[med-svn] [ugene] 02/05: Imported Upstream version 1.21.0+dfsg
Andreas Tille
tille at debian.org
Wed Jul 27 21:02:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ugene.
commit 20c61aa131aa1f7271950db318104fac06ba1315
Author: Andreas Tille <tille at debian.org>
Date: Sat Mar 12 08:45:37 2016 +0100
Imported Upstream version 1.21.0+dfsg
---
LICENSE.3rd_party | 7 +
installer/_common_data/humimit_custom.pri | 60 +
.../U2Algorithm/src/misc/BinaryFindOpenCL.cpp | 2 +-
.../U2Algorithm/src/misc/BinaryFindOpenCL.h | 2 +-
src/corelibs/U2Algorithm/src/misc/BitsTable.cpp | 2 +-
src/corelibs/U2Algorithm/src/misc/BitsTable.h | 2 +-
.../U2Algorithm/src/misc/CDSearchTaskFactory.h | 2 +-
.../U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp | 2 +-
.../U2Algorithm/src/misc/DnaAssemblyMultiTask.h | 2 +-
src/corelibs/U2Algorithm/src/misc/DynTable.h | 2 +-
src/corelibs/U2Algorithm/src/misc/EnzymeModel.h | 2 +-
.../U2Algorithm/src/misc/FindAlgorithm.cpp | 2 +-
src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h | 2 +-
.../U2Algorithm/src/misc/FindAlgorithmTask.cpp | 2 +-
.../U2Algorithm/src/misc/FindAlgorithmTask.h | 2 +-
.../src/misc/GenomeAssemblyMultiTask.cpp | 2 +-
.../U2Algorithm/src/misc/GenomeAssemblyMultiTask.h | 2 +-
.../U2Algorithm/src/misc/RepeatFinderSettings.h | 2 +-
.../U2Algorithm/src/misc/RepeatFinderTaskFactory.h | 2 +-
src/corelibs/U2Algorithm/src/misc/RollingArray.h | 2 +-
src/corelibs/U2Algorithm/src/misc/RollingMatrix.h | 2 +-
.../src/misc/SequenceContentFilterTask.cpp | 2 +-
.../src/misc/SequenceContentFilterTask.h | 2 +-
src/corelibs/U2Algorithm/src/misc/SyncSort.h | 2 +-
.../src/molecular_geometry/GeomUtils.cpp | 2 +-
.../U2Algorithm/src/molecular_geometry/GeomUtils.h | 2 +-
.../src/molecular_geometry/MolecularSurface.cpp | 2 +-
.../src/molecular_geometry/MolecularSurface.h | 2 +-
.../MolecularSurfaceFactoryRegistry.cpp | 2 +-
.../MolecularSurfaceFactoryRegistry.h | 2 +-
.../src/molecular_geometry/VanDerWaalsSurface.cpp | 2 +-
.../src/molecular_geometry/VanDerWaalsSurface.h | 2 +-
.../src/msa_alignment/AbstractAlignmentTask.cpp | 2 +-
.../src/msa_alignment/AbstractAlignmentTask.h | 2 +-
.../AlignSequencesToAlignmentTaskSettings.cpp | 2 +-
.../AlignSequencesToAlignmentTaskSettings.h | 2 +-
.../msa_alignment/BaseAlignmentAlgorithmIds.cpp | 2 +-
.../src/msa_alignment/BaseAlignmentAlgorithmIds.h | 2 +-
.../src/msa_alignment/SimpleAddingToAlignment.cpp | 2 +-
.../src/msa_alignment/SimpleAddingToAlignment.h | 2 +-
.../src/pairwise_alignment/NWAligner.cpp | 2 +-
.../U2Algorithm/src/pairwise_alignment/NWAligner.h | 2 +-
.../src/pairwise_alignment/PairwiseAligner.cpp | 2 +-
.../src/pairwise_alignment/PairwiseAligner.h | 2 +-
.../pairwise_alignment/PairwiseAlignmentTask.cpp | 2 +-
.../src/pairwise_alignment/PairwiseAlignmentTask.h | 2 +-
.../src/phyltree/CreatePhyTreeSettings.cpp | 2 +-
.../src/phyltree/CreatePhyTreeSettings.h | 2 +-
.../U2Algorithm/src/phyltree/PhyTreeGenerator.h | 2 +-
.../src/phyltree/PhyTreeGeneratorRegistry.cpp | 2 +-
.../src/phyltree/PhyTreeGeneratorRegistry.h | 2 +-
.../src/phyltree/PhyTreeGeneratorTask.cpp | 2 +-
.../src/phyltree/PhyTreeGeneratorTask.h | 2 +-
.../src/registry/AlignmentAlgorithmsRegistry.cpp | 2 +-
.../src/registry/AlignmentAlgorithmsRegistry.h | 2 +-
.../src/registry/CDSearchTaskFactoryRegistry.h | 2 +-
.../U2Algorithm/src/registry/CudaGpuRegistry.cpp | 2 +-
.../U2Algorithm/src/registry/CudaGpuRegistry.h | 2 +-
.../src/registry/DnaAssemblyAlgRegistry.cpp | 2 +-
.../src/registry/DnaAssemblyAlgRegistry.h | 2 +-
.../U2Algorithm/src/registry/DnaAssemblyTask.cpp | 2 +-
.../U2Algorithm/src/registry/DnaAssemblyTask.h | 2 +-
.../src/registry/GenomeAssemblyRegistry.cpp | 2 +-
.../src/registry/GenomeAssemblyRegistry.h | 2 +-
.../U2Algorithm/src/registry/OpenCLGpuRegistry.cpp | 2 +-
.../U2Algorithm/src/registry/OpenCLGpuRegistry.h | 2 +-
.../registry/RepeatFinderTaskFactoryRegistry.cpp | 2 +-
.../src/registry/RepeatFinderTaskFactoryRegistry.h | 2 +-
.../src/registry/SecStructPredictAlgRegistry.cpp | 2 +-
.../src/registry/SecStructPredictAlgRegistry.h | 2 +-
.../src/registry/SecStructPredictTask.cpp | 2 +-
.../src/registry/SecStructPredictTask.h | 2 +-
.../src/registry/SplicedAlignmentTask.cpp | 2 +-
.../src/registry/SplicedAlignmentTask.h | 2 +-
.../src/registry/SplicedAlignmentTaskRegistry.cpp | 2 +-
.../src/registry/SplicedAlignmentTaskRegistry.h | 2 +-
.../src/registry/SubstMatrixRegistry.cpp | 2 +-
.../U2Algorithm/src/registry/SubstMatrixRegistry.h | 2 +-
.../smith_waterman/SWMulAlignExternalPropTag.cpp | 2 +-
.../src/smith_waterman/SWMulAlignExternalPropTag.h | 2 +-
.../src/smith_waterman/SWMulAlignResultNamesTag.h | 2 +-
.../SWMulAlignResultNamesTagsRegistry.cpp | 2 +-
.../SWMulAlignResultNamesTagsRegistry.h | 2 +-
.../src/smith_waterman/SWMulAlignSeqPrefixTag.cpp | 2 +-
.../src/smith_waterman/SWMulAlignSeqPrefixTag.h | 2 +-
.../src/smith_waterman/SWMulAlignSubseqPropTag.cpp | 2 +-
.../src/smith_waterman/SWMulAlignSubseqPropTag.h | 2 +-
.../src/smith_waterman/SWResultFilterRegistry.cpp | 2 +-
.../src/smith_waterman/SWResultFilterRegistry.h | 2 +-
.../smith_waterman/SmithWatermanReportCallback.cpp | 5 +-
.../smith_waterman/SmithWatermanReportCallback.h | 2 +-
.../src/smith_waterman/SmithWatermanResult.cpp | 2 +-
.../src/smith_waterman/SmithWatermanResult.h | 2 +-
.../smith_waterman/SmithWatermanResultFilters.cpp | 2 +-
.../smith_waterman/SmithWatermanResultFilters.h | 2 +-
.../src/smith_waterman/SmithWatermanSettings.h | 2 +-
.../src/smith_waterman/SmithWatermanTaskFactory.h | 2 +-
.../SmithWatermanTaskFactoryRegistry.cpp | 2 +-
.../SmithWatermanTaskFactoryRegistry.h | 2 +-
.../src/smith_waterman/SmithWatermanUtil.cpp | 2 +-
.../src/smith_waterman/SmithWatermanUtil.h | 2 +-
.../StructuralAlignmentAlgorithm.cpp | 2 +-
.../StructuralAlignmentAlgorithm.h | 2 +-
.../StructuralAlignmentAlgorithmFactory.cpp | 2 +-
.../StructuralAlignmentAlgorithmFactory.h | 2 +-
.../StructuralAlignmentAlgorithmRegistry.cpp | 2 +-
.../StructuralAlignmentAlgorithmRegistry.h | 2 +-
.../AssemblyConsensusAlgorithm.cpp | 2 +-
.../AssemblyConsensusAlgorithm.h | 2 +-
.../AssemblyConsensusAlgorithmDefault.cpp | 2 +-
.../AssemblyConsensusAlgorithmDefault.h | 2 +-
.../AssemblyConsensusAlgorithmRegistry.cpp | 2 +-
.../AssemblyConsensusAlgorithmRegistry.h | 2 +-
.../AssemblyConsensusAlgorithmSamtools.cpp | 2 +-
.../AssemblyConsensusAlgorithmSamtools.h | 2 +-
.../AssemblyConsensusUtils.cpp | 2 +-
.../AssemblyConsensusUtils.h | 2 +-
.../BuiltInAssemblyConsensusAlgorithms.cpp | 2 +-
.../BuiltInAssemblyConsensusAlgorithms.h | 2 +-
.../U2Algorithm/src/util_gpu/opencl/BinaryFind.cl | 2 +-
.../src/util_gpu/opencl/OpenCLHelper.cpp | 2 +-
.../U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h | 2 +-
.../src/util_gpu/opencl/OpenCLUtils.cpp | 2 +-
.../U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h | 2 +-
.../BuiltInConsensusAlgorithms.cpp | 2 +-
.../BuiltInConsensusAlgorithms.h | 2 +-
.../util_msa_consensus/MSAConsensusAlgorithm.cpp | 2 +-
.../src/util_msa_consensus/MSAConsensusAlgorithm.h | 2 +-
.../MSAConsensusAlgorithmClustal.cpp | 2 +-
.../MSAConsensusAlgorithmClustal.h | 2 +-
.../MSAConsensusAlgorithmDefault.cpp | 2 +-
.../MSAConsensusAlgorithmDefault.h | 2 +-
.../MSAConsensusAlgorithmLevitsky.cpp | 2 +-
.../MSAConsensusAlgorithmLevitsky.h | 2 +-
.../MSAConsensusAlgorithmRegistry.cpp | 2 +-
.../MSAConsensusAlgorithmRegistry.h | 2 +-
.../MSAConsensusAlgorithmStrict.cpp | 2 +-
.../MSAConsensusAlgorithmStrict.h | 2 +-
.../src/util_msa_consensus/MSAConsensusUtils.cpp | 2 +-
.../src/util_msa_consensus/MSAConsensusUtils.h | 2 +-
.../BuiltInDistanceAlgorithms.cpp | 2 +-
.../util_msa_distance/BuiltInDistanceAlgorithms.h | 2 +-
.../src/util_msa_distance/MSADistanceAlgorithm.cpp | 2 +-
.../src/util_msa_distance/MSADistanceAlgorithm.h | 2 +-
.../MSADistanceAlgorithmHamming.cpp | 2 +-
.../MSADistanceAlgorithmHamming.h | 2 +-
.../MSADistanceAlgorithmHammingRevCompl.cpp | 2 +-
.../MSADistanceAlgorithmHammingRevCompl.h | 2 +-
.../MSADistanceAlgorithmRegistry.cpp | 2 +-
.../MSADistanceAlgorithmRegistry.h | 2 +-
.../MSADistanceAlgorithmSimilarity.cpp | 2 +-
.../MSADistanceAlgorithmSimilarity.h | 2 +-
.../src/util_msaedit/CreateSubalignmentTask.cpp | 2 +-
.../src/util_msaedit/CreateSubalignmentTask.h | 2 +-
.../src/util_msaedit/MAlignmentUtilTasks.cpp | 2 +-
.../src/util_msaedit/MAlignmentUtilTasks.h | 2 +-
.../src/util_msaedit/MSAColorScheme.cpp | 2 +-
.../U2Algorithm/src/util_msaedit/MSAColorScheme.h | 2 +-
.../U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp | 2 +-
.../U2Algorithm/src/util_orf/ORFAlgorithmTask.h | 2 +-
.../U2Algorithm/src/util_orf/ORFFinder.cpp | 2 +-
src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h | 2 +-
.../src/util_sarray/SArrayBasedFindTask.cpp | 2 +-
.../src/util_sarray/SArrayBasedFindTask.h | 2 +-
.../U2Algorithm/src/util_sarray/SArrayIndex.cpp | 2 +-
.../U2Algorithm/src/util_sarray/SArrayIndex.h | 2 +-
.../src/util_sarray/SArrayIndexSerializer.cpp | 2 +-
.../src/util_sarray/SArrayIndexSerializer.h | 2 +-
.../BuiltInPWMConversionAlgorithms.cpp | 2 +-
.../BuiltInPWMConversionAlgorithms.h | 2 +-
.../util_weight_matrix/PWMConversionAlgorithm.cpp | 2 +-
.../util_weight_matrix/PWMConversionAlgorithm.h | 2 +-
.../PWMConversionAlgorithmBVH.cpp | 2 +-
.../util_weight_matrix/PWMConversionAlgorithmBVH.h | 2 +-
.../PWMConversionAlgorithmLOD.cpp | 2 +-
.../util_weight_matrix/PWMConversionAlgorithmLOD.h | 2 +-
.../PWMConversionAlgorithmMCH.cpp | 2 +-
.../util_weight_matrix/PWMConversionAlgorithmMCH.h | 2 +-
.../PWMConversionAlgorithmNLG.cpp | 2 +-
.../util_weight_matrix/PWMConversionAlgorithmNLG.h | 2 +-
.../PWMConversionAlgorithmRegistry.cpp | 2 +-
.../PWMConversionAlgorithmRegistry.h | 2 +-
src/corelibs/U2Algorithm/transl/english.ts | 8 +-
src/corelibs/U2Algorithm/transl/russian.ts | 10 +-
src/corelibs/U2Core/U2Core.pro | 2 +
.../U2Core/src/cmdline/CMDLineCoreOptions.cpp | 2 +-
.../U2Core/src/cmdline/CMDLineCoreOptions.h | 2 +-
.../U2Core/src/cmdline/CMDLineHelpProvider.h | 2 +-
.../U2Core/src/cmdline/CMDLineRegistry.cpp | 2 +-
src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h | 2 +-
src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp | 2 +-
src/corelibs/U2Core/src/cmdline/CMDLineUtils.h | 2 +-
src/corelibs/U2Core/src/datatype/Annotation.cpp | 2 +-
src/corelibs/U2Core/src/datatype/Annotation.h | 2 +-
.../U2Core/src/datatype/AnnotationData.cpp | 2 +-
src/corelibs/U2Core/src/datatype/AnnotationData.h | 2 +-
.../U2Core/src/datatype/AnnotationGroup.cpp | 2 +-
src/corelibs/U2Core/src/datatype/AnnotationGroup.h | 2 +-
.../U2Core/src/datatype/AnnotationModification.cpp | 2 +-
.../U2Core/src/datatype/AnnotationModification.h | 2 +-
.../U2Core/src/datatype/AnnotationSettings.cpp | 2 +-
.../U2Core/src/datatype/AnnotationSettings.h | 2 +-
.../datatype/AnnotationTableObjectConstraints.cpp | 2 +-
.../datatype/AnnotationTableObjectConstraints.h | 2 +-
src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp | 2 +-
.../U2Core/src/datatype/BaseTranslations.cpp | 2 +-
src/corelibs/U2Core/src/datatype/BioStruct3D.cpp | 13 +-
src/corelibs/U2Core/src/datatype/BioStruct3D.h | 3 +-
src/corelibs/U2Core/src/datatype/DIProperties.h | 2 +-
src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp | 2 +-
src/corelibs/U2Core/src/datatype/DNAAlphabet.h | 2 +-
.../src/datatype/DNAAlphabetRegistryImpl.cpp | 2 +-
.../U2Core/src/datatype/DNAAlphabetRegistryImpl.h | 2 +-
src/corelibs/U2Core/src/datatype/DNAChromatogram.h | 2 +-
src/corelibs/U2Core/src/datatype/DNAInfo.cpp | 2 +-
src/corelibs/U2Core/src/datatype/DNAInfo.h | 2 +-
src/corelibs/U2Core/src/datatype/DNAQuality.cpp | 2 +-
src/corelibs/U2Core/src/datatype/DNAQuality.h | 2 +-
src/corelibs/U2Core/src/datatype/DNASequence.cpp | 2 +-
src/corelibs/U2Core/src/datatype/DNASequence.h | 2 +-
.../U2Core/src/datatype/DNASequenceUtils.cpp | 2 +-
.../U2Core/src/datatype/DNASequenceUtils.h | 2 +-
.../U2Core/src/datatype/DNATranslation.cpp | 2 +-
src/corelibs/U2Core/src/datatype/DNATranslation.h | 2 +-
.../U2Core/src/datatype/DNATranslationImpl.cpp | 2 +-
.../U2Core/src/datatype/DNATranslationImpl.h | 2 +-
src/corelibs/U2Core/src/datatype/FeatureColors.cpp | 2 +-
src/corelibs/U2Core/src/datatype/FeatureColors.h | 2 +-
src/corelibs/U2Core/src/datatype/MAlignment.cpp | 2 +-
src/corelibs/U2Core/src/datatype/MAlignment.h | 2 +-
.../U2Core/src/datatype/MAlignmentInfo.cpp | 2 +-
src/corelibs/U2Core/src/datatype/MAlignmentInfo.h | 2 +-
src/corelibs/U2Core/src/datatype/Matrix44.cpp | 2 +-
src/corelibs/U2Core/src/datatype/Matrix44.h | 2 +-
src/corelibs/U2Core/src/datatype/PFMatrix.cpp | 2 +-
src/corelibs/U2Core/src/datatype/PFMatrix.h | 2 +-
src/corelibs/U2Core/src/datatype/PWMatrix.cpp | 2 +-
src/corelibs/U2Core/src/datatype/PWMatrix.h | 2 +-
src/corelibs/U2Core/src/datatype/PhyTree.cpp | 2 +-
src/corelibs/U2Core/src/datatype/PhyTree.h | 2 +-
src/corelibs/U2Core/src/datatype/SMatrix.cpp | 2 +-
src/corelibs/U2Core/src/datatype/SMatrix.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Alphabet.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Assembly.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Attribute.h | 2 +-
.../U2Core/src/datatype/U2CoreAttributes.cpp | 2 +-
.../U2Core/src/datatype/U2CoreAttributes.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Feature.h | 2 +-
src/corelibs/U2Core/src/datatype/U2FeatureKeys.h | 2 +-
src/corelibs/U2Core/src/datatype/U2FeatureType.cpp | 2 +-
src/corelibs/U2Core/src/datatype/U2FeatureType.h | 2 +-
src/corelibs/U2Core/src/datatype/U2IdTypes.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Identity.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Location.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Mod.cpp | 2 +-
src/corelibs/U2Core/src/datatype/U2Mod.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Msa.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Qualifier.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Range.h | 2 +-
src/corelibs/U2Core/src/datatype/U2RawData.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Region.cpp | 2 +-
src/corelibs/U2Core/src/datatype/U2Region.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Sequence.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Type.cpp | 2 +-
src/corelibs/U2Core/src/datatype/U2Type.h | 2 +-
src/corelibs/U2Core/src/datatype/U2TypeIds.h | 2 +-
src/corelibs/U2Core/src/datatype/U2Variant.h | 2 +-
src/corelibs/U2Core/src/datatype/UdrRecord.cpp | 2 +-
src/corelibs/U2Core/src/datatype/UdrRecord.h | 2 +-
src/corelibs/U2Core/src/datatype/UdrSchema.cpp | 2 +-
src/corelibs/U2Core/src/datatype/UdrSchema.h | 2 +-
.../U2Core/src/datatype/UdrSchemaRegistry.cpp | 2 +-
.../U2Core/src/datatype/UdrSchemaRegistry.h | 2 +-
src/corelibs/U2Core/src/datatype/Vector3D.cpp | 2 +-
src/corelibs/U2Core/src/datatype/Vector3D.h | 2 +-
.../U2Core/src/datatype/udr/RawDataUdrSchema.cpp | 2 +-
.../U2Core/src/datatype/udr/RawDataUdrSchema.h | 2 +-
src/corelibs/U2Core/src/dbi/DbiConnection.cpp | 2 +-
src/corelibs/U2Core/src/dbi/DbiConnection.h | 2 +-
src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp | 2 +-
src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h | 2 +-
src/corelibs/U2Core/src/dbi/U2AbstractDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2AttributeDbi.h | 2 +-
.../U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2Dbi.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2Dbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiRegistry.h | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2DbiUtils.h | 2 +-
src/corelibs/U2Core/src/dbi/U2FeatureDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h | 2 +-
src/corelibs/U2Core/src/dbi/U2ModDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2MsaDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2ObjectDbi.h | 2 +-
.../U2Core/src/dbi/U2ObjectRelationsDbi.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h | 2 +-
.../U2Core/src/dbi/U2SQLiteTripleStore.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h | 2 +-
src/corelibs/U2Core/src/dbi/U2SequenceDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp | 2 +-
src/corelibs/U2Core/src/dbi/U2SqlHelpers.h | 2 +-
src/corelibs/U2Core/src/dbi/U2VariantDbi.h | 2 +-
src/corelibs/U2Core/src/dbi/UdrDbi.cpp | 2 +-
src/corelibs/U2Core/src/dbi/UdrDbi.h | 2 +-
src/corelibs/U2Core/src/globals/AppContext.cpp | 2 +-
src/corelibs/U2Core/src/globals/AppContext.h | 12 +-
src/corelibs/U2Core/src/globals/AppFileStorage.cpp | 2 +-
src/corelibs/U2Core/src/globals/AppFileStorage.h | 2 +-
.../U2Core/src/globals/AppGlobalObject.cpp | 2 +-
src/corelibs/U2Core/src/globals/AppGlobalObject.h | 2 +-
src/corelibs/U2Core/src/globals/AppResources.cpp | 2 +-
src/corelibs/U2Core/src/globals/AppResources.h | 2 +-
src/corelibs/U2Core/src/globals/AppSettings.h | 2 +-
.../U2Core/src/globals/AutoAnnotationsSupport.cpp | 2 +-
.../U2Core/src/globals/AutoAnnotationsSupport.h | 2 +-
.../U2Core/src/globals/BaseDocumentFormats.cpp | 2 +-
.../U2Core/src/globals/BaseDocumentFormats.h | 2 +-
.../U2Core/src/globals/ClipboardController.cpp | 79 +
.../U2Core/src/globals/ClipboardController.h | 61 +
src/corelibs/U2Core/src/globals/Counter.cpp | 2 +-
src/corelibs/U2Core/src/globals/Counter.h | 2 +-
.../U2Core/src/globals/CredentialsAsker.cpp | 2 +-
src/corelibs/U2Core/src/globals/CredentialsAsker.h | 2 +-
src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp | 2 +-
src/corelibs/U2Core/src/globals/DBXRefRegistry.h | 2 +-
.../U2Core/src/globals/DataBaseRegistry.cpp | 2 +-
src/corelibs/U2Core/src/globals/DataBaseRegistry.h | 2 +-
.../U2Core/src/globals/DataPathRegistry.cpp | 2 +-
src/corelibs/U2Core/src/globals/DataPathRegistry.h | 2 +-
.../U2Core/src/globals/ExternalToolRegistry.cpp | 2 +-
.../U2Core/src/globals/ExternalToolRegistry.h | 2 +-
src/corelibs/U2Core/src/globals/FormatSettings.cpp | 2 +-
src/corelibs/U2Core/src/globals/FormatSettings.h | 2 +-
src/corelibs/U2Core/src/globals/GUrl.cpp | 2 +-
src/corelibs/U2Core/src/globals/GUrl.h | 2 +-
src/corelibs/U2Core/src/globals/Identifiable.h | 2 +-
src/corelibs/U2Core/src/globals/L10n.h | 2 +-
src/corelibs/U2Core/src/globals/Log.cpp | 2 +-
src/corelibs/U2Core/src/globals/Log.h | 2 +-
src/corelibs/U2Core/src/globals/LogCache.cpp | 2 +-
src/corelibs/U2Core/src/globals/LogCache.h | 2 +-
.../U2Core/src/globals/NetworkConfiguration.cpp | 2 +-
.../U2Core/src/globals/NetworkConfiguration.h | 2 +-
.../U2Core/src/globals/PasswordStorage.cpp | 2 +-
src/corelibs/U2Core/src/globals/PasswordStorage.h | 2 +-
src/corelibs/U2Core/src/globals/PluginModel.cpp | 2 +-
src/corelibs/U2Core/src/globals/PluginModel.h | 2 +-
.../src/globals/ProjectFilterTaskRegistry.cpp | 2 +-
.../U2Core/src/globals/ProjectFilterTaskRegistry.h | 2 +-
src/corelibs/U2Core/src/globals/ProjectService.cpp | 2 +-
src/corelibs/U2Core/src/globals/ProjectService.h | 2 +-
.../globals/ProjectTreeControllerModeSettings.cpp | 2 +-
.../globals/ProjectTreeControllerModeSettings.h | 20 +-
.../U2Core/src/globals/ResourceTracker.cpp | 2 +-
src/corelibs/U2Core/src/globals/ResourceTracker.h | 2 +-
.../U2Core/src/globals/ScriptingToolRegistry.cpp | 2 +-
.../U2Core/src/globals/ScriptingToolRegistry.h | 2 +-
src/corelibs/U2Core/src/globals/ServiceModel.cpp | 2 +-
src/corelibs/U2Core/src/globals/ServiceModel.h | 2 +-
src/corelibs/U2Core/src/globals/ServiceTypes.h | 2 +-
src/corelibs/U2Core/src/globals/Settings.h | 2 +-
src/corelibs/U2Core/src/globals/Task.cpp | 2 +-
src/corelibs/U2Core/src/globals/Task.h | 2 +-
src/corelibs/U2Core/src/globals/Timer.cpp | 2 +-
src/corelibs/U2Core/src/globals/Timer.h | 2 +-
src/corelibs/U2Core/src/globals/U2OpStatus.h | 2 +-
src/corelibs/U2Core/src/globals/U2SafePoints.h | 2 +-
.../U2Core/src/globals/UserActionsWriter.cpp | 2 +-
.../U2Core/src/globals/UserActionsWriter.h | 2 +-
.../src/globals/UserApplicationsSettings.cpp | 2 +-
.../U2Core/src/globals/UserApplicationsSettings.h | 2 +-
src/corelibs/U2Core/src/globals/Version.cpp | 2 +-
src/corelibs/U2Core/src/globals/Version.h | 2 +-
src/corelibs/U2Core/src/globals/global.h | 2 +-
.../U2Core/src/gobjects/AnnotationTableObject.cpp | 2 +-
.../U2Core/src/gobjects/AnnotationTableObject.h | 2 +-
.../U2Core/src/gobjects/AssemblyObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/AssemblyObject.h | 2 +-
.../U2Core/src/gobjects/BioStruct3DObject.cpp | 2 +-
.../U2Core/src/gobjects/BioStruct3DObject.h | 2 +-
.../U2Core/src/gobjects/DNAChromatogramObject.cpp | 2 +-
.../U2Core/src/gobjects/DNAChromatogramObject.h | 2 +-
.../U2Core/src/gobjects/DNASequenceObject.cpp | 2 +-
.../U2Core/src/gobjects/DNASequenceObject.h | 2 +-
.../U2Core/src/gobjects/GObjectRelationRoles.cpp | 2 +-
.../U2Core/src/gobjects/GObjectRelationRoles.h | 2 +-
src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/GObjectTypes.h | 2 +-
src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/GObjectUtils.h | 2 +-
.../U2Core/src/gobjects/MAlignmentObject.cpp | 2 +-
.../U2Core/src/gobjects/MAlignmentObject.h | 2 +-
.../U2Core/src/gobjects/PFMatrixObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/PFMatrixObject.h | 2 +-
.../U2Core/src/gobjects/PWMatrixObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/PWMatrixObject.h | 2 +-
src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/PhyTreeObject.h | 2 +-
src/corelibs/U2Core/src/gobjects/TextObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/TextObject.h | 2 +-
.../U2Core/src/gobjects/UnloadedObject.cpp | 2 +-
src/corelibs/U2Core/src/gobjects/UnloadedObject.h | 2 +-
.../U2Core/src/gobjects/VariantTrackObject.cpp | 2 +-
.../U2Core/src/gobjects/VariantTrackObject.h | 2 +-
.../U2Core/src/io/DatabaseConnectionAdapter.cpp | 2 +-
.../U2Core/src/io/DatabaseConnectionAdapter.h | 2 +-
src/corelibs/U2Core/src/io/HttpFileAdapter.cpp | 2 +-
src/corelibs/U2Core/src/io/HttpFileAdapter.h | 2 +-
src/corelibs/U2Core/src/io/IOAdapter.cpp | 2 +-
src/corelibs/U2Core/src/io/IOAdapter.h | 2 +-
src/corelibs/U2Core/src/io/InputStream.h | 2 +-
src/corelibs/U2Core/src/io/LocalFileAdapter.cpp | 4 +-
src/corelibs/U2Core/src/io/LocalFileAdapter.h | 2 +-
src/corelibs/U2Core/src/io/OutputStream.h | 2 +-
src/corelibs/U2Core/src/io/StringAdapter.cpp | 2 +-
src/corelibs/U2Core/src/io/StringAdapter.h | 2 +-
src/corelibs/U2Core/src/io/VFSAdapter.cpp | 2 +-
src/corelibs/U2Core/src/io/VFSAdapter.h | 2 +-
src/corelibs/U2Core/src/io/VirtualFileSystem.cpp | 2 +-
src/corelibs/U2Core/src/io/VirtualFileSystem.h | 2 +-
src/corelibs/U2Core/src/io/ZlibAdapter.cpp | 2 +-
src/corelibs/U2Core/src/io/ZlibAdapter.h | 2 +-
src/corelibs/U2Core/src/models/BunchMimeData.cpp | 2 +-
src/corelibs/U2Core/src/models/BunchMimeData.h | 2 +-
src/corelibs/U2Core/src/models/DocumentImport.cpp | 2 +-
src/corelibs/U2Core/src/models/DocumentImport.h | 2 +-
src/corelibs/U2Core/src/models/DocumentModel.cpp | 6 +-
src/corelibs/U2Core/src/models/DocumentModel.h | 2 +-
src/corelibs/U2Core/src/models/DocumentUtils.cpp | 2 +-
src/corelibs/U2Core/src/models/DocumentUtils.h | 2 +-
src/corelibs/U2Core/src/models/Folder.cpp | 2 +-
src/corelibs/U2Core/src/models/Folder.h | 2 +-
src/corelibs/U2Core/src/models/GHints.cpp | 2 +-
src/corelibs/U2Core/src/models/GHints.h | 2 +-
src/corelibs/U2Core/src/models/GObject.cpp | 2 +-
src/corelibs/U2Core/src/models/GObject.h | 2 +-
.../U2Core/src/models/GObjectReference.cpp | 2 +-
src/corelibs/U2Core/src/models/GObjectReference.h | 2 +-
.../U2Core/src/models/MimeDataIterator.cpp | 2 +-
src/corelibs/U2Core/src/models/MimeDataIterator.h | 2 +-
src/corelibs/U2Core/src/models/ProjectModel.cpp | 2 +-
src/corelibs/U2Core/src/models/ProjectModel.h | 2 +-
.../U2Core/src/models/StateLockableDataModel.cpp | 2 +-
.../U2Core/src/models/StateLockableDataModel.h | 2 +-
.../U2Core/src/selection/AnnotationSelection.cpp | 2 +-
.../U2Core/src/selection/AnnotationSelection.h | 2 +-
.../U2Core/src/selection/DNASequenceSelection.h | 2 +-
.../U2Core/src/selection/DocumentSelection.cpp | 2 +-
.../U2Core/src/selection/DocumentSelection.h | 2 +-
.../U2Core/src/selection/FolderSelection.cpp | 2 +-
.../U2Core/src/selection/FolderSelection.h | 2 +-
.../U2Core/src/selection/GObjectSelection.cpp | 2 +-
.../U2Core/src/selection/GObjectSelection.h | 2 +-
.../U2Core/src/selection/LRegionsSelection.cpp | 2 +-
.../U2Core/src/selection/LRegionsSelection.h | 2 +-
.../U2Core/src/selection/SelectionModel.cpp | 2 +-
src/corelibs/U2Core/src/selection/SelectionModel.h | 2 +-
.../U2Core/src/selection/SelectionTypes.cpp | 2 +-
src/corelibs/U2Core/src/selection/SelectionTypes.h | 2 +-
.../U2Core/src/selection/SelectionUtils.cpp | 2 +-
src/corelibs/U2Core/src/selection/SelectionUtils.h | 2 +-
src/corelibs/U2Core/src/selection/TextSelection.h | 2 +-
.../U2Core/src/tasks/AbstractProjectFilterTask.cpp | 2 +-
.../U2Core/src/tasks/AbstractProjectFilterTask.h | 2 +-
src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/AddDocumentTask.h | 2 +-
.../U2Core/src/tasks/AddObjectsToDocumentTask.cpp | 2 +-
.../U2Core/src/tasks/AddObjectsToDocumentTask.h | 2 +-
.../src/tasks/AddSequencesToAlignmentTask.cpp | 50 +-
.../U2Core/src/tasks/AddSequencesToAlignmentTask.h | 17 +-
.../U2Core/src/tasks/BackgroundTaskRunner.h | 2 +-
.../U2Core/src/tasks/CleanupFileStorageTask.cpp | 2 +-
.../U2Core/src/tasks/CleanupFileStorageTask.h | 2 +-
src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/CloneObjectTask.h | 2 +-
.../U2Core/src/tasks/ConnectSharedDatabaseTask.cpp | 2 +-
.../U2Core/src/tasks/ConnectSharedDatabaseTask.h | 2 +-
.../U2Core/src/tasks/ConsoleShutdownTask.cpp | 2 +-
.../U2Core/src/tasks/ConsoleShutdownTask.h | 2 +-
src/corelibs/U2Core/src/tasks/CopyDataTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/CopyDataTask.h | 2 +-
src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/CopyDocumentTask.h | 2 +-
.../U2Core/src/tasks/CreateAnnotationTask.cpp | 2 +-
.../U2Core/src/tasks/CreateAnnotationTask.h | 2 +-
.../U2Core/src/tasks/DeleteObjectsTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h | 2 +-
.../U2Core/src/tasks/DocumentProviderTask.cpp | 2 +-
.../U2Core/src/tasks/DocumentProviderTask.h | 2 +-
.../U2Core/src/tasks/ExternalToolRunTask.cpp | 227 +-
.../U2Core/src/tasks/ExternalToolRunTask.h | 83 +-
.../src/tasks/ExtractAnnotatedRegionTask.cpp | 2 +-
.../U2Core/src/tasks/ExtractAnnotatedRegionTask.h | 2 +-
src/corelibs/U2Core/src/tasks/FailTask.h | 2 +-
src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/LoadDocumentTask.h | 2 +-
.../U2Core/src/tasks/LoadRemoteDocumentTask.cpp | 2 +-
.../U2Core/src/tasks/LoadRemoteDocumentTask.h | 2 +-
.../U2Core/src/tasks/ModifySequenceObjectTask.cpp | 2 +-
.../U2Core/src/tasks/ModifySequenceObjectTask.h | 2 +-
src/corelibs/U2Core/src/tasks/MultiTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/MultiTask.h | 2 +-
.../U2Core/src/tasks/RemoveAnnotationsTask.cpp | 2 +-
.../U2Core/src/tasks/RemoveAnnotationsTask.h | 2 +-
.../U2Core/src/tasks/RemoveDocumentTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h | 2 +-
.../U2Core/src/tasks/ReverseSequenceTask.cpp | 2 +-
.../U2Core/src/tasks/ReverseSequenceTask.h | 2 +-
.../U2Core/src/tasks/SaveDocumentStreamingTask.cpp | 2 +-
.../U2Core/src/tasks/SaveDocumentStreamingTask.h | 2 +-
src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/SaveDocumentTask.h | 2 +-
src/corelibs/U2Core/src/tasks/ScriptTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/ScriptTask.h | 2 +-
.../U2Core/src/tasks/SequenceDbiWalkerTask.cpp | 2 +-
.../U2Core/src/tasks/SequenceDbiWalkerTask.h | 2 +-
.../U2Core/src/tasks/SequenceWalkerTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h | 2 +-
src/corelibs/U2Core/src/tasks/TLSTask.cpp | 2 +-
src/corelibs/U2Core/src/tasks/TLSTask.h | 2 +-
src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp | 2 +-
src/corelibs/U2Core/src/tasks/TaskSignalMapper.h | 2 +-
src/corelibs/U2Core/src/tasks/TaskStarter.cpp | 2 +-
src/corelibs/U2Core/src/tasks/TaskStarter.h | 2 +-
src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp | 2 +-
src/corelibs/U2Core/src/tasks/TmpDirChecker.h | 2 +-
.../tasks/shared_db/ImportDirToDatabaseTask.cpp | 2 +-
.../src/tasks/shared_db/ImportDirToDatabaseTask.h | 2 +-
.../shared_db/ImportDocumentToDatabaseTask.cpp | 2 +-
.../tasks/shared_db/ImportDocumentToDatabaseTask.h | 2 +-
.../tasks/shared_db/ImportFileToDatabaseTask.cpp | 2 +-
.../src/tasks/shared_db/ImportFileToDatabaseTask.h | 2 +-
.../tasks/shared_db/ImportObjectToDatabaseTask.cpp | 2 +-
.../tasks/shared_db/ImportObjectToDatabaseTask.h | 2 +-
.../src/tasks/shared_db/ImportToDatabaseTask.cpp | 2 +-
.../src/tasks/shared_db/ImportToDatabaseTask.h | 2 +-
src/corelibs/U2Core/src/util/AssemblyImporter.cpp | 2 +-
src/corelibs/U2Core/src/util/AssemblyImporter.h | 2 +-
.../U2Core/src/util/DatatypeSerializeUtils.cpp | 2 +-
.../U2Core/src/util/DatatypeSerializeUtils.h | 2 +-
.../U2Core/src/util/FileAndDirectoryUtils.cpp | 2 +-
.../U2Core/src/util/FileAndDirectoryUtils.h | 2 +-
src/corelibs/U2Core/src/util/FileStorageUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/FileStorageUtils.h | 2 +-
src/corelibs/U2Core/src/util/FilesIterator.cpp | 2 +-
src/corelibs/U2Core/src/util/FilesIterator.h | 2 +-
src/corelibs/U2Core/src/util/FormatUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/FormatUtils.h | 2 +-
src/corelibs/U2Core/src/util/GAutoDeleteList.cpp | 2 +-
src/corelibs/U2Core/src/util/GAutoDeleteList.h | 2 +-
src/corelibs/U2Core/src/util/GUrlUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/GUrlUtils.h | 2 +-
src/corelibs/U2Core/src/util/GenbankFeatures.cpp | 2 +-
src/corelibs/U2Core/src/util/GenbankFeatures.h | 2 +-
src/corelibs/U2Core/src/util/IOAdapterUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/IOAdapterUtils.h | 2 +-
.../U2Core/src/util/ImportToDatabaseOptions.cpp | 2 +-
.../U2Core/src/util/ImportToDatabaseOptions.h | 2 +-
.../U2Core/src/util/MAlignmentExporter.cpp | 2 +-
src/corelibs/U2Core/src/util/MAlignmentExporter.h | 2 +-
.../U2Core/src/util/MAlignmentImporter.cpp | 2 +-
src/corelibs/U2Core/src/util/MAlignmentImporter.h | 2 +-
src/corelibs/U2Core/src/util/MAlignmentWalker.cpp | 2 +-
src/corelibs/U2Core/src/util/MAlignmentWalker.h | 2 +-
src/corelibs/U2Core/src/util/MSAUtils.cpp | 15 +-
src/corelibs/U2Core/src/util/MSAUtils.h | 3 +-
src/corelibs/U2Core/src/util/MsaDbiUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/MsaDbiUtils.h | 2 +-
src/corelibs/U2Core/src/util/MsaRowUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/MsaRowUtils.h | 2 +-
.../U2Core/src/util/PMatrixSerializeUtils.h | 2 +-
.../U2Core/src/util/QObjectScopedPointer.h | 2 +-
src/corelibs/U2Core/src/util/QVariantUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/QVariantUtils.h | 2 +-
src/corelibs/U2Core/src/util/SNPTablesUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/SequenceUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/SequenceUtils.h | 2 +-
src/corelibs/U2Core/src/util/TaskWatchdog.cpp | 2 +-
src/corelibs/U2Core/src/util/TaskWatchdog.h | 2 +-
src/corelibs/U2Core/src/util/TextUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/TextUtils.h | 2 +-
src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U1AnnotationUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U2AlphabetUtils.h | 2 +-
.../U2Core/src/util/U2AssemblyReadIterator.cpp | 2 +-
.../U2Core/src/util/U2AssemblyReadIterator.h | 2 +-
src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U2AssemblyUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2AttributeUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U2AttributeUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2Bits.cpp | 2 +-
src/corelibs/U2Core/src/util/U2Bits.h | 2 +-
src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp | 2 +-
src/corelibs/U2Core/src/util/U2DbiUpgrader.h | 2 +-
src/corelibs/U2Core/src/util/U2FeatureUtils.cpp | 29 +-
src/corelibs/U2Core/src/util/U2FeatureUtils.h | 6 +-
src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2OpStatusUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2SequenceUtils.cpp | 6 +-
src/corelibs/U2Core/src/util/U2SequenceUtils.h | 2 +-
src/corelibs/U2Core/src/util/U2VariationUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/U2VariationUtils.h | 2 +-
.../U2Core/src/util/VariationPropertiesUtils.h | 2 +-
src/corelibs/U2Core/transl/english.ts | 233 +-
src/corelibs/U2Core/transl/russian.ts | 233 +-
src/corelibs/U2Designer/html/Dashboard.css | 2 +-
src/corelibs/U2Designer/html/Dashboard.html | 2 +-
src/corelibs/U2Designer/html/EstimationReport.css | 2 +-
src/corelibs/U2Designer/html/EstimationReport.html | 2 +-
src/corelibs/U2Designer/javascript/Common.js | 2 +-
src/corelibs/U2Designer/javascript/ContextMenu.js | 2 +-
.../U2Designer/javascript/ExternalToolsWidget.js | 2 +-
.../U2Designer/javascript/ParametersWidget.js | 2 +-
.../U2Designer/src/BreakpointHitCountDialog.cpp | 4 +-
.../U2Designer/src/BreakpointHitCountDialog.h | 2 +-
src/corelibs/U2Designer/src/DatasetWidget.cpp | 2 +-
src/corelibs/U2Designer/src/DatasetWidget.h | 2 +-
src/corelibs/U2Designer/src/DatasetsController.cpp | 2 +-
src/corelibs/U2Designer/src/DatasetsController.h | 2 +-
src/corelibs/U2Designer/src/DatasetsListWidget.cpp | 2 +-
src/corelibs/U2Designer/src/DatasetsListWidget.h | 2 +-
src/corelibs/U2Designer/src/DbFolderItem.cpp | 2 +-
src/corelibs/U2Designer/src/DbFolderItem.h | 2 +-
src/corelibs/U2Designer/src/DbObjectItem.cpp | 2 +-
src/corelibs/U2Designer/src/DbObjectItem.h | 2 +-
src/corelibs/U2Designer/src/DelegateEditors.cpp | 2 +-
src/corelibs/U2Designer/src/DelegateEditors.h | 2 +-
src/corelibs/U2Designer/src/DesignerUtils.cpp | 2 +-
src/corelibs/U2Designer/src/DesignerUtils.h | 2 +-
src/corelibs/U2Designer/src/DirectoryItem.cpp | 2 +-
src/corelibs/U2Designer/src/DirectoryItem.h | 2 +-
.../U2Designer/src/EditBreakpointLabelsDialog.cpp | 4 +-
.../U2Designer/src/EditBreakpointLabelsDialog.h | 2 +-
.../U2Designer/src/EditMarkerGroupDialog.cpp | 11 +-
.../U2Designer/src/EditMarkerGroupDialog.h | 2 +-
src/corelibs/U2Designer/src/EstimationReporter.cpp | 2 +-
src/corelibs/U2Designer/src/EstimationReporter.h | 2 +-
src/corelibs/U2Designer/src/FileItem.cpp | 2 +-
src/corelibs/U2Designer/src/FileItem.h | 2 +-
src/corelibs/U2Designer/src/GrouperEditor.cpp | 2 +-
src/corelibs/U2Designer/src/GrouperEditor.h | 2 +-
.../U2Designer/src/GrouperEditorWidget.cpp | 2 +-
src/corelibs/U2Designer/src/GrouperEditorWidget.h | 2 +-
src/corelibs/U2Designer/src/MarkerEditor.cpp | 2 +-
src/corelibs/U2Designer/src/MarkerEditor.h | 2 +-
src/corelibs/U2Designer/src/MarkerEditorWidget.cpp | 2 +-
src/corelibs/U2Designer/src/MarkerEditorWidget.h | 2 +-
.../U2Designer/src/NewBreakpointDialog.cpp | 4 +-
src/corelibs/U2Designer/src/NewBreakpointDialog.h | 2 +-
.../U2Designer/src/NewGrouperSlotDialog.cpp | 25 +-
src/corelibs/U2Designer/src/NewGrouperSlotDialog.h | 2 +-
src/corelibs/U2Designer/src/OutputFileDialog.cpp | 2 +-
src/corelibs/U2Designer/src/OutputFileDialog.h | 2 +-
src/corelibs/U2Designer/src/PropertyWidget.cpp | 2 +-
src/corelibs/U2Designer/src/PropertyWidget.h | 2 +-
src/corelibs/U2Designer/src/QDScheduler.cpp | 2 +-
src/corelibs/U2Designer/src/QDScheduler.h | 2 +-
src/corelibs/U2Designer/src/UrlItem.cpp | 2 +-
src/corelibs/U2Designer/src/UrlItem.h | 2 +-
src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp | 2 +-
src/corelibs/U2Designer/src/WorkflowGUIUtils.h | 2 +-
.../U2Designer/src/dashboard/Dashboard.cpp | 2 +-
src/corelibs/U2Designer/src/dashboard/Dashboard.h | 2 +-
.../src/dashboard/ExternalToolsWidget.cpp | 2 +-
.../U2Designer/src/dashboard/ExternalToolsWidget.h | 2 +-
.../U2Designer/src/dashboard/OutputFilesWidget.cpp | 2 +-
.../U2Designer/src/dashboard/OutputFilesWidget.h | 2 +-
.../U2Designer/src/dashboard/ParametersWidget.cpp | 2 +-
.../U2Designer/src/dashboard/ParametersWidget.h | 2 +-
.../U2Designer/src/dashboard/ProblemsWidget.cpp | 2 +-
.../U2Designer/src/dashboard/ProblemsWidget.h | 2 +-
.../U2Designer/src/dashboard/ResourcesWidget.cpp | 2 +-
.../U2Designer/src/dashboard/ResourcesWidget.h | 2 +-
.../U2Designer/src/dashboard/StatisticsWidget.cpp | 2 +-
.../U2Designer/src/dashboard/StatisticsWidget.h | 2 +-
.../U2Designer/src/dashboard/TableWidget.cpp | 2 +-
.../U2Designer/src/dashboard/TableWidget.h | 2 +-
.../src/support/OutputDirectoryWidget.cpp | 2 +-
.../U2Designer/src/support/OutputDirectoryWidget.h | 2 +-
.../U2Designer/src/support/URLLineEdit.cpp | 2 +-
src/corelibs/U2Designer/src/support/URLLineEdit.h | 2 +-
.../src/wizard/BowtieWidgetController.cpp | 2 +-
.../U2Designer/src/wizard/BowtieWidgetController.h | 2 +-
.../src/wizard/ElementSelectorController.cpp | 2 +-
.../src/wizard/ElementSelectorController.h | 2 +-
.../src/wizard/PairedDatasetsController.cpp | 2 +-
.../src/wizard/PairedDatasetsController.h | 2 +-
.../src/wizard/PropertyWizardController.cpp | 2 +-
.../src/wizard/PropertyWizardController.h | 2 +-
.../U2Designer/src/wizard/RadioController.cpp | 2 +-
.../U2Designer/src/wizard/RadioController.h | 2 +-
.../U2Designer/src/wizard/SelectorActors.cpp | 2 +-
.../U2Designer/src/wizard/SelectorActors.h | 2 +-
.../U2Designer/src/wizard/SettingsController.cpp | 2 +-
.../U2Designer/src/wizard/SettingsController.h | 2 +-
.../src/wizard/TophatSamplesWidgetController.cpp | 2 +-
.../src/wizard/TophatSamplesWidgetController.h | 2 +-
.../src/wizard/UrlAndDatasetWizardController.cpp | 2 +-
.../src/wizard/UrlAndDatasetWizardController.h | 2 +-
.../U2Designer/src/wizard/WDWizardPage.cpp | 2 +-
src/corelibs/U2Designer/src/wizard/WDWizardPage.h | 2 +-
.../U2Designer/src/wizard/WidgetController.cpp | 2 +-
.../U2Designer/src/wizard/WidgetController.h | 2 +-
.../U2Designer/src/wizard/WizardController.cpp | 6 +-
.../U2Designer/src/wizard/WizardController.h | 2 +-
.../U2Designer/src/wizard/WizardPageController.cpp | 2 +-
.../U2Designer/src/wizard/WizardPageController.h | 2 +-
src/corelibs/U2Designer/transl/english.ts | 151 +-
src/corelibs/U2Designer/transl/russian.ts | 163 +-
src/corelibs/U2Formats/src/ABIFormat.cpp | 2 +-
src/corelibs/U2Formats/src/ABIFormat.h | 2 +-
src/corelibs/U2Formats/src/ASNFormat.cpp | 2 +-
src/corelibs/U2Formats/src/ASNFormat.h | 2 +-
.../U2Formats/src/AbstractVariationFormat.cpp | 2 +-
.../U2Formats/src/AbstractVariationFormat.h | 2 +-
src/corelibs/U2Formats/src/BAMUtils.cpp | 2 +-
src/corelibs/U2Formats/src/BAMUtils.h | 2 +-
src/corelibs/U2Formats/src/BedFormat.cpp | 2 +-
src/corelibs/U2Formats/src/BedFormat.h | 2 +-
src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp | 2 +-
src/corelibs/U2Formats/src/ClustalWAlnFormat.h | 2 +-
src/corelibs/U2Formats/src/ColumnDataParser.cpp | 2 +-
src/corelibs/U2Formats/src/ColumnDataParser.h | 2 +-
src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp | 2 +-
src/corelibs/U2Formats/src/DNAQualityIOUtils.h | 2 +-
src/corelibs/U2Formats/src/Database.cpp | 2 +-
src/corelibs/U2Formats/src/Database.h | 2 +-
.../U2Formats/src/DatabaseConnectionFormat.cpp | 2 +-
.../U2Formats/src/DatabaseConnectionFormat.h | 2 +-
src/corelibs/U2Formats/src/DifferentialFormat.cpp | 2 +-
src/corelibs/U2Formats/src/DifferentialFormat.h | 2 +-
src/corelibs/U2Formats/src/DocumentFormatUtils.cpp | 2 +-
src/corelibs/U2Formats/src/DocumentFormatUtils.h | 2 +-
.../U2Formats/src/EMBLGenbankAbstractDocument.cpp | 2 +-
.../U2Formats/src/EMBLGenbankAbstractDocument.h | 2 +-
src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp | 2 +-
src/corelibs/U2Formats/src/EMBLPlainTextFormat.h | 2 +-
src/corelibs/U2Formats/src/FastaFormat.cpp | 2 +-
src/corelibs/U2Formats/src/FastaFormat.h | 2 +-
src/corelibs/U2Formats/src/FastqFormat.cpp | 2 +-
src/corelibs/U2Formats/src/FastqFormat.h | 2 +-
src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp | 2 +-
src/corelibs/U2Formats/src/FpkmTrackingFormat.h | 2 +-
src/corelibs/U2Formats/src/GFFFormat.cpp | 2 +-
src/corelibs/U2Formats/src/GFFFormat.h | 2 +-
src/corelibs/U2Formats/src/GTFFormat.cpp | 2 +-
src/corelibs/U2Formats/src/GTFFormat.h | 2 +-
.../U2Formats/src/GenbankLocationParser.cpp | 2 +-
src/corelibs/U2Formats/src/GenbankLocationParser.h | 2 +-
.../U2Formats/src/GenbankPlainTextFormat.cpp | 2 +-
.../U2Formats/src/GenbankPlainTextFormat.h | 2 +-
src/corelibs/U2Formats/src/MSFFormat.cpp | 2 +-
src/corelibs/U2Formats/src/MSFFormat.h | 2 +-
src/corelibs/U2Formats/src/MegaFormat.cpp | 2 +-
src/corelibs/U2Formats/src/MegaFormat.h | 2 +-
src/corelibs/U2Formats/src/NEXUSFormat.cpp | 2 +-
src/corelibs/U2Formats/src/NEXUSFormat.h | 2 +-
src/corelibs/U2Formats/src/NEXUSParser.h | 2 +-
src/corelibs/U2Formats/src/NewickFormat.cpp | 2 +-
src/corelibs/U2Formats/src/NewickFormat.h | 2 +-
src/corelibs/U2Formats/src/PDBFormat.cpp | 2 +-
src/corelibs/U2Formats/src/PDBFormat.h | 2 +-
src/corelibs/U2Formats/src/PDWFormat.cpp | 2 +-
src/corelibs/U2Formats/src/PDWFormat.h | 2 +-
src/corelibs/U2Formats/src/PhylipFormat.cpp | 2 +-
src/corelibs/U2Formats/src/PhylipFormat.h | 2 +-
src/corelibs/U2Formats/src/PlainTextFormat.cpp | 2 +-
src/corelibs/U2Formats/src/PlainTextFormat.h | 2 +-
.../U2Formats/src/RawDNASequenceFormat.cpp | 58 +-
src/corelibs/U2Formats/src/RawDNASequenceFormat.h | 2 +-
src/corelibs/U2Formats/src/SAMFormat.cpp | 2 +-
src/corelibs/U2Formats/src/SAMFormat.h | 2 +-
src/corelibs/U2Formats/src/SCFFormat.cpp | 2 +-
src/corelibs/U2Formats/src/SCFFormat.h | 2 +-
src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp | 2 +-
src/corelibs/U2Formats/src/SNPDatabaseUtils.h | 2 +-
.../U2Formats/src/SimpleSNPVariationFormat.cpp | 2 +-
.../U2Formats/src/SimpleSNPVariationFormat.h | 2 +-
.../U2Formats/src/StdResidueDictionary.cpp | 2 +-
src/corelibs/U2Formats/src/StdResidueDictionary.h | 2 +-
src/corelibs/U2Formats/src/StockholmFormat.cpp | 2 +-
src/corelibs/U2Formats/src/StockholmFormat.h | 2 +-
.../U2Formats/src/StreamSequenceReader.cpp | 2 +-
src/corelibs/U2Formats/src/StreamSequenceReader.h | 2 +-
.../U2Formats/src/StreamSequenceWriter.cpp | 2 +-
src/corelibs/U2Formats/src/StreamSequenceWriter.h | 2 +-
.../U2Formats/src/SwissProtPlainTextFormat.cpp | 2 +-
.../U2Formats/src/SwissProtPlainTextFormat.h | 2 +-
src/corelibs/U2Formats/src/VCF4VariationFormat.cpp | 2 +-
src/corelibs/U2Formats/src/VCF4VariationFormat.h | 2 +-
.../U2Formats/src/VectorNtiSequenceFormat.cpp | 2 +-
.../U2Formats/src/VectorNtiSequenceFormat.h | 2 +-
src/corelibs/U2Formats/src/ace/AceFormat.cpp | 2 +-
src/corelibs/U2Formats/src/ace/AceFormat.h | 2 +-
src/corelibs/U2Formats/src/ace/AceImportUtils.cpp | 2 +-
src/corelibs/U2Formats/src/ace/AceImportUtils.h | 2 +-
src/corelibs/U2Formats/src/ace/AceImporter.cpp | 2 +-
src/corelibs/U2Formats/src/ace/AceImporter.h | 2 +-
.../ace/CloneAssemblyWithReferenceToDbiTask.cpp | 2 +-
.../src/ace/CloneAssemblyWithReferenceToDbiTask.h | 2 +-
.../U2Formats/src/ace/ConvertAceToSqliteTask.cpp | 2 +-
.../U2Formats/src/ace/ConvertAceToSqliteTask.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlAttributeDbi.h | 2 +-
.../src/mysql_dbi/MysqlBlobInputStream.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlBlobInputStream.h | 2 +-
.../src/mysql_dbi/MysqlBlobOutputStream.cpp | 2 +-
.../src/mysql_dbi/MysqlBlobOutputStream.h | 2 +-
.../mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp | 2 +-
.../src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h | 2 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp | 2 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlFeatureDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlModDbi.cpp | 2 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp | 2 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlObjectDbi.h | 2 +-
.../src/mysql_dbi/MysqlObjectRelationsDbi.cpp | 2 +-
.../src/mysql_dbi/MysqlObjectRelationsDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlSequenceDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp | 2 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp | 2 +-
.../U2Formats/src/mysql_dbi/MysqlVariantDbi.h | 2 +-
.../src/mysql_dbi/util/MysqlAssemblyAdapter.cpp | 2 +-
.../src/mysql_dbi/util/MysqlAssemblyAdapter.h | 2 +-
.../src/mysql_dbi/util/MysqlAssemblyUtils.cpp | 2 +-
.../src/mysql_dbi/util/MysqlAssemblyUtils.h | 2 +-
.../U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp | 2 +-
.../U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h | 2 +-
.../U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp | 2 +-
.../U2Formats/src/mysql_dbi/util/MysqlHelpers.h | 2 +-
.../src/mysql_dbi/util/MysqlModificationAction.cpp | 2 +-
.../src/mysql_dbi/util/MysqlModificationAction.h | 2 +-
.../util/MysqlMultiTableAssemblyAdapter.cpp | 2 +-
.../util/MysqlMultiTableAssemblyAdapter.h | 2 +-
.../util/MysqlSingleTableAssemblyAdapter.cpp | 2 +-
.../util/MysqlSingleTableAssemblyAdapter.h | 2 +-
.../src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp | 2 +-
.../src/mysql_dbi/util/upgraders/MysqlUpgrader.h | 2 +-
.../upgraders/MysqlUpgraderFrom_1_14_To_1_15.cpp | 2 +-
.../upgraders/MysqlUpgraderFrom_1_14_To_1_15.h | 2 +-
.../upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp | 2 +-
.../upgraders/MysqlUpgraderFrom_1_15_To_1_16.h | 2 +-
.../upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp | 2 +-
.../upgraders/MysqlUpgraderFrom_1_16_To_1_17.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h | 2 +-
.../src/sqlite_dbi/SQLiteAttributeDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h | 2 +-
.../src/sqlite_dbi/SQLiteBlobInputStream.cpp | 2 +-
.../src/sqlite_dbi/SQLiteBlobInputStream.h | 2 +-
.../src/sqlite_dbi/SQLiteBlobOutputStream.cpp | 2 +-
.../src/sqlite_dbi/SQLiteBlobOutputStream.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteDbi.cpp | 2 +-
src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp | 4 +-
.../U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteModDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h | 2 +-
.../src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp | 2 +-
.../src/sqlite_dbi/SQLiteObjectRelationsDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h | 2 +-
.../assembly/MultiTableAssemblyAdapter.cpp | 2 +-
.../assembly/MultiTableAssemblyAdapter.h | 2 +-
.../sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp | 2 +-
.../src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h | 2 +-
.../assembly/SingleTableAssemblyAdapter.cpp | 2 +-
.../assembly/SingleTableAssemblyAdapter.h | 2 +-
.../src/sqlite_dbi/util/SqliteUpgrader.cpp | 2 +-
.../U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h | 2 +-
.../util/SqliteUpgraderFrom_0_To_1_13.cpp | 2 +-
.../sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h | 2 +-
src/corelibs/U2Formats/src/tasks/BgzipTask.cpp | 2 +-
src/corelibs/U2Formats/src/tasks/BgzipTask.h | 2 +-
.../src/tasks/ConvertAssemblyToSamTask.cpp | 2 +-
.../U2Formats/src/tasks/ConvertAssemblyToSamTask.h | 2 +-
.../U2Formats/src/tasks/ConvertFileTask.cpp | 2 +-
src/corelibs/U2Formats/src/tasks/ConvertFileTask.h | 2 +-
src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp | 2 +-
src/corelibs/U2Formats/src/tasks/MergeBamTask.h | 2 +-
.../U2Formats/src/tasks/MysqlUpgradeTask.cpp | 2 +-
.../U2Formats/src/tasks/MysqlUpgradeTask.h | 2 +-
src/corelibs/U2Formats/src/util/AssemblyAdapter.h | 2 +-
.../U2Formats/src/util/AssemblyPackAlgorithm.cpp | 2 +-
.../U2Formats/src/util/AssemblyPackAlgorithm.h | 2 +-
src/corelibs/U2Formats/transl/english.ts | 424 ++--
src/corelibs/U2Formats/transl/russian.ts | 428 ++--
src/corelibs/U2Gui/U2Gui.pro | 2 +
src/corelibs/U2Gui/U2Gui.qrc | 1 +
src/corelibs/U2Gui/src/AppSettingsGUI.h | 2 +-
src/corelibs/U2Gui/src/MainWindow.cpp | 2 +-
src/corelibs/U2Gui/src/MainWindow.h | 3 +-
src/corelibs/U2Gui/src/Notification.cpp | 2 +-
src/corelibs/U2Gui/src/Notification.h | 2 +-
src/corelibs/U2Gui/src/NotificationWidget.cpp | 2 +-
src/corelibs/U2Gui/src/NotificationWidget.h | 2 +-
src/corelibs/U2Gui/src/NotificationsTypes.h | 2 +-
src/corelibs/U2Gui/src/ObjectViewModel.cpp | 2 +-
src/corelibs/U2Gui/src/ObjectViewModel.h | 2 +-
src/corelibs/U2Gui/src/ObjectViewTasks.cpp | 2 +-
src/corelibs/U2Gui/src/ObjectViewTasks.h | 2 +-
src/corelibs/U2Gui/src/OpenViewTask.cpp | 2 +-
src/corelibs/U2Gui/src/OpenViewTask.h | 2 +-
src/corelibs/U2Gui/src/PasteController.cpp | 226 ++
src/corelibs/U2Gui/src/PasteController.h | 85 +
src/corelibs/U2Gui/src/PluginViewer.h | 2 +-
src/corelibs/U2Gui/src/ProjectParsing.cpp | 2 +-
src/corelibs/U2Gui/src/ProjectParsing.h | 2 +-
src/corelibs/U2Gui/src/ProjectView.h | 2 +-
src/corelibs/U2Gui/src/ToolsMenu.cpp | 2 +-
src/corelibs/U2Gui/src/ToolsMenu.h | 2 +-
src/corelibs/U2Gui/src/U2SavableWidget.cpp | 2 +-
src/corelibs/U2Gui/src/U2SavableWidget.h | 2 +-
src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp | 2 +-
src/corelibs/U2Gui/src/U2WidgetStateStorage.h | 2 +-
src/corelibs/U2Gui/src/UnloadDocumentTask.cpp | 5 +-
src/corelibs/U2Gui/src/UnloadDocumentTask.h | 2 +-
src/corelibs/U2Gui/src/WelcomePageAction.cpp | 2 +-
src/corelibs/U2Gui/src/WelcomePageAction.h | 2 +-
.../src/options_panel/GroupHeaderImageWidget.cpp | 2 +-
.../src/options_panel/GroupHeaderImageWidget.h | 2 +-
.../U2Gui/src/options_panel/GroupOptionsWidget.cpp | 2 +-
.../U2Gui/src/options_panel/GroupOptionsWidget.h | 2 +-
.../U2Gui/src/options_panel/OPWidgetFactory.cpp | 2 +-
.../U2Gui/src/options_panel/OPWidgetFactory.h | 2 +-
.../src/options_panel/OPWidgetFactoryRegistry.cpp | 2 +-
.../src/options_panel/OPWidgetFactoryRegistry.h | 2 +-
.../U2Gui/src/options_panel/OptionsPanel.cpp | 2 +-
.../U2Gui/src/options_panel/OptionsPanel.h | 2 +-
.../U2Gui/src/options_panel/OptionsPanelGroup.cpp | 2 +-
.../U2Gui/src/options_panel/OptionsPanelGroup.h | 2 +-
.../U2Gui/src/options_panel/OptionsPanelWidget.cpp | 2 +-
.../U2Gui/src/options_panel/OptionsPanelWidget.h | 2 +-
.../src/options_panel/ShowHideSubgroupWidget.cpp | 2 +-
.../src/options_panel/ShowHideSubgroupWidget.h | 2 +-
.../src/util/AddNewDocumentDialogController.h | 2 +-
.../U2Gui/src/util/AddNewDocumentDialogImpl.cpp | 4 +-
.../U2Gui/src/util/AddNewDocumentDialogImpl.h | 2 +-
.../U2Gui/src/util/AuthenticationDialog.cpp | 4 +-
src/corelibs/U2Gui/src/util/AuthenticationDialog.h | 2 +-
.../U2Gui/src/util/AuthenticationWidget.cpp | 2 +-
src/corelibs/U2Gui/src/util/AuthenticationWidget.h | 2 +-
.../src/util/BreakpointConditionEditDialog.cpp | 4 +-
.../U2Gui/src/util/BreakpointConditionEditDialog.h | 2 +-
.../U2Gui/src/util/CreateAnnotationDialog.cpp | 4 +-
.../U2Gui/src/util/CreateAnnotationDialog.h | 2 +-
.../U2Gui/src/util/CreateAnnotationFullWidget.cpp | 2 +-
.../U2Gui/src/util/CreateAnnotationFullWidget.h | 2 +-
.../src/util/CreateAnnotationNormalWidget.cpp | 2 +-
.../U2Gui/src/util/CreateAnnotationNormalWidget.h | 2 +-
.../util/CreateAnnotationOptionsPanelWidget.cpp | 2 +-
.../src/util/CreateAnnotationOptionsPanelWidget.h | 2 +-
.../U2Gui/src/util/CreateAnnotationWidget.cpp | 2 +-
.../U2Gui/src/util/CreateAnnotationWidget.h | 2 +-
.../src/util/CreateAnnotationWidgetController.cpp | 2 +-
.../src/util/CreateAnnotationWidgetController.h | 2 +-
.../CreateDocumentFromTextDialogController.cpp | 6 +-
.../util/CreateDocumentFromTextDialogController.h | 2 +-
.../util/CreateObjectRelationDialogController.cpp | 2 +-
.../util/CreateObjectRelationDialogController.h | 2 +-
.../util/CreateSequenceFromTextAndOpenViewTask.cpp | 7 +-
.../util/CreateSequenceFromTextAndOpenViewTask.h | 5 +-
.../U2Gui/src/util/CredentialsAskerGui.cpp | 2 +-
src/corelibs/U2Gui/src/util/CredentialsAskerGui.h | 2 +-
src/corelibs/U2Gui/src/util/DialogUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/DialogUtils.h | 2 +-
.../src/util/DocumentFormatComboboxController.cpp | 2 +-
.../src/util/DocumentFormatComboboxController.h | 2 +-
.../U2Gui/src/util/DownloadRemoteFileDialog.cpp | 6 +-
.../U2Gui/src/util/DownloadRemoteFileDialog.h | 2 +-
.../U2Gui/src/util/EditQualifierDialog.cpp | 7 +-
src/corelibs/U2Gui/src/util/EditQualifierDialog.h | 2 +-
.../src/util/EditSequenceDialogController.cpp | 4 +-
.../U2Gui/src/util/EditSequenceDialogController.h | 2 +-
.../U2Gui/src/util/ExportAnnotations2CSVTask.cpp | 2 +-
.../U2Gui/src/util/ExportAnnotations2CSVTask.h | 2 +-
.../U2Gui/src/util/ExportAnnotationsDialog.cpp | 7 +-
.../U2Gui/src/util/ExportAnnotationsDialog.h | 2 +-
.../src/util/ExportDocumentDialogController.cpp | 6 +-
.../src/util/ExportDocumentDialogController.h | 2 +-
src/corelibs/U2Gui/src/util/ExportImageDialog.cpp | 16 +-
src/corelibs/U2Gui/src/util/ExportImageDialog.h | 2 +-
src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/ExportObjectUtils.h | 2 +-
.../U2Gui/src/util/GObjectComboBoxController.cpp | 2 +-
.../U2Gui/src/util/GObjectComboBoxController.h | 2 +-
src/corelibs/U2Gui/src/util/GScrollBar.cpp | 2 +-
src/corelibs/U2Gui/src/util/GScrollBar.h | 2 +-
src/corelibs/U2Gui/src/util/GUIUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/GUIUtils.h | 2 +-
.../U2Gui/src/util/GenbankLocationValidator.cpp | 2 +-
.../U2Gui/src/util/GenbankLocationValidator.h | 2 +-
src/corelibs/U2Gui/src/util/GlassView.cpp | 2 +-
src/corelibs/U2Gui/src/util/GlassView.h | 2 +-
src/corelibs/U2Gui/src/util/GraphUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/GraphUtils.h | 2 +-
src/corelibs/U2Gui/src/util/HelpButton.cpp | 2 +-
src/corelibs/U2Gui/src/util/HelpButton.h | 2 +-
.../src/util/ImportDialogs/AceImportDialog.cpp | 4 +-
.../U2Gui/src/util/ImportDialogs/AceImportDialog.h | 2 +-
.../U2Gui/src/util/ImportDialogsFactories.cpp | 2 +-
.../U2Gui/src/util/ImportDialogsFactories.h | 2 +-
.../src/util/ImportSequenceFromRawDataTask.cpp | 2 +-
.../U2Gui/src/util/ImportSequenceFromRawDataTask.h | 2 +-
.../U2Gui/src/util/InputWidgetsControllers.cpp | 2 +-
.../U2Gui/src/util/InputWidgetsControllers.h | 2 +-
.../U2Gui/src/util/LabelClickTransmitter.cpp | 2 +-
.../U2Gui/src/util/LabelClickTransmitter.h | 2 +-
src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp | 2 +-
src/corelibs/U2Gui/src/util/LastUsedDirHelper.h | 2 +-
src/corelibs/U2Gui/src/util/LocalToolbar.cpp | 2 +-
src/corelibs/U2Gui/src/util/LocalToolbar.h | 2 +-
.../U2Gui/src/util/ObjectViewTreeController.cpp | 2 +-
.../U2Gui/src/util/ObjectViewTreeController.h | 2 +-
src/corelibs/U2Gui/src/util/OrderedToolbar.cpp | 2 +-
src/corelibs/U2Gui/src/util/OrderedToolbar.h | 2 +-
src/corelibs/U2Gui/src/util/PositionSelector.cpp | 2 +-
src/corelibs/U2Gui/src/util/PositionSelector.h | 2 +-
.../src/util/ProjectDocumentComboBoxController.cpp | 2 +-
.../src/util/ProjectDocumentComboBoxController.h | 2 +-
.../src/util/ProjectTreeItemSelectorDialog.cpp | 2 +-
.../U2Gui/src/util/ProjectTreeItemSelectorDialog.h | 2 +-
.../src/util/ProjectTreeItemSelectorDialogImpl.h | 2 +-
src/corelibs/U2Gui/src/util/RangeSelector.cpp | 4 +-
src/corelibs/U2Gui/src/util/RangeSelector.h | 2 +-
src/corelibs/U2Gui/src/util/RegionSelector.cpp | 2 +-
src/corelibs/U2Gui/src/util/RegionSelector.h | 2 +-
.../RemovePartFromSequenceDialogController.cpp | 4 +-
.../util/RemovePartFromSequenceDialogController.h | 2 +-
.../U2Gui/src/util/SaveDocumentGroupController.cpp | 2 +-
.../U2Gui/src/util/SaveDocumentGroupController.h | 2 +-
src/corelibs/U2Gui/src/util/ScaleBar.cpp | 2 +-
src/corelibs/U2Gui/src/util/ScaleBar.h | 2 +-
.../U2Gui/src/util/ScriptEditorDelegate.cpp | 2 +-
src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h | 2 +-
src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp | 4 +-
src/corelibs/U2Gui/src/util/ScriptEditorDialog.h | 2 +-
src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp | 2 +-
src/corelibs/U2Gui/src/util/ScriptEditorWidget.h | 2 +-
src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp | 2 +-
src/corelibs/U2Gui/src/util/ScriptHighlighter.h | 2 +-
.../util/SearchGenbankSequenceDialogController.cpp | 4 +-
.../util/SearchGenbankSequenceDialogController.h | 2 +-
.../U2Gui/src/util/SeqPasterWidgetController.cpp | 2 +-
.../U2Gui/src/util/SeqPasterWidgetController.h | 2 +-
src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp | 2 +-
src/corelibs/U2Gui/src/util/SequenceTextEdit.h | 2 +-
src/corelibs/U2Gui/src/util/SuggestCompleter.cpp | 2 +-
src/corelibs/U2Gui/src/util/SuggestCompleter.h | 2 +-
src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/TreeWidgetUtils.h | 2 +-
src/corelibs/U2Gui/src/util/U2FileDialog.cpp | 2 +-
src/corelibs/U2Gui/src/util/U2FileDialog.h | 2 +-
.../U2Gui/src/util/U2LongLongValidator.cpp | 2 +-
src/corelibs/U2Gui/src/util/U2LongLongValidator.h | 2 +-
.../U2Gui/src/util/WidgetWithLocalToolbar.cpp | 2 +-
.../U2Gui/src/util/WidgetWithLocalToolbar.h | 2 +-
.../U2Gui/src/util/imageExport/ImageExportTask.cpp | 2 +-
.../U2Gui/src/util/imageExport/ImageExportTask.h | 2 +-
.../imageExport/WidgetScreenshotExportTask.cpp | 2 +-
.../util/imageExport/WidgetScreenshotExportTask.h | 2 +-
src/corelibs/U2Gui/src/util/logview/LogView.cpp | 2 +-
src/corelibs/U2Gui/src/util/logview/LogView.h | 2 +-
.../U2Gui/src/util/project/ConnectionHelper.cpp | 2 +-
.../U2Gui/src/util/project/ConnectionHelper.h | 2 +-
.../U2Gui/src/util/project/DocumentFolders.cpp | 2 +-
.../U2Gui/src/util/project/DocumentFolders.h | 2 +-
.../src/util/project/FilteredProjectGroup.cpp | 2 +-
.../U2Gui/src/util/project/FilteredProjectGroup.h | 2 +-
.../util/project/FilteredProjectItemDelegate.cpp | 2 +-
.../src/util/project/FilteredProjectItemDelegate.h | 2 +-
.../U2Gui/src/util/project/FolderNameDialog.cpp | 2 +-
.../U2Gui/src/util/project/FolderNameDialog.h | 2 +-
.../src/util/project/LoadDocumentTaskProvider.h | 2 +-
.../U2Gui/src/util/project/ProjectFilterNames.cpp | 2 +-
.../U2Gui/src/util/project/ProjectFilterNames.h | 2 +-
.../src/util/project/ProjectFilterProxyModel.cpp | 2 +-
.../src/util/project/ProjectFilterProxyModel.h | 2 +-
.../util/project/ProjectFilteringController.cpp | 2 +-
.../src/util/project/ProjectFilteringController.h | 2 +-
.../src/util/project/ProjectTreeController.cpp | 6 +-
.../U2Gui/src/util/project/ProjectTreeController.h | 2 +-
.../U2Gui/src/util/project/ProjectUpdater.cpp | 2 +-
.../U2Gui/src/util/project/ProjectUpdater.h | 2 +-
.../U2Gui/src/util/project/ProjectUtils.cpp | 2 +-
src/corelibs/U2Gui/src/util/project/ProjectUtils.h | 2 +-
.../src/util/project/ProjectViewFilterModel.cpp | 2 +-
.../src/util/project/ProjectViewFilterModel.h | 2 +-
.../U2Gui/src/util/project/ProjectViewModel.cpp | 2 +-
.../U2Gui/src/util/project/ProjectViewModel.h | 2 +-
.../project/filter_tasks/FeatureKeyFilterTask.cpp | 2 +-
.../project/filter_tasks/FeatureKeyFilterTask.h | 2 +-
.../project/filter_tasks/MsaContentFilterTask.cpp | 2 +-
.../project/filter_tasks/MsaContentFilterTask.h | 2 +-
.../project/filter_tasks/MsaSeqNameFilterTask.cpp | 2 +-
.../project/filter_tasks/MsaSeqNameFilterTask.h | 2 +-
.../project/filter_tasks/ObjectNameFilterTask.cpp | 2 +-
.../project/filter_tasks/ObjectNameFilterTask.h | 2 +-
.../project/filter_tasks/SequenceAccFilterTask.cpp | 2 +-
.../project/filter_tasks/SequenceAccFilterTask.h | 2 +-
.../project/filter_tasks/TextContentFilterTask.cpp | 2 +-
.../project/filter_tasks/TextContentFilterTask.h | 2 +-
.../util/shared_db/CommonImportOptionsDialog.cpp | 4 +-
.../src/util/shared_db/CommonImportOptionsDialog.h | 2 +-
.../src/util/shared_db/EditConnectionDialog.cpp | 4 +-
.../src/util/shared_db/EditConnectionDialog.h | 2 +-
.../src/util/shared_db/ImportOptionsWidget.cpp | 2 +-
.../U2Gui/src/util/shared_db/ImportOptionsWidget.h | 2 +-
.../src/util/shared_db/ImportToDatabaseDialog.cpp | 4 +-
.../src/util/shared_db/ImportToDatabaseDialog.h | 2 +-
.../src/util/shared_db/ItemToImportEditDialog.cpp | 4 +-
.../src/util/shared_db/ItemToImportEditDialog.h | 2 +-
.../src/util/shared_db/SharedConnectionsDialog.cpp | 6 +-
.../src/util/shared_db/SharedConnectionsDialog.h | 2 +-
.../U2Gui/src/util/ui/ExportAnnotationsDialog.ui | 4 +-
src/corelibs/U2Gui/transl/english.ts | 180 +-
src/corelibs/U2Gui/transl/russian.ts | 198 +-
.../U2Lang/src/library/BaseActorCategories.cpp | 2 +-
.../U2Lang/src/library/BaseActorCategories.h | 2 +-
src/corelibs/U2Lang/src/library/BaseAttributes.cpp | 2 +-
src/corelibs/U2Lang/src/library/BaseAttributes.h | 2 +-
.../U2Lang/src/library/BaseDatasetWorker.cpp | 2 +-
.../U2Lang/src/library/BaseDatasetWorker.h | 2 +-
.../U2Lang/src/library/BaseOneOneWorker.cpp | 2 +-
src/corelibs/U2Lang/src/library/BaseOneOneWorker.h | 2 +-
src/corelibs/U2Lang/src/library/BasePorts.cpp | 2 +-
src/corelibs/U2Lang/src/library/BasePorts.h | 2 +-
src/corelibs/U2Lang/src/library/BaseSlots.cpp | 2 +-
src/corelibs/U2Lang/src/library/BaseSlots.h | 2 +-
.../U2Lang/src/library/BaseThroughWorker.cpp | 2 +-
.../U2Lang/src/library/BaseThroughWorker.h | 2 +-
src/corelibs/U2Lang/src/library/BaseTypes.cpp | 2 +-
src/corelibs/U2Lang/src/library/BaseTypes.h | 2 +-
.../U2Lang/src/library/LastReadyScheduler.cpp | 2 +-
.../U2Lang/src/library/LastReadyScheduler.h | 2 +-
src/corelibs/U2Lang/src/library/LocalDomain.cpp | 2 +-
src/corelibs/U2Lang/src/library/LocalDomain.h | 2 +-
.../U2Lang/src/library/script/ActorContext.cpp | 2 +-
.../U2Lang/src/library/script/ActorContext.h | 2 +-
.../src/library/script/DbiClassPrototype.cpp | 2 +-
.../U2Lang/src/library/script/DbiClassPrototype.h | 2 +-
.../src/library/script/ScriptEngineUtils.cpp | 2 +-
.../U2Lang/src/library/script/ScriptEngineUtils.h | 2 +-
.../U2Lang/src/library/script/ScriptLibrary.cpp | 2 +-
.../U2Lang/src/library/script/ScriptLibrary.h | 2 +-
.../src/library/script/SequencePrototype.cpp | 2 +-
.../U2Lang/src/library/script/SequencePrototype.h | 2 +-
.../U2Lang/src/model/ActorPrototypeRegistry.cpp | 2 +-
.../U2Lang/src/model/ActorPrototypeRegistry.h | 2 +-
src/corelibs/U2Lang/src/model/Aliasing.cpp | 2 +-
src/corelibs/U2Lang/src/model/Aliasing.h | 2 +-
src/corelibs/U2Lang/src/model/Attribute.cpp | 2 +-
src/corelibs/U2Lang/src/model/Attribute.h | 2 +-
.../U2Lang/src/model/AttributeRelation.cpp | 2 +-
src/corelibs/U2Lang/src/model/AttributeRelation.h | 2 +-
src/corelibs/U2Lang/src/model/Configuration.cpp | 2 +-
src/corelibs/U2Lang/src/model/Configuration.h | 2 +-
.../U2Lang/src/model/ConfigurationEditor.cpp | 2 +-
.../U2Lang/src/model/ConfigurationEditor.h | 2 +-
.../U2Lang/src/model/ConfigurationValidator.h | 2 +-
src/corelibs/U2Lang/src/model/Datatype.cpp | 2 +-
src/corelibs/U2Lang/src/model/Datatype.h | 2 +-
src/corelibs/U2Lang/src/model/DbiDataHandler.cpp | 2 +-
src/corelibs/U2Lang/src/model/DbiDataHandler.h | 2 +-
src/corelibs/U2Lang/src/model/DbiDataStorage.cpp | 2 +-
src/corelibs/U2Lang/src/model/DbiDataStorage.h | 2 +-
src/corelibs/U2Lang/src/model/Descriptor.cpp | 2 +-
src/corelibs/U2Lang/src/model/Descriptor.h | 2 +-
src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp | 2 +-
src/corelibs/U2Lang/src/model/ExternalToolCfg.h | 2 +-
src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp | 2 +-
src/corelibs/U2Lang/src/model/GrouperOutSlot.h | 2 +-
.../U2Lang/src/model/GrouperSlotAttribute.cpp | 2 +-
.../U2Lang/src/model/GrouperSlotAttribute.h | 2 +-
.../U2Lang/src/model/IncludedProtoFactory.cpp | 2 +-
.../U2Lang/src/model/IncludedProtoFactory.h | 2 +-
src/corelibs/U2Lang/src/model/IntegralBus.cpp | 2 +-
src/corelibs/U2Lang/src/model/IntegralBus.h | 2 +-
src/corelibs/U2Lang/src/model/IntegralBusModel.cpp | 2 +-
src/corelibs/U2Lang/src/model/IntegralBusModel.h | 2 +-
src/corelibs/U2Lang/src/model/IntegralBusType.cpp | 2 +-
src/corelibs/U2Lang/src/model/IntegralBusType.h | 2 +-
src/corelibs/U2Lang/src/model/Marker.cpp | 2 +-
src/corelibs/U2Lang/src/model/Marker.h | 2 +-
src/corelibs/U2Lang/src/model/MarkerAttribute.cpp | 2 +-
src/corelibs/U2Lang/src/model/MarkerAttribute.h | 2 +-
src/corelibs/U2Lang/src/model/MessageMetadata.cpp | 2 +-
src/corelibs/U2Lang/src/model/MessageMetadata.h | 2 +-
src/corelibs/U2Lang/src/model/Peer.h | 2 +-
src/corelibs/U2Lang/src/model/Port.cpp | 2 +-
src/corelibs/U2Lang/src/model/Port.h | 2 +-
src/corelibs/U2Lang/src/model/PortRelation.h | 2 +-
src/corelibs/U2Lang/src/model/QDConstraint.cpp | 2 +-
src/corelibs/U2Lang/src/model/QDConstraint.h | 2 +-
src/corelibs/U2Lang/src/model/QDScheme.cpp | 2 +-
src/corelibs/U2Lang/src/model/QDScheme.h | 2 +-
.../U2Lang/src/model/QueryDesignerRegistry.cpp | 2 +-
.../U2Lang/src/model/QueryDesignerRegistry.h | 2 +-
.../U2Lang/src/model/ReadDbObjActorPrototype.cpp | 2 +-
.../U2Lang/src/model/ReadDbObjActorPrototype.h | 2 +-
src/corelibs/U2Lang/src/model/RunFileSystem.cpp | 2 +-
src/corelibs/U2Lang/src/model/RunFileSystem.h | 2 +-
src/corelibs/U2Lang/src/model/Schema.cpp | 2 +-
src/corelibs/U2Lang/src/model/Schema.h | 2 +-
.../U2Lang/src/model/SchemaActorsRegistry.cpp | 2 +-
.../U2Lang/src/model/SchemaActorsRegistry.h | 2 +-
src/corelibs/U2Lang/src/model/SchemaConfig.h | 2 +-
src/corelibs/U2Lang/src/model/WorkflowContext.cpp | 2 +-
src/corelibs/U2Lang/src/model/WorkflowContext.h | 2 +-
src/corelibs/U2Lang/src/model/WorkflowEnv.cpp | 2 +-
src/corelibs/U2Lang/src/model/WorkflowEnv.h | 2 +-
src/corelibs/U2Lang/src/model/WorkflowManager.h | 2 +-
.../U2Lang/src/model/WorkflowScriptEngine.cpp | 2 +-
.../U2Lang/src/model/WorkflowScriptEngine.h | 2 +-
.../U2Lang/src/model/WorkflowTransport.cpp | 2 +-
src/corelibs/U2Lang/src/model/WorkflowTransport.h | 2 +-
src/corelibs/U2Lang/src/model/actor/Actor.cpp | 2 +-
src/corelibs/U2Lang/src/model/actor/Actor.h | 2 +-
.../src/model/actor/ActorConfigurationEditor.cpp | 2 +-
.../src/model/actor/ActorConfigurationEditor.h | 2 +-
.../U2Lang/src/model/actor/ActorDocument.h | 2 +-
.../U2Lang/src/model/actor/ActorPrototype.cpp | 2 +-
.../U2Lang/src/model/actor/ActorPrototype.h | 2 +-
.../src/model/actor/ActorScriptValidator.cpp | 2 +-
.../U2Lang/src/model/actor/ActorScriptValidator.h | 2 +-
.../U2Lang/src/model/actor/ActorValidator.cpp | 2 +-
.../U2Lang/src/model/actor/ActorValidator.h | 2 +-
.../U2Lang/src/model/url_attribute/Dataset.cpp | 2 +-
.../U2Lang/src/model/url_attribute/Dataset.h | 2 +-
.../src/model/url_attribute/DbFolderScanner.cpp | 2 +-
.../src/model/url_attribute/DbFolderScanner.h | 2 +-
.../src/model/url_attribute/SharedDbUrlUtils.cpp | 2 +-
.../src/model/url_attribute/SharedDbUrlUtils.h | 2 +-
.../src/model/url_attribute/URLAttribute.cpp | 2 +-
.../U2Lang/src/model/url_attribute/URLAttribute.h | 2 +-
.../src/model/url_attribute/URLContainer.cpp | 2 +-
.../U2Lang/src/model/url_attribute/URLContainer.h | 2 +-
.../src/model/wizard/ElementSelectorWidget.cpp | 2 +-
.../src/model/wizard/ElementSelectorWidget.h | 2 +-
src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/IdMapping.h | 2 +-
.../U2Lang/src/model/wizard/PortMapping.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/PortMapping.h | 2 +-
.../U2Lang/src/model/wizard/SelectorValue.cpp | 2 +-
.../U2Lang/src/model/wizard/SelectorValue.h | 2 +-
.../U2Lang/src/model/wizard/SlotMapping.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/SlotMapping.h | 2 +-
src/corelibs/U2Lang/src/model/wizard/Variable.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/Variable.h | 2 +-
src/corelibs/U2Lang/src/model/wizard/Wizard.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/Wizard.h | 2 +-
.../U2Lang/src/model/wizard/WizardPage.cpp | 2 +-
src/corelibs/U2Lang/src/model/wizard/WizardPage.h | 2 +-
.../U2Lang/src/model/wizard/WizardWidget.cpp | 2 +-
.../U2Lang/src/model/wizard/WizardWidget.h | 2 +-
.../U2Lang/src/model/wizard/WizardWidgetVisitor.h | 2 +-
src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp | 2 +-
src/corelibs/U2Lang/src/run/WorkflowMonitor.h | 2 +-
src/corelibs/U2Lang/src/support/AttributeInfo.cpp | 2 +-
src/corelibs/U2Lang/src/support/AttributeInfo.h | 2 +-
.../src/support/BaseBreakpointHitCounter.cpp | 2 +-
.../U2Lang/src/support/BaseBreakpointHitCounter.h | 2 +-
src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp | 2 +-
src/corelibs/U2Lang/src/support/BaseNGSWorker.h | 2 +-
.../src/support/BreakpointConditionChecker.cpp | 2 +-
.../src/support/BreakpointConditionChecker.h | 2 +-
.../src/support/BreakpointEqualHitCounter.cpp | 2 +-
.../U2Lang/src/support/BreakpointEqualHitCounter.h | 2 +-
.../support/BreakpointGreaterOrEqualHitCounter.cpp | 2 +-
.../support/BreakpointGreaterOrEqualHitCounter.h | 2 +-
.../src/support/BreakpointMultipleHitCounter.cpp | 2 +-
.../src/support/BreakpointMultipleHitCounter.h | 2 +-
.../U2Lang/src/support/CoreLibConstants.cpp | 2 +-
src/corelibs/U2Lang/src/support/CoreLibConstants.h | 2 +-
.../U2Lang/src/support/ElapsedTimeUpdater.cpp | 2 +-
.../U2Lang/src/support/ElapsedTimeUpdater.h | 2 +-
.../U2Lang/src/support/IntegralBusUtils.cpp | 2 +-
src/corelibs/U2Lang/src/support/IntegralBusUtils.h | 2 +-
.../U2Lang/src/support/MapDatatypeEditor.cpp | 2 +-
.../U2Lang/src/support/MapDatatypeEditor.h | 2 +-
src/corelibs/U2Lang/src/support/MarkerUtils.cpp | 2 +-
src/corelibs/U2Lang/src/support/MarkerUtils.h | 2 +-
.../U2Lang/src/support/NoFailTaskWrapper.cpp | 2 +-
.../U2Lang/src/support/NoFailTaskWrapper.h | 2 +-
.../U2Lang/src/support/SchemaSerializer.cpp | 2 +-
src/corelibs/U2Lang/src/support/SchemaSerializer.h | 2 +-
.../U2Lang/src/support/ScriptWorkerSerializer.cpp | 2 +-
.../U2Lang/src/support/ScriptWorkerSerializer.h | 2 +-
.../U2Lang/src/support/SimpleWorkflowTask.cpp | 20 +-
.../U2Lang/src/support/SimpleWorkflowTask.h | 4 +-
src/corelibs/U2Lang/src/support/SupportClass.cpp | 2 +-
src/corelibs/U2Lang/src/support/SupportClass.h | 2 +-
.../U2Lang/src/support/SupportStructures.cpp | 2 +-
.../U2Lang/src/support/SupportStructures.h | 2 +-
.../U2Lang/src/support/WorkflowBreakpoint.cpp | 2 +-
.../U2Lang/src/support/WorkflowBreakpoint.h | 2 +-
.../src/support/WorkflowBreakpointSharedInfo.cpp | 2 +-
.../src/support/WorkflowBreakpointSharedInfo.h | 2 +-
.../src/support/WorkflowDebugMessageParser.cpp | 2 +-
.../src/support/WorkflowDebugMessageParser.h | 2 +-
.../U2Lang/src/support/WorkflowDebugStatus.cpp | 2 +-
.../U2Lang/src/support/WorkflowDebugStatus.h | 2 +-
.../U2Lang/src/support/WorkflowEnvImpl.cpp | 2 +-
src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h | 2 +-
.../U2Lang/src/support/WorkflowIOTasks.cpp | 2 +-
src/corelibs/U2Lang/src/support/WorkflowIOTasks.h | 2 +-
.../U2Lang/src/support/WorkflowInvestigationData.h | 2 +-
.../U2Lang/src/support/WorkflowRunTask.cpp | 2 +-
src/corelibs/U2Lang/src/support/WorkflowRunTask.h | 2 +-
.../U2Lang/src/support/WorkflowSettings.cpp | 2 +-
src/corelibs/U2Lang/src/support/WorkflowSettings.h | 2 +-
src/corelibs/U2Lang/src/support/WorkflowUtils.cpp | 4 +-
src/corelibs/U2Lang/src/support/WorkflowUtils.h | 2 +-
.../src/support/external_script/ScriptContext.cpp | 2 +-
.../src/support/external_script/ScriptContext.h | 2 +-
.../external_script/ScriptableScheduler.cpp | 2 +-
.../support/external_script/ScriptableScheduler.h | 2 +-
.../WorkflowRunSerializedSchemeTask.cpp | 2 +-
.../WorkflowRunSerializedSchemeTask.h | 2 +-
.../U2Lang/src/support/serialize/Constants.cpp | 2 +-
.../U2Lang/src/support/serialize/Constants.h | 2 +-
.../src/support/serialize/HRSchemaSerializer.cpp | 2 +-
.../src/support/serialize/HRSchemaSerializer.h | 2 +-
.../src/support/serialize/HRVisualSerializer.cpp | 2 +-
.../src/support/serialize/HRVisualSerializer.h | 2 +-
.../src/support/serialize/HRWizardSerializer.cpp | 2 +-
.../src/support/serialize/HRWizardSerializer.h | 2 +-
.../U2Lang/src/support/serialize/OldUWL.cpp | 2 +-
src/corelibs/U2Lang/src/support/serialize/OldUWL.h | 2 +-
.../U2Lang/src/support/serialize/Tokenizer.cpp | 2 +-
.../U2Lang/src/support/serialize/Tokenizer.h | 2 +-
.../U2Lang/src/support/serialize/Utils.cpp | 2 +-
src/corelibs/U2Lang/src/support/serialize/Utils.h | 2 +-
.../U2Lang/src/tasks/ReadDocumentTaskFactory.cpp | 2 +-
.../U2Lang/src/tasks/ReadDocumentTaskFactory.h | 2 +-
.../U2Lang/src/tasks/SchemaEstimationTask.cpp | 2 +-
.../U2Lang/src/tasks/SchemaEstimationTask.h | 2 +-
.../U2Lang/src/tasks/WorkflowTasksRegistry.cpp | 2 +-
.../U2Lang/src/tasks/WorkflowTasksRegistry.h | 2 +-
src/corelibs/U2Lang/transl/english.ts | 21 +-
src/corelibs/U2Lang/transl/russian.ts | 37 +-
src/corelibs/U2Private/src/AppContextImpl.cpp | 2 +-
src/corelibs/U2Private/src/AppContextImpl.h | 13 +-
src/corelibs/U2Private/src/AppSettingsImpl.cpp | 2 +-
src/corelibs/U2Private/src/AppSettingsImpl.h | 2 +-
src/corelibs/U2Private/src/ConsoleLogDriver.cpp | 2 +-
src/corelibs/U2Private/src/ConsoleLogDriver.h | 2 +-
src/corelibs/U2Private/src/CredentialsAskerCli.cpp | 2 +-
src/corelibs/U2Private/src/CredentialsAskerCli.h | 2 +-
.../U2Private/src/DocumentFormatRegistryImpl.cpp | 2 +-
.../U2Private/src/DocumentFormatRegistryImpl.h | 2 +-
.../U2Private/src/IOAdapterRegistryImpl.cpp | 2 +-
src/corelibs/U2Private/src/IOAdapterRegistryImpl.h | 2 +-
src/corelibs/U2Private/src/LogSettings.cpp | 2 +-
src/corelibs/U2Private/src/LogSettings.h | 2 +-
src/corelibs/U2Private/src/PluginDescriptor.cpp | 2 +-
src/corelibs/U2Private/src/PluginDescriptor.h | 2 +-
src/corelibs/U2Private/src/PluginSupportImpl.cpp | 2 +-
src/corelibs/U2Private/src/PluginSupportImpl.h | 2 +-
src/corelibs/U2Private/src/ServiceRegistryImpl.cpp | 2 +-
src/corelibs/U2Private/src/ServiceRegistryImpl.h | 2 +-
src/corelibs/U2Private/src/SettingsImpl.cpp | 2 +-
src/corelibs/U2Private/src/SettingsImpl.h | 2 +-
src/corelibs/U2Private/src/SleepPreventerMac.cpp | 2 +-
src/corelibs/U2Private/src/SleepPreventerMac.h | 2 +-
src/corelibs/U2Private/src/TaskSchedulerImpl.cpp | 2 +-
src/corelibs/U2Private/src/TaskSchedulerImpl.h | 2 +-
.../U2Private/src/crash_handler/CrashHandler.cpp | 2 +-
.../U2Private/src/crash_handler/CrashHandler.h | 2 +-
.../src/crash_handler/CrashHandlerArgsHelper.cpp | 256 ++-
.../src/crash_handler/CrashHandlerArgsHelper.h | 4 +-
.../src/crash_handler/CrashHandlerPrivate.cpp | 2 +-
.../src/crash_handler/CrashHandlerPrivate.h | 2 +-
.../src/crash_handler/CrashHandlerPrivateMac.cpp | 2 +-
.../src/crash_handler/CrashHandlerPrivateMac.h | 2 +-
.../CrashHandlerPrivateUnixNotMac.cpp | 2 +-
.../crash_handler/CrashHandlerPrivateUnixNotMac.h | 2 +-
.../src/crash_handler/CrashHandlerPrivateWin.cpp | 2 +-
.../src/crash_handler/CrashHandlerPrivateWin.h | 2 +-
.../U2Private/src/crash_handler/CrashLogCache.cpp | 2 +-
.../U2Private/src/crash_handler/CrashLogCache.h | 2 +-
.../U2Private/src/crash_handler/StackWalker.cpp | 2 +-
.../U2Private/src/crash_handler/StackWalker.h | 2 +-
.../U2Remote/src/DistributedComputingUtil.cpp | 2 +-
.../U2Remote/src/DistributedComputingUtil.h | 2 +-
src/corelibs/U2Remote/src/PingTask.cpp | 2 +-
src/corelibs/U2Remote/src/PingTask.h | 2 +-
src/corelibs/U2Remote/src/ProtocolInfo.cpp | 2 +-
src/corelibs/U2Remote/src/ProtocolInfo.h | 2 +-
src/corelibs/U2Remote/src/ProtocolUI.cpp | 2 +-
src/corelibs/U2Remote/src/ProtocolUI.h | 2 +-
src/corelibs/U2Remote/src/RemoteMachine.cpp | 2 +-
src/corelibs/U2Remote/src/RemoteMachine.h | 2 +-
src/corelibs/U2Remote/src/RemoteMachineMonitor.cpp | 2 +-
src/corelibs/U2Remote/src/RemoteMachineMonitor.h | 2 +-
.../src/RemoteMachineMonitorDialogController.cpp | 2 +-
.../src/RemoteMachineMonitorDialogController.h | 2 +-
.../src/RemoteMachineMonitorDialogImpl.cpp | 2 +-
.../U2Remote/src/RemoteMachineMonitorDialogImpl.h | 2 +-
.../U2Remote/src/RemoteMachineScanDialogImpl.cpp | 2 +-
.../U2Remote/src/RemoteMachineScanDialogImpl.h | 2 +-
src/corelibs/U2Remote/src/RemoteMachineScanner.cpp | 2 +-
src/corelibs/U2Remote/src/RemoteMachineScanner.h | 2 +-
.../U2Remote/src/RemoteMachineSettingsDialog.cpp | 2 +-
.../U2Remote/src/RemoteMachineSettingsDialog.h | 2 +-
src/corelibs/U2Remote/src/RemoteMachineTasks.cpp | 2 +-
src/corelibs/U2Remote/src/RemoteMachineTasks.h | 2 +-
.../U2Remote/src/RemoteWorkflowRunTask.cpp | 2 +-
src/corelibs/U2Remote/src/RemoteWorkflowRunTask.h | 2 +-
src/corelibs/U2Remote/src/Serializable.cpp | 2 +-
src/corelibs/U2Remote/src/Serializable.h | 2 +-
src/corelibs/U2Remote/src/SerializeUtils.cpp | 2 +-
src/corelibs/U2Remote/src/SerializeUtils.h | 2 +-
src/corelibs/U2Remote/src/SynchHttp.cpp | 2 +-
src/corelibs/U2Remote/src/SynchHttp.h | 2 +-
src/corelibs/U2Remote/src/TaskDistributor.h | 2 +-
src/corelibs/U2Script/src/CommonDbi.cpp | 2 +-
src/corelibs/U2Script/src/CommonDbi.h | 2 +-
src/corelibs/U2Script/src/FormatDetection.cpp | 2 +-
src/corelibs/U2Script/src/FormatDetection.h | 2 +-
src/corelibs/U2Script/src/SchemeHandle.cpp | 2 +-
src/corelibs/U2Script/src/SchemeHandle.h | 2 +-
src/corelibs/U2Script/src/SchemeWrapper.cpp | 2 +-
src/corelibs/U2Script/src/SchemeWrapper.h | 2 +-
src/corelibs/U2Script/src/TextConversionUtils.cpp | 2 +-
src/corelibs/U2Script/src/TextConversionUtils.h | 2 +-
src/corelibs/U2Script/src/U2Script.cpp | 2 +-
src/corelibs/U2Script/src/U2Script.h | 2 +-
src/corelibs/U2Script/src/UgeneContextWrapper.cpp | 2 +-
src/corelibs/U2Script/src/UgeneContextWrapper.h | 2 +-
.../U2Script/src/WorkflowElementFacade.cpp | 2 +-
src/corelibs/U2Script/src/WorkflowElementFacade.h | 2 +-
src/corelibs/U2Script/src/globals.cpp | 2 +-
src/corelibs/U2Script/src/globals.h | 2 +-
src/corelibs/U2Script/src/js/ActorWrap.cpp | 2 +-
src/corelibs/U2Script/src/js/ActorWrap.h | 2 +-
src/corelibs/U2Script/src/js/DebugStatusWrap.cpp | 2 +-
src/corelibs/U2Script/src/js/DebugStatusWrap.h | 2 +-
src/corelibs/U2Script/src/js/JsContext.cpp | 2 +-
src/corelibs/U2Script/src/js/JsContext.h | 2 +-
src/corelibs/U2Script/src/js/JsScheduler.cpp | 2 +-
src/corelibs/U2Script/src/js/JsScheduler.h | 2 +-
src/corelibs/U2Script/src/js/NodeApiUtils.cpp | 2 +-
src/corelibs/U2Script/src/js/NodeApiUtils.h | 2 +-
src/corelibs/U2Script/src/python/u2py_internals.c | 2 +-
src/corelibs/U2Script/transl/english.ts | 4 +-
src/corelibs/U2Script/transl/russian.ts | 4 +-
src/corelibs/U2Test/U2Test.pri | 11 +-
src/corelibs/U2Test/U2Test.pro | 29 +-
src/corelibs/U2Test/src/GTest.cpp | 2 +-
src/corelibs/U2Test/src/GTest.h | 2 +-
.../U2Test/src/GTestFrameworkComponents.cpp | 2 +-
src/corelibs/U2Test/src/GTestFrameworkComponents.h | 2 +-
src/corelibs/U2Test/src/TestRunnerTask.cpp | 2 +-
src/corelibs/U2Test/src/TestRunnerTask.h | 2 +-
src/corelibs/U2Test/src/gui_tests/GUITestBase.cpp | 108 -
src/corelibs/U2Test/src/gui_tests/GUITestBase.h | 91 -
.../U2Test/src/gui_tests/GUITestLauncher.cpp | 54 +-
.../U2Test/src/gui_tests/GUITestLauncher.h | 5 +-
.../U2Test/src/gui_tests/GUITestService.cpp | 40 +-
src/corelibs/U2Test/src/gui_tests/GUITestService.h | 3 +-
.../U2Test/src/gui_tests/GUITestTeamcityLogger.cpp | 2 +-
.../U2Test/src/gui_tests/GUITestTeamcityLogger.h | 2 +-
.../U2Test/src/gui_tests/GUITestThread.cpp | 19 +-
src/corelibs/U2Test/src/gui_tests/GUITestThread.h | 2 +-
.../U2Test/src/gui_tests/GUITestWindow.cpp | 2 +-
src/corelibs/U2Test/src/gui_tests/GUITestWindow.h | 2 +-
src/corelibs/U2Test/src/gui_tests/UGUITest.cpp | 70 +
src/corelibs/U2Test/src/gui_tests/UGUITest.h | 53 +
src/corelibs/U2Test/src/gui_tests/UGUITestBase.cpp | 108 +
src/corelibs/U2Test/src/gui_tests/UGUITestBase.h | 59 +
src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp | 2 +-
src/corelibs/U2Test/src/xmltest/XMLTestFormat.h | 2 +-
src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp | 2 +-
src/corelibs/U2Test/src/xmltest/XMLTestUtils.h | 2 +-
src/corelibs/U2Test/transl/english.ts | 23 +-
src/corelibs/U2Test/transl/russian.ts | 23 +-
src/corelibs/U2View/src/LicenseDialog.cpp | 2 +-
src/corelibs/U2View/src/LicenseDialog.h | 2 +-
src/corelibs/U2View/src/UndoRedoFramework.cpp | 2 +-
src/corelibs/U2View/src/UndoRedoFramework.h | 2 +-
src/corelibs/U2View/src/WebWindow.cpp | 2 +-
src/corelibs/U2View/src/WebWindow.h | 2 +-
.../src/ov_assembly/AddReadsToDocumentTask.cpp | 2 +-
.../src/ov_assembly/AddReadsToDocumentTask.h | 2 +-
.../src/ov_assembly/AssemblyAnnotationsArea.cpp | 2 +-
.../src/ov_assembly/AssemblyAnnotationsArea.h | 2 +-
.../U2View/src/ov_assembly/AssemblyBrowser.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyBrowser.h | 2 +-
.../src/ov_assembly/AssemblyBrowserFactory.h | 2 +-
.../src/ov_assembly/AssemblyBrowserSettings.cpp | 2 +-
.../src/ov_assembly/AssemblyBrowserSettings.h | 2 +-
.../src/ov_assembly/AssemblyBrowserState.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyBrowserState.h | 2 +-
.../src/ov_assembly/AssemblyBrowserTasks.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyBrowserTasks.h | 2 +-
.../src/ov_assembly/AssemblyCellRenderer.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyCellRenderer.h | 2 +-
.../src/ov_assembly/AssemblyConsensusArea.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyConsensusArea.h | 2 +-
.../src/ov_assembly/AssemblyConsensusTask.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyConsensusTask.h | 2 +-
.../src/ov_assembly/AssemblyCoverageGraph.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyCoverageGraph.h | 2 +-
.../U2View/src/ov_assembly/AssemblyInfoWidget.cpp | 4 +-
.../U2View/src/ov_assembly/AssemblyInfoWidget.h | 2 +-
.../U2View/src/ov_assembly/AssemblyModel.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyModel.h | 2 +-
.../src/ov_assembly/AssemblyNavigationWidget.cpp | 4 +-
.../src/ov_assembly/AssemblyNavigationWidget.h | 2 +-
.../U2View/src/ov_assembly/AssemblyReadsArea.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyReadsArea.h | 2 +-
.../src/ov_assembly/AssemblyReadsAreaHint.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyReadsAreaHint.h | 2 +-
.../src/ov_assembly/AssemblyReferenceArea.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyReferenceArea.h | 2 +-
.../U2View/src/ov_assembly/AssemblyRuler.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyRuler.h | 2 +-
.../src/ov_assembly/AssemblySettingsWidget.cpp | 4 +-
.../src/ov_assembly/AssemblySettingsWidget.h | 2 +-
.../U2View/src/ov_assembly/AssemblyVariantHint.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyVariantHint.h | 2 +-
.../U2View/src/ov_assembly/AssemblyVariantRow.cpp | 2 +-
.../U2View/src/ov_assembly/AssemblyVariantRow.h | 2 +-
.../ov_assembly/CalculateCoveragePerBaseTask.cpp | 2 +-
.../src/ov_assembly/CalculateCoveragePerBaseTask.h | 2 +-
.../U2View/src/ov_assembly/CoverageInfo.cpp | 2 +-
src/corelibs/U2View/src/ov_assembly/CoverageInfo.h | 2 +-
.../src/ov_assembly/CoveredRegionsManager.cpp | 2 +-
.../U2View/src/ov_assembly/CoveredRegionsManager.h | 2 +-
.../src/ov_assembly/ExportConsensusDialog.cpp | 4 +-
.../U2View/src/ov_assembly/ExportConsensusDialog.h | 2 +-
.../U2View/src/ov_assembly/ExportConsensusTask.cpp | 2 +-
.../U2View/src/ov_assembly/ExportConsensusTask.h | 2 +-
.../ExportConsensusVariationsDialog.cpp | 4 +-
.../ov_assembly/ExportConsensusVariationsDialog.h | 2 +-
.../ov_assembly/ExportConsensusVariationsTask.cpp | 2 +-
.../ov_assembly/ExportConsensusVariationsTask.h | 2 +-
.../src/ov_assembly/ExportCoverageDialog.cpp | 4 +-
.../U2View/src/ov_assembly/ExportCoverageDialog.h | 2 +-
.../U2View/src/ov_assembly/ExportCoverageTask.cpp | 2 +-
.../U2View/src/ov_assembly/ExportCoverageTask.h | 2 +-
.../U2View/src/ov_assembly/ExportReadsDialog.cpp | 4 +-
.../U2View/src/ov_assembly/ExportReadsDialog.h | 2 +-
.../src/ov_assembly/ZoomableAssemblyOverview.cpp | 2 +-
.../src/ov_assembly/ZoomableAssemblyOverview.h | 2 +-
.../AlignSequencesToAlignmentTask.cpp | 2 +-
.../AlignSequencesToAlignmentTask.h | 2 +-
src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/AlignmentLogo.h | 2 +-
.../Clipboard/SubalignmentToClipboardTask.cpp | 2 +-
.../ov_msa/Clipboard/SubalignmentToClipboardTask.h | 2 +-
.../src/ov_msa/ColorSchemaDialogController.cpp | 6 +-
.../src/ov_msa/ColorSchemaDialogController.h | 2 +-
.../src/ov_msa/ColorSchemaSettingsController.cpp | 4 +-
.../src/ov_msa/ColorSchemaSettingsController.h | 2 +-
.../src/ov_msa/Common/RefSeqCommonWidget.cpp | 2 +-
.../U2View/src/ov_msa/Common/RefSeqCommonWidget.h | 2 +-
.../ov_msa/CreateSubalignmentDialogController.cpp | 4 +-
.../ov_msa/CreateSubalignmentDialogController.h | 2 +-
.../U2View/src/ov_msa/DeleteGapsDialog.cpp | 4 +-
src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h | 2 +-
.../src/ov_msa/Export/MSAImageExportTask.cpp | 40 +-
.../U2View/src/ov_msa/Export/MSAImageExportTask.h | 17 +-
.../ExportConsensus/MSAExportConsensusTab.cpp | 9 +-
.../ov_msa/ExportConsensus/MSAExportConsensusTab.h | 2 +-
.../MSAExportConsensusTabFactory.cpp | 4 +-
.../ExportConsensus/MSAExportConsensusTabFactory.h | 2 +-
.../ov_msa/ExportHighlightedDialogController.cpp | 4 +-
.../src/ov_msa/ExportHighlightedDialogController.h | 2 +-
.../U2View/src/ov_msa/General/MSAGeneralTab.cpp | 2 +-
.../U2View/src/ov_msa/General/MSAGeneralTab.h | 2 +-
.../src/ov_msa/General/MSAGeneralTabFactory.cpp | 4 +-
.../src/ov_msa/General/MSAGeneralTabFactory.h | 2 +-
.../src/ov_msa/Highlighting/MSAHighlightingTab.cpp | 2 +-
.../src/ov_msa/Highlighting/MSAHighlightingTab.h | 2 +-
.../Highlighting/MSAHighlightingTabFactory.cpp | 4 +-
.../Highlighting/MSAHighlightingTabFactory.h | 2 +-
.../Highlighting/MsaHighlightingSavableTab.cpp | 2 +-
.../Highlighting/MsaHighlightingSavableTab.h | 2 +-
.../U2View/src/ov_msa/MSACollapsibleModel.cpp | 2 +-
.../U2View/src/ov_msa/MSACollapsibleModel.h | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditor.cpp | 31 +-
src/corelibs/U2View/src/ov_msa/MSAEditor.h | 5 +-
.../U2View/src/ov_msa/MSAEditorConsensusArea.cpp | 3 +-
.../U2View/src/ov_msa/MSAEditorConsensusArea.h | 2 +-
.../U2View/src/ov_msa/MSAEditorConsensusCache.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorConsensusCache.h | 4 +-
.../U2View/src/ov_msa/MSAEditorFactory.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h | 2 +-
.../U2View/src/ov_msa/MSAEditorNameList.cpp | 47 +-
src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h | 6 +-
.../U2View/src/ov_msa/MSAEditorOffsetsView.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorOffsetsView.h | 2 +-
.../U2View/src/ov_msa/MSAEditorOverviewArea.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorOverviewArea.h | 2 +-
.../U2View/src/ov_msa/MSAEditorSequenceArea.cpp | 102 +-
.../U2View/src/ov_msa/MSAEditorSequenceArea.h | 5 +-
src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditorState.h | 2 +-
.../U2View/src/ov_msa/MSAEditorStatusBar.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorStatusBar.h | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp | 24 +-
src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h | 2 +-
.../U2View/src/ov_msa/MSAEditorUndoFramework.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorUndoFramework.h | 2 +-
.../src/ov_msa/MSASelectSubalignmentDialog.cpp | 4 +-
.../src/ov_msa/MSASelectSubalignmentDialog.h | 2 +-
.../src/ov_msa/MsaEditorSimilarityColumn.cpp | 2 +-
.../U2View/src/ov_msa/MsaEditorSimilarityColumn.h | 2 +-
.../src/ov_msa/MsaEditorUserModStepController.cpp | 2 +-
.../src/ov_msa/MsaEditorUserModStepController.h | 2 +-
src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h | 2 +-
.../U2View/src/ov_msa/MsaUpdatedWidgetInterface.h | 2 +-
.../ov_msa/Overview/MSAGraphCalculationTask.cpp | 2 +-
.../src/ov_msa/Overview/MSAGraphCalculationTask.h | 2 +-
.../src/ov_msa/Overview/MSAGraphOverview.cpp | 2 +-
.../U2View/src/ov_msa/Overview/MSAGraphOverview.h | 2 +-
.../U2View/src/ov_msa/Overview/MSAOverview.cpp | 2 +-
.../U2View/src/ov_msa/Overview/MSAOverview.h | 2 +-
.../src/ov_msa/Overview/MSAOverviewContextMenu.cpp | 2 +-
.../src/ov_msa/Overview/MSAOverviewContextMenu.h | 2 +-
.../ov_msa/Overview/MSAOverviewImageExportTask.cpp | 2 +-
.../ov_msa/Overview/MSAOverviewImageExportTask.h | 2 +-
.../src/ov_msa/Overview/MSASimpleOverview.cpp | 2 +-
.../U2View/src/ov_msa/Overview/MSASimpleOverview.h | 2 +-
.../U2View/src/ov_msa/PairAlign/PairAlign.cpp | 2 +-
.../U2View/src/ov_msa/PairAlign/PairAlign.h | 2 +-
.../src/ov_msa/PairAlign/PairAlignFactory.cpp | 4 +-
.../U2View/src/ov_msa/PairAlign/PairAlignFactory.h | 2 +-
.../ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeManager.h | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeViewer.h | 2 +-
.../ov_msa/PhyTrees/MSAEditorTreeViewerTasks.cpp | 2 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.h | 2 +-
.../src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp | 2 +-
.../src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h | 2 +-
...SaveSelectedSequenceFromMSADialogController.cpp | 4 +-
.../SaveSelectedSequenceFromMSADialogController.h | 2 +-
.../ov_msa/SeqStatistics/SeqStatisticsWidget.cpp | 2 +-
.../src/ov_msa/SeqStatistics/SeqStatisticsWidget.h | 2 +-
.../SeqStatistics/SeqStatisticsWidgetFactory.cpp | 4 +-
.../SeqStatistics/SeqStatisticsWidgetFactory.h | 2 +-
.../ov_msa/SequenceSelectorWidgetController.cpp | 2 +-
.../src/ov_msa/SequenceSelectorWidgetController.h | 2 +-
.../src/ov_msa/TreeOptions/TreeOptionsWidget.cpp | 2 +-
.../src/ov_msa/TreeOptions/TreeOptionsWidget.h | 2 +-
.../TreeOptions/TreeOptionsWidgetFactory.cpp | 8 +-
.../ov_msa/TreeOptions/TreeOptionsWidgetFactory.h | 2 +-
.../U2View/src/ov_phyltree/CreateBranchesTask.h | 2 +-
.../src/ov_phyltree/CreateCircularBranchesTask.cpp | 2 +-
.../src/ov_phyltree/CreateCircularBranchesTask.h | 2 +-
.../ov_phyltree/CreateRectangularBranchesTask.cpp | 2 +-
.../ov_phyltree/CreateRectangularBranchesTask.h | 2 +-
.../src/ov_phyltree/CreateUnrootedBranchesTask.cpp | 2 +-
.../src/ov_phyltree/CreateUnrootedBranchesTask.h | 2 +-
.../U2View/src/ov_phyltree/GraphicsBranchItem.cpp | 2 +-
.../U2View/src/ov_phyltree/GraphicsBranchItem.h | 2 +-
.../U2View/src/ov_phyltree/GraphicsButtonItem.cpp | 2 +-
.../U2View/src/ov_phyltree/GraphicsButtonItem.h | 2 +-
.../src/ov_phyltree/GraphicsCircularBranchItem.cpp | 2 +-
.../src/ov_phyltree/GraphicsCircularBranchItem.h | 2 +-
.../ov_phyltree/GraphicsRectangularBranchItem.cpp | 2 +-
.../ov_phyltree/GraphicsRectangularBranchItem.h | 2 +-
.../src/ov_phyltree/GraphicsUnrootedBranchItem.cpp | 2 +-
.../src/ov_phyltree/GraphicsUnrootedBranchItem.h | 2 +-
src/corelibs/U2View/src/ov_phyltree/TreeSettings.h | 2 +-
src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp | 2 +-
src/corelibs/U2View/src/ov_phyltree/TreeViewer.h | 2 +-
.../U2View/src/ov_phyltree/TreeViewerFactory.cpp | 2 +-
.../U2View/src/ov_phyltree/TreeViewerFactory.h | 2 +-
.../U2View/src/ov_phyltree/TreeViewerState.cpp | 2 +-
.../U2View/src/ov_phyltree/TreeViewerState.h | 2 +-
.../U2View/src/ov_phyltree/TreeViewerTasks.cpp | 2 +-
.../U2View/src/ov_phyltree/TreeViewerTasks.h | 2 +-
.../U2View/src/ov_phyltree/TreeViewerUtils.cpp | 2 +-
.../U2View/src/ov_phyltree/TreeViewerUtils.h | 2 +-
.../src/ov_sequence/ADVAnnotationCreation.cpp | 2 +-
.../U2View/src/ov_sequence/ADVAnnotationCreation.h | 2 +-
.../U2View/src/ov_sequence/ADVClipboard.cpp | 14 +-
src/corelibs/U2View/src/ov_sequence/ADVClipboard.h | 7 +-
.../U2View/src/ov_sequence/ADVGraphModel.cpp | 2 +-
.../U2View/src/ov_sequence/ADVGraphModel.h | 2 +-
.../src/ov_sequence/ADVSequenceObjectContext.cpp | 2 +-
.../src/ov_sequence/ADVSequenceObjectContext.h | 2 +-
.../U2View/src/ov_sequence/ADVSequenceWidget.cpp | 2 +-
.../U2View/src/ov_sequence/ADVSequenceWidget.h | 2 +-
.../src/ov_sequence/ADVSingleSequenceWidget.cpp | 5 +-
.../src/ov_sequence/ADVSingleSequenceWidget.h | 2 +-
.../U2View/src/ov_sequence/ADVSplitWidget.h | 2 +-
.../U2View/src/ov_sequence/ADVSyncViewManager.cpp | 2 +-
.../U2View/src/ov_sequence/ADVSyncViewManager.h | 2 +-
src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/ADVUtils.h | 2 +-
.../U2View/src/ov_sequence/AnnotatedDNAView.cpp | 86 +-
.../U2View/src/ov_sequence/AnnotatedDNAView.h | 7 +-
.../src/ov_sequence/AnnotatedDNAViewFactory.cpp | 2 +-
.../src/ov_sequence/AnnotatedDNAViewFactory.h | 2 +-
.../src/ov_sequence/AnnotatedDNAViewState.cpp | 2 +-
.../U2View/src/ov_sequence/AnnotatedDNAViewState.h | 2 +-
.../src/ov_sequence/AnnotatedDNAViewTasks.cpp | 2 +-
.../U2View/src/ov_sequence/AnnotatedDNAViewTasks.h | 2 +-
.../U2View/src/ov_sequence/AnnotationsTreeView.cpp | 51 +-
.../U2View/src/ov_sequence/AnnotationsTreeView.h | 5 +-
.../U2View/src/ov_sequence/AutoAnnotationUtils.cpp | 2 +-
.../U2View/src/ov_sequence/AutoAnnotationUtils.h | 2 +-
.../ov_sequence/CreateRulerDialogController.cpp | 4 +-
.../src/ov_sequence/CreateRulerDialogController.h | 2 +-
src/corelibs/U2View/src/ov_sequence/DetView.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/DetView.h | 2 +-
.../ov_sequence/EditAnnotationDialogController.cpp | 4 +-
.../ov_sequence/EditAnnotationDialogController.h | 2 +-
.../U2View/src/ov_sequence/GSequenceGraphView.cpp | 2 +-
.../U2View/src/ov_sequence/GSequenceGraphView.h | 2 +-
.../ov_sequence/GSequenceGraphViewWithFactory.cpp | 2 +-
.../ov_sequence/GSequenceGraphViewWithFactory.h | 2 +-
.../U2View/src/ov_sequence/GSequenceLineView.cpp | 2 +-
.../U2View/src/ov_sequence/GSequenceLineView.h | 2 +-
.../src/ov_sequence/GSequenceLineViewAnnotated.cpp | 2 +-
.../src/ov_sequence/GSequenceLineViewAnnotated.h | 2 +-
.../U2View/src/ov_sequence/GraphLabelModel.cpp | 2 +-
.../U2View/src/ov_sequence/GraphLabelModel.h | 2 +-
.../src/ov_sequence/GraphLabelsSelectDialog.cpp | 4 +-
.../src/ov_sequence/GraphLabelsSelectDialog.h | 2 +-
src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/GraphMenu.h | 2 +-
.../U2View/src/ov_sequence/GraphSettingsDialog.cpp | 4 +-
.../U2View/src/ov_sequence/GraphSettingsDialog.h | 2 +-
src/corelibs/U2View/src/ov_sequence/Overview.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/Overview.h | 2 +-
src/corelibs/U2View/src/ov_sequence/PanView.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/PanView.h | 2 +-
.../U2View/src/ov_sequence/PanViewRows.cpp | 2 +-
src/corelibs/U2View/src/ov_sequence/PanViewRows.h | 2 +-
.../SaveGraphCutoffsDialogController.cpp | 4 +-
.../ov_sequence/SaveGraphCutoffsDialogController.h | 2 +-
.../src/ov_sequence/SaveGraphCutoffsTask.cpp | 2 +-
.../U2View/src/ov_sequence/SaveGraphCutoffsTask.h | 2 +-
.../src/ov_sequence/SearchQualifierDialog.cpp | 4 +-
.../U2View/src/ov_sequence/SearchQualifierDialog.h | 2 +-
.../src/ov_sequence/WindowStepSelectorWidget.cpp | 2 +-
.../src/ov_sequence/WindowStepSelectorWidget.h | 2 +-
.../annot_highlight/AnnotHighlightSettings.cpp | 2 +-
.../annot_highlight/AnnotHighlightSettings.h | 2 +-
.../annot_highlight/AnnotHighlightTree.cpp | 3 +-
.../annot_highlight/AnnotHighlightTree.h | 2 +-
.../annot_highlight/AnnotHighlightTreeItem.cpp | 2 +-
.../annot_highlight/AnnotHighlightTreeItem.h | 2 +-
.../annot_highlight/AnnotHighlightWidget.cpp | 42 +-
.../annot_highlight/AnnotHighlightWidget.h | 2 +-
.../AnnotHighlightWidgetFactory.cpp | 4 +-
.../annot_highlight/AnnotHighlightWidgetFactory.h | 2 +-
.../ov_sequence/find_pattern/FindPatternTask.cpp | 2 +-
.../src/ov_sequence/find_pattern/FindPatternTask.h | 2 +-
.../ov_sequence/find_pattern/FindPatternWidget.cpp | 17 +-
.../ov_sequence/find_pattern/FindPatternWidget.h | 4 +-
.../find_pattern/FindPatternWidgetFactory.cpp | 4 +-
.../find_pattern/FindPatternWidgetFactory.h | 2 +-
.../find_pattern/FindPatternWidgetSavableTab.cpp | 2 +-
.../find_pattern/FindPatternWidgetSavableTab.h | 2 +-
.../ov_sequence/image_export/ExportImagePainter.h | 2 +-
.../image_export/SequenceExportSettingsWidget.cpp | 2 +-
.../image_export/SequenceExportSettingsWidget.h | 2 +-
.../ov_sequence/image_export/SequencePainter.cpp | 2 +-
.../src/ov_sequence/image_export/SequencePainter.h | 2 +-
.../SingleSequenceImageExportController.cpp | 2 +-
.../SingleSequenceImageExportController.h | 2 +-
.../image_export/SingleSequenceImageExportTask.cpp | 2 +-
.../image_export/SingleSequenceImageExportTask.h | 2 +-
.../ov_sequence/sequence_info/CharOccurTask.cpp | 2 +-
.../src/ov_sequence/sequence_info/CharOccurTask.h | 2 +-
.../sequence_info/DNAStatisticsTask.cpp | 2 +-
.../ov_sequence/sequence_info/DNAStatisticsTask.h | 2 +-
.../ov_sequence/sequence_info/DinuclOccurTask.cpp | 2 +-
.../ov_sequence/sequence_info/DinuclOccurTask.h | 2 +-
.../src/ov_sequence/sequence_info/SequenceInfo.cpp | 2 +-
.../src/ov_sequence/sequence_info/SequenceInfo.h | 2 +-
.../sequence_info/SequenceInfoFactory.cpp | 4 +-
.../sequence_info/SequenceInfoFactory.h | 2 +-
.../view_rendering/DetViewMultiLineRenderer.cpp | 2 +-
.../view_rendering/DetViewMultiLineRenderer.h | 2 +-
.../ov_sequence/view_rendering/DetViewRenderer.cpp | 2 +-
.../ov_sequence/view_rendering/DetViewRenderer.h | 2 +-
.../view_rendering/DetViewSingleLineRenderer.cpp | 2 +-
.../view_rendering/DetViewSingleLineRenderer.h | 2 +-
.../ov_sequence/view_rendering/PanViewRenderer.cpp | 2 +-
.../ov_sequence/view_rendering/PanViewRenderer.h | 2 +-
.../SequenceViewAnnotatedRenderer.cpp | 5 +-
.../view_rendering/SequenceViewAnnotatedRenderer.h | 2 +-
.../view_rendering/SequenceViewRenderer.cpp | 2 +-
.../view_rendering/SequenceViewRenderer.h | 2 +-
.../U2View/src/ov_text/SimpleTextObjectView.cpp | 2 +-
.../U2View/src/ov_text/SimpleTextObjectView.h | 2 +-
.../src/ov_text/SimpleTextObjectViewTasks.cpp | 2 +-
.../U2View/src/ov_text/SimpleTextObjectViewTasks.h | 2 +-
.../U2View/src/phyltree/BaseSettingsDialog.cpp | 2 +-
.../U2View/src/phyltree/BaseSettingsDialog.h | 2 +-
.../U2View/src/phyltree/BranchSettingsDialog.cpp | 4 +-
.../U2View/src/phyltree/BranchSettingsDialog.h | 2 +-
.../src/phyltree/CreatePhyTreeDialogController.cpp | 16 +-
.../src/phyltree/CreatePhyTreeDialogController.h | 2 +-
.../U2View/src/phyltree/CreatePhyTreeWidget.cpp | 8 +-
.../U2View/src/phyltree/CreatePhyTreeWidget.h | 4 +-
.../src/phyltree/PhyTreeDisplayOptionsWidget.cpp | 6 +-
.../src/phyltree/PhyTreeDisplayOptionsWidget.h | 2 +-
.../U2View/src/phyltree/TextSettingsDialog.cpp | 4 +-
.../U2View/src/phyltree/TextSettingsDialog.h | 2 +-
.../U2View/src/phyltree/TreeSettingsDialog.cpp | 4 +-
.../U2View/src/phyltree/TreeSettingsDialog.h | 2 +-
.../src/util_dna_assembly/BuildIndexDialog.cpp | 14 +-
.../src/util_dna_assembly/BuildIndexDialog.h | 2 +-
.../ConvertAssemblyToSamDialog.cpp | 4 +-
.../util_dna_assembly/ConvertAssemblyToSamDialog.h | 2 +-
.../src/util_dna_assembly/DnaAssemblyDialog.cpp | 14 +-
.../src/util_dna_assembly/DnaAssemblyDialog.h | 2 +-
.../util_dna_assembly/DnaAssemblyGUIExtension.cpp | 2 +-
.../util_dna_assembly/DnaAssemblyGUIExtension.h | 2 +-
.../src/util_dna_assembly/DnaAssemblyUtils.cpp | 2 +-
.../src/util_dna_assembly/DnaAssemblyUtils.h | 2 +-
.../src/util_dna_assembly/GenomeAssemblyDialog.cpp | 2 +-
.../src/util_dna_assembly/GenomeAssemblyDialog.h | 2 +-
.../AlignmentAlgorithmGUIExtension.cpp | 2 +-
.../AlignmentAlgorithmGUIExtension.h | 2 +-
.../util_sec_struct_predict/SecStructDialog.cpp | 4 +-
.../src/util_sec_struct_predict/SecStructDialog.h | 2 +-
.../SecStructPredictUtils.cpp | 2 +-
.../SecStructPredictUtils.h | 2 +-
.../util_smith_waterman/SmithWatermanDialog.cpp | 4 +-
.../src/util_smith_waterman/SmithWatermanDialog.h | 2 +-
.../util_smith_waterman/SmithWatermanDialogImpl.h | 2 +-
.../src/util_smith_waterman/SubstMatrixDialog.cpp | 2 +-
.../src/util_smith_waterman/SubstMatrixDialog.h | 2 +-
src/corelibs/U2View/transl/english.ts | 760 ++++---
src/corelibs/U2View/transl/russian.ts | 764 ++++---
src/include/U2Core/ClipboardController.h | 1 +
src/include/U2Gui/PasteController.h | 1 +
src/include/U2Test/GUITest.h | 1 -
src/include/U2Test/GUITestBase.h | 1 -
src/include/U2Test/UGUITest.h | 1 +
src/include/U2Test/UGUITestBase.h | 1 +
src/libs_3rdparty/humimit/Doxyfile | 2384 --------------------
src/libs_3rdparty/humimit/humimit.pri | 69 -
src/libs_3rdparty/humimit/humimit.pro | 110 -
src/libs_3rdparty/humimit/src/GTGlobals.cpp | 86 -
src/libs_3rdparty/humimit/src/GTGlobals.h | 131 --
.../humimit/src/base_dialogs/ColorDialogFiller.cpp | 82 -
.../humimit/src/base_dialogs/ColorDialogFiller.h | 40 -
.../src/base_dialogs/DefaultDialogFiller.cpp | 32 -
.../humimit/src/base_dialogs/DefaultDialogFiller.h | 41 -
.../humimit/src/base_dialogs/FontDialogFiller.cpp | 43 -
.../humimit/src/base_dialogs/FontDialogFiller.h | 36 -
.../humimit/src/base_dialogs/GTFileDialog.cpp | 375 ---
.../humimit/src/base_dialogs/GTFileDialog.h | 83 -
.../humimit/src/base_dialogs/MessageBoxFiller.cpp | 191 --
.../humimit/src/base_dialogs/MessageBoxFiller.h | 71 -
.../humimit/src/core/CustomScenario.cpp | 30 -
.../humimit/src/core/CustomScenario.h | 39 -
src/libs_3rdparty/humimit/src/core/GUITest.cpp | 85 -
src/libs_3rdparty/humimit/src/core/GUITest.h | 83 -
.../humimit/src/core/GUITestOpStatus.h | 49 -
.../humimit/src/core/MainThreadRunnable.cpp | 91 -
.../humimit/src/core/MainThreadRunnable.h | 66 -
.../humimit/src/core/MainThreadTimer.cpp | 49 -
.../humimit/src/core/MainThreadTimer.h | 48 -
src/libs_3rdparty/humimit/src/core/global.h | 14 -
.../humimit/src/drivers/GTKeyboardDriver.cpp | 84 -
.../humimit/src/drivers/GTKeyboardDriver.h | 89 -
.../humimit/src/drivers/GTKeyboardDriverLinux.cpp | 242 --
.../humimit/src/drivers/GTKeyboardDriverMac.cpp | 376 ---
.../src/drivers/GTKeyboardDriverWindows.cpp | 460 ----
.../humimit/src/drivers/GTMouseDriver.cpp | 102 -
.../humimit/src/drivers/GTMouseDriver.h | 79 -
.../humimit/src/drivers/GTMouseDriverLinux.cpp | 185 --
.../humimit/src/drivers/GTMouseDriverMac.cpp | 175 --
.../humimit/src/drivers/GTMouseDriverWindows.cpp | 181 --
.../humimit/src/primitives/GTAction.cpp | 150 --
.../humimit/src/primitives/GTAction.h | 45 -
.../humimit/src/primitives/GTCheckBox.cpp | 62 -
.../humimit/src/primitives/GTCheckBox.h | 41 -
.../humimit/src/primitives/GTComboBox.cpp | 184 --
.../humimit/src/primitives/GTComboBox.h | 50 -
.../humimit/src/primitives/GTDoubleSpinBox.cpp | 137 --
.../humimit/src/primitives/GTDoubleSpinBox.h | 27 -
.../humimit/src/primitives/GTGroupBox.cpp | 71 -
.../humimit/src/primitives/GTGroupBox.h | 44 -
.../humimit/src/primitives/GTLineEdit.cpp | 166 --
.../humimit/src/primitives/GTLineEdit.h | 64 -
.../humimit/src/primitives/GTListWidget.cpp | 115 -
.../humimit/src/primitives/GTListWidget.h | 44 -
.../humimit/src/primitives/GTMainWindow.cpp | 61 -
.../humimit/src/primitives/GTMainWindow.h | 40 -
.../humimit/src/primitives/GTMenu.cpp | 307 ---
src/libs_3rdparty/humimit/src/primitives/GTMenu.h | 65 -
.../humimit/src/primitives/GTMenuBar.cpp | 54 -
.../humimit/src/primitives/GTMenuBar.h | 39 -
.../humimit/src/primitives/GTPlainTextEdit.cpp | 67 -
.../humimit/src/primitives/GTPlainTextEdit.h | 51 -
.../humimit/src/primitives/GTRadioButton.cpp | 88 -
.../humimit/src/primitives/GTRadioButton.h | 42 -
.../humimit/src/primitives/GTScrollBar.cpp | 292 ---
.../humimit/src/primitives/GTScrollBar.h | 61 -
.../humimit/src/primitives/GTSlider.cpp | 43 -
.../humimit/src/primitives/GTSlider.h | 37 -
.../humimit/src/primitives/GTSpinBox.cpp | 141 --
.../humimit/src/primitives/GTSpinBox.h | 47 -
.../humimit/src/primitives/GTTabBar.cpp | 55 -
.../humimit/src/primitives/GTTabBar.h | 38 -
.../humimit/src/primitives/GTTabWidget.cpp | 123 -
.../humimit/src/primitives/GTTabWidget.h | 51 -
.../humimit/src/primitives/GTTableView.cpp | 70 -
.../humimit/src/primitives/GTTableView.h | 40 -
.../humimit/src/primitives/GTTextEdit.cpp | 82 -
.../humimit/src/primitives/GTTextEdit.h | 44 -
.../humimit/src/primitives/GTToolbar.cpp | 99 -
.../humimit/src/primitives/GTToolbar.h | 50 -
.../humimit/src/primitives/GTTreeView.cpp | 96 -
.../humimit/src/primitives/GTTreeView.h | 50 -
.../humimit/src/primitives/GTTreeWidget.cpp | 271 ---
.../humimit/src/primitives/GTTreeWidget.h | 65 -
.../humimit/src/primitives/GTWebView.cpp | 153 --
.../humimit/src/primitives/GTWebView.h | 49 -
.../humimit/src/primitives/GTWidget.cpp | 404 ----
.../humimit/src/primitives/GTWidget.h | 86 -
.../humimit/src/primitives/PopupChooser.cpp | 229 --
.../humimit/src/primitives/PopupChooser.h | 98 -
.../src/primitives/private/GTMenuPrivate.cpp | 129 --
.../humimit/src/primitives/private/GTMenuPrivate.h | 42 -
.../src/primitives/private/GTMenuPrivateMac.h | 53 -
.../src/primitives/private/GTMenuPrivateMac.mm | 164 --
.../humimit/src/system/GTClipboard.cpp | 139 --
src/libs_3rdparty/humimit/src/system/GTClipboard.h | 43 -
src/libs_3rdparty/humimit/src/system/GTFile.cpp | 453 ----
src/libs_3rdparty/humimit/src/system/GTFile.h | 89 -
.../humimit/src/utils/GTKeyboardUtils.cpp | 70 -
.../humimit/src/utils/GTKeyboardUtils.h | 42 -
.../humimit/src/utils/GTMouseUtils.cpp | 51 -
src/libs_3rdparty/humimit/src/utils/GTMouseUtils.h | 44 -
src/libs_3rdparty/humimit/src/utils/GTThread.cpp | 70 -
src/libs_3rdparty/humimit/src/utils/GTThread.h | 52 -
src/libs_3rdparty/humimit/src/utils/GTUtilsApp.cpp | 68 -
src/libs_3rdparty/humimit/src/utils/GTUtilsApp.h | 37 -
.../humimit/src/utils/GTUtilsDialog.cpp | 359 ---
.../humimit/src/utils/GTUtilsDialog.h | 164 --
.../humimit/src/utils/GTUtilsToolTip.cpp | 43 -
.../humimit/src/utils/GTUtilsToolTip.h | 39 -
src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp | 3 +-
src/libs_3rdparty/samtools/src/SamtoolsAdapter.h | 2 +-
.../CoreTests/src/AnnotationTableObjectTest.cpp | 2 +-
.../CoreTests/src/AnnotationTableObjectTest.h | 2 +-
src/plugins/CoreTests/src/AsnParserTests.cpp | 2 +-
src/plugins/CoreTests/src/AsnParserTests.h | 2 +-
.../CoreTests/src/BinaryFindOpenCLTests.cpp | 2 +-
src/plugins/CoreTests/src/BinaryFindOpenCLTests.h | 2 +-
.../CoreTests/src/BioStruct3DObjectTests.cpp | 2 +-
src/plugins/CoreTests/src/BioStruct3DObjectTests.h | 2 +-
src/plugins/CoreTests/src/CMDLineTests.cpp | 2 +-
src/plugins/CoreTests/src/CMDLineTests.h | 2 +-
src/plugins/CoreTests/src/CoreTests.cpp | 2 +-
src/plugins/CoreTests/src/CoreTests.h | 2 +-
.../CoreTests/src/DNASequenceObjectTests.cpp | 2 +-
src/plugins/CoreTests/src/DNASequenceObjectTests.h | 2 +-
.../CoreTests/src/DNATranslationImplTests.cpp | 2 +-
.../CoreTests/src/DNATranslationImplTests.h | 2 +-
src/plugins/CoreTests/src/DnaAssemblyTests.cpp | 2 +-
src/plugins/CoreTests/src/DnaAssemblyTests.h | 2 +-
src/plugins/CoreTests/src/DocumentModelTests.cpp | 43 +-
src/plugins/CoreTests/src/DocumentModelTests.h | 4 +-
src/plugins/CoreTests/src/EditAlignmentTests.cpp | 2 +-
src/plugins/CoreTests/src/EditAlignmentTests.h | 2 +-
src/plugins/CoreTests/src/EditSequenceTests.cpp | 2 +-
src/plugins/CoreTests/src/EditSequenceTests.h | 2 +-
src/plugins/CoreTests/src/FindAlgorithmTests.cpp | 2 +-
src/plugins/CoreTests/src/FindAlgorithmTests.h | 2 +-
src/plugins/CoreTests/src/FormatDetectionTests.cpp | 2 +-
src/plugins/CoreTests/src/FormatDetectionTests.h | 2 +-
src/plugins/CoreTests/src/GUrlTests.cpp | 2 +-
src/plugins/CoreTests/src/GUrlTests.h | 2 +-
.../CoreTests/src/LoadRemoteDocumentTests.cpp | 2 +-
.../CoreTests/src/LoadRemoteDocumentTests.h | 2 +-
src/plugins/CoreTests/src/PWMatrixTests.cpp | 2 +-
src/plugins/CoreTests/src/PWMatrixTests.h | 2 +-
src/plugins/CoreTests/src/PhyTreeObjectTests.cpp | 2 +-
src/plugins/CoreTests/src/PhyTreeObjectTests.h | 2 +-
.../CoreTests/src/PingRemoteServiceTests.cpp | 2 +-
src/plugins/CoreTests/src/PingRemoteServiceTests.h | 2 +-
src/plugins/CoreTests/src/SMatrixTests.cpp | 2 +-
src/plugins/CoreTests/src/SMatrixTests.h | 2 +-
.../CoreTests/src/SecStructPredictTests.cpp | 2 +-
src/plugins/CoreTests/src/SecStructPredictTests.h | 2 +-
src/plugins/CoreTests/src/SequenceWalkerTests.cpp | 2 +-
src/plugins/CoreTests/src/SequenceWalkerTests.h | 2 +-
src/plugins/CoreTests/src/TaskTests.cpp | 2 +-
src/plugins/CoreTests/src/TaskTests.h | 2 +-
src/plugins/CoreTests/src/TextObjectTests.cpp | 2 +-
src/plugins/CoreTests/src/TextObjectTests.h | 2 +-
src/plugins/CoreTests/src/UtilTestActions.cpp | 2 +-
src/plugins/CoreTests/src/UtilTestActions.h | 2 +-
src/plugins/GUITestBase/GUITestBase.pri | 4 +-
src/plugins/GUITestBase/GUITestBase.pro | 6 +-
src/plugins/GUITestBase/src/GTDatabaseConfig.cpp | 6 +-
src/plugins/GUITestBase/src/GTDatabaseConfig.h | 2 +-
.../src/GTUtilsAnnotationsHighlightingTreeView.cpp | 4 +-
.../src/GTUtilsAnnotationsHighlightingTreeView.h | 2 +-
.../GUITestBase/src/GTUtilsAnnotationsTreeView.cpp | 29 +-
.../GUITestBase/src/GTUtilsAnnotationsTreeView.h | 2 +-
.../GUITestBase/src/GTUtilsAssemblyBrowser.cpp | 2 +-
.../GUITestBase/src/GTUtilsAssemblyBrowser.h | 2 +-
.../GUITestBase/src/GTUtilsBookmarksTreeView.cpp | 5 +-
.../GUITestBase/src/GTUtilsBookmarksTreeView.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsDashboard.cpp | 12 +-
src/plugins/GUITestBase/src/GTUtilsDashboard.h | 11 +-
src/plugins/GUITestBase/src/GTUtilsDocument.cpp | 9 +-
src/plugins/GUITestBase/src/GTUtilsDocument.h | 3 +-
src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp | 4 +-
src/plugins/GUITestBase/src/GTUtilsEscClicker.h | 4 +-
.../GUITestBase/src/GTUtilsExternalTools.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsExternalTools.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsLog.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsLog.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsMdi.cpp | 8 +-
src/plugins/GUITestBase/src/GTUtilsMdi.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsMsaEditor.h | 2 +-
.../src/GTUtilsMsaEditorSequenceArea.cpp | 4 +-
.../GUITestBase/src/GTUtilsMsaEditorSequenceArea.h | 2 +-
.../GUITestBase/src/GTUtilsNotifications.cpp | 6 +-
src/plugins/GUITestBase/src/GTUtilsNotifications.h | 2 +-
.../GUITestBase/src/GTUtilsOptionPanelMSA.cpp | 6 +-
.../GUITestBase/src/GTUtilsOptionPanelMSA.h | 2 +-
.../src/GTUtilsOptionPanelSequenceView.cpp | 7 +-
.../src/GTUtilsOptionPanelSequenceView.h | 2 +-
.../GUITestBase/src/GTUtilsOptionsPanel.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsPcr.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsPcr.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp | 5 +-
src/plugins/GUITestBase/src/GTUtilsPhyTree.h | 2 +-
.../GUITestBase/src/GTUtilsPrimerLibrary.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsProject.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsProject.h | 2 +-
.../GUITestBase/src/GTUtilsProjectTreeView.cpp | 42 +-
.../GUITestBase/src/GTUtilsProjectTreeView.h | 6 +-
.../GUITestBase/src/GTUtilsQueryDesigner.cpp | 4 +-
src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h | 2 +-
.../GUITestBase/src/GTUtilsSequenceView.cpp | 17 +-
src/plugins/GUITestBase/src/GTUtilsSequenceView.h | 2 +-
.../src/GTUtilsSharedDatabaseDocument.cpp | 4 +-
.../src/GTUtilsSharedDatabaseDocument.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsStartPage.cpp | 9 +-
src/plugins/GUITestBase/src/GTUtilsStartPage.h | 5 +-
src/plugins/GUITestBase/src/GTUtilsTask.cpp | 8 +-
src/plugins/GUITestBase/src/GTUtilsTask.h | 2 +-
.../GUITestBase/src/GTUtilsTaskTreeView.cpp | 6 +-
src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsWizard.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsWizard.h | 2 +-
.../GUITestBase/src/GTUtilsWorkflowDesigner.cpp | 55 +-
.../GUITestBase/src/GTUtilsWorkflowDesigner.h | 20 +-
src/plugins/GUITestBase/src/GUITestBasePlugin.cpp | 117 +-
src/plugins/GUITestBase/src/GUITestBasePlugin.h | 8 +-
.../GUITestBase/src/api/GTBaseCompleter.cpp | 2 +-
src/plugins/GUITestBase/src/api/GTBaseCompleter.h | 2 +-
src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp | 2 +-
src/plugins/GUITestBase/src/api/GTGraphicsItem.h | 2 +-
.../src/api/GTMSAEditorStatusWidget.cpp | 2 +-
.../GUITestBase/src/api/GTMSAEditorStatusWidget.h | 2 +-
.../GUITestBase/src/api/GTRegionSelector.cpp | 2 +-
src/plugins/GUITestBase/src/api/GTRegionSelector.h | 2 +-
.../src/api/GTSequenceReadingModeDialog.cpp | 2 +-
.../src/api/GTSequenceReadingModeDialog.h | 2 +-
.../src/api/GTSequenceReadingModeDialogUtils.cpp | 2 +-
.../src/api/GTSequenceReadingModeDialogUtils.h | 2 +-
.../GUITestBase/src/runnables/qt/EscapeClicker.cpp | 2 +-
.../GUITestBase/src/runnables/qt/EscapeClicker.h | 2 +-
.../ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp | 6 +-
.../ugene/corelibs/U2Gui/AddFolderDialogFiller.h | 4 +-
.../corelibs/U2Gui/AddNewDocumentDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/AddNewDocumentDialogFiller.h | 2 +-
.../corelibs/U2Gui/AlignShortReadsDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/AlignShortReadsDialogFiller.h | 2 +-
.../corelibs/U2Gui/AppSettingsDialogFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/AppSettingsDialogFiller.h | 2 +-
.../corelibs/U2Gui/BuildIndexDialogFiller.cpp | 4 +-
.../ugene/corelibs/U2Gui/BuildIndexDialogFiller.h | 4 +-
.../U2Gui/CommonImportOptionsDialogFiller.cpp | 6 +-
.../U2Gui/CommonImportOptionsDialogFiller.h | 4 +-
.../U2Gui/ConvertAssemblyToSAMDialogFiller.cpp | 6 +-
.../U2Gui/ConvertAssemblyToSAMDialogFiller.h | 4 +-
.../U2Gui/CreateAnnotationWidgetFiller.cpp | 2 +-
.../corelibs/U2Gui/CreateAnnotationWidgetFiller.h | 2 +-
.../U2Gui/CreateDocumentFromTextDialogFiller.cpp | 6 +-
.../U2Gui/CreateDocumentFromTextDialogFiller.h | 4 +-
.../U2Gui/CreateObjectRelationDialogFiller.cpp | 2 +-
.../U2Gui/CreateObjectRelationDialogFiller.h | 2 +-
.../corelibs/U2Gui/CreateRulerDialogFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/CreateRulerDialogFiller.h | 2 +-
.../U2Gui/DownloadRemoteFileDialogFiller.cpp | 2 +-
.../U2Gui/DownloadRemoteFileDialogFiller.h | 2 +-
.../corelibs/U2Gui/EditAnnotationDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/EditAnnotationDialogFiller.h | 2 +-
.../corelibs/U2Gui/EditConnectionDialogFiller.cpp | 4 +-
.../corelibs/U2Gui/EditConnectionDialogFiller.h | 2 +-
.../U2Gui/EditGroupAnnotationsDialogFiller.cpp | 6 +-
.../U2Gui/EditGroupAnnotationsDialogFiller.h | 4 +-
.../corelibs/U2Gui/EditQualifierDialogFiller.cpp | 10 +-
.../corelibs/U2Gui/EditQualifierDialogFiller.h | 6 +-
.../corelibs/U2Gui/EditSequenceDialogFiller.cpp | 7 +-
.../corelibs/U2Gui/EditSequenceDialogFiller.h | 4 +-
.../corelibs/U2Gui/ExportChromatogramFiller.cpp | 6 +-
.../corelibs/U2Gui/ExportChromatogramFiller.h | 4 +-
.../corelibs/U2Gui/ExportDocumentDialogFiller.cpp | 6 +-
.../corelibs/U2Gui/ExportDocumentDialogFiller.h | 4 +-
.../corelibs/U2Gui/ExportImageDialogFiller.cpp | 18 +-
.../ugene/corelibs/U2Gui/ExportImageDialogFiller.h | 10 +-
.../corelibs/U2Gui/FindQualifierDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/FindQualifierDialogFiller.h | 2 +-
.../corelibs/U2Gui/FindRepeatsDialogFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h | 2 +-
.../corelibs/U2Gui/FindTandemsDialogFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/FindTandemsDialogFiller.h | 2 +-
.../U2Gui/GraphLabelsSelectDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/GraphLabelsSelectDialogFiller.h | 2 +-
.../corelibs/U2Gui/GraphSettingsDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/GraphSettingsDialogFiller.h | 2 +-
.../corelibs/U2Gui/ImportBAMFileDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/ImportBAMFileDialogFiller.h | 2 +-
.../corelibs/U2Gui/ImportOptionsWidgetFiller.cpp | 2 +-
.../corelibs/U2Gui/ImportOptionsWidgetFiller.h | 2 +-
.../U2Gui/ImportToDatabaseDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/ImportToDatabaseDialogFiller.h | 2 +-
.../U2Gui/ItemToImportEditDialogFiller.cpp | 6 +-
.../corelibs/U2Gui/ItemToImportEditDialogFiller.h | 4 +-
.../corelibs/U2Gui/PositionSelectorFiller.cpp | 6 +-
.../ugene/corelibs/U2Gui/PositionSelectorFiller.h | 4 +-
.../PredictSecondaryStructureDialogFiller.cpp | 2 +-
.../U2Gui/PredictSecondaryStructureDialogFiller.h | 2 +-
.../U2Gui/ProjectTreeItemSelectorDialogFiller.cpp | 2 +-
.../U2Gui/ProjectTreeItemSelectorDialogFiller.h | 2 +-
.../corelibs/U2Gui/RangeSelectionDialogFiller.cpp | 6 +-
.../corelibs/U2Gui/RangeSelectionDialogFiller.h | 4 +-
.../ugene/corelibs/U2Gui/RangeSelectorFiller.cpp | 6 +-
.../ugene/corelibs/U2Gui/RangeSelectorFiller.h | 4 +-
.../U2Gui/RemovePartFromSequenceDialogFiller.cpp | 6 +-
.../U2Gui/RemovePartFromSequenceDialogFiller.h | 4 +-
.../U2Gui/ReplaceSubsequenceDialogFiller.cpp | 2 +-
.../U2Gui/ReplaceSubsequenceDialogFiller.h | 2 +-
.../U2Gui/SetSequenceOriginDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/SetSequenceOriginDialogFiller.h | 2 +-
.../U2Gui/SharedConnectionsDialogFiller.cpp | 4 +-
.../corelibs/U2Gui/SharedConnectionsDialogFiller.h | 2 +-
.../corelibs/U2Gui/util/RenameSequenceFiller.cpp | 2 +-
.../corelibs/U2Gui/util/RenameSequenceFiller.h | 2 +-
.../ov_assembly/ExportConsensusDialogFiller.cpp | 2 +-
.../ov_assembly/ExportConsensusDialogFiller.h | 2 +-
.../ov_assembly/ExportCoverageDialogFiller.cpp | 7 +-
.../ov_assembly/ExportCoverageDialogFiller.h | 4 +-
.../U2View/ov_assembly/ExportReadsDialogFiller.cpp | 6 +-
.../U2View/ov_assembly/ExportReadsDialogFiller.h | 4 +-
.../U2View/ov_msa/BranchSettingsDialogFiller.cpp | 6 +-
.../U2View/ov_msa/BranchSettingsDialogFiller.h | 4 +-
.../U2View/ov_msa/BuildTreeDialogFiller.cpp | 2 +-
.../corelibs/U2View/ov_msa/BuildTreeDialogFiller.h | 2 +-
.../U2View/ov_msa/DeleteGapsDialogFiller.cpp | 10 +-
.../U2View/ov_msa/DeleteGapsDialogFiller.h | 6 +-
.../U2View/ov_msa/DistanceMatrixDialogFiller.cpp | 2 +-
.../U2View/ov_msa/DistanceMatrixDialogFiller.h | 2 +-
.../ov_msa/ExportHighlightedDialogFiller.cpp | 6 +-
.../U2View/ov_msa/ExportHighlightedDialogFiller.h | 4 +-
.../ov_msa/ExtractSelectedAsMSADialogFiller.cpp | 2 +-
.../ov_msa/ExtractSelectedAsMSADialogFiller.h | 2 +-
.../GenerateAlignmentProfileDialogFiller.cpp | 6 +-
.../ov_msa/GenerateAlignmentProfileDialogFiller.h | 4 +-
.../U2View/ov_msa/LicenseAgreementDialogFiller.cpp | 2 +-
.../U2View/ov_msa/LicenseAgreementDialogFiller.h | 2 +-
.../SmithWatermanDialogBaseFiller.cpp | 2 +-
.../SmithWatermanDialogBaseFiller.h | 2 +-
.../FindAnnotationCollocationsDialogFiller.cpp | 6 +-
.../FindAnnotationCollocationsDialogFiller.h | 4 +-
.../StructuralAlignmentDialogFiller.cpp | 6 +-
.../StructuralAlignmentDialogFiller.h | 4 +-
.../ugene/plugins/cap3/CAP3SupportDialogFiller.cpp | 2 +-
.../ugene/plugins/cap3/CAP3SupportDialogFiller.h | 2 +-
.../dna_export/ExportAnnotationsDialogFiller.cpp | 6 +-
.../dna_export/ExportAnnotationsDialogFiller.h | 4 +-
.../dna_export/ExportBlastResultDialogFiller.cpp | 2 +-
.../dna_export/ExportBlastResultDialogFiller.h | 2 +-
.../dna_export/ExportMSA2MSADialogFiller.cpp | 6 +-
.../plugins/dna_export/ExportMSA2MSADialogFiller.h | 4 +-
.../dna_export/ExportMSA2SequencesDialogFiller.cpp | 2 +-
.../dna_export/ExportMSA2SequencesDialogFiller.h | 2 +-
...rtSelectedSequenceFromAlignmentDialogFiller.cpp | 2 +-
...portSelectedSequenceFromAlignmentDialogFiller.h | 2 +-
.../dna_export/ExportSequences2MSADialogFiller.cpp | 2 +-
.../dna_export/ExportSequences2MSADialogFiller.h | 2 +-
.../dna_export/ExportSequencesDialogFiller.cpp | 6 +-
.../dna_export/ExportSequencesDialogFiller.h | 4 +-
.../dna_export/ImportAnnotationsToCsvFiller.cpp | 2 +-
.../dna_export/ImportAnnotationsToCsvFiller.h | 2 +-
.../plugins/dotplot/BuildDotPlotDialogFiller.cpp | 6 +-
.../plugins/dotplot/BuildDotPlotDialogFiller.h | 4 +-
.../ugene/plugins/dotplot/DotPlotDialogFiller.cpp | 7 +-
.../ugene/plugins/dotplot/DotPlotDialogFiller.h | 4 +-
.../enzymes/ConstructMoleculeDialogFiller.cpp | 2 +-
.../enzymes/ConstructMoleculeDialogFiller.h | 2 +-
.../plugins/enzymes/CreateFragmentDialogFiller.cpp | 2 +-
.../plugins/enzymes/CreateFragmentDialogFiller.h | 2 +-
.../plugins/enzymes/DigestSequenceDialogFiller.cpp | 2 +-
.../plugins/enzymes/DigestSequenceDialogFiller.h | 2 +-
.../plugins/enzymes/EditFragmentDialogFiller.cpp | 2 +-
.../plugins/enzymes/EditFragmentDialogFiller.h | 2 +-
.../plugins/enzymes/FindEnzymesDialogFiller.cpp | 2 +-
.../plugins/enzymes/FindEnzymesDialogFiller.h | 2 +-
.../external_tools/BlastAllSupportDialogFiller.cpp | 8 +-
.../external_tools/BlastAllSupportDialogFiller.h | 2 +-
.../ClustalOSupportRunDialogFiller.cpp | 2 +-
.../ClustalOSupportRunDialogFiller.h | 2 +-
.../external_tools/FormatDBDialogFiller.cpp | 6 +-
.../plugins/external_tools/FormatDBDialogFiller.h | 4 +-
.../external_tools/RemoteBLASTDialogFiller.cpp | 2 +-
.../external_tools/RemoteBLASTDialogFiller.h | 2 +-
.../SpadesGenomeAssemblyDialogFiller.cpp | 2 +-
.../SpadesGenomeAssemblyDialogFiller.h | 2 +-
.../plugins/external_tools/TCoffeeDailogFiller.cpp | 6 +-
.../plugins/external_tools/TCoffeeDailogFiller.h | 4 +-
.../ugene/plugins/orf_marker/OrfDialogFiller.cpp | 2 +-
.../ugene/plugins/orf_marker/OrfDialogFiller.h | 2 +-
.../ugene/plugins/pcr/AddPrimerDialogFiller.cpp | 2 +-
.../ugene/plugins/pcr/AddPrimerDialogFiller.h | 2 +-
.../plugins/pcr/ExportPrimersDialogFiller.cpp | 2 +-
.../ugene/plugins/pcr/ExportPrimersDialogFiller.h | 2 +-
.../plugins/pcr/ImportPrimersDialogFiller.cpp | 2 +-
.../ugene/plugins/pcr/ImportPrimersDialogFiller.h | 2 +-
.../plugins/pcr/PrimerLibrarySelectorFiller.cpp | 2 +-
.../plugins/pcr/PrimerLibrarySelectorFiller.h | 2 +-
.../plugins/pcr/PrimersDetailsDialogFiller.cpp | 2 +-
.../ugene/plugins/pcr/PrimersDetailsDialogFiller.h | 2 +-
.../plugins/weight_matrix/PwmBuildDialogFiller.cpp | 2 +-
.../plugins/weight_matrix/PwmBuildDialogFiller.h | 2 +-
.../weight_matrix/PwmSearchDialogFiller.cpp | 2 +-
.../plugins/weight_matrix/PwmSearchDialogFiller.h | 2 +-
.../workflow_designer/AliasesDialogFiller.cpp | 6 +-
.../workflow_designer/AliasesDialogFiller.h | 4 +-
.../ConfigurationWizardFiller.cpp | 2 +-
.../workflow_designer/ConfigurationWizardFiller.h | 2 +-
.../CreateElementWithCommandLineFiller.cpp | 2 +-
.../CreateElementWithCommandLineToolFiller.h | 20 +-
.../CreateElementWithScriptDialogFiller.cpp | 14 +-
.../CreateElementWithScriptDialogFiller.h | 8 +-
.../DashboardsManagerDialogFiller.cpp | 2 +-
.../DashboardsManagerDialogFiller.h | 2 +-
.../DatasetNameEditDialogFiller.cpp | 23 +-
.../DatasetNameEditDialogFiller.h | 6 +-
.../workflow_designer/DefaultWizardFiller.cpp | 2 +-
.../workflow_designer/DefaultWizardFiller.h | 2 +-
.../workflow_designer/RPackageDialorFiller.cpp | 2 +-
.../workflow_designer/RPackageDialorFiller.h | 2 +-
.../workflow_designer/StartupDialogFiller.cpp | 4 +-
.../workflow_designer/StartupDialogFiller.h | 7 +-
.../plugins/workflow_designer/WizardFiller.cpp | 2 +-
.../ugene/plugins/workflow_designer/WizardFiller.h | 2 +-
.../workflow_designer/WorkflowMetadialogFiller.cpp | 6 +-
.../workflow_designer/WorkflowMetadialogFiller.h | 4 +-
.../MAFFT/MAFFTSupportRunDialogFiller.cpp | 6 +-
.../MAFFT/MAFFTSupportRunDialogFiller.h | 4 +-
.../clustalw/ClustalWDialogFiller.cpp | 7 +-
.../clustalw/ClustalWDialogFiller.h | 5 +-
.../hmm3/UHMM3PhmmerDialogFiller.cpp | 6 +-
.../hmm3/UHMM3PhmmerDialogFiller.h | 4 +-
.../hmm3/UHMM3SearchDialogFiller.cpp | 2 +-
.../hmm3/UHMM3SearchDialogFiller.h | 2 +-
.../plugins_3rdparty/kalign/KalignDialogFiller.cpp | 6 +-
.../plugins_3rdparty/kalign/KalignDialogFiller.h | 4 +-
.../primer3/Primer3DialogFiller.cpp | 2 +-
.../plugins_3rdparty/primer3/Primer3DialogFiller.h | 2 +-
.../umuscle/MuscleDialogFiller.cpp | 6 +-
.../plugins_3rdparty/umuscle/MuscleDialogFiller.h | 4 +-
.../ugeneui/ConvertAceToSqliteDialogFiller.cpp | 6 +-
.../ugene/ugeneui/ConvertAceToSqliteDialogFiller.h | 4 +-
.../ugene/ugeneui/CreateNewProjectWidgetFiller.cpp | 6 +-
.../ugene/ugeneui/CreateNewProjectWidgetFiller.h | 4 +-
.../ugeneui/DocumentFormatSelectorDialogFiller.cpp | 2 +-
.../ugeneui/DocumentFormatSelectorDialogFiller.h | 2 +-
.../DocumentProviderSelectorDialogFiller.cpp | 2 +-
.../ugeneui/DocumentProviderSelectorDialogFiller.h | 2 +-
.../ugene/ugeneui/ExportProjectDialogFiller.cpp | 14 +-
.../ugene/ugeneui/ExportProjectDialogFiller.h | 8 +-
.../ugene/ugeneui/NCBISearchDialogFiller.cpp | 10 +-
.../ugene/ugeneui/NCBISearchDialogFiller.h | 6 +-
.../ugene/ugeneui/SaveProjectDialogFiller.cpp | 4 +-
.../ugene/ugeneui/SaveProjectDialogFiller.h | 4 +-
.../ugeneui/SelectDocumentFormatDialogFiller.cpp | 2 +-
.../ugeneui/SelectDocumentFormatDialogFiller.h | 2 +-
.../SequenceReadingModeSelectorDialogFiller.cpp | 2 +-
.../SequenceReadingModeSelectorDialogFiller.h | 2 +-
.../GUITestBase/src/test_runner/GUITestRunner.cpp | 9 +-
.../GUITestBase/src/test_runner/GUITestRunner.h | 8 +-
.../GUITestBase/src/tests/GUIInitialChecks.cpp | 65 +-
.../GUITestBase/src/tests/GUIInitialChecks.h | 4 +-
.../Assembly_browser/GTTestsAssemblyBrowser.cpp | 4 +-
.../Assembly_browser/GTTestsAssemblyBrowser.h | 4 +-
.../Assembling/bowtie2/GTTestsBowtie2.cpp | 2 +-
.../Assembling/bowtie2/GTTestsBowtie2.h | 4 +-
.../Assembling/dna_assembly/GTTestsDnaAssembly.cpp | 2 +-
.../Assembling/dna_assembly/GTTestsDnaAssembly.h | 4 +-
.../Assembling/dna_assembly/GTTestsIndexReuse.cpp | 2 +-
.../Assembling/dna_assembly/GTTestsIndexReuse.h | 4 +-
.../conversions/GTTestsDnaAssemblyConversions.cpp | 2 +-
.../conversions/GTTestsDnaAssemblyConversions.h | 4 +-
.../common_scenarios/Assembling/sam/GTTestsSAM.cpp | 2 +-
.../common_scenarios/Assembling/sam/GTTestsSAM.h | 4 +-
.../NIAID_pipelines/GTTestsNiaidPipelines.cpp | 2 +-
.../NIAID_pipelines/GTTestsNiaidPipelines.h | 4 +-
.../Query_Designer/GTTestsQuerryDesigner.cpp | 2 +-
.../Query_Designer/GTTestsQuerryDesigner.h | 4 +-
.../annotations/GTTestsAnnotations.cpp | 2 +-
.../annotations/GTTestsAnnotations.h | 4 +-
.../annotations/GTTestsCreateAnnotationWidget.cpp | 9 +-
.../annotations/GTTestsCreateAnnotationWidget.h | 4 +-
.../annotations/edit/GTTestsAnnotationsEdit.cpp | 4 +-
.../annotations/edit/GTTestsAnnotationsEdit.h | 4 +-
.../qualifiers/GTTestsAnnotationsQualifiers.cpp | 2 +-
.../qualifiers/GTTestsAnnotationsQualifiers.h | 4 +-
.../GTTestsAnnotationsImport.cpp | 2 +-
.../annotations_import/GTTestsAnnotationsImport.h | 4 +-
.../circular_view/GTTestsCvGeneral.cpp | 2 +-
.../circular_view/GTTestsCvGeneral.h | 4 +-
.../common_scenarios/cloning/GTTestsCloning.cpp | 2 +-
.../common_scenarios/cloning/GTTestsCloning.h | 4 +-
.../document_from_text/GTTestsDocumentFromText.cpp | 2 +-
.../document_from_text/GTTestsDocumentFromText.h | 4 +-
.../common_scenarios/dp_view/GTTestsDpView.cpp | 10 +-
.../tests/common_scenarios/dp_view/GTTestsDpView.h | 4 +-
.../msa_editor/GTTestsMsaEditor.cpp | 9 +-
.../common_scenarios/msa_editor/GTTestsMsaEditor.h | 4 +-
.../msa_editor/align/GTTestsAlignSequenceToMsa.cpp | 2 +-
.../msa_editor/align/GTTestsAlignSequenceToMsa.h | 4 +-
.../msa_editor/colors/GTTestsMSAEditorColors.cpp | 2 +-
.../msa_editor/colors/GTTestsMSAEditorColors.h | 4 +-
.../consensus/GTTestsMSAEditorConsensus.cpp | 2 +-
.../consensus/GTTestsMSAEditorConsensus.h | 4 +-
.../msa_editor/edit/GTTestsMSAEditorEdit.cpp | 2 +-
.../msa_editor/edit/GTTestsMSAEditorEdit.h | 4 +-
.../overview/GTTestsMSAEditorOverview.cpp | 2 +-
.../msa_editor/overview/GTTestsMSAEditorOverview.h | 4 +-
.../GTTestsMSAEditorReplaceCharacter.cpp | 2 +-
.../GTTestsMSAEditorReplaceCharacter.h | 4 +-
.../options_panel/GTTestsOptionPanel.cpp | 2 +-
.../options_panel/GTTestsOptionPanel.h | 4 +-
.../options_panel/msa/GTTestsOptionPanelMSA.cpp | 2 +-
.../options_panel/msa/GTTestsOptionPanelMSA.h | 4 +-
.../GTTestsOptionPanelSequenceView.cpp | 2 +-
.../sequence_view/GTTestsOptionPanelSequenceView.h | 4 +-
.../common_scenarios/pcr/GTTestsInSilicoPcr.cpp | 2 +-
.../common_scenarios/pcr/GTTestsInSilicoPcr.h | 4 +-
.../common_scenarios/pcr/GTTestsPrimerLibrary.cpp | 2 +-
.../common_scenarios/pcr/GTTestsPrimerLibrary.h | 4 +-
.../common_scenarios/project/GTTestsProject.cpp | 209 +-
.../common_scenarios/project/GTTestsProject.h | 28 +-
.../GTTestsProjectAnonymousProject.cpp | 2 +-
.../GTTestsProjectAnonymousProject.h | 4 +-
.../project/bookmarks/GTTestsBookmarks.cpp | 2 +-
.../project/bookmarks/GTTestsBookmarks.h | 4 +-
.../GTTestsProjectDocumentModifying.cpp | 2 +-
.../GTTestsProjectDocumentModifying.h | 4 +-
.../multiple_docs/GTTestsProjectMultipleDocs.cpp | 2 +-
.../multiple_docs/GTTestsProjectMultipleDocs.h | 4 +-
.../project_filtering/GTTestsProjectFiltering.cpp | 2 +-
.../project_filtering/GTTestsProjectFiltering.h | 4 +-
.../project/relations/GTTestsProjectRelations.cpp | 2 +-
.../project/relations/GTTestsProjectRelations.h | 4 +-
.../remote_request/GTTestsProjectRemoteRequest.cpp | 2 +-
.../remote_request/GTTestsProjectRemoteRequest.h | 4 +-
.../GTTestsProjectSequenceExporting.cpp | 2 +-
.../GTTestsProjectSequenceExporting.h | 4 +-
.../from_project_view/GTTestsFromProjectView.cpp | 2 +-
.../from_project_view/GTTestsFromProjectView.h | 4 +-
.../user_locking/GTTestsProjectUserLocking.cpp | 6 +-
.../user_locking/GTTestsProjectUserLocking.h | 4 +-
.../repeat_finder/GTTestsRepeatFinder.cpp | 2 +-
.../repeat_finder/GTTestsRepeatFinder.h | 4 +-
.../sequence_edit/GTTestsSequenceEdit.cpp | 4 +-
.../sequence_edit/GTTestsSequenceEdit.h | 4 +-
.../sequence_view/GTTestsSequenceView.cpp | 11 +-
.../sequence_view/GTTestsSequenceView.h | 4 +-
.../shared_database/GTTestsSharedDatabase.cpp | 30 +-
.../shared_database/GTTestsSharedDatabase.h | 4 +-
.../smith_waterman_dialog/GTTestsSWDialog.cpp | 2 +-
.../smith_waterman_dialog/GTTestsSWDialog.h | 4 +-
.../start_page/GTTestsStartPage.cpp | 2 +-
.../common_scenarios/start_page/GTTestsStartPage.h | 4 +-
.../toggle_view/GTTestsToggleView.cpp | 59 +-
.../toggle_view/GTTestsToggleView.h | 4 +-
.../GTTestsCommonScenariousTreeviewer.cpp | 73 +-
.../GTTestsCommonScenariousTreeviewer.h | 4 +-
.../common_scenarios/undo_redo/GTTestsUndoRedo.cpp | 2 +-
.../common_scenarios/undo_redo/GTTestsUndoRedo.h | 4 +-
.../workflow_designer/GTTestsWorkflowDesigner.cpp | 2 +-
.../workflow_designer/GTTestsWorkflowDesigner.h | 4 +-
.../estimating/GTTestsWorkflowEstimating.cpp | 2 +-
.../estimating/GTTestsWorkflowEstimating.h | 4 +-
.../name_filter/GTTestsWorkflowNameFilter.cpp | 2 +-
.../name_filter/GTTestsWorkflowNameFilter.h | 4 +-
.../GTTestsWorkflowParemeterValidation.cpp | 2 +-
.../GTTestsWorkflowParemeterValidation.h | 4 +-
.../scripting/GTTestsWorkflowScripting.cpp | 2 +-
.../scripting/GTTestsWorkflowScripting.h | 4 +-
.../shared_db/GTTestsSharedDbWd.cpp | 2 +-
.../shared_db/GTTestsSharedDbWd.h | 4 +-
.../src/tests/crazy_user/GTAbstractGUIAction.cpp | 2 +-
.../src/tests/crazy_user/GTAbstractGUIAction.h | 2 +-
.../tests/crazy_user/GTRandomGUIActionFactory.cpp | 5 +-
.../tests/crazy_user/GTRandomGUIActionFactory.h | 2 +-
.../src/tests/crazy_user/GUICrazyUserTest.cpp | 2 +-
.../src/tests/crazy_user/GUICrazyUserTest.h | 4 +-
.../GTTestsRegressionScenarios_1001_2000.cpp | 183 +-
.../GTTestsRegressionScenarios_1001_2000.h | 4 +-
.../GTTestsRegressionScenarios_1_1000.cpp | 33 +-
.../GTTestsRegressionScenarios_1_1000.h | 4 +-
.../GTTestsRegressionScenarios_2001_3000.cpp | 35 +-
.../GTTestsRegressionScenarios_2001_3000.h | 4 +-
.../GTTestsRegressionScenarios_3001_4000.cpp | 45 +-
.../GTTestsRegressionScenarios_3001_4000.h | 6 +-
.../GTTestsRegressionScenarios_4001_5000.cpp | 655 +++++-
.../GTTestsRegressionScenarios_4001_5000.h | 30 +-
.../GTTestsRegressionScenarios_5001_6000.cpp | 207 ++
.../GTTestsRegressionScenarios_5001_6000.h | 45 +
src/plugins/annotator/src/AnnotatorPlugin.cpp | 2 +-
src/plugins/annotator/src/AnnotatorPlugin.h | 2 +-
src/plugins/annotator/src/AnnotatorTests.cpp | 2 +-
src/plugins/annotator/src/AnnotatorTests.h | 2 +-
src/plugins/annotator/src/CollocationWorker.cpp | 2 +-
src/plugins/annotator/src/CollocationWorker.h | 2 +-
.../annotator/src/CollocationsDialogController.cpp | 4 +-
.../annotator/src/CollocationsDialogController.h | 2 +-
.../annotator/src/CollocationsSearchAlgorithm.cpp | 2 +-
.../annotator/src/CollocationsSearchAlgorithm.h | 2 +-
.../annotator/src/CustomAutoAnnotationDialog.cpp | 4 +-
.../annotator/src/CustomAutoAnnotationDialog.h | 2 +-
.../annotator/src/CustomPatternAnnotationTask.cpp | 2 +-
.../annotator/src/CustomPatternAnnotationTask.h | 2 +-
src/plugins/annotator/src/GeneByGeneReportTask.cpp | 2 +-
src/plugins/annotator/src/GeneByGeneReportTask.h | 2 +-
.../annotator/src/GeneByGeneReportWorker.cpp | 2 +-
src/plugins/annotator/src/GeneByGeneReportWorker.h | 2 +-
src/plugins/api_tests/src/ApiTestsPlugin.cpp | 2 +-
src/plugins/api_tests/src/ApiTestsPlugin.h | 2 +-
src/plugins/api_tests/src/UnitTestSuite.cpp | 2 +-
src/plugins/api_tests/src/UnitTestSuite.h | 2 +-
.../annotations/AnnotationGroupUnitTests.cpp | 2 +-
.../annotations/AnnotationGroupUnitTests.h | 2 +-
.../datatype/annotations/AnnotationUnitTests.cpp | 2 +-
.../datatype/annotations/AnnotationUnitTests.h | 2 +-
.../core/datatype/msa/MAlignmentRowUnitTests.cpp | 2 +-
.../src/core/datatype/msa/MAlignmentRowUnitTests.h | 2 +-
.../src/core/datatype/msa/MAlignmentUnitTests.cpp | 2 +-
.../src/core/datatype/msa/MAlignmentUnitTests.h | 2 +-
.../datatype/udr/RawDataUdrSchemaUnitTests.cpp | 2 +-
.../core/datatype/udr/RawDataUdrSchemaUnitTests.h | 2 +-
.../src/core/datatype/udr/UdrSchemaUnitTests.cpp | 2 +-
.../src/core/datatype/udr/UdrSchemaUnitTests.h | 2 +-
src/plugins/api_tests/src/core/dbi/DbiTest.cpp | 2 +-
.../src/core/dbi/features/FeatureDbiUnitTests.cpp | 54 +-
.../src/core/dbi/features/FeatureDbiUnitTests.h | 9 +-
.../api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp | 2 +-
.../api_tests/src/core/dbi/msa/MsaDbiUnitTests.h | 2 +-
.../src/core/dbi/sequence/SequenceDbiUnitTests.cpp | 2 +-
.../api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp | 2 +-
.../api_tests/src/core/dbi/udr/UdrDbiUnitTests.h | 2 +-
.../CInterfaceManualTests.cpp | 2 +-
.../base_scheme_interface/CInterfaceManualTests.h | 2 +-
.../base_scheme_interface/CInterfaceSasTests.cpp | 2 +-
.../base_scheme_interface/CInterfaceSasTests.h | 2 +-
.../SchemeSimilarityUtils.cpp | 2 +-
.../base_scheme_interface/SchemeSimilarityUtils.h | 2 +-
.../src/core/format/fastq/FastqUnitTests.cpp | 2 +-
.../format/genbank/LocationParserUnitTests.cpp | 2 +-
.../ModDbiSQLiteSpecificUnitTests.cpp | 2 +-
.../sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h | 2 +-
.../MsaDbiSQLiteSpecificUnitTests.cpp | 2 +-
.../sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h | 2 +-
.../sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp | 2 +-
.../sqlite_object_dbi/SQLiteObjectDbiUnitTests.h | 2 +-
.../SequenceDbiSQLiteSpecificUnitTests.cpp | 2 +-
.../SequenceDbiSQLiteSpecificUnitTests.h | 2 +-
.../core/gobjects/BioStruct3DObjectUnitTests.cpp | 2 +-
.../src/core/gobjects/BioStruct3DObjectUnitTests.h | 2 +-
.../gobjects/DNAChromatogramObjectUnitTests.cpp | 2 +-
.../core/gobjects/DNAChromatogramObjectUnitTests.h | 2 +-
.../core/gobjects/FeaturesTableObjectUnitTest.cpp | 2 +-
.../core/gobjects/FeaturesTableObjectUnitTest.h | 2 +-
.../core/gobjects/MAlignmentObjectUnitTests.cpp | 2 +-
.../src/core/gobjects/MAlignmentObjectUnitTests.h | 2 +-
.../src/core/gobjects/PhyTreeObjectUnitTests.cpp | 2 +-
.../src/core/gobjects/PhyTreeObjectUnitTests.h | 2 +-
.../src/core/gobjects/TextObjectUnitTests.cpp | 2 +-
.../src/core/gobjects/TextObjectUnitTests.h | 2 +-
.../core/util/DatatypeSerializeUtilsUnitTest.cpp | 2 +-
.../src/core/util/DatatypeSerializeUtilsUnitTest.h | 2 +-
.../util/MAlignmentImporterExporterUnitTests.cpp | 2 +-
.../util/MAlignmentImporterExporterUnitTests.h | 2 +-
.../src/core/util/MsaDbiUtilsUnitTests.cpp | 2 +-
.../api_tests/src/core/util/MsaDbiUtilsUnitTests.h | 2 +-
.../api_tests/src/core/util/MsaUtilsUnitTests.cpp | 2 +-
.../api_tests/src/core/util/MsaUtilsUnitTests.h | 2 +-
src/plugins/biostruct3d_view/biostruct3d_view.pri | 18 +-
src/plugins/biostruct3d_view/biostruct3d_view.pro | 88 +-
.../biostruct3d_view/src/AnaglyphRenderer.cpp | 119 +-
.../biostruct3d_view/src/AnaglyphRenderer.h | 3 +-
.../src/BallAndStickGLRenderer.cpp | 31 +-
.../biostruct3d_view/src/BallAndStickGLRenderer.h | 3 +-
.../src/BioStruct3DColorScheme.cpp | 14 +-
.../biostruct3d_view/src/BioStruct3DColorScheme.h | 2 +-
.../src/BioStruct3DGLImageExportTask.cpp | 4 +-
.../src/BioStruct3DGLImageExportTask.h | 2 +-
.../biostruct3d_view/src/BioStruct3DGLRender.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DGLRender.h | 2 +-
.../biostruct3d_view/src/BioStruct3DGLWidget.cpp | 104 +-
.../biostruct3d_view/src/BioStruct3DGLWidget.h | 36 +-
.../biostruct3d_view/src/BioStruct3DSplitter.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DSplitter.h | 2 +-
.../src/BioStruct3DSubsetEditor.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DSubsetEditor.h | 2 +-
.../biostruct3d_view/src/BioStruct3DViewPlugin.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DViewPlugin.h | 2 +-
.../biostruct3d_view/src/GLFrameManager.cpp | 31 +-
src/plugins/biostruct3d_view/src/GLFrameManager.h | 21 +-
src/plugins/biostruct3d_view/src/GraphicUtils.cpp | 222 +-
src/plugins/biostruct3d_view/src/GraphicUtils.h | 9 +-
.../src/MolecularSurfaceRenderer.cpp | 39 +-
.../src/MolecularSurfaceRenderer.h | 2 +-
.../biostruct3d_view/src/SelectModelsDialog.cpp | 4 +-
.../biostruct3d_view/src/SelectModelsDialog.h | 2 +-
.../biostruct3d_view/src/SettingsDialog.cpp | 4 +-
src/plugins/biostruct3d_view/src/SettingsDialog.h | 2 +-
.../src/StructuralAlignmentDialog.cpp | 4 +-
.../src/StructuralAlignmentDialog.h | 2 +-
.../biostruct3d_view/src/TubeGLRenderer.cpp | 10 +-
src/plugins/biostruct3d_view/src/TubeGLRenderer.h | 2 +-
.../biostruct3d_view/src/VanDerWaalsGLRenderer.cpp | 12 +-
.../biostruct3d_view/src/VanDerWaalsGLRenderer.h | 10 +-
.../biostruct3d_view/src/WormsGLRenderer.cpp | 12 +-
src/plugins/biostruct3d_view/src/WormsGLRenderer.h | 2 +-
.../src/deprecated/AnaglyphRenderer.cpp | 256 +++
.../src/deprecated/AnaglyphRenderer.h | 112 +
.../src/deprecated/BallAndStickGLRenderer.cpp | 193 ++
.../src/deprecated/BallAndStickGLRenderer.h | 59 +
.../src/deprecated/BioStruct3DColorScheme.cpp | 313 +++
.../src/deprecated/BioStruct3DColorScheme.h | 176 ++
.../deprecated/BioStruct3DGLImageExportTask.cpp | 76 +
.../src/deprecated/BioStruct3DGLImageExportTask.h | 90 +
.../src/deprecated/BioStruct3DGLRender.cpp | 102 +
.../src/deprecated/BioStruct3DGLRender.h | 182 ++
.../src/deprecated/BioStruct3DGLWidget.cpp | 1120 +++++++++
.../src/deprecated/BioStruct3DGLWidget.h | 376 +++
.../src/deprecated/BioStruct3DSplitter.cpp | 855 +++++++
.../src/deprecated/BioStruct3DSplitter.h | 239 ++
.../src/deprecated/BioStruct3DSubsetEditor.cpp | 181 ++
.../src/deprecated/BioStruct3DSubsetEditor.h | 81 +
.../src/deprecated/BioStruct3DViewPlugin.cpp | 213 ++
.../src/deprecated/BioStruct3DViewPlugin.h | 77 +
.../src/deprecated/GLFrameManager.cpp | 206 ++
.../src/deprecated/GLFrameManager.h | 95 +
.../src/deprecated/GraphicUtils.cpp | 632 ++++++
.../biostruct3d_view/src/deprecated/GraphicUtils.h | 157 ++
.../src/deprecated/MolecularSurfaceRenderer.cpp | 133 ++
.../src/deprecated/MolecularSurfaceRenderer.h | 109 +
.../src/deprecated/SelectModelsDialog.cpp | 104 +
.../src/deprecated/SelectModelsDialog.h | 54 +
.../src/deprecated/SettingsDialog.cpp | 266 +++
.../src/deprecated/SettingsDialog.h | 133 ++
.../src/deprecated/StructuralAlignmentDialog.cpp | 147 ++
.../src/deprecated/StructuralAlignmentDialog.h | 57 +
.../src/deprecated/TubeGLRenderer.cpp | 131 ++
.../src/deprecated/TubeGLRenderer.h | 67 +
.../src/deprecated/VanDerWaalsGLRenderer.cpp | 83 +
.../src/deprecated/VanDerWaalsGLRenderer.h | 49 +
.../src/deprecated/WormsGLRenderer.cpp | 383 ++++
.../src/deprecated/WormsGLRenderer.h | 118 +
src/plugins/biostruct3d_view/transl/english.ts | 99 +-
src/plugins/biostruct3d_view/transl/russian.ts | 99 +-
.../browser_support/src/BrowserSupportPlugin.cpp | 2 +-
.../browser_support/src/BrowserSupportPlugin.h | 2 +-
src/plugins/chroma_view/src/ChromaViewPlugin.cpp | 2 +-
src/plugins/chroma_view/src/ChromaViewPlugin.h | 2 +-
src/plugins/chroma_view/src/ChromatogramView.cpp | 3 +-
src/plugins/chroma_view/src/ChromatogramView.h | 2 +-
src/plugins/chroma_view/transl/english.ts | 6 +-
src/plugins/chroma_view/transl/russian.ts | 6 +-
src/plugins/circular_view/src/CircularItems.cpp | 2 +-
src/plugins/circular_view/src/CircularItems.h | 2 +-
src/plugins/circular_view/src/CircularView.cpp | 9 +-
src/plugins/circular_view/src/CircularView.h | 2 +-
.../src/CircularViewImageExportTask.cpp | 2 +-
.../src/CircularViewImageExportTask.h | 2 +-
.../circular_view/src/CircularViewPlugin.cpp | 2 +-
src/plugins/circular_view/src/CircularViewPlugin.h | 2 +-
.../src/CircularViewSettingsWidget.cpp | 2 +-
.../circular_view/src/CircularViewSettingsWidget.h | 2 +-
.../src/CircularViewSettingsWidgetFactory.cpp | 4 +-
.../src/CircularViewSettingsWidgetFactory.h | 2 +-
.../circular_view/src/CircularViewSplitter.cpp | 2 +-
.../circular_view/src/CircularViewSplitter.h | 2 +-
.../circular_view/src/RestrictionMapWidget.cpp | 2 +-
.../circular_view/src/RestrictionMapWidget.h | 2 +-
.../circular_view/src/SetSequenceOriginDialog.cpp | 2 +-
.../circular_view/src/SetSequenceOriginDialog.h | 2 +-
.../circular_view/src/ShiftSequenceStartTask.cpp | 2 +-
.../circular_view/src/ShiftSequenceStartTask.h | 2 +-
src/plugins/cuda_support/src/CudaSupportPlugin.cpp | 2 +-
src/plugins/cuda_support/src/CudaSupportPlugin.h | 2 +-
.../src/CudaSupportSettingsController.cpp | 2 +-
.../src/CudaSupportSettingsController.h | 2 +-
src/plugins/dbi_bam/src/Alignment.cpp | 2 +-
src/plugins/dbi_bam/src/Alignment.h | 2 +-
src/plugins/dbi_bam/src/BAMDbiPlugin.cpp | 2 +-
src/plugins/dbi_bam/src/BAMDbiPlugin.h | 2 +-
src/plugins/dbi_bam/src/BAMFormat.cpp | 2 +-
src/plugins/dbi_bam/src/BAMFormat.h | 2 +-
src/plugins/dbi_bam/src/BaiReader.cpp | 2 +-
src/plugins/dbi_bam/src/BaiReader.h | 2 +-
src/plugins/dbi_bam/src/BaiWriter.cpp | 2 +-
src/plugins/dbi_bam/src/BaiWriter.h | 2 +-
src/plugins/dbi_bam/src/BgzfReader.cpp | 2 +-
src/plugins/dbi_bam/src/BgzfReader.h | 2 +-
src/plugins/dbi_bam/src/BgzfWriter.cpp | 2 +-
src/plugins/dbi_bam/src/BgzfWriter.h | 2 +-
src/plugins/dbi_bam/src/CancelledException.cpp | 2 +-
src/plugins/dbi_bam/src/CancelledException.h | 2 +-
src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp | 6 +-
src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h | 2 +-
src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp | 2 +-
src/plugins/dbi_bam/src/ConvertToSQLiteTask.h | 2 +-
src/plugins/dbi_bam/src/Dbi.cpp | 2 +-
src/plugins/dbi_bam/src/Dbi.h | 2 +-
src/plugins/dbi_bam/src/Exception.cpp | 2 +-
src/plugins/dbi_bam/src/Exception.h | 2 +-
src/plugins/dbi_bam/src/Header.cpp | 2 +-
src/plugins/dbi_bam/src/Header.h | 2 +-
src/plugins/dbi_bam/src/IOException.cpp | 2 +-
src/plugins/dbi_bam/src/IOException.h | 2 +-
src/plugins/dbi_bam/src/Index.cpp | 2 +-
src/plugins/dbi_bam/src/Index.h | 2 +-
src/plugins/dbi_bam/src/InvalidFormatException.cpp | 2 +-
src/plugins/dbi_bam/src/InvalidFormatException.h | 2 +-
src/plugins/dbi_bam/src/LoadBamInfoTask.cpp | 2 +-
src/plugins/dbi_bam/src/LoadBamInfoTask.h | 2 +-
src/plugins/dbi_bam/src/PrepareToImportTask.cpp | 2 +-
src/plugins/dbi_bam/src/PrepareToImportTask.h | 2 +-
src/plugins/dbi_bam/src/Reader.cpp | 2 +-
src/plugins/dbi_bam/src/Reader.h | 2 +-
src/plugins/dbi_bam/src/SamReader.cpp | 2 +-
src/plugins/dbi_bam/src/SamReader.h | 2 +-
src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp | 2 +-
src/plugins/dbi_bam/src/SamtoolsBasedDbi.h | 2 +-
src/plugins/dbi_bam/src/VirtualOffset.cpp | 2 +-
src/plugins/dbi_bam/src/VirtualOffset.h | 2 +-
.../dna_export/src/CSVColumnConfiguration.h | 2 +-
.../src/CSVColumnConfigurationDialog.cpp | 4 +-
.../dna_export/src/CSVColumnConfigurationDialog.h | 2 +-
src/plugins/dna_export/src/DNAExportPlugin.cpp | 2 +-
src/plugins/dna_export/src/DNAExportPlugin.h | 2 +-
.../dna_export/src/DNAExportPluginTests.cpp | 2 +-
src/plugins/dna_export/src/DNAExportPluginTests.h | 2 +-
.../dna_export/src/DNASequenceGenerator.cpp | 2 +-
src/plugins/dna_export/src/DNASequenceGenerator.h | 2 +-
.../dna_export/src/DNASequenceGeneratorDialog.cpp | 6 +-
.../dna_export/src/DNASequenceGeneratorDialog.h | 2 +-
.../dna_export/src/ExportAlignmentViewItems.cpp | 2 +-
.../dna_export/src/ExportAlignmentViewItems.h | 2 +-
.../dna_export/src/ExportBlastResultDialog.cpp | 4 +-
.../dna_export/src/ExportBlastResultDialog.h | 2 +-
.../dna_export/src/ExportChromatogramDialog.cpp | 4 +-
.../dna_export/src/ExportChromatogramDialog.h | 2 +-
src/plugins/dna_export/src/ExportMSA2MSADialog.cpp | 4 +-
src/plugins/dna_export/src/ExportMSA2MSADialog.h | 2 +-
.../dna_export/src/ExportMSA2SequencesDialog.cpp | 4 +-
.../dna_export/src/ExportMSA2SequencesDialog.h | 2 +-
.../dna_export/src/ExportProjectViewItems.cpp | 2 +-
.../dna_export/src/ExportProjectViewItems.h | 2 +-
.../dna_export/src/ExportQualityScoresTask.cpp | 2 +-
.../dna_export/src/ExportQualityScoresTask.h | 2 +-
.../dna_export/src/ExportQualityScoresWorker.cpp | 2 +-
.../dna_export/src/ExportQualityScoresWorker.h | 2 +-
.../src/ExportSelectedSeqRegionsTask.cpp | 2 +-
.../dna_export/src/ExportSelectedSeqRegionsTask.h | 2 +-
src/plugins/dna_export/src/ExportSequenceTask.cpp | 22 +-
src/plugins/dna_export/src/ExportSequenceTask.h | 3 +-
.../dna_export/src/ExportSequenceViewItems.cpp | 2 +-
.../dna_export/src/ExportSequenceViewItems.h | 2 +-
.../dna_export/src/ExportSequences2MSADialog.cpp | 4 +-
.../dna_export/src/ExportSequences2MSADialog.h | 2 +-
.../dna_export/src/ExportSequencesDialog.cpp | 4 +-
src/plugins/dna_export/src/ExportSequencesDialog.h | 2 +-
src/plugins/dna_export/src/ExportTasks.cpp | 2 +-
src/plugins/dna_export/src/ExportTasks.h | 2 +-
src/plugins/dna_export/src/ExportUtils.cpp | 2 +-
src/plugins/dna_export/src/ExportUtils.h | 2 +-
src/plugins/dna_export/src/GenerateDNAWorker.cpp | 2 +-
src/plugins/dna_export/src/GenerateDNAWorker.h | 2 +-
.../dna_export/src/GetSequenceByIdDialog.cpp | 4 +-
src/plugins/dna_export/src/GetSequenceByIdDialog.h | 2 +-
.../src/ImportAnnotationsFromCSVDialog.cpp | 4 +-
.../src/ImportAnnotationsFromCSVDialog.h | 2 +-
.../src/ImportAnnotationsFromCSVTask.cpp | 2 +-
.../dna_export/src/ImportAnnotationsFromCSVTask.h | 2 +-
.../dna_export/src/ImportQualityScoresTask.cpp | 2 +-
.../dna_export/src/ImportQualityScoresTask.h | 2 +-
.../dna_export/src/ImportQualityScoresWorker.cpp | 2 +-
.../dna_export/src/ImportQualityScoresWorker.h | 2 +-
src/plugins/dna_export/transl/english.ts | 9 +-
src/plugins/dna_export/transl/russian.ts | 11 +-
src/plugins/dna_flexibility/src/DNAFlexDialog.cpp | 4 +-
src/plugins/dna_flexibility/src/DNAFlexDialog.h | 2 +-
src/plugins/dna_flexibility/src/DNAFlexGraph.cpp | 2 +-
src/plugins/dna_flexibility/src/DNAFlexGraph.h | 2 +-
.../dna_flexibility/src/DNAFlexGraphAlgorithm.cpp | 2 +-
.../dna_flexibility/src/DNAFlexGraphAlgorithm.h | 2 +-
src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp | 2 +-
src/plugins/dna_flexibility/src/DNAFlexPlugin.h | 2 +-
src/plugins/dna_flexibility/src/DNAFlexTask.cpp | 2 +-
src/plugins/dna_flexibility/src/DNAFlexTask.h | 2 +-
.../dna_flexibility/src/FindHighFlexRegions.cpp | 2 +-
.../dna_flexibility/src/FindHighFlexRegions.h | 2 +-
.../src/FindHighFlexRegionsAlgorithm.cpp | 2 +-
.../src/FindHighFlexRegionsAlgorithm.h | 2 +-
src/plugins/dna_flexibility/src/HighFlexResult.h | 2 +-
.../dna_flexibility/src/HighFlexSettings.cpp | 2 +-
src/plugins/dna_flexibility/src/HighFlexSettings.h | 2 +-
src/plugins/dna_flexibility/transl/russian.ts | 14 +-
src/plugins/dna_graphpack/src/BaseContentGraph.cpp | 2 +-
src/plugins/dna_graphpack/src/BaseContentGraph.h | 2 +-
src/plugins/dna_graphpack/src/CumulativeSkew.cpp | 2 +-
src/plugins/dna_graphpack/src/CumulativeSkew.h | 2 +-
.../dna_graphpack/src/DNAGraphPackPlugin.cpp | 2 +-
src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h | 2 +-
src/plugins/dna_graphpack/src/DeviationGraph.cpp | 2 +-
src/plugins/dna_graphpack/src/DeviationGraph.h | 2 +-
src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp | 2 +-
src/plugins/dna_graphpack/src/EntropyAlgorithm.h | 2 +-
src/plugins/dna_graphpack/src/GCFramePlot.cpp | 2 +-
src/plugins/dna_graphpack/src/GCFramePlot.h | 2 +-
.../src/KarlinSignatureDifferenceGraph.cpp | 2 +-
.../src/KarlinSignatureDifferenceGraph.h | 2 +-
.../dna_stat/src/DNAStatMSAProfileDialog.cpp | 4 +-
src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h | 2 +-
src/plugins/dna_stat/src/DNAStatPlugin.cpp | 2 +-
src/plugins/dna_stat/src/DNAStatPlugin.h | 2 +-
src/plugins/dna_stat/src/DNAStatProfileTask.cpp | 2 +-
src/plugins/dna_stat/src/DNAStatProfileTask.h | 2 +-
src/plugins/dna_stat/src/DNAStatsWindow.cpp | 2 +-
src/plugins/dna_stat/src/DNAStatsWindow.h | 2 +-
.../src/DistanceMatrixMSAProfileDialog.cpp | 4 +-
.../dna_stat/src/DistanceMatrixMSAProfileDialog.h | 2 +-
src/plugins/dna_stat/transl/english.ts | 7 +-
src/plugins/dna_stat/transl/russian.ts | 11 +-
src/plugins/dotplot/src/DotPlotClasses.cpp | 2 +-
src/plugins/dotplot/src/DotPlotClasses.h | 2 +-
src/plugins/dotplot/src/DotPlotDialog.cpp | 4 +-
src/plugins/dotplot/src/DotPlotDialog.h | 2 +-
src/plugins/dotplot/src/DotPlotFilesDialog.cpp | 4 +-
src/plugins/dotplot/src/DotPlotFilesDialog.h | 2 +-
src/plugins/dotplot/src/DotPlotFilterDialog.cpp | 4 +-
src/plugins/dotplot/src/DotPlotFilterDialog.h | 2 +-
src/plugins/dotplot/src/DotPlotImageExportTask.cpp | 2 +-
src/plugins/dotplot/src/DotPlotImageExportTask.h | 2 +-
src/plugins/dotplot/src/DotPlotPlugin.cpp | 2 +-
src/plugins/dotplot/src/DotPlotPlugin.h | 2 +-
src/plugins/dotplot/src/DotPlotSplitter.cpp | 2 +-
src/plugins/dotplot/src/DotPlotSplitter.h | 2 +-
src/plugins/dotplot/src/DotPlotTasks.cpp | 2 +-
src/plugins/dotplot/src/DotPlotTasks.h | 2 +-
src/plugins/dotplot/src/DotPlotWidget.cpp | 2 +-
src/plugins/dotplot/src/DotPlotWidget.h | 2 +-
src/plugins/dotplot/transl/russian.ts | 2 +-
src/plugins/enzymes/src/CloningUtilTasks.cpp | 2 +-
src/plugins/enzymes/src/CloningUtilTasks.h | 2 +-
.../enzymes/src/ConstructMoleculeDialog.cpp | 4 +-
src/plugins/enzymes/src/ConstructMoleculeDialog.h | 2 +-
src/plugins/enzymes/src/CreateFragmentDialog.cpp | 6 +-
src/plugins/enzymes/src/CreateFragmentDialog.h | 2 +-
src/plugins/enzymes/src/DNAFragment.cpp | 2 +-
src/plugins/enzymes/src/DNAFragment.h | 2 +-
src/plugins/enzymes/src/DigestSequenceDialog.cpp | 4 +-
src/plugins/enzymes/src/DigestSequenceDialog.h | 2 +-
src/plugins/enzymes/src/EditFragmentDialog.cpp | 4 +-
src/plugins/enzymes/src/EditFragmentDialog.h | 2 +-
src/plugins/enzymes/src/EnzymesIO.cpp | 2 +-
src/plugins/enzymes/src/EnzymesIO.h | 2 +-
src/plugins/enzymes/src/EnzymesPlugin.cpp | 2 +-
src/plugins/enzymes/src/EnzymesPlugin.h | 2 +-
src/plugins/enzymes/src/EnzymesQuery.cpp | 4 +-
src/plugins/enzymes/src/EnzymesQuery.h | 2 +-
src/plugins/enzymes/src/EnzymesTests.cpp | 2 +-
src/plugins/enzymes/src/EnzymesTests.h | 2 +-
src/plugins/enzymes/src/FindEnzymesAlgorithm.h | 2 +-
src/plugins/enzymes/src/FindEnzymesDialog.cpp | 4 +-
src/plugins/enzymes/src/FindEnzymesDialog.h | 2 +-
src/plugins/enzymes/src/FindEnzymesTask.cpp | 2 +-
src/plugins/enzymes/src/FindEnzymesTask.h | 2 +-
src/plugins/enzymes/transl/english.ts | 18 +-
src/plugins/enzymes/transl/russian.ts | 18 +-
.../src/ExpertDiscoveryAdvSetDialog.cpp | 4 +-
.../src/ExpertDiscoveryAdvSetDialog.h | 2 +-
.../src/ExpertDiscoveryControlDialog.cpp | 4 +-
.../src/ExpertDiscoveryControlDialog.h | 2 +-
.../src/ExpertDiscoveryControlMrkDialog.cpp | 4 +-
.../src/ExpertDiscoveryControlMrkDialog.h | 2 +-
.../expert_discovery/src/ExpertDiscoveryData.cpp | 2 +-
.../expert_discovery/src/ExpertDiscoveryData.h | 2 +-
.../src/ExpertDiscoveryExtSigWiz.cpp | 2 +-
.../src/ExpertDiscoveryExtSigWiz.h | 2 +-
.../expert_discovery/src/ExpertDiscoveryGraphs.cpp | 2 +-
.../expert_discovery/src/ExpertDiscoveryGraphs.h | 2 +-
.../src/ExpertDiscoveryPosNegDialog.cpp | 4 +-
.../src/ExpertDiscoveryPosNegDialog.h | 2 +-
.../src/ExpertDiscoveryPosNegMrkDialog.cpp | 4 +-
.../src/ExpertDiscoveryPosNegMrkDialog.h | 2 +-
.../src/ExpertDiscoverySearchDialogController.cpp | 4 +-
.../src/ExpertDiscoverySearchDialogController.h | 2 +-
.../src/ExpertDiscoverySetupRecBoundDialog.cpp | 4 +-
.../src/ExpertDiscoverySetupRecBoundDialog.h | 2 +-
.../expert_discovery/src/ExpertDiscoveryTask.cpp | 2 +-
.../expert_discovery/src/ExpertDiscoveryTask.h | 2 +-
.../src/ExpertDiscoveryTreeWidgetsCtrl.cpp | 2 +-
.../src/ExpertDiscoveryTreeWidgetsCtrl.h | 2 +-
.../expert_discovery/src/ExpertDiscoveryView.cpp | 2 +-
.../expert_discovery/src/ExpertDiscoveryView.h | 2 +-
.../src/ETSProjectViewItemsContoller.cpp | 2 +-
.../src/ETSProjectViewItemsContoller.h | 2 +-
.../src/ExternalToolManager.cpp | 2 +-
.../src/ExternalToolManager.h | 2 +-
.../src/ExternalToolSupportL10N.h | 2 +-
.../src/ExternalToolSupportPlugin.cpp | 2 +-
.../src/ExternalToolSupportPlugin.h | 2 +-
.../src/ExternalToolSupportSettings.cpp | 2 +-
.../src/ExternalToolSupportSettings.h | 2 +-
.../src/ExternalToolSupportSettingsController.cpp | 4 +-
.../src/ExternalToolSupportSettingsController.h | 2 +-
.../external_tool_support/src/R/RSupport.cpp | 2 +-
src/plugins/external_tool_support/src/R/RSupport.h | 2 +-
.../external_tool_support/src/RnaSeqCommon.cpp | 2 +-
.../external_tool_support/src/RnaSeqCommon.h | 2 +-
.../external_tool_support/src/TaskLocalStorage.cpp | 2 +-
.../external_tool_support/src/TaskLocalStorage.h | 2 +-
.../src/bedtools/BedToolsWorkersLibrary.cpp | 2 +-
.../src/bedtools/BedToolsWorkersLibrary.h | 2 +-
.../src/bedtools/BedtoolsIntersectTask.cpp | 2 +-
.../src/bedtools/BedtoolsIntersectTask.h | 2 +-
.../src/bedtools/BedtoolsSupport.cpp | 2 +-
.../src/bedtools/BedtoolsSupport.h | 2 +-
.../src/bedtools/BedtoolsSupportTask.cpp | 2 +-
.../src/bedtools/BedtoolsSupportTask.h | 2 +-
.../src/bigWigTools/BedGraphToBigWigTask.cpp | 2 +-
.../src/bigWigTools/BedGraphToBigWigTask.h | 2 +-
.../src/bigWigTools/BedGraphToBigWigWorker.cpp | 2 +-
.../src/bigWigTools/BedGraphToBigWigWorker.h | 2 +-
.../src/bigWigTools/BigWigSupport.cpp | 2 +-
.../src/bigWigTools/BigWigSupport.h | 2 +-
.../src/blast/BlastAllSupport.cpp | 2 +-
.../src/blast/BlastAllSupport.h | 2 +-
.../src/blast/BlastAllSupportRunDialog.cpp | 2 +-
.../src/blast/BlastAllSupportRunDialog.h | 2 +-
.../src/blast/BlastAllSupportTask.cpp | 2 +-
.../src/blast/BlastAllSupportTask.h | 2 +-
.../src/blast/BlastAllWorker.cpp | 2 +-
.../src/blast/BlastAllWorker.h | 2 +-
.../src/blast/FormatDBSupport.cpp | 2 +-
.../src/blast/FormatDBSupport.h | 2 +-
.../src/blast/FormatDBSupportRunDialog.cpp | 4 +-
.../src/blast/FormatDBSupportRunDialog.h | 2 +-
.../src/blast/FormatDBSupportTask.cpp | 2 +-
.../src/blast/FormatDBSupportTask.h | 2 +-
.../src/blast_plus/BlastDBCmdDialog.cpp | 4 +-
.../src/blast_plus/BlastDBCmdDialog.h | 2 +-
.../src/blast_plus/BlastDBCmdSupport.cpp | 2 +-
.../src/blast_plus/BlastDBCmdSupport.h | 2 +-
.../src/blast_plus/BlastDBCmdSupportTask.cpp | 2 +-
.../src/blast_plus/BlastDBCmdSupportTask.h | 2 +-
.../src/blast_plus/BlastNPlusSupportTask.cpp | 2 +-
.../src/blast_plus/BlastNPlusSupportTask.h | 2 +-
.../src/blast_plus/BlastPPlusSupportTask.cpp | 2 +-
.../src/blast_plus/BlastPPlusSupportTask.h | 2 +-
.../src/blast_plus/BlastPlusSupport.cpp | 2 +-
.../src/blast_plus/BlastPlusSupport.h | 2 +-
.../src/blast_plus/BlastPlusSupportCommonTask.cpp | 2 +-
.../src/blast_plus/BlastPlusSupportCommonTask.h | 2 +-
.../src/blast_plus/BlastPlusSupportRunDialog.cpp | 2 +-
.../src/blast_plus/BlastPlusSupportRunDialog.h | 2 +-
.../src/blast_plus/BlastPlusWorker.cpp | 2 +-
.../src/blast_plus/BlastPlusWorker.h | 2 +-
.../src/blast_plus/BlastXPlusSupportTask.cpp | 2 +-
.../src/blast_plus/BlastXPlusSupportTask.h | 2 +-
.../src/blast_plus/RPSBlastSupportTask.cpp | 2 +-
.../src/blast_plus/RPSBlastSupportTask.h | 2 +-
.../src/blast_plus/TBlastNPlusSupportTask.cpp | 2 +-
.../src/blast_plus/TBlastNPlusSupportTask.h | 2 +-
.../src/blast_plus/TBlastXPlusSupportTask.cpp | 2 +-
.../src/blast_plus/TBlastXPlusSupportTask.h | 2 +-
.../src/bowtie/BowtieSettingsWidget.cpp | 2 +-
.../src/bowtie/BowtieSettingsWidget.h | 2 +-
.../src/bowtie/BowtieSupport.cpp | 2 +-
.../src/bowtie/BowtieSupport.h | 2 +-
.../src/bowtie/BowtieTask.cpp | 2 +-
.../external_tool_support/src/bowtie/BowtieTask.h | 2 +-
.../src/bowtie/BowtieWorker.cpp | 2 +-
.../src/bowtie/BowtieWorker.h | 2 +-
.../src/bowtie/bowtie_tests/bowtieTests.cpp | 2 +-
.../src/bowtie/bowtie_tests/bowtieTests.h | 2 +-
.../src/bowtie2/Bowtie2SettingsWidget.cpp | 2 +-
.../src/bowtie2/Bowtie2SettingsWidget.h | 2 +-
.../src/bowtie2/Bowtie2Support.cpp | 2 +-
.../src/bowtie2/Bowtie2Support.h | 2 +-
.../src/bowtie2/Bowtie2Task.cpp | 2 +-
.../src/bowtie2/Bowtie2Task.h | 2 +-
.../src/bowtie2/Bowtie2Worker.cpp | 2 +-
.../src/bowtie2/Bowtie2Worker.h | 2 +-
.../external_tool_support/src/bwa/BwaMemWorker.cpp | 2 +-
.../external_tool_support/src/bwa/BwaMemWorker.h | 2 +-
.../src/bwa/BwaSettingsWidget.cpp | 2 +-
.../src/bwa/BwaSettingsWidget.h | 2 +-
.../external_tool_support/src/bwa/BwaSupport.cpp | 2 +-
.../external_tool_support/src/bwa/BwaSupport.h | 2 +-
.../external_tool_support/src/bwa/BwaTask.cpp | 2 +-
.../external_tool_support/src/bwa/BwaTask.h | 2 +-
.../external_tool_support/src/bwa/BwaWorker.cpp | 2 +-
.../external_tool_support/src/bwa/BwaWorker.h | 2 +-
.../src/bwa/bwa_tests/bwaTests.cpp | 2 +-
.../src/bwa/bwa_tests/bwaTests.h | 2 +-
.../external_tool_support/src/cap3/CAP3Support.cpp | 2 +-
.../external_tool_support/src/cap3/CAP3Support.h | 2 +-
.../src/cap3/CAP3SupportDialog.cpp | 4 +-
.../src/cap3/CAP3SupportDialog.h | 2 +-
.../src/cap3/CAP3SupportTask.cpp | 2 +-
.../src/cap3/CAP3SupportTask.h | 2 +-
.../external_tool_support/src/cap3/CAP3Worker.cpp | 2 +-
.../external_tool_support/src/cap3/CAP3Worker.h | 2 +-
.../src/ceas/CEASReportWorker.cpp | 2 +-
.../src/ceas/CEASReportWorker.h | 2 +-
.../src/ceas/CEASSettings.cpp | 2 +-
.../external_tool_support/src/ceas/CEASSettings.h | 2 +-
.../external_tool_support/src/ceas/CEASSupport.cpp | 2 +-
.../external_tool_support/src/ceas/CEASSupport.h | 2 +-
.../src/ceas/CEASSupportTask.cpp | 2 +-
.../src/ceas/CEASSupportTask.h | 2 +-
.../src/clustalo/ClustalOSupport.cpp | 2 +-
.../src/clustalo/ClustalOSupport.h | 2 +-
.../src/clustalo/ClustalOSupportRunDialog.cpp | 6 +-
.../src/clustalo/ClustalOSupportRunDialog.h | 2 +-
.../src/clustalo/ClustalOSupportTask.cpp | 2 +-
.../src/clustalo/ClustalOSupportTask.h | 2 +-
.../src/clustalo/ClustalOWorker.cpp | 2 +-
.../src/clustalo/ClustalOWorker.h | 2 +-
.../src/clustalw/ClustalWSupport.cpp | 2 +-
.../src/clustalw/ClustalWSupport.h | 2 +-
.../src/clustalw/ClustalWSupportRunDialog.cpp | 6 +-
.../src/clustalw/ClustalWSupportRunDialog.h | 2 +-
.../src/clustalw/ClustalWSupportTask.cpp | 2 +-
.../src/clustalw/ClustalWSupportTask.h | 2 +-
.../src/clustalw/ClustalWWorker.cpp | 2 +-
.../src/clustalw/ClustalWWorker.h | 2 +-
.../src/conduct_go/ConductGOSettings.cpp | 2 +-
.../src/conduct_go/ConductGOSettings.h | 2 +-
.../src/conduct_go/ConductGOSupport.cpp | 4 +-
.../src/conduct_go/ConductGOSupport.h | 2 +-
.../src/conduct_go/ConductGOTask.cpp | 2 +-
.../src/conduct_go/ConductGOTask.h | 2 +-
.../src/conduct_go/ConductGOWorker.cpp | 2 +-
.../src/conduct_go/ConductGOWorker.h | 2 +-
.../conservation_plot/ConservationPlotSettings.cpp | 2 +-
.../conservation_plot/ConservationPlotSettings.h | 2 +-
.../conservation_plot/ConservationPlotSupport.cpp | 2 +-
.../conservation_plot/ConservationPlotSupport.h | 2 +-
.../src/conservation_plot/ConservationPlotTask.cpp | 2 +-
.../src/conservation_plot/ConservationPlotTask.h | 2 +-
.../conservation_plot/ConservationPlotWorker.cpp | 2 +-
.../src/conservation_plot/ConservationPlotWorker.h | 2 +-
.../src/cufflinks/CuffdiffSupportTask.cpp | 2 +-
.../src/cufflinks/CuffdiffSupportTask.h | 2 +-
.../src/cufflinks/CuffdiffWorker.cpp | 2 +-
.../src/cufflinks/CuffdiffWorker.h | 2 +-
.../src/cufflinks/CufflinksSettings.cpp | 2 +-
.../src/cufflinks/CufflinksSettings.h | 2 +-
.../src/cufflinks/CufflinksSupport.cpp | 2 +-
.../src/cufflinks/CufflinksSupport.h | 2 +-
.../src/cufflinks/CufflinksSupportTask.cpp | 2 +-
.../src/cufflinks/CufflinksSupportTask.h | 2 +-
.../src/cufflinks/CufflinksWorker.cpp | 2 +-
.../src/cufflinks/CufflinksWorker.h | 2 +-
.../src/cufflinks/CuffmergeSupportTask.cpp | 2 +-
.../src/cufflinks/CuffmergeSupportTask.h | 2 +-
.../src/cufflinks/CuffmergeWorker.cpp | 2 +-
.../src/cufflinks/CuffmergeWorker.h | 2 +-
.../src/cufflinks/GffreadSupportTask.cpp | 2 +-
.../src/cufflinks/GffreadSupportTask.h | 2 +-
.../src/cufflinks/GffreadWorker.cpp | 2 +-
.../src/cufflinks/GffreadWorker.h | 2 +-
.../src/cutadapt/CutadaptSupport.cpp | 2 +-
.../src/cutadapt/CutadaptSupport.h | 2 +-
.../src/cutadapt/CutadaptWorker.cpp | 2 +-
.../src/cutadapt/CutadaptWorker.h | 2 +-
.../src/fastqc/FastqcSupport.cpp | 2 +-
.../src/fastqc/FastqcSupport.h | 2 +-
.../src/fastqc/FastqcTask.cpp | 2 +-
.../external_tool_support/src/fastqc/FastqcTask.h | 2 +-
.../src/fastqc/FastqcWorker.cpp | 2 +-
.../src/fastqc/FastqcWorker.h | 2 +-
.../external_tool_support/src/java/JavaSupport.cpp | 2 +-
.../external_tool_support/src/java/JavaSupport.h | 2 +-
.../src/macs/MACSSettings.cpp | 2 +-
.../external_tool_support/src/macs/MACSSettings.h | 2 +-
.../external_tool_support/src/macs/MACSSupport.cpp | 2 +-
.../external_tool_support/src/macs/MACSSupport.h | 2 +-
.../external_tool_support/src/macs/MACSTask.cpp | 2 +-
.../external_tool_support/src/macs/MACSTask.h | 2 +-
.../external_tool_support/src/macs/MACSWorker.cpp | 2 +-
.../external_tool_support/src/macs/MACSWorker.h | 2 +-
.../src/mafft/MAFFTSupport.cpp | 2 +-
.../external_tool_support/src/mafft/MAFFTSupport.h | 2 +-
.../src/mafft/MAFFTSupportRunDialog.cpp | 6 +-
.../src/mafft/MAFFTSupportRunDialog.h | 2 +-
.../src/mafft/MAFFTSupportTask.cpp | 2 +-
.../src/mafft/MAFFTSupportTask.h | 2 +-
.../src/mafft/MAFFTWorker.cpp | 2 +-
.../external_tool_support/src/mafft/MAFFTWorker.h | 2 +-
.../src/mafft/MafftAddToAlignmentTask.cpp | 2 +-
.../src/mafft/MafftAddToAlignmentTask.h | 2 +-
.../src/mrbayes/MrBayesDialogWidget.cpp | 56 +-
.../src/mrbayes/MrBayesDialogWidget.h | 2 +-
.../src/mrbayes/MrBayesSupport.cpp | 2 +-
.../src/mrbayes/MrBayesSupport.h | 2 +-
.../src/mrbayes/MrBayesTask.cpp | 2 +-
.../src/mrbayes/MrBayesTask.h | 2 +-
.../src/mrbayes/MrBayesTests.cpp | 2 +-
.../src/mrbayes/MrBayesTests.h | 2 +-
.../src/peak2gene/Gene2PeakFormatLoader.cpp | 2 +-
.../src/peak2gene/Gene2PeakFormatLoader.h | 2 +-
.../src/peak2gene/Peak2GeneFormatLoader.cpp | 2 +-
.../src/peak2gene/Peak2GeneFormatLoader.h | 2 +-
.../src/peak2gene/Peak2GeneSettings.cpp | 2 +-
.../src/peak2gene/Peak2GeneSettings.h | 2 +-
.../src/peak2gene/Peak2GeneSupport.cpp | 2 +-
.../src/peak2gene/Peak2GeneSupport.h | 2 +-
.../src/peak2gene/Peak2GeneTask.cpp | 2 +-
.../src/peak2gene/Peak2GeneTask.h | 2 +-
.../src/peak2gene/Peak2GeneWorker.cpp | 2 +-
.../src/peak2gene/Peak2GeneWorker.h | 2 +-
.../src/peak2gene/TabulatedFormatReader.cpp | 2 +-
.../src/peak2gene/TabulatedFormatReader.h | 2 +-
.../external_tool_support/src/perl/PerlSupport.cpp | 2 +-
.../external_tool_support/src/perl/PerlSupport.h | 2 +-
.../src/phyml/PhyMLDialogWidget.cpp | 38 +-
.../src/phyml/PhyMLDialogWidget.h | 2 +-
.../src/phyml/PhyMLSupport.cpp | 2 +-
.../external_tool_support/src/phyml/PhyMLSupport.h | 2 +-
.../external_tool_support/src/phyml/PhyMLTask.cpp | 2 +-
.../external_tool_support/src/phyml/PhyMLTask.h | 2 +-
.../external_tool_support/src/phyml/PhyMLTests.cpp | 2 +-
.../external_tool_support/src/phyml/PhyMLTests.h | 2 +-
.../src/python/PythonSupport.cpp | 2 +-
.../src/python/PythonSupport.h | 2 +-
.../src/samtools/BcfToolsSupport.cpp | 2 +-
.../src/samtools/BcfToolsSupport.h | 2 +-
.../src/samtools/SamToolsExtToolSupport.cpp | 2 +-
.../src/samtools/SamToolsExtToolSupport.h | 2 +-
.../src/samtools/TabixSupport.cpp | 2 +-
.../src/samtools/TabixSupport.h | 2 +-
.../src/samtools/TabixSupportTask.cpp | 2 +-
.../src/samtools/TabixSupportTask.h | 2 +-
.../src/seqpos/SeqPosSettings.cpp | 2 +-
.../src/seqpos/SeqPosSettings.h | 2 +-
.../src/seqpos/SeqPosSupport.cpp | 2 +-
.../src/seqpos/SeqPosSupport.h | 2 +-
.../src/seqpos/SeqPosTask.cpp | 2 +-
.../external_tool_support/src/seqpos/SeqPosTask.h | 2 +-
.../src/seqpos/SeqPosWorker.cpp | 2 +-
.../src/seqpos/SeqPosWorker.h | 2 +-
.../src/snpeff/SnpEffSupport.cpp | 47 +-
.../src/snpeff/SnpEffSupport.h | 2 +-
.../src/snpeff/SnpEffTask.cpp | 122 +-
.../external_tool_support/src/snpeff/SnpEffTask.h | 2 +-
.../src/snpeff/SnpEffWorker.cpp | 10 +-
.../src/snpeff/SnpEffWorker.h | 2 +-
.../src/spades/SpadesSettingsWidget.cpp | 2 +-
.../src/spades/SpadesSettingsWidget.h | 2 +-
.../src/spades/SpadesSupport.cpp | 2 +-
.../src/spades/SpadesSupport.h | 2 +-
.../src/spades/SpadesTask.cpp | 2 +-
.../external_tool_support/src/spades/SpadesTask.h | 2 +-
.../src/spades/SpadesWorker.cpp | 2 +-
.../src/spades/SpadesWorker.h | 2 +-
.../src/spidey/SpideySupport.cpp | 2 +-
.../src/spidey/SpideySupport.h | 2 +-
.../src/spidey/SpideySupportTask.cpp | 2 +-
.../src/spidey/SpideySupportTask.h | 2 +-
.../src/tcoffee/TCoffeeSupport.cpp | 2 +-
.../src/tcoffee/TCoffeeSupport.h | 2 +-
.../src/tcoffee/TCoffeeSupportRunDialog.cpp | 6 +-
.../src/tcoffee/TCoffeeSupportRunDialog.h | 2 +-
.../src/tcoffee/TCoffeeSupportTask.cpp | 2 +-
.../src/tcoffee/TCoffeeSupportTask.h | 2 +-
.../src/tcoffee/TCoffeeWorker.cpp | 2 +-
.../src/tcoffee/TCoffeeWorker.h | 2 +-
.../src/tophat/TopHatSettings.cpp | 2 +-
.../src/tophat/TopHatSettings.h | 2 +-
.../src/tophat/TopHatSupport.cpp | 2 +-
.../src/tophat/TopHatSupport.h | 2 +-
.../src/tophat/TopHatSupportTask.cpp | 2 +-
.../src/tophat/TopHatSupportTask.h | 2 +-
.../src/tophat/TopHatWorker.cpp | 2 +-
.../src/tophat/TopHatWorker.h | 2 +-
.../src/utils/AlignMsaAction.cpp | 2 +-
.../src/utils/AlignMsaAction.h | 2 +-
.../src/utils/BaseShortReadsAlignerWorker.cpp | 2 +-
.../src/utils/BaseShortReadsAlignerWorker.h | 2 +-
.../src/utils/BlastDBSelectorWidgetController.cpp | 2 +-
.../src/utils/BlastDBSelectorWidgetController.h | 2 +-
.../src/utils/BlastRunCommonDialog.cpp | 4 +-
.../src/utils/BlastRunCommonDialog.h | 2 +-
.../src/utils/BlastTaskSettings.cpp | 2 +-
.../src/utils/BlastTaskSettings.h | 2 +-
.../src/utils/CistromeDelegate.cpp | 2 +-
.../src/utils/CistromeDelegate.h | 2 +-
.../src/utils/ExportTasks.cpp | 2 +-
.../external_tool_support/src/utils/ExportTasks.h | 2 +-
.../src/utils/ExternalToolSearchTask.cpp | 2 +-
.../src/utils/ExternalToolSearchTask.h | 2 +-
.../src/utils/ExternalToolSupportAction.cpp | 2 +-
.../src/utils/ExternalToolSupportAction.h | 2 +-
.../src/utils/ExternalToolUtils.cpp | 2 +-
.../src/utils/ExternalToolUtils.h | 2 +-
.../src/utils/ExternalToolValidateTask.cpp | 2 +-
.../src/utils/ExternalToolValidateTask.h | 2 +-
.../src/vcftools/VcfConsensusSupport.cpp | 2 +-
.../src/vcftools/VcfConsensusSupport.h | 2 +-
.../src/vcftools/VcfConsensusSupportTask.cpp | 2 +-
.../src/vcftools/VcfConsensusSupportTask.h | 2 +-
.../src/vcftools/VcfConsensusWorker.cpp | 4 +-
.../src/vcftools/VcfConsensusWorker.h | 2 +-
.../src/vcfutils/VcfutilsSupport.cpp | 2 +-
.../src/vcfutils/VcfutilsSupport.h | 2 +-
.../external_tool_support/transl/english.ts | 147 +-
.../external_tool_support/transl/russian.ts | 311 ++-
.../src/BuildSArraySettingsWidget.cpp | 2 +-
.../genome_aligner/src/BuildSArraySettingsWidget.h | 2 +-
src/plugins/genome_aligner/src/DataBunch.cpp | 2 +-
src/plugins/genome_aligner/src/DataBunch.h | 2 +-
.../src/GenomeAlignerCMDLineTask.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerCMDLineTask.h | 2 +-
.../genome_aligner/src/GenomeAlignerFindTask.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerFindTask.h | 2 +-
src/plugins/genome_aligner/src/GenomeAlignerIO.cpp | 2 +-
src/plugins/genome_aligner/src/GenomeAlignerIO.h | 2 +-
.../genome_aligner/src/GenomeAlignerIndex.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerIndex.h | 2 +-
.../genome_aligner/src/GenomeAlignerIndexPart.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerIndexPart.h | 2 +-
.../genome_aligner/src/GenomeAlignerIndexTask.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerIndexTask.h | 2 +-
.../src/GenomeAlignerIndexWorker.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerIndexWorker.h | 2 +-
.../genome_aligner/src/GenomeAlignerPlugin.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerPlugin.h | 2 +-
.../src/GenomeAlignerSearchQuery.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerSearchQuery.h | 2 +-
.../src/GenomeAlignerSettingsController.cpp | 4 +-
.../src/GenomeAlignerSettingsController.h | 2 +-
.../src/GenomeAlignerSettingsWidget.cpp | 2 +-
.../src/GenomeAlignerSettingsWidget.h | 2 +-
.../genome_aligner/src/GenomeAlignerTask.cpp | 2 +-
src/plugins/genome_aligner/src/GenomeAlignerTask.h | 2 +-
.../genome_aligner/src/GenomeAlignerWorker.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerWorker.h | 2 +-
.../genome_aligner/src/GenomeAlignerWriteTask.cpp | 2 +-
.../genome_aligner/src/GenomeAlignerWriteTask.h | 2 +-
.../genome_aligner/src/ReadShortReadsSubTask.cpp | 2 +-
.../genome_aligner/src/ReadShortReadsSubTask.h | 2 +-
.../src/WriteAlignedReadsSubTask.cpp | 2 +-
.../genome_aligner/src/WriteAlignedReadsSubTask.h | 2 +-
.../linkdata_support/src/LinkDataScriptLibrary.cpp | 2 +-
.../linkdata_support/src/LinkDataScriptLibrary.h | 2 +-
.../linkdata_support/src/LinkDataSupportPlugin.cpp | 2 +-
.../linkdata_support/src/LinkDataSupportPlugin.h | 2 +-
.../opencl_support/src/OpenCLSupportPlugin.cpp | 2 +-
.../opencl_support/src/OpenCLSupportPlugin.h | 2 +-
.../src/OpenCLSupportSettingsController.cpp | 4 +-
.../src/OpenCLSupportSettingsController.h | 2 +-
src/plugins/opencl_support/transl/english.ts | 14 +-
src/plugins/opencl_support/transl/russian.ts | 14 +-
src/plugins/orf_marker/src/ORFDialog.cpp | 4 +-
src/plugins/orf_marker/src/ORFDialog.h | 2 +-
src/plugins/orf_marker/src/ORFMarkerPlugin.cpp | 2 +-
src/plugins/orf_marker/src/ORFMarkerPlugin.h | 2 +-
src/plugins/orf_marker/src/ORFMarkerTask.cpp | 2 +-
src/plugins/orf_marker/src/ORFMarkerTask.h | 2 +-
src/plugins/orf_marker/src/ORFMarkerTests.cpp | 2 +-
src/plugins/orf_marker/src/ORFMarkerTests.h | 2 +-
src/plugins/orf_marker/src/ORFQuery.cpp | 2 +-
src/plugins/orf_marker/src/ORFQuery.h | 2 +-
src/plugins/orf_marker/src/ORFWorker.cpp | 2 +-
src/plugins/orf_marker/src/ORFWorker.h | 2 +-
src/plugins/pcr/src/EditPrimerDialog.cpp | 4 +-
src/plugins/pcr/src/EditPrimerDialog.h | 2 +-
src/plugins/pcr/src/ExtractProductTask.cpp | 2 +-
src/plugins/pcr/src/ExtractProductTask.h | 2 +-
src/plugins/pcr/src/FindPrimerPairsWorker.cpp | 2 +-
src/plugins/pcr/src/FindPrimerPairsWorker.h | 2 +-
src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp | 4 +-
src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h | 2 +-
.../pcr/src/InSilicoPcrOptionPanelWidget.cpp | 2 +-
src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h | 2 +-
src/plugins/pcr/src/InSilicoPcrProductsTable.cpp | 2 +-
src/plugins/pcr/src/InSilicoPcrProductsTable.h | 2 +-
src/plugins/pcr/src/InSilicoPcrTask.cpp | 2 +-
src/plugins/pcr/src/InSilicoPcrTask.h | 2 +-
src/plugins/pcr/src/InSilicoPcrWorker.cpp | 2 +-
src/plugins/pcr/src/InSilicoPcrWorker.h | 2 +-
src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp | 2 +-
src/plugins/pcr/src/InSilicoPcrWorkflowTask.h | 2 +-
src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp | 2 +-
src/plugins/pcr/src/PcrOptionsPanelSavableTab.h | 2 +-
src/plugins/pcr/src/PcrPlugin.cpp | 2 +-
src/plugins/pcr/src/PcrPlugin.h | 2 +-
src/plugins/pcr/src/Primer.cpp | 2 +-
src/plugins/pcr/src/Primer.h | 2 +-
src/plugins/pcr/src/PrimerDimersFinder.cpp | 2 +-
src/plugins/pcr/src/PrimerDimersFinder.h | 2 +-
src/plugins/pcr/src/PrimerGroupBox.cpp | 2 +-
src/plugins/pcr/src/PrimerGroupBox.h | 2 +-
src/plugins/pcr/src/PrimerLibrary.cpp | 2 +-
src/plugins/pcr/src/PrimerLibrary.h | 2 +-
src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp | 2 +-
src/plugins/pcr/src/PrimerLibraryMdiWindow.h | 2 +-
src/plugins/pcr/src/PrimerLibrarySelector.cpp | 4 +-
src/plugins/pcr/src/PrimerLibrarySelector.h | 2 +-
src/plugins/pcr/src/PrimerLibraryTable.cpp | 2 +-
src/plugins/pcr/src/PrimerLibraryTable.h | 2 +-
.../pcr/src/PrimerLibraryTableController.cpp | 2 +-
src/plugins/pcr/src/PrimerLibraryTableController.h | 2 +-
src/plugins/pcr/src/PrimerLibraryWidget.cpp | 4 +-
src/plugins/pcr/src/PrimerLibraryWidget.h | 2 +-
src/plugins/pcr/src/PrimerLineEdit.cpp | 2 +-
src/plugins/pcr/src/PrimerLineEdit.h | 2 +-
src/plugins/pcr/src/PrimerStatistics.cpp | 2 +-
src/plugins/pcr/src/PrimerStatistics.h | 2 +-
src/plugins/pcr/src/PrimersDetailsDialog.cpp | 4 +-
src/plugins/pcr/src/PrimersDetailsDialog.h | 2 +-
src/plugins/pcr/src/PrimersGrouperWorker.cpp | 2 +-
src/plugins/pcr/src/PrimersGrouperWorker.h | 2 +-
src/plugins/pcr/src/export/ExportPrimersDialog.cpp | 4 +-
src/plugins/pcr/src/export/ExportPrimersDialog.h | 2 +-
.../pcr/src/export/ExportPrimersToDatabaseTask.cpp | 2 +-
.../pcr/src/export/ExportPrimersToDatabaseTask.h | 2 +-
.../src/export/ExportPrimersToLocalFileTask.cpp | 2 +-
.../pcr/src/export/ExportPrimersToLocalFileTask.h | 2 +-
.../pcr/src/import/ImportPrimerFromObjectTask.cpp | 2 +-
.../pcr/src/import/ImportPrimerFromObjectTask.h | 2 +-
src/plugins/pcr/src/import/ImportPrimersDialog.cpp | 4 +-
src/plugins/pcr/src/import/ImportPrimersDialog.h | 2 +-
.../pcr/src/import/ImportPrimersFromFileTask.cpp | 2 +-
.../pcr/src/import/ImportPrimersFromFileTask.h | 2 +-
.../pcr/src/import/ImportPrimersFromFolderTask.cpp | 2 +-
.../pcr/src/import/ImportPrimersFromFolderTask.h | 2 +-
.../pcr/src/import/ImportPrimersMultiTask.cpp | 2 +-
.../pcr/src/import/ImportPrimersMultiTask.h | 2 +-
src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp | 2 +-
src/plugins/perf_monitor/src/PerfMonitorPlugin.h | 2 +-
src/plugins/perf_monitor/src/PerfMonitorView.cpp | 2 +-
src/plugins/perf_monitor/src/PerfMonitorView.h | 2 +-
src/plugins/query_designer/src/QDDocument.cpp | 2 +-
src/plugins/query_designer/src/QDDocument.h | 2 +-
.../query_designer/src/QDDocumentFormat.cpp | 2 +-
src/plugins/query_designer/src/QDDocumentFormat.h | 2 +-
src/plugins/query_designer/src/QDGroupsEditor.cpp | 2 +-
src/plugins/query_designer/src/QDGroupsEditor.h | 2 +-
src/plugins/query_designer/src/QDRunDialog.cpp | 6 +-
src/plugins/query_designer/src/QDRunDialog.h | 2 +-
src/plugins/query_designer/src/QDSamples.cpp | 2 +-
src/plugins/query_designer/src/QDSamples.h | 2 +-
src/plugins/query_designer/src/QDSceneIOTasks.cpp | 2 +-
src/plugins/query_designer/src/QDSceneIOTasks.h | 2 +-
src/plugins/query_designer/src/QDTests.cpp | 2 +-
src/plugins/query_designer/src/QDTests.h | 2 +-
src/plugins/query_designer/src/QDWorker.cpp | 2 +-
src/plugins/query_designer/src/QDWorker.h | 2 +-
.../query_designer/src/QueryDesignerPlugin.cpp | 2 +-
.../query_designer/src/QueryDesignerPlugin.h | 2 +-
src/plugins/query_designer/src/QueryEditor.cpp | 2 +-
src/plugins/query_designer/src/QueryEditor.h | 2 +-
src/plugins/query_designer/src/QueryPalette.cpp | 2 +-
src/plugins/query_designer/src/QueryPalette.h | 2 +-
.../query_designer/src/QueryProcCfgDelegate.h | 2 +-
src/plugins/query_designer/src/QueryProcCfgModel.h | 2 +-
.../query_designer/src/QueryViewAdapter.cpp | 2 +-
src/plugins/query_designer/src/QueryViewAdapter.h | 2 +-
.../query_designer/src/QueryViewController.cpp | 4 +-
.../query_designer/src/QueryViewController.h | 2 +-
src/plugins/query_designer/src/QueryViewItems.cpp | 2 +-
src/plugins/query_designer/src/QueryViewItems.h | 2 +-
.../query_designer/src/library/QDFindActor.cpp | 2 +-
.../query_designer/src/library/QDFindActor.h | 2 +-
.../src/library/QDFindPolyRegionsActor.cpp | 2 +-
.../src/library/QDFindPolyRegionsActor.h | 2 +-
.../src/library/QDGcContentActor.cpp | 2 +-
.../query_designer/src/library/QDGcContentActor.h | 2 +-
src/plugins/remote_blast/src/BlastQuery.cpp | 2 +-
src/plugins/remote_blast/src/BlastQuery.h | 2 +-
src/plugins/remote_blast/src/DBRequestFactory.h | 2 +-
src/plugins/remote_blast/src/HttpRequest.h | 2 +-
src/plugins/remote_blast/src/HttpRequestBLAST.cpp | 2 +-
src/plugins/remote_blast/src/RemoteBLASTConsts.cpp | 2 +-
src/plugins/remote_blast/src/RemoteBLASTConsts.h | 2 +-
src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp | 2 +-
src/plugins/remote_blast/src/RemoteBLASTPlugin.h | 2 +-
.../remote_blast/src/RemoteBLASTPluginTests.cpp | 2 +-
.../remote_blast/src/RemoteBLASTPluginTests.h | 2 +-
src/plugins/remote_blast/src/RemoteBLASTTask.cpp | 2 +-
src/plugins/remote_blast/src/RemoteBLASTTask.h | 2 +-
src/plugins/remote_blast/src/RemoteBLASTWorker.cpp | 2 +-
src/plugins/remote_blast/src/RemoteBLASTWorker.h | 2 +-
.../remote_blast/src/SendSelectionDialog.cpp | 4 +-
src/plugins/remote_blast/src/SendSelectionDialog.h | 2 +-
src/plugins/remote_blast/transl/english.ts | 26 +-
src/plugins/remote_blast/transl/russian.ts | 34 +-
src/plugins/remote_service/src/Base64File.cpp | 2 +-
src/plugins/remote_service/src/Base64File.h | 2 +-
.../remote_service/src/BufferedDataReader.cpp | 2 +-
.../remote_service/src/BufferedDataReader.h | 2 +-
.../remote_service/src/RemoteServiceMachine.cpp | 2 +-
.../remote_service/src/RemoteServiceMachine.h | 2 +-
.../remote_service/src/RemoteServicePingTask.cpp | 2 +-
.../remote_service/src/RemoteServicePingTask.h | 2 +-
.../remote_service/src/RemoteServicePlugin.cpp | 2 +-
.../remote_service/src/RemoteServicePlugin.h | 2 +-
.../remote_service/src/RemoteServiceSettingsUI.cpp | 2 +-
.../remote_service/src/RemoteServiceSettingsUI.h | 2 +-
.../remote_service/src/RemoteServiceUtilTasks.cpp | 2 +-
.../remote_service/src/RemoteServiceUtilTasks.h | 2 +-
.../remote_service/src/RemoteTasksDialog.cpp | 4 +-
src/plugins/remote_service/src/RemoteTasksDialog.h | 2 +-
.../remote_service/src/UctpRequestBuilders.cpp | 2 +-
.../remote_service/src/UctpRequestBuilders.h | 2 +-
.../remote_service/src/WebTransportProtocol.cpp | 2 +-
.../remote_service/src/WebTransportProtocol.h | 2 +-
src/plugins/remote_service/src/base64/cdecode.c | 2 +-
src/plugins/remote_service/src/base64/cencode.c | 2 +-
.../repeat_finder/src/FindRepeatsDialog.cpp | 6 +-
src/plugins/repeat_finder/src/FindRepeatsDialog.h | 2 +-
src/plugins/repeat_finder/src/FindRepeatsTask.cpp | 2 +-
src/plugins/repeat_finder/src/FindRepeatsTask.h | 2 +-
.../repeat_finder/src/FindTandemsDialog.cpp | 4 +-
src/plugins/repeat_finder/src/FindTandemsDialog.h | 2 +-
src/plugins/repeat_finder/src/RFBase.cpp | 2 +-
src/plugins/repeat_finder/src/RFBase.h | 2 +-
src/plugins/repeat_finder/src/RFConstants.h | 2 +-
src/plugins/repeat_finder/src/RFDiagonal.cpp | 2 +-
src/plugins/repeat_finder/src/RFDiagonal.h | 2 +-
src/plugins/repeat_finder/src/RFSArray.cpp | 2 +-
src/plugins/repeat_finder/src/RFSArray.h | 2 +-
src/plugins/repeat_finder/src/RFSArrayWK.cpp | 2 +-
src/plugins/repeat_finder/src/RFSArrayWK.h | 2 +-
src/plugins/repeat_finder/src/RFTaskFactory.cpp | 2 +-
src/plugins/repeat_finder/src/RFTaskFactory.h | 2 +-
src/plugins/repeat_finder/src/RF_BitMask.h | 2 +-
.../repeat_finder/src/RF_SArray_TandemFinder.cpp | 2 +-
.../repeat_finder/src/RF_SArray_TandemFinder.h | 2 +-
src/plugins/repeat_finder/src/RF_SuffixArray.cpp | 2 +-
src/plugins/repeat_finder/src/RF_SuffixArray.h | 2 +-
.../repeat_finder/src/RepeatFinderPlugin.cpp | 2 +-
src/plugins/repeat_finder/src/RepeatFinderPlugin.h | 2 +-
.../repeat_finder/src/RepeatFinderTests.cpp | 2 +-
src/plugins/repeat_finder/src/RepeatFinderTests.h | 2 +-
src/plugins/repeat_finder/src/RepeatQuery.cpp | 2 +-
src/plugins/repeat_finder/src/RepeatQuery.h | 2 +-
src/plugins/repeat_finder/src/RepeatWorker.cpp | 2 +-
src/plugins/repeat_finder/src/RepeatWorker.h | 2 +-
src/plugins/repeat_finder/src/TandemQuery.cpp | 2 +-
src/plugins/repeat_finder/src/TandemQuery.h | 2 +-
src/plugins/repeat_finder/transl/english.ts | 39 +-
src/plugins/repeat_finder/transl/russian.ts | 39 +-
.../smith_waterman/src/PairAlignSequences.cpp | 2 +-
.../smith_waterman/src/PairAlignSequences.h | 2 +-
.../PairwiseAlignmentSmithWatermanGUIExtension.cpp | 2 +-
.../PairwiseAlignmentSmithWatermanGUIExtension.h | 2 +-
.../smith_waterman/src/SWAlgorithmPlugin.cpp | 2 +-
src/plugins/smith_waterman/src/SWAlgorithmPlugin.h | 2 +-
src/plugins/smith_waterman/src/SWAlgorithmTask.cpp | 2 +-
src/plugins/smith_waterman/src/SWAlgorithmTask.h | 2 +-
src/plugins/smith_waterman/src/SWQuery.cpp | 2 +-
src/plugins/smith_waterman/src/SWQuery.h | 2 +-
src/plugins/smith_waterman/src/SWTaskFactory.cpp | 2 +-
src/plugins/smith_waterman/src/SWTaskFactory.h | 2 +-
src/plugins/smith_waterman/src/SWWorker.cpp | 2 +-
src/plugins/smith_waterman/src/SWWorker.h | 2 +-
.../smith_waterman/src/SmithWatermanAlgorithm.cpp | 2 +-
.../smith_waterman/src/SmithWatermanAlgorithm.h | 2 +-
.../src/SmithWatermanAlgorithmCUDA.cpp | 2 +-
.../src/SmithWatermanAlgorithmCUDA.h | 2 +-
.../src/SmithWatermanAlgorithmOPENCL.cpp | 2 +-
.../src/SmithWatermanAlgorithmOPENCL.h | 2 +-
.../src/SmithWatermanAlgorithmSSE2.cpp | 2 +-
.../src/SmithWatermanAlgorithmSSE2.h | 2 +-
.../smith_waterman/src/SmithWatermanTests.cpp | 2 +-
.../smith_waterman/src/SmithWatermanTests.h | 2 +-
src/plugins/smith_waterman/src/sw_cuda.cu | 2 +-
src/plugins/smith_waterman/src/sw_cuda_cpp.cpp | 2 +-
src/plugins/smith_waterman/src/sw_cuda_cpp.h | 2 +-
src/plugins/smith_waterman/transl/english.ts | 64 +-
src/plugins/smith_waterman/transl/russian.ts | 82 +-
src/plugins/test_runner/src/GTestScriptWrapper.cpp | 2 +-
src/plugins/test_runner/src/GTestScriptWrapper.h | 2 +-
src/plugins/test_runner/src/TestRunnerPlugin.cpp | 2 +-
src/plugins/test_runner/src/TestRunnerPlugin.h | 2 +-
src/plugins/test_runner/src/TestViewController.cpp | 2 +-
src/plugins/test_runner/src/TestViewController.h | 2 +-
src/plugins/test_runner/src/TestViewReporter.cpp | 2 +-
src/plugins/test_runner/src/TestViewReporter.h | 2 +-
src/plugins/weight_matrix/src/PMatrixFormat.cpp | 2 +-
src/plugins/weight_matrix/src/PMatrixFormat.h | 2 +-
.../weight_matrix/src/PWMBuildDialogController.cpp | 4 +-
.../weight_matrix/src/PWMBuildDialogController.h | 2 +-
.../src/PWMJASPARDialogController.cpp | 4 +-
.../weight_matrix/src/PWMJASPARDialogController.h | 2 +-
.../src/PWMSearchDialogController.cpp | 4 +-
.../weight_matrix/src/PWMSearchDialogController.h | 2 +-
.../src/SetParametersDialogController.cpp | 4 +-
.../src/SetParametersDialogController.h | 2 +-
.../src/ViewMatrixDialogController.cpp | 4 +-
.../weight_matrix/src/ViewMatrixDialogController.h | 2 +-
src/plugins/weight_matrix/src/WMQuery.cpp | 2 +-
src/plugins/weight_matrix/src/WMQuery.h | 2 +-
.../weight_matrix/src/WeightMatrixAlgorithm.cpp | 2 +-
.../weight_matrix/src/WeightMatrixAlgorithm.h | 2 +-
.../weight_matrix/src/WeightMatrixBuildWorker.cpp | 2 +-
src/plugins/weight_matrix/src/WeightMatrixIO.cpp | 2 +-
src/plugins/weight_matrix/src/WeightMatrixIO.h | 2 +-
.../weight_matrix/src/WeightMatrixIOWorkers.cpp | 2 +-
.../weight_matrix/src/WeightMatrixIOWorkers.h | 2 +-
.../weight_matrix/src/WeightMatrixPlugin.cpp | 2 +-
src/plugins/weight_matrix/src/WeightMatrixPlugin.h | 2 +-
.../weight_matrix/src/WeightMatrixSearchTask.cpp | 2 +-
.../weight_matrix/src/WeightMatrixSearchTask.h | 2 +-
.../weight_matrix/src/WeightMatrixSearchWorker.cpp | 2 +-
.../weight_matrix/src/WeightMatrixWorkers.h | 2 +-
.../src/ActorCfgFilterProxyModel.cpp | 2 +-
.../src/ActorCfgFilterProxyModel.h | 2 +-
.../workflow_designer/src/ActorCfgModel.cpp | 2 +-
src/plugins/workflow_designer/src/ActorCfgModel.h | 2 +-
.../src/BreakpointManagerView.cpp | 2 +-
.../workflow_designer/src/BreakpointManagerView.h | 2 +-
.../workflow_designer/src/ChooseItemDialog.cpp | 2 +-
.../workflow_designer/src/ChooseItemDialog.h | 2 +-
.../workflow_designer/src/CreateScriptWorker.cpp | 4 +-
.../workflow_designer/src/CreateScriptWorker.h | 2 +-
.../src/DashboardsManagerDialog.cpp | 4 +-
.../src/DashboardsManagerDialog.h | 2 +-
.../workflow_designer/src/EstimationDialog.cpp | 2 +-
.../workflow_designer/src/EstimationDialog.h | 2 +-
.../src/GalaxyConfigConfigurationDialogImpl.cpp | 2 +-
.../src/GalaxyConfigConfigurationDialogImpl.h | 2 +-
.../workflow_designer/src/ImportSchemaDialog.cpp | 4 +-
.../workflow_designer/src/ImportSchemaDialog.h | 2 +-
.../src/InvestigationDataModel.cpp | 2 +-
.../workflow_designer/src/InvestigationDataModel.h | 2 +-
.../workflow_designer/src/ItemViewStyle.cpp | 2 +-
src/plugins/workflow_designer/src/ItemViewStyle.h | 2 +-
.../src/PortAliasesConfigurationDialog.cpp | 4 +-
.../src/PortAliasesConfigurationDialog.h | 2 +-
.../workflow_designer/src/SampleActionsManager.cpp | 2 +-
.../workflow_designer/src/SampleActionsManager.h | 2 +-
.../workflow_designer/src/SceneSerializer.cpp | 2 +-
.../workflow_designer/src/SceneSerializer.h | 2 +-
.../src/SchemaAliasesConfigurationDialogImpl.cpp | 4 +-
.../src/SchemaAliasesConfigurationDialogImpl.h | 2 +-
.../workflow_designer/src/StartupDialog.cpp | 4 +-
src/plugins/workflow_designer/src/StartupDialog.h | 2 +-
.../workflow_designer/src/TableViewTabKey.cpp | 2 +-
.../workflow_designer/src/TableViewTabKey.h | 2 +-
.../src/WorkflowDesignerPlugin.cpp | 2 +-
.../workflow_designer/src/WorkflowDesignerPlugin.h | 2 +-
.../workflow_designer/src/WorkflowDocument.cpp | 2 +-
.../workflow_designer/src/WorkflowDocument.h | 2 +-
.../workflow_designer/src/WorkflowEditor.cpp | 2 +-
src/plugins/workflow_designer/src/WorkflowEditor.h | 2 +-
.../src/WorkflowEditorDelegates.cpp | 2 +-
.../src/WorkflowEditorDelegates.h | 2 +-
.../src/WorkflowInvestigationWidgetsController.cpp | 2 +-
.../src/WorkflowInvestigationWidgetsController.h | 2 +-
.../workflow_designer/src/WorkflowMetaDialog.cpp | 4 +-
.../workflow_designer/src/WorkflowMetaDialog.h | 2 +-
.../workflow_designer/src/WorkflowPalette.cpp | 2 +-
.../workflow_designer/src/WorkflowPalette.h | 2 +-
.../workflow_designer/src/WorkflowSamples.cpp | 2 +-
.../workflow_designer/src/WorkflowSamples.h | 2 +-
.../workflow_designer/src/WorkflowSceneIOTasks.cpp | 2 +-
.../workflow_designer/src/WorkflowSceneIOTasks.h | 2 +-
.../src/WorkflowSettingsController.cpp | 4 +-
.../src/WorkflowSettingsController.h | 2 +-
.../workflow_designer/src/WorkflowTabView.cpp | 2 +-
.../workflow_designer/src/WorkflowTabView.h | 2 +-
.../src/WorkflowViewController.cpp | 2 +-
.../workflow_designer/src/WorkflowViewController.h | 2 +-
.../workflow_designer/src/WorkflowViewItems.cpp | 2 +-
.../workflow_designer/src/WorkflowViewItems.h | 2 +-
.../src/cmdline/GalaxyConfigTask.cpp | 2 +-
.../src/cmdline/GalaxyConfigTask.h | 2 +-
.../src/cmdline/WorkflowCMDLineTasks.cpp | 2 +-
.../src/cmdline/WorkflowCMDLineTasks.h | 2 +-
.../AnnotationsMessageTranslator.cpp | 2 +-
.../AnnotationsMessageTranslator.h | 2 +-
.../AssemblyMessageTranslator.cpp | 2 +-
.../AssemblyMessageTranslator.h | 2 +-
.../BaseMessageTranslator.cpp | 2 +-
.../BaseMessageTranslator.h | 2 +-
.../MultipleAlignmentMessageTranslator.cpp | 2 +-
.../MultipleAlignmentMessageTranslator.h | 2 +-
.../SequenceMessageTranslator.cpp | 2 +-
.../SequenceMessageTranslator.h | 2 +-
.../VariationTrackMessageTranslator.cpp | 2 +-
.../VariationTrackMessageTranslator.h | 2 +-
.../WorkflowDebugMessageParserImpl.cpp | 2 +-
.../WorkflowDebugMessageParserImpl.h | 2 +-
.../src/library/AlignToReferenceWorker.cpp | 2 +-
.../src/library/AlignToReferenceWorker.h | 2 +-
.../src/library/AminoTranslationWorker.h | 2 +-
.../src/library/AssemblyToSequenceWorker.cpp | 2 +-
.../src/library/AssemblyToSequenceWorker.h | 2 +-
.../src/library/BaseDocWriter.cpp | 2 +-
.../workflow_designer/src/library/BaseDocWriter.h | 2 +-
.../src/library/CDSearchWorker.cpp | 2 +-
.../workflow_designer/src/library/CDSearchWorker.h | 2 +-
.../src/library/CfgExternalToolModel.cpp | 2 +-
.../src/library/CfgExternalToolModel.h | 2 +-
.../src/library/ConvertFilesFormatWorker.cpp | 2 +-
.../src/library/ConvertFilesFormatWorker.h | 2 +-
.../workflow_designer/src/library/CoreLib.cpp | 2 +-
.../workflow_designer/src/library/CoreLib.h | 2 +-
.../src/library/CreateExternalProcessDialog.cpp | 216 +-
.../src/library/CreateExternalProcessDialog.h | 2 +-
.../workflow_designer/src/library/DocActors.cpp | 2 +-
.../workflow_designer/src/library/DocActors.h | 2 +-
.../workflow_designer/src/library/DocWorkers.cpp | 2 +-
.../workflow_designer/src/library/DocWorkers.h | 2 +-
.../src/library/ExternalProcessWorker.cpp | 2 +-
.../src/library/ExternalProcessWorker.h | 2 +-
.../src/library/ExtractAssemblyCoverageWorker.cpp | 2 +-
.../src/library/ExtractAssemblyCoverageWorker.h | 2 +-
.../src/library/ExtractConsensusWorker.cpp | 2 +-
.../src/library/ExtractConsensusWorker.h | 2 +-
.../src/library/ExtractMSAConsensusWorker.cpp | 2 +-
.../src/library/ExtractMSAConsensusWorker.h | 2 +-
.../src/library/FASTQWorkersLibrary.cpp | 2 +-
.../src/library/FASTQWorkersLibrary.h | 2 +-
.../library/FilterAnnotationsByQualifierWorker.cpp | 2 +-
.../library/FilterAnnotationsByQualifierWorker.h | 2 +-
.../src/library/FilterAnnotationsWorker.cpp | 2 +-
.../src/library/FilterAnnotationsWorker.h | 2 +-
.../src/library/FilterBamWorker.cpp | 2 +-
.../src/library/FilterBamWorker.h | 2 +-
.../workflow_designer/src/library/FindWorker.cpp | 2 +-
.../workflow_designer/src/library/FindWorker.h | 2 +-
.../src/library/GenericReadActor.cpp | 6 +-
.../src/library/GenericReadActor.h | 2 +-
.../src/library/GenericReadWorker.cpp | 2 +-
.../src/library/GenericReadWorker.h | 2 +-
.../src/library/GetFileListWorker.cpp | 2 +-
.../src/library/GetFileListWorker.h | 2 +-
.../workflow_designer/src/library/GroupWorker.cpp | 2 +-
.../workflow_designer/src/library/GroupWorker.h | 2 +-
.../src/library/ImportAnnotationsWorker.cpp | 2 +-
.../src/library/ImportAnnotationsWorker.h | 2 +-
.../src/library/IncludedProtoFactoryImpl.cpp | 2 +-
.../src/library/IncludedProtoFactoryImpl.h | 2 +-
.../src/library/MSA2SequenceWorker.cpp | 2 +-
.../src/library/MSA2SequenceWorker.h | 2 +-
.../src/library/MarkSequenceWorker.cpp | 2 +-
.../src/library/MarkSequenceWorker.h | 2 +-
.../src/library/MergeBamWorker.cpp | 2 +-
.../workflow_designer/src/library/MergeBamWorker.h | 2 +-
.../src/library/MultiplexerWorker.cpp | 2 +-
.../src/library/MultiplexerWorker.h | 2 +-
.../src/library/PassFilterWorker.cpp | 2 +-
.../src/library/PassFilterWorker.h | 2 +-
.../src/library/ReadAnnotationsWorker.cpp | 2 +-
.../src/library/ReadAnnotationsWorker.h | 2 +-
.../src/library/ReadAssemblyWorker.cpp | 2 +-
.../src/library/ReadAssemblyWorker.h | 2 +-
.../src/library/ReadVariationWorker.cpp | 2 +-
.../src/library/ReadVariationWorker.h | 2 +-
.../src/library/RemoteDBFetcherWorker.cpp | 2 +-
.../src/library/RemoteDBFetcherWorker.h | 2 +-
.../library/RenameChromosomeInVariationWorker.cpp | 6 +-
.../library/RenameChromosomeInVariationWorker.h | 2 +-
.../src/library/RmdupBamWorker.cpp | 2 +-
.../workflow_designer/src/library/RmdupBamWorker.h | 2 +-
.../workflow_designer/src/library/SchemaWorker.cpp | 2 +-
.../workflow_designer/src/library/SchemaWorker.h | 2 +-
.../workflow_designer/src/library/ScriptWorker.cpp | 2 +-
.../workflow_designer/src/library/ScriptWorker.h | 2 +-
.../src/library/SequenceSplitWorker.cpp | 2 +-
.../src/library/SequenceSplitWorker.h | 2 +-
.../src/library/SequencesToMSAWorker.cpp | 2 +-
.../src/library/SequencesToMSAWorker.h | 2 +-
.../src/library/SortBamWorker.cpp | 2 +-
.../workflow_designer/src/library/SortBamWorker.h | 2 +-
.../src/library/StatisticWorkers.cpp | 2 +-
.../src/library/StatisticWorkers.h | 2 +-
.../src/library/Text2SequenceWorker.cpp | 2 +-
.../src/library/Text2SequenceWorker.h | 2 +-
.../src/library/WriteAnnotationsWorker.cpp | 2 +-
.../src/library/WriteAnnotationsWorker.h | 2 +-
.../src/library/WriteAssemblyWorkers.cpp | 2 +-
.../src/library/WriteAssemblyWorkers.h | 2 +-
.../src/library/WriteVariationWorker.cpp | 2 +-
.../src/library/WriteVariationWorker.h | 2 +-
.../src/tasks/ReadAssemblyTask.cpp | 2 +-
.../workflow_designer/src/tasks/ReadAssemblyTask.h | 2 +-
.../src/tasks/RenameChromosomeInVariationTask.cpp | 2 +-
.../src/tasks/RenameChromosomeInVariationTask.h | 2 +-
.../src/ui/ExternalProcessWorkerDialog.ui | 6 +-
.../src/util/DatasetValidator.cpp | 2 +-
.../workflow_designer/src/util/DatasetValidator.h | 2 +-
.../src/util/DatasetsCountValidator.cpp | 2 +-
.../src/util/DatasetsCountValidator.h | 2 +-
.../src/util/GrouperActionUtils.cpp | 2 +-
.../src/util/GrouperActionUtils.h | 2 +-
.../src/util/RequiredSlotsValidator.cpp | 2 +-
.../src/util/RequiredSlotsValidator.h | 2 +-
.../src/util/SaveSchemaImageUtils.cpp | 2 +-
.../src/util/SaveSchemaImageUtils.h | 2 +-
.../src/util/WorkerNameValidator.cpp | 2 +-
.../src/util/WorkerNameValidator.h | 2 +-
.../src/util/WriteSequenceValidator.cpp | 2 +-
.../src/util/WriteSequenceValidator.h | 2 +-
src/plugins/workflow_designer/transl/english.ts | 237 +-
src/plugins/workflow_designer/transl/russian.ts | 347 ++-
.../workflow_dump/src/WorkflowDumpPlugin.cpp | 2 +-
src/plugins/workflow_dump/src/WorkflowDumpPlugin.h | 2 +-
src/plugins_3rdparty/ball/src/BallPlugin.cpp | 2 +-
src/plugins_3rdparty/ball/src/BallPlugin.h | 2 +-
src/plugins_3rdparty/ball/src/SAS.cpp | 2 +-
src/plugins_3rdparty/ball/src/SAS.h | 2 +-
src/plugins_3rdparty/ball/src/SES.cpp | 2 +-
src/plugins_3rdparty/ball/src/SES.h | 2 +-
src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp | 2 +-
src/plugins_3rdparty/gor4/src/GorIVAlgTask.h | 2 +-
src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp | 2 +-
src/plugins_3rdparty/gor4/src/GorIVPlugin.h | 2 +-
src/plugins_3rdparty/hmm2/src/HMMIO.cpp | 2 +-
src/plugins_3rdparty/hmm2/src/HMMIO.h | 2 +-
src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp | 2 +-
src/plugins_3rdparty/hmm2/src/HMMIOWorker.h | 2 +-
src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp | 2 +-
src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h | 2 +-
src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp | 2 +-
src/plugins_3rdparty/hmm2/src/uHMMPlugin.h | 2 +-
.../hmm2/src/u_build/HMMBuildDialogController.cpp | 4 +-
.../hmm2/src/u_build/HMMBuildDialogController.h | 2 +-
.../u_calibrate/HMMCalibrateDialogController.cpp | 4 +-
.../src/u_calibrate/HMMCalibrateDialogController.h | 2 +-
.../src/u_search/HMMSearchDialogController.cpp | 4 +-
.../hmm2/src/u_search/HMMSearchDialogController.h | 2 +-
.../hmm2/src/u_search/HMMSearchQDActor.cpp | 2 +-
.../hmm2/src/u_search/HMMSearchQDActor.h | 2 +-
.../hmm2/src/u_search/HMMSearchTask.cpp | 2 +-
.../hmm2/src/u_search/HMMSearchTask.h | 2 +-
.../hmm3/src/build/uHMM3BuildDialogImpl.cpp | 4 +-
.../hmm3/src/build/uHMM3BuildDialogImpl.h | 2 +-
.../hmm3/src/build/uHMM3BuildTask.cpp | 2 +-
.../hmm3/src/build/uHMM3BuildTask.h | 2 +-
src/plugins_3rdparty/hmm3/src/build/uhmm3build.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/build/uhmm3build.h | 2 +-
.../hmm3/src/format/uHMMFormat.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/format/uHMMFormat.h | 2 +-
.../hmm3/src/format/uHMMFormatReader.cpp | 2 +-
.../hmm3/src/format/uHMMFormatReader.h | 2 +-
.../hmm3/src/gobject/uHMMObject.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.h | 2 +-
.../hmm3/src/phmmer/uHMM3PhmmerDialogImpl.cpp | 4 +-
.../hmm3/src/phmmer/uHMM3PhmmerDialogImpl.h | 2 +-
.../hmm3/src/phmmer/uhmm3PhmmerTask.cpp | 2 +-
.../hmm3/src/phmmer/uhmm3PhmmerTask.h | 2 +-
.../hmm3/src/phmmer/uhmm3phmmer.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.h | 2 +-
.../hmm3/src/search/uHMM3SearchDialogImpl.cpp | 4 +-
.../hmm3/src/search/uHMM3SearchDialogImpl.h | 2 +-
.../hmm3/src/search/uHMM3SearchTask.cpp | 2 +-
.../hmm3/src/search/uHMM3SearchTask.h | 2 +-
.../hmm3/src/search/uhmm3QDActor.cpp | 2 +-
.../hmm3/src/search/uhmm3QDActor.h | 2 +-
.../hmm3/src/search/uhmm3SearchResult.cpp | 2 +-
.../hmm3/src/search/uhmm3SearchResult.h | 2 +-
.../hmm3/src/search/uhmm3search.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/search/uhmm3search.h | 2 +-
.../task_local_storage/uHMMSearchTaskLocalData.cpp | 2 +-
.../task_local_storage/uHMMSearchTaskLocalData.h | 2 +-
.../uHMMSearchTaskLocalStorage.cpp | 2 +-
.../uHMMSearchTaskLocalStorage.h | 2 +-
.../hmm3/src/tests/uhmmer3BuildTests.cpp | 2 +-
.../hmm3/src/tests/uhmmer3BuildTests.h | 2 +-
.../hmm3/src/tests/uhmmer3PhmmerTests.cpp | 2 +-
.../hmm3/src/tests/uhmmer3PhmmerTests.h | 2 +-
.../hmm3/src/tests/uhmmer3SearchTests.cpp | 2 +-
.../hmm3/src/tests/uhmmer3SearchTests.h | 2 +-
.../hmm3/src/tests/uhmmer3Tests.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.h | 2 +-
src/plugins_3rdparty/hmm3/src/uHMM3Plugin.cpp | 2 +-
src/plugins_3rdparty/hmm3/src/uHMM3Plugin.h | 2 +-
.../hmm3/src/util/uhmm3Utilities.cpp | 2 +-
.../hmm3/src/util/uhmm3Utilities.h | 2 +-
.../hmm3/src/workers/HMM3BuildWorker.cpp | 2 +-
.../hmm3/src/workers/HMM3BuildWorker.h | 2 +-
.../hmm3/src/workers/HMM3IOWorker.cpp | 2 +-
.../hmm3/src/workers/HMM3IOWorker.h | 2 +-
.../hmm3/src/workers/HMM3SearchWorker.cpp | 2 +-
.../hmm3/src/workers/HMM3SearchWorker.h | 2 +-
src/plugins_3rdparty/hmm3/transl/russian.ts | 4 +-
src/plugins_3rdparty/kalign/src/KalignAdapter.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignAdapter.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignConstants.h | 2 +-
.../kalign/src/KalignDialogController.cpp | 6 +-
.../kalign/src/KalignDialogController.h | 2 +-
.../kalign/src/KalignException.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignException.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignPlugin.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignPlugin.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignTask.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignTask.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignUtils.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignUtils.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignWorker.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignWorker.h | 2 +-
...airwiseAlignmentHirschbergGUIExtensionFactory.h | 2 +-
.../kalign/src/PairwiseAlignmentHirschbergTask.h | 2 +-
.../src/PairwiseAlignmentHirschbergTaskFactory.h | 2 +-
.../kalign/src/TaskLocalStorage.cpp | 2 +-
src/plugins_3rdparty/kalign/src/TaskLocalStorage.h | 2 +-
.../kalign/src/kalign_tests/KalignTests.cpp | 2 +-
.../kalign/src/kalign_tests/KalignTests.h | 2 +-
src/plugins_3rdparty/kalign/transl/russian.ts | 20 +-
src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp | 2 +-
src/plugins_3rdparty/phylip/src/DistanceMatrix.h | 2 +-
.../phylip/src/NeighborJoinAdapter.cpp | 2 +-
.../phylip/src/NeighborJoinAdapter.h | 2 +-
.../phylip/src/NeighborJoinWidget.cpp | 56 +-
.../phylip/src/NeighborJoinWidget.h | 2 +-
src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp | 2 +-
src/plugins_3rdparty/phylip/src/PhylipPlugin.h | 2 +-
.../phylip/src/PhylipPluginTests.cpp | 2 +-
.../phylip/src/PhylipPluginTests.h | 2 +-
src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp | 2 +-
src/plugins_3rdparty/phylip/src/SeqBootAdapter.h | 2 +-
.../primer3/src/FindExonRegionsTask.cpp | 2 +-
.../primer3/src/FindExonRegionsTask.h | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp | 4 +-
src/plugins_3rdparty/primer3/src/Primer3Dialog.h | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Plugin.h | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Query.cpp | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Query.h | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Task.cpp | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Task.h | 2 +-
.../primer3/src/Primer3TaskSettings.cpp | 2 +-
.../primer3/src/Primer3TaskSettings.h | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Tests.cpp | 2 +-
src/plugins_3rdparty/primer3/src/Primer3Tests.h | 2 +-
.../psipred/src/PsipredAlgTask.cpp | 2 +-
src/plugins_3rdparty/psipred/src/PsipredAlgTask.h | 2 +-
src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp | 2 +-
src/plugins_3rdparty/psipred/src/PsipredPlugin.h | 2 +-
src/plugins_3rdparty/ptools/src/PToolsAligner.cpp | 2 +-
src/plugins_3rdparty/ptools/src/PToolsAligner.h | 2 +-
src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp | 2 +-
src/plugins_3rdparty/ptools/src/PToolsPlugin.h | 2 +-
src/plugins_3rdparty/ptools/src/PToolsTests.cpp | 2 +-
src/plugins_3rdparty/ptools/src/PToolsTests.h | 2 +-
.../sitecon/src/DIPropertiesSitecon.cpp | 2 +-
.../sitecon/src/DIPropertiesSitecon.h | 2 +-
.../sitecon/src/DIPropertiesTests.cpp | 2 +-
.../sitecon/src/DIPropertiesTests.h | 2 +-
.../sitecon/src/SiteconAlgorithm.cpp | 2 +-
.../sitecon/src/SiteconAlgorithm.h | 2 +-
.../sitecon/src/SiteconAlgorithmTests.cpp | 2 +-
.../sitecon/src/SiteconAlgorithmTests.h | 2 +-
.../sitecon/src/SiteconBuildDialogController.cpp | 4 +-
.../sitecon/src/SiteconBuildDialogController.h | 2 +-
.../sitecon/src/SiteconBuildWorker.cpp | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconIO.cpp | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconIO.h | 2 +-
.../sitecon/src/SiteconIOWorkers.cpp | 2 +-
.../sitecon/src/SiteconIOWorkers.h | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconPlugin.h | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconQuery.h | 2 +-
.../sitecon/src/SiteconSearchDialogController.cpp | 4 +-
.../sitecon/src/SiteconSearchDialogController.h | 2 +-
.../sitecon/src/SiteconSearchTask.cpp | 2 +-
.../sitecon/src/SiteconSearchTask.h | 2 +-
.../sitecon/src/SiteconSearchWorker.cpp | 2 +-
src/plugins_3rdparty/sitecon/src/SiteconWorkers.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleAdapter.h | 2 +-
.../umuscle/src/MuscleAlignDialogController.cpp | 6 +-
.../umuscle/src/MuscleAlignDialogController.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleConstants.h | 2 +-
.../umuscle/src/MuscleParallel.cpp | 37 +-
src/plugins_3rdparty/umuscle/src/MuscleParallel.h | 2 +-
src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/MusclePlugin.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleTask.cpp | 5 +-
src/plugins_3rdparty/umuscle/src/MuscleTask.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleUtils.h | 2 +-
.../umuscle/src/MuscleWorkPool.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleWorker.h | 2 +-
.../umuscle/src/ProfileToProfileWorker.cpp | 2 +-
.../umuscle/src/ProfileToProfileWorker.h | 2 +-
.../umuscle/src/TaskLocalStorage.cpp | 2 +-
.../umuscle/src/TaskLocalStorage.h | 2 +-
src/plugins_3rdparty/umuscle/src/refinehorizP.cpp | 2 +-
src/plugins_3rdparty/umuscle/src/refinevertP.cpp | 2 +-
.../umuscle/src/umuscle_tests/umuscleTests.cpp | 2 +-
.../umuscle/src/umuscle_tests/umuscleTests.h | 2 +-
src/plugins_3rdparty/umuscle/transl/english.ts | 70 +-
src/plugins_3rdparty/umuscle/transl/russian.ts | 70 +-
.../variants/src/AssemblySamtoolsMpileup.cpp | 2 +-
.../variants/src/AssemblySamtoolsMpileup.h | 2 +-
.../variants/src/SamtoolMpileupWorker.cpp | 46 +-
.../variants/src/SamtoolMpileupWorker.h | 2 +-
.../variants/src/SamtoolsPlugin.cpp | 2 +-
src/plugins_3rdparty/variants/src/SamtoolsPlugin.h | 2 +-
src/plugins_3rdparty/variants/transl/english.ts | 12 +-
src/plugins_3rdparty/variants/transl/russian.ts | 166 +-
src/plugins_checker/src/Main.cpp | 2 +-
src/ugene_globals.pri | 4 +
src/ugene_version.pri | 4 +-
src/ugenecl/src/DumpHelpTask.cpp | 2 +-
src/ugenecl/src/DumpHelpTask.h | 2 +-
src/ugenecl/src/DumpLicenseTask.cpp | 2 +-
src/ugenecl/src/DumpLicenseTask.h | 2 +-
src/ugenecl/src/DumpVersionTask.cpp | 2 +-
src/ugenecl/src/DumpVersionTask.h | 2 +-
src/ugenecl/src/ForeverTask.cpp | 2 +-
src/ugenecl/src/ForeverTask.h | 2 +-
src/ugenecl/src/Main.cpp | 2 +-
src/ugenecl/src/TaskStatusBar.cpp | 2 +-
src/ugenecl/src/TaskStatusBar.h | 2 +-
src/ugenecl/src/TestStarter.cpp | 2 +-
src/ugenecl/src/TestStarter.h | 2 +-
src/ugenecl/ugenecl.pri | 10 +-
src/ugenem/src/SendReportDialog.cpp | 69 +-
src/ugenem/src/SendReportDialog.h | 7 +-
src/ugenem/src/Utils.cpp | 28 +-
src/ugenem/src/Utils.h | 6 +-
src/ugenem/src/getMemorySize.c | 97 +
src/ugenem/src/main.cpp | 12 +-
src/ugenem/ugenem.pro | 3 +-
src/ugeneui/html/version_news.html | 27 +-
src/ugeneui/html/welcome_page.css | 12 +-
src/ugeneui/html/welcome_page.html | 45 +-
src/ugeneui/src/Main.cpp | 68 +-
.../app_settings/AppSettingsDialogController.cpp | 2 +-
.../src/app_settings/AppSettingsDialogController.h | 2 +-
.../src/app_settings/AppSettingsDialogTree.h | 2 +-
.../src/app_settings/AppSettingsGUIImpl.cpp | 2 +-
src/ugeneui/src/app_settings/AppSettingsGUIImpl.h | 2 +-
.../DirectoriesSettingsGUIController.cpp | 4 +-
.../DirectoriesSettingsGUIController.h | 2 +-
.../FormatSettingsGUIController.cpp | 4 +-
.../format_settings/FormatSettingsGUIController.h | 2 +-
.../logview_settings/LogSettingsGUIController.cpp | 4 +-
.../logview_settings/LogSettingsGUIController.h | 2 +-
.../NetworkSettingsGUIController.cpp | 4 +-
.../NetworkSettingsGUIController.h | 2 +-
.../ResourceSettingsGUIController.cpp | 4 +-
.../ResourceSettingsGUIController.h | 2 +-
.../UserApplicationsSettingsGUIController.cpp | 4 +-
.../UserApplicationsSettingsGUIController.h | 2 +-
.../src/main_window/AboutDialogController.cpp | 2 +-
.../src/main_window/AboutDialogController.h | 2 +-
src/ugeneui/src/main_window/CheckUpdatesTask.cpp | 2 +-
src/ugeneui/src/main_window/CheckUpdatesTask.h | 2 +-
src/ugeneui/src/main_window/DockManagerImpl.cpp | 2 +-
src/ugeneui/src/main_window/DockManagerImpl.h | 2 +-
src/ugeneui/src/main_window/MDIManagerImpl.cpp | 4 +-
src/ugeneui/src/main_window/MDIManagerImpl.h | 2 +-
src/ugeneui/src/main_window/MainWindowImpl.cpp | 18 +-
src/ugeneui/src/main_window/MainWindowImpl.h | 6 +-
src/ugeneui/src/main_window/MenuManager.cpp | 2 +-
src/ugeneui/src/main_window/MenuManager.h | 2 +-
src/ugeneui/src/main_window/ShutdownTask.cpp | 2 +-
src/ugeneui/src/main_window/ShutdownTask.h | 2 +-
src/ugeneui/src/main_window/SplashScreen.cpp | 6 +-
src/ugeneui/src/main_window/SplashScreen.h | 2 +-
.../main_window/TmpDirChangeDialogController.cpp | 2 +-
.../src/main_window/TmpDirChangeDialogController.h | 2 +-
src/ugeneui/src/main_window/ToolBarManager.cpp | 2 +-
src/ugeneui/src/main_window/ToolBarManager.h | 2 +-
.../src/plugin_viewer/PluginViewerController.cpp | 2 +-
.../src/plugin_viewer/PluginViewerController.h | 2 +-
src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp | 2 +-
src/ugeneui/src/plugin_viewer/PluginViewerImpl.h | 2 +-
.../DocumentFormatSelectorController.cpp | 4 +-
.../DocumentFormatSelectorController.h | 2 +-
.../DocumentProviderSelectorController.cpp | 4 +-
.../DocumentProviderSelectorController.h | 2 +-
.../DocumentReadingModeSelectorController.cpp | 4 +-
.../DocumentReadingModeSelectorController.h | 2 +-
.../ExportProjectDialogController.cpp | 5 +-
.../ExportProjectDialogController.h | 2 +-
...tipleDocumentsReadingModeSelectorController.cpp | 4 +-
...ultipleDocumentsReadingModeSelectorController.h | 2 +-
src/ugeneui/src/project_support/ProjectImpl.cpp | 2 +-
src/ugeneui/src/project_support/ProjectImpl.h | 2 +-
.../src/project_support/ProjectLoaderImpl.cpp | 42 +-
.../src/project_support/ProjectLoaderImpl.h | 4 +-
.../src/project_support/ProjectServiceImpl.cpp | 2 +-
.../src/project_support/ProjectServiceImpl.h | 2 +-
.../src/project_support/ProjectTasksGui.cpp | 2 +-
src/ugeneui/src/project_support/ProjectTasksGui.h | 2 +-
.../src/project_support/ui/ExportProjectDialog.ui | 38 +-
.../src/project_view/BuiltInObjectViews.cpp | 2 +-
.../src/project_view/ProjectViewDocTree.cpp | 2 +-
src/ugeneui/src/project_view/ProjectViewDocTree.h | 2 +-
src/ugeneui/src/project_view/ProjectViewImpl.cpp | 238 +-
src/ugeneui/src/project_view/ProjectViewImpl.h | 13 +-
.../src/project_view/ProjectViewSearchBox.cpp | 2 +-
.../src/project_view/ProjectViewSearchBox.h | 2 +-
src/ugeneui/src/shtirlitz/Shtirlitz.cpp | 7 +-
src/ugeneui/src/shtirlitz/Shtirlitz.h | 2 +-
.../src/shtirlitz/StatisticalReportController.cpp | 44 +-
.../src/shtirlitz/StatisticalReportController.h | 12 +-
src/ugeneui/src/shtirlitz/ui/StatisticalReport.ui | 54 +-
src/ugeneui/src/task_view/TaskStatusBar.cpp | 2 +-
src/ugeneui/src/task_view/TaskStatusBar.h | 2 +-
src/ugeneui/src/task_view/TaskViewController.cpp | 2 +-
src/ugeneui/src/task_view/TaskViewController.h | 2 +-
src/ugeneui/src/utils/MultilingualHtmlView.cpp | 88 +
src/ugeneui/src/utils/MultilingualHtmlView.h | 49 +
.../src/welcome_page/WelcomePageController.cpp | 2 +-
.../src/welcome_page/WelcomePageController.h | 2 +-
src/ugeneui/src/welcome_page/WelcomePageMdi.cpp | 5 +-
src/ugeneui/src/welcome_page/WelcomePageMdi.h | 2 +-
src/ugeneui/src/welcome_page/WelcomePageWidget.cpp | 51 +-
src/ugeneui/src/welcome_page/WelcomePageWidget.h | 9 +-
.../src/welcome_page/ui/WelcomePageWidget.ui | 62 -
src/ugeneui/transl/english.ts | 201 +-
src/ugeneui/transl/russian.ts | 201 +-
src/ugeneui/ugeneui.pri | 10 +-
src/ugeneui/ugeneui.pro | 33 +-
src/ugeneui/ugeneui.qrc | 1 +
ugene.pro | 17 +-
3982 files changed, 20068 insertions(+), 22581 deletions(-)
diff --git a/LICENSE.3rd_party b/LICENSE.3rd_party
index e2c4c84..17a01f8 100644
--- a/LICENSE.3rd_party
+++ b/LICENSE.3rd_party
@@ -345,3 +345,10 @@ The algorithm "Unique repeats filter"
Packaging:
Copyright (C) 2008-2012 by Ivan Efremov <iefremov at unipro.ru>
released under the GPL.
+
+
+The File src/ugenem/src/getMemorySize.c
+ Author: David Robert Nadeau
+ Site: http://NadeauSoftware.com/
+ License: Creative Commons Attribution 3.0 Unported License
+ http://creativecommons.org/licenses/by/3.0/deed.en_US
diff --git a/installer/_common_data/humimit_custom.pri b/installer/_common_data/humimit_custom.pri
new file mode 100644
index 0000000..97527d8
--- /dev/null
+++ b/installer/_common_data/humimit_custom.pri
@@ -0,0 +1,60 @@
+# include (humimit.pri)
+
+include( ../../ugene_globals.pri )
+UGENE_RELATIVE_DESTDIR = ''
+
+TARGET = humimit
+TEMPLATE = lib
+CONFIG += thread debug_and_release warn_off qt dll
+INCLUDEPATH += src _tmp
+QT += testlib
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
+
+DEFINES += BUILDING_HUMIMIT_DLL
+DEFINES += QT_DLL
+
+!debug_and_release|build_pass {
+
+ CONFIG(debug, debug|release) {
+ TARGET = humimitd
+ DEFINES += _DEBUG
+ CONFIG +=console
+ DESTDIR=../../_debug/
+ OBJECTS_DIR=_tmp/obj/debug
+ }
+
+ CONFIG(release, debug|release) {
+ TARGET = humimit
+ DEFINES+=NDEBUG
+ DESTDIR=../../_release/
+ OBJECTS_DIR=_tmp/obj/release
+ }
+}
+
+
+unix {
+ !macx {
+ LIBS += -lXtst
+ }
+ macx {
+ QMAKE_LFLAGS += -framework ApplicationServices
+ LIBS += -framework AppKit
+ }
+ target.path = $$UGENE_INSTALL_DIR/$$UGENE_RELATIVE_DESTDIR
+ INSTALLS += target
+}
+
+win32 {
+ QMAKE_CXXFLAGS_WARN_ON = -W3
+ QMAKE_CFLAGS_WARN_ON = -W3
+
+ QMAKE_MSVC_PROJECT_NAME=lib_3rd_humimit
+
+ LIBS += User32.lib Gdi32.lib
+ LIBS += psapi.lib
+ DEFINES += "PSAPI_VERSION=1"
+}
+
+
+
diff --git a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
index 32eba16..0757baa 100644
--- a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
index 3fb5fd0..1942735 100644
--- a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
+++ b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp b/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
index 0f1de53..3059428 100644
--- a/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/BitsTable.h b/src/corelibs/U2Algorithm/src/misc/BitsTable.h
index aced047..c668610 100644
--- a/src/corelibs/U2Algorithm/src/misc/BitsTable.h
+++ b/src/corelibs/U2Algorithm/src/misc/BitsTable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h b/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
index 06f785f..6abb409 100644
--- a/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
index 30fb98c..c129059 100644
--- a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
index 93fa7ba..f4b7b34 100644
--- a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/DynTable.h b/src/corelibs/U2Algorithm/src/misc/DynTable.h
index 946ad26..a8b95ab 100644
--- a/src/corelibs/U2Algorithm/src/misc/DynTable.h
+++ b/src/corelibs/U2Algorithm/src/misc/DynTable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h b/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
index 1811a7b..96638ec 100644
--- a/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
+++ b/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
index f6a6efa..c555522 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
index cff54d4..8a87d4a 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
index 0237024..226944e 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
index 7c8b43c..73a57f1 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
index af260c4..79db87e 100644
--- a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
index 99fb12b..ac2c695 100644
--- a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h b/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
index 50707cd..7bd7a49 100644
--- a/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
+++ b/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h b/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
index d53eabf..0a52d37 100644
--- a/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/RollingArray.h b/src/corelibs/U2Algorithm/src/misc/RollingArray.h
index 099ec4a..9c0483e 100644
--- a/src/corelibs/U2Algorithm/src/misc/RollingArray.h
+++ b/src/corelibs/U2Algorithm/src/misc/RollingArray.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h b/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
index e3b081e..4339fe2 100644
--- a/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
+++ b/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
index 6855e17..e1cafcd 100644
--- a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
index 979b9dc..968e0be 100644
--- a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/misc/SyncSort.h b/src/corelibs/U2Algorithm/src/misc/SyncSort.h
index 7d261bf..f0f36a8 100644
--- a/src/corelibs/U2Algorithm/src/misc/SyncSort.h
+++ b/src/corelibs/U2Algorithm/src/misc/SyncSort.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
index ac436c1..b085a68 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
index 89c355d..c09118a 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
index 53a414c..c9478b9 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
index ef0a848..0a90ead 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
index 00507af..0080702 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
index e7cec0e..adc5fd7 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
index 820263c..29656ed 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
index ba83c0a..b2f6bef 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
index 59ea39c..252ba36 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
index 1791594..9840bd1 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
index da8afa8..f7041b8 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
index ec8225a..4b59943 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
index 8a2e37d..ae7f607 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
index 3b3c9b7..86de42b 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
index a41dbc6..6a9e408 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
index a17cd02..eed0221 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
index 95a0feb..309a62d 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
index 5aa4366..7b9b4f7 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
index e25edad..3f66d4a 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
index 067c620..94dc132 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
index 300d17f..f957a1e 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
index 4e78bca..ffd6722 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
index 40ebcdf..5ed36a7 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
index 8f5d1b9..59b25dc 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
index e7c7502..fcebb97 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
index 0535fc8..a5ba55d 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
index 101f3f9..fdb1335 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
index e175f92..ec3d19f 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
index 8ff7a08..edea693 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
index 5de43e8..c6277d0 100644
--- a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
index fd8960a..b891130 100644
--- a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
index ece30b0..15fe6fc 100644
--- a/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
index aa446f8..9418cd9 100644
--- a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
index 36323d4..e2312fa 100644
--- a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
index b7d206e..7011b2c 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
index 920fa9c..109843c 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
index 9917f02..12541ed 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
index 0e64db4..af83cf2 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
index ac2edc7..d58de16 100644
--- a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
index 3c19d46..4787a6f 100644
--- a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
index 52b20a0..0c43f4f 100644
--- a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
index ec8b273..4ba3a4a 100644
--- a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
index e802cdf..621d4df 100644
--- a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
index e7ae465..b6ede46 100644
--- a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
index 92d8682..9595d32 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
index 9ff372b..42cc40d 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
index 9c81370..837d394 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
index 66c9920..94c2d5a 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
index cde78b8..d59ddc7 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
index b7b0989..bcbb5bf 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
index fc2d429..24d6f23 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
index 26d4796..ee2028d 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
index 42cae7b..3e761cf 100644
--- a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
index 5f8dbf7..cd51cd3 100644
--- a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
index 8cf0604..706012f 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
index d09e022..5c549aa 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
index f0aa273..b0eca38 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
index d3638c6..06cb83e 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
index bbbbdfd..61d2b20 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
index 1743b65..39a7acc 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
index 36deef1..cd61aed 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
index e7aabfa..a590dc6 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
index adf30f5..5ba4f2e 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
index 3846bc0..90c40c8 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
index ab4f736..b776004 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
index fb7c9a4..b2ddedd 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -389,6 +389,9 @@ QString SmithWatermanReportCallbackMAImpl::planFor_MSA_Alignment_InCurrentWindow
MsaDbiUtils::splitBytesToCharsAndGaps(refSequenceData, notUsedOutputParam, refRow->gaps);
MsaDbiUtils::splitBytesToCharsAndGaps(ptrnSequenceData, notUsedOutputParam, ptrnRow->gaps);
+ U2UseCommonUserModStep userModStep(sourceMsaRef, os);
+ Q_UNUSED(userModStep);
+ SAFE_POINT_OP(os, QString());
msaDbi->updateGapModel(sourceMsaRef.entityId, refRow->rowId, refRow->gaps, os);
CHECK_OP(os, tr("Failed to update row gap model"));
msaDbi->updateGapModel(sourceMsaRef.entityId, ptrnRow->rowId, ptrnRow->gaps, os);
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
index 74cf6c4..5715f81 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
index e1426f5..021fb8f 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
index b6f7beb..6fe370d 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
index f5062a0..cf5d8e9 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
index eef594b..ab9f2c3 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
index bd17403..0d838fd 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
index f738cdd..bd1ed42 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
index 8454d92..b5e28d9 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
index e634716..dcaa0b2 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
index 9bbabf2..70848df 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
index be3cfb0..8f48575 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
index bb02df5..8113a70 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
index ff22699..f797332 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
index 2848c11..992def8 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
index b439da4..f386f7c 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
index cc7850f..1e60c84 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
index d4571e3..fdbd41a 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
index 314a9d6..2b6db75 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
index 4837161..985c382 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
index 215f8f6..f6bd01b 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
index 35d1ea9..bf7b015 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
index b8b765d..2e50179 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
index 11db58e..14fd964 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
index 6bfce9d..8d56ff2 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
index d9c043e..95fcd19 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
index d96eef7..b0d7552 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
index 4faa42a..f4b831f 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
index 2d529e3..84d50f0 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
index 6c625a7..44e5643 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_gpu/opencl/BinaryFind.cl b/src/corelibs/U2Algorithm/src/util_gpu/opencl/BinaryFind.cl
index c9d247e..d548cf1 100755
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/BinaryFind.cl
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/BinaryFind.cl
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
index dc63d23..3ae04b7 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
index c1780f7..5228cca 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
index b91aa2b..9cda0d1 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
index 84e52e3..f542976 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
index 0356d47..9ec0b0b 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
index 7ea12b3..b0e80ab 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
index efd9deb..9268b1a 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
index c714b74..03421c6 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
index 3afb510..fe61d58 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
index c34a320..d7b0285 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
index 546198c..c1c8459 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
index 6731197..acbe54b 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
index 4a31d0e..97ecc49 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
index b5940fd..d124ba8 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
index 9f2597e..1b4ff7c 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
index 7c804ea..3d21b95 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
index 9728ee0..36ebce3 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
index eae8aca..87f0c4b 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
index e61c78f..d057538 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
index 96cc247..c2b6926 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
index 158fe8e..8653231 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
index 76674c3..022c4b8 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
index b12aca7..373a069 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
index 9a0d1b7..1afaf36 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
index fb28ff7..97ff7a1 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
index 6c8ea0e..4ab445d 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
index cdb8c96..795c299 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
index cfaa287..37645e4 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
index e31ad79..a578a5c 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
index d530a5f..a842df3 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
index ec41332..d012450 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
index bd2e92e..c762cdd 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
index c87aafb..e6a3d96 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
index ecead23..fd7600e 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
index e4646fb..410ea2d 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
index 41a258e..ff818ee 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.cpp
index 4cb3b52..d635a5f 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.h b/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.h
index 8f6c81d..366c522 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MSAColorScheme.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
index 4d278fa..4a70568 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
index 221dd77..7c777d3 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
index eef63eb..455baac 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
index 197db7c..cb5ed7d 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
index 03666fa..5df88f1 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
index 8b7badf..fb3ac43 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
index 3884e30..b9a8647 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
index c688c8d..6adb81f 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
index 3286706..2c0d4cc 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
index b1f46e0..c5670a2 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
index 832e7ee..cda769f 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
index ac839d4..7892cfc 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
index 9e615f5..a90f09d 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
index ce25bb3..35649a4 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
index 4c2d322..8a5d778 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
index 7159e12..547a680 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
index cf0ad19..569ec44 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
index 43346ce..3d7a4a7 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
index abe50e2..c2c0a91 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
index 1d1907d..4592fa1 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
index b2bf9ce..5bf68e3 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
index 0528c85..02fb67e 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
index cbeed14..4350fbd 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
index 9e92714..d0d5c73 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Algorithm/transl/english.ts b/src/corelibs/U2Algorithm/transl/english.ts
index 412d7f4..d30b951 100644
--- a/src/corelibs/U2Algorithm/transl/english.ts
+++ b/src/corelibs/U2Algorithm/transl/english.ts
@@ -63,12 +63,12 @@
<translation>clear OpenCL resources</translation>
</message>
<message>
- <location filename="../src/misc/BinaryFindOpenCL.cpp" line="169"/>
+ <location filename="../src/misc/BinaryFindOpenCL.cpp" line="173"/>
<source>GPU memory usage: %1 Mb</source>
<translation>GPU memory usage: %1 Mb</translation>
</message>
<message>
- <location filename="../src/misc/BinaryFindOpenCL.cpp" line="183"/>
+ <location filename="../src/misc/BinaryFindOpenCL.cpp" line="188"/>
<source>Device's preferred work group size multiple is %1</source>
<translation>Device's preferred work group size multiple is %1</translation>
</message>
@@ -662,8 +662,8 @@ For every column selects the most rare symbol in the whole alignment with percen
<translation>Failed to get msa from dbi</translation>
</message>
<message>
- <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="393"/>
- <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="395"/>
+ <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="396"/>
+ <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="398"/>
<source>Failed to update row gap model</source>
<translation>Failed to update row gap model</translation>
</message>
diff --git a/src/corelibs/U2Algorithm/transl/russian.ts b/src/corelibs/U2Algorithm/transl/russian.ts
index 7e4609a..cbfa856 100644
--- a/src/corelibs/U2Algorithm/transl/russian.ts
+++ b/src/corelibs/U2Algorithm/transl/russian.ts
@@ -63,12 +63,12 @@
<translation>очистка OpenCL ресурсов</translation>
</message>
<message>
- <location filename="../src/misc/BinaryFindOpenCL.cpp" line="169"/>
+ <location filename="../src/misc/BinaryFindOpenCL.cpp" line="173"/>
<source>GPU memory usage: %1 Mb</source>
<translation>Использование памяти: %1 Mb</translation>
</message>
<message>
- <location filename="../src/misc/BinaryFindOpenCL.cpp" line="183"/>
+ <location filename="../src/misc/BinaryFindOpenCL.cpp" line="188"/>
<source>Device's preferred work group size multiple is %1</source>
<translation>Предпочтительный размер рабочей группы кратен %1</translation>
</message>
@@ -664,10 +664,10 @@ For every column selects the most rare symbol in the whole alignment with percen
<translation>Неудачная попытка получения msa из dbi</translation>
</message>
<message>
- <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="393"/>
- <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="395"/>
+ <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="396"/>
+ <location filename="../src/smith_waterman/SmithWatermanReportCallback.cpp" line="398"/>
<source>Failed to update row gap model</source>
- <translation>Неудачная попытка обновить модель пропусков строк</translation>
+ <translation>Неудачная попытка обновить модель пробелов строк</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2Core/U2Core.pro b/src/corelibs/U2Core/U2Core.pro
index a20795d..eaeee23 100644
--- a/src/corelibs/U2Core/U2Core.pro
+++ b/src/corelibs/U2Core/U2Core.pro
@@ -81,6 +81,7 @@ HEADERS += src/cmdline/CMDLineCoreOptions.h \
src/globals/AppSettings.h \
src/globals/AutoAnnotationsSupport.h \
src/globals/BaseDocumentFormats.h \
+ src/globals/ClipboardController.h \
src/globals/Counter.h \
src/globals/CredentialsAsker.h \
src/globals/DataBaseRegistry.h \
@@ -289,6 +290,7 @@ SOURCES += src/cmdline/CMDLineCoreOptions.cpp \
src/globals/AppResources.cpp \
src/globals/AutoAnnotationsSupport.cpp \
src/globals/BaseDocumentFormats.cpp \
+ src/globals/ClipboardController.cpp \
src/globals/Counter.cpp \
src/globals/CredentialsAsker.cpp \
src/globals/DataBaseRegistry.cpp \
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
index 1f4f26c..be9f18f 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
index 23f2e3b..72a5a8c 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h b/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
index 57688da..b2127d2 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
index 6054013..a08c8d5 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
index fbb39c9..c56a664 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
index 86fdd79..9eaf405 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
index b6af601..ebf818d 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Annotation.cpp b/src/corelibs/U2Core/src/datatype/Annotation.cpp
index 6ab6a59..a003332 100644
--- a/src/corelibs/U2Core/src/datatype/Annotation.cpp
+++ b/src/corelibs/U2Core/src/datatype/Annotation.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Annotation.h b/src/corelibs/U2Core/src/datatype/Annotation.h
index a7a4e6b..dc40827 100644
--- a/src/corelibs/U2Core/src/datatype/Annotation.h
+++ b/src/corelibs/U2Core/src/datatype/Annotation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationData.cpp b/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
index e6f6b48..f84fc4f 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationData.h b/src/corelibs/U2Core/src/datatype/AnnotationData.h
index 425549c..1029c49 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationData.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp b/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
index 438bb56..af0a3b8 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationGroup.h b/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
index 75e5b6a..e4a7d15 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp b/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
index 82f29dd..1287f41 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationModification.h b/src/corelibs/U2Core/src/datatype/AnnotationModification.h
index acb45bf..ab8f4f8 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationModification.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationModification.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp b/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
index 2143906..860c360 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationSettings.h b/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
index 56112ef..46d3dff 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
index f9f04b2..68b047a 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
index 83ebfee..263c41e 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp b/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
index 3a31fad..6abe5ba 100644
--- a/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
+++ b/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp b/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
index c584552..d0f5282 100644
--- a/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
+++ b/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp b/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
index f288911..088816f 100644
--- a/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
+++ b/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -249,10 +249,19 @@ QByteArray BioStruct3D::getRawSequenceByChainIndex(int id) const {
char BioStruct3D::getChainIdByIndex(int index) const {
SAFE_POINT(moleculeMap.contains(index), QString("Can't find chain identifier for index: %1").arg(index), 0);
- const SharedMolecule molecule = moleculeMap.value(index);
return moleculeMap.value(index)->chainId;
}
+int BioStruct3D::getIndexByChainId(char chainId) const {
+ foreach(int curIndex, moleculeMap.keys()) {
+ const SharedMolecule molecule = moleculeMap.value(curIndex);
+ if (molecule->chainId == chainId) {
+ return curIndex;
+ }
+ }
+ return -1;
+}
+
const QList<int> BioStruct3D::getModelsNames() const {
return modelMap.keys();
}
diff --git a/src/corelibs/U2Core/src/datatype/BioStruct3D.h b/src/corelibs/U2Core/src/datatype/BioStruct3D.h
index e35fcf6..72c9160 100644
--- a/src/corelibs/U2Core/src/datatype/BioStruct3D.h
+++ b/src/corelibs/U2Core/src/datatype/BioStruct3D.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -198,6 +198,7 @@ public:
QByteArray getRawSequenceByChainIndex(int id) const;
char getChainIdByIndex(int id) const;
+ int getIndexByChainId(char chainId) const;
int getNumberOfAtoms() const;
QList<SharedAtom> getAllAtoms() const;
int getNumberOfResidues() const;
diff --git a/src/corelibs/U2Core/src/datatype/DIProperties.h b/src/corelibs/U2Core/src/datatype/DIProperties.h
index 3652f51..51a7d5c 100644
--- a/src/corelibs/U2Core/src/datatype/DIProperties.h
+++ b/src/corelibs/U2Core/src/datatype/DIProperties.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp b/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
index e6b6e9f..77f5765 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAAlphabet.h b/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
index 7f7f0b4..cb9a3a7 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
index 5dcc6a8..0b568a5 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
index e1bcad9..bb4ffca 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAChromatogram.h b/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
index 9eda2ca..22b2ed9 100644
--- a/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
+++ b/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAInfo.cpp b/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
index 18b0ebb..eb3ef6a 100644
--- a/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAInfo.h b/src/corelibs/U2Core/src/datatype/DNAInfo.h
index 5b74309..8fe5ac4 100644
--- a/src/corelibs/U2Core/src/datatype/DNAInfo.h
+++ b/src/corelibs/U2Core/src/datatype/DNAInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAQuality.cpp b/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
index 4e2825e..a81dce5 100644
--- a/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNAQuality.h b/src/corelibs/U2Core/src/datatype/DNAQuality.h
index 4a234d2..084a57e 100644
--- a/src/corelibs/U2Core/src/datatype/DNAQuality.h
+++ b/src/corelibs/U2Core/src/datatype/DNAQuality.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNASequence.cpp b/src/corelibs/U2Core/src/datatype/DNASequence.cpp
index 6d1f0fc..c1b5487 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequence.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNASequence.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNASequence.h b/src/corelibs/U2Core/src/datatype/DNASequence.h
index 2fe7288..b78475c 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequence.h
+++ b/src/corelibs/U2Core/src/datatype/DNASequence.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
index a794af4..e21eb1e 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
index 308e734..20bf155 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
+++ b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNATranslation.cpp b/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
index b5fb80e..bb8b0e8 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNATranslation.h b/src/corelibs/U2Core/src/datatype/DNATranslation.h
index b29a622..a73f18e 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslation.h
+++ b/src/corelibs/U2Core/src/datatype/DNATranslation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
index 23868b2..b9933e9 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
index 2408255..856aca8 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
+++ b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/FeatureColors.cpp b/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
index f65edd5..3a8de4e 100644
--- a/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
+++ b/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/FeatureColors.h b/src/corelibs/U2Core/src/datatype/FeatureColors.h
index 3fd4969..c9e3467 100644
--- a/src/corelibs/U2Core/src/datatype/FeatureColors.h
+++ b/src/corelibs/U2Core/src/datatype/FeatureColors.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/MAlignment.cpp b/src/corelibs/U2Core/src/datatype/MAlignment.cpp
index 33f2e1b..7bcf4e2 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignment.cpp
+++ b/src/corelibs/U2Core/src/datatype/MAlignment.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/MAlignment.h b/src/corelibs/U2Core/src/datatype/MAlignment.h
index ba2822a..e267e8b 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignment.h
+++ b/src/corelibs/U2Core/src/datatype/MAlignment.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
index e0d552a..f2f9be7 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
+++ b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
index 7bce134..d23adc8 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
+++ b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Matrix44.cpp b/src/corelibs/U2Core/src/datatype/Matrix44.cpp
index 0a29198..caec95b 100644
--- a/src/corelibs/U2Core/src/datatype/Matrix44.cpp
+++ b/src/corelibs/U2Core/src/datatype/Matrix44.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Matrix44.h b/src/corelibs/U2Core/src/datatype/Matrix44.h
index c62d292..f2dce4c 100644
--- a/src/corelibs/U2Core/src/datatype/Matrix44.h
+++ b/src/corelibs/U2Core/src/datatype/Matrix44.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PFMatrix.cpp b/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
index 1217925..3bfff90 100644
--- a/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PFMatrix.h b/src/corelibs/U2Core/src/datatype/PFMatrix.h
index 308d116..455c253 100644
--- a/src/corelibs/U2Core/src/datatype/PFMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/PFMatrix.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PWMatrix.cpp b/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
index 8b90aa0..c58835f 100644
--- a/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PWMatrix.h b/src/corelibs/U2Core/src/datatype/PWMatrix.h
index f8992eb..76a0168 100644
--- a/src/corelibs/U2Core/src/datatype/PWMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/PWMatrix.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PhyTree.cpp b/src/corelibs/U2Core/src/datatype/PhyTree.cpp
index 4714187..10feda0 100644
--- a/src/corelibs/U2Core/src/datatype/PhyTree.cpp
+++ b/src/corelibs/U2Core/src/datatype/PhyTree.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/PhyTree.h b/src/corelibs/U2Core/src/datatype/PhyTree.h
index 5c2ebfc..19a24c5 100644
--- a/src/corelibs/U2Core/src/datatype/PhyTree.h
+++ b/src/corelibs/U2Core/src/datatype/PhyTree.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/SMatrix.cpp b/src/corelibs/U2Core/src/datatype/SMatrix.cpp
index 67ba92f..0247a57 100644
--- a/src/corelibs/U2Core/src/datatype/SMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/SMatrix.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/SMatrix.h b/src/corelibs/U2Core/src/datatype/SMatrix.h
index 92b0c72..bfe8d2e 100644
--- a/src/corelibs/U2Core/src/datatype/SMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/SMatrix.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Alphabet.h b/src/corelibs/U2Core/src/datatype/U2Alphabet.h
index 7eed752..aa0c53f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Alphabet.h
+++ b/src/corelibs/U2Core/src/datatype/U2Alphabet.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Assembly.h b/src/corelibs/U2Core/src/datatype/U2Assembly.h
index 66682ee..0d6daa9 100644
--- a/src/corelibs/U2Core/src/datatype/U2Assembly.h
+++ b/src/corelibs/U2Core/src/datatype/U2Assembly.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Attribute.h b/src/corelibs/U2Core/src/datatype/U2Attribute.h
index bff0ae1..6bc2416 100644
--- a/src/corelibs/U2Core/src/datatype/U2Attribute.h
+++ b/src/corelibs/U2Core/src/datatype/U2Attribute.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
index 467595e..e3deb09 100644
--- a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
index 293dd83..9f629db 100644
--- a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
+++ b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Feature.h b/src/corelibs/U2Core/src/datatype/U2Feature.h
index d35c906..22ca16c 100644
--- a/src/corelibs/U2Core/src/datatype/U2Feature.h
+++ b/src/corelibs/U2Core/src/datatype/U2Feature.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h b/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
index 13632da..d38fbbe 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp b/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
index 7ca4cd5..b253448 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2FeatureType.h b/src/corelibs/U2Core/src/datatype/U2FeatureType.h
index 15f50d6..18f93df 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureType.h
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureType.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2IdTypes.h b/src/corelibs/U2Core/src/datatype/U2IdTypes.h
index ba24527..438b53e 100644
--- a/src/corelibs/U2Core/src/datatype/U2IdTypes.h
+++ b/src/corelibs/U2Core/src/datatype/U2IdTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Identity.h b/src/corelibs/U2Core/src/datatype/U2Identity.h
index fcd8f68..262e248 100644
--- a/src/corelibs/U2Core/src/datatype/U2Identity.h
+++ b/src/corelibs/U2Core/src/datatype/U2Identity.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Location.h b/src/corelibs/U2Core/src/datatype/U2Location.h
index e39b69d..614e63f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Location.h
+++ b/src/corelibs/U2Core/src/datatype/U2Location.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Mod.cpp b/src/corelibs/U2Core/src/datatype/U2Mod.cpp
index 500d20f..0a661df 100644
--- a/src/corelibs/U2Core/src/datatype/U2Mod.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Mod.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Mod.h b/src/corelibs/U2Core/src/datatype/U2Mod.h
index 811382d..46395da 100644
--- a/src/corelibs/U2Core/src/datatype/U2Mod.h
+++ b/src/corelibs/U2Core/src/datatype/U2Mod.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Msa.h b/src/corelibs/U2Core/src/datatype/U2Msa.h
index ce25977..4b4e8b0 100644
--- a/src/corelibs/U2Core/src/datatype/U2Msa.h
+++ b/src/corelibs/U2Core/src/datatype/U2Msa.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Qualifier.h b/src/corelibs/U2Core/src/datatype/U2Qualifier.h
index ed8cb63..d7d2e59 100644
--- a/src/corelibs/U2Core/src/datatype/U2Qualifier.h
+++ b/src/corelibs/U2Core/src/datatype/U2Qualifier.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Range.h b/src/corelibs/U2Core/src/datatype/U2Range.h
index e386090..70d42d0 100644
--- a/src/corelibs/U2Core/src/datatype/U2Range.h
+++ b/src/corelibs/U2Core/src/datatype/U2Range.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2RawData.h b/src/corelibs/U2Core/src/datatype/U2RawData.h
index 548fa3c..4e529de 100644
--- a/src/corelibs/U2Core/src/datatype/U2RawData.h
+++ b/src/corelibs/U2Core/src/datatype/U2RawData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Region.cpp b/src/corelibs/U2Core/src/datatype/U2Region.cpp
index 06be2fc..c24df8f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Region.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Region.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Region.h b/src/corelibs/U2Core/src/datatype/U2Region.h
index 65d5b2d..154048b 100644
--- a/src/corelibs/U2Core/src/datatype/U2Region.h
+++ b/src/corelibs/U2Core/src/datatype/U2Region.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Sequence.h b/src/corelibs/U2Core/src/datatype/U2Sequence.h
index e2663b4..3458d8e 100644
--- a/src/corelibs/U2Core/src/datatype/U2Sequence.h
+++ b/src/corelibs/U2Core/src/datatype/U2Sequence.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Type.cpp b/src/corelibs/U2Core/src/datatype/U2Type.cpp
index 64b5628..3bc7212 100644
--- a/src/corelibs/U2Core/src/datatype/U2Type.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Type.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Type.h b/src/corelibs/U2Core/src/datatype/U2Type.h
index 886ef9e..617bbc3 100644
--- a/src/corelibs/U2Core/src/datatype/U2Type.h
+++ b/src/corelibs/U2Core/src/datatype/U2Type.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2TypeIds.h b/src/corelibs/U2Core/src/datatype/U2TypeIds.h
index bab7540..7ab327d 100644
--- a/src/corelibs/U2Core/src/datatype/U2TypeIds.h
+++ b/src/corelibs/U2Core/src/datatype/U2TypeIds.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/U2Variant.h b/src/corelibs/U2Core/src/datatype/U2Variant.h
index 6cfd1db..954967f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Variant.h
+++ b/src/corelibs/U2Core/src/datatype/U2Variant.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrRecord.cpp b/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
index 632213a..92560d4 100644
--- a/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrRecord.h b/src/corelibs/U2Core/src/datatype/UdrRecord.h
index 249481c..97f274c 100644
--- a/src/corelibs/U2Core/src/datatype/UdrRecord.h
+++ b/src/corelibs/U2Core/src/datatype/UdrRecord.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrSchema.cpp b/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
index 303c00b..b2c0927 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrSchema.h b/src/corelibs/U2Core/src/datatype/UdrSchema.h
index 450edf0..5ccb1f2 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchema.h
+++ b/src/corelibs/U2Core/src/datatype/UdrSchema.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
index 640ad96..8203330 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
index 46edff9..6e8ac3c 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
+++ b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Vector3D.cpp b/src/corelibs/U2Core/src/datatype/Vector3D.cpp
index abdaf40..a123354 100644
--- a/src/corelibs/U2Core/src/datatype/Vector3D.cpp
+++ b/src/corelibs/U2Core/src/datatype/Vector3D.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/Vector3D.h b/src/corelibs/U2Core/src/datatype/Vector3D.h
index 4132def..5756924 100644
--- a/src/corelibs/U2Core/src/datatype/Vector3D.h
+++ b/src/corelibs/U2Core/src/datatype/Vector3D.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
index 1cd500c..d857243 100644
--- a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
+++ b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
index 93451fd..b08c9ff 100644
--- a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
+++ b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/DbiConnection.cpp b/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
index f8d5b11..1e2fe40 100644
--- a/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
+++ b/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/DbiConnection.h b/src/corelibs/U2Core/src/dbi/DbiConnection.h
index 3edf36c..3a926a6 100644
--- a/src/corelibs/U2Core/src/dbi/DbiConnection.h
+++ b/src/corelibs/U2Core/src/dbi/DbiConnection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
index 50a1cbd..d8ebafc 100644
--- a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
+++ b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
index 30c3e42..13f3a58 100644
--- a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
+++ b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h b/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
index c212dc8..631b0b0 100644
--- a/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h b/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
index 0c6294a..7880649 100644
--- a/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h b/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
index 81d4213..83cdfb6 100644
--- a/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h b/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
index 29d5620..868ec66 100644
--- a/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2Dbi.cpp b/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
index 9f58661..7bce5c8 100644
--- a/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2Dbi.h b/src/corelibs/U2Core/src/dbi/U2Dbi.h
index f85ef30..d02a647 100644
--- a/src/corelibs/U2Core/src/dbi/U2Dbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2Dbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
index ebf2ecb..9145fcc 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
index 52afa35..f942061 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
index 1f628d9..4a572a5 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
index a0cf10d..cd2d31d 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp b/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
index de51519..b4413e6 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiUtils.h b/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
index 292c42c..62eaa42 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h b/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
index 6cc53d1..da3e013 100644
--- a/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h b/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
index 96f7e6a..85f2fc1 100644
--- a/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
+++ b/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2ModDbi.h b/src/corelibs/U2Core/src/dbi/U2ModDbi.h
index d48362a..526027d 100644
--- a/src/corelibs/U2Core/src/dbi/U2ModDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ModDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2MsaDbi.h b/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
index ecacd1a..b2e0894 100644
--- a/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
index 94e8e18..bb98491 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
index 0620cad..b98e361 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
index 500deba..e38f73f 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
index c4d728f..c06a6b8 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
index 6dc757c..5b0b543 100644
--- a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
index eb29140..626a078 100644
--- a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
+++ b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h b/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
index 3d12929..0e3ff01 100644
--- a/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
index e28a6f3..20b4564 100644
--- a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
index 2a58f5a..2912962 100644
--- a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
+++ b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/U2VariantDbi.h b/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
index 5074482..fb0e7a5 100644
--- a/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/UdrDbi.cpp b/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
index 4519cb5..f97af68 100644
--- a/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/dbi/UdrDbi.h b/src/corelibs/U2Core/src/dbi/UdrDbi.h
index 0b157e8..1272758 100644
--- a/src/corelibs/U2Core/src/dbi/UdrDbi.h
+++ b/src/corelibs/U2Core/src/dbi/UdrDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppContext.cpp b/src/corelibs/U2Core/src/globals/AppContext.cpp
index bb3132c..b566deb 100644
--- a/src/corelibs/U2Core/src/globals/AppContext.cpp
+++ b/src/corelibs/U2Core/src/globals/AppContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppContext.h b/src/corelibs/U2Core/src/globals/AppContext.h
index f6baf57..40524cf 100644
--- a/src/corelibs/U2Core/src/globals/AppContext.h
+++ b/src/corelibs/U2Core/src/globals/AppContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -80,7 +80,7 @@ class QDActorPrototypeRegistry;
class StructuralAlignmentAlgorithmRegistry;
class AutoAnnotationsSupport;
class CDSearchFactoryRegistry;
-class GUITestBase;
+class UGUITestBase;
class SplicedAlignmentTaskRegistry;
class OPCommonWidgetFactoryRegistry;
class OPWidgetFactoryRegistry;
@@ -94,6 +94,7 @@ class PasswordStorage;
class ConvertFactoryRegistry;
class WelcomePageAction;
class ProjectFilterTaskRegistry;
+class PasteFactory;
class U2CORE_EXPORT AppContext : public QObject {
Q_OBJECT
@@ -234,7 +235,7 @@ public:
static QString getActiveWindowName() {return getInstance()->_getActiveWindowName();}
static void setActiveWindowName(const QString &name) {getInstance()->_setActiveWindowName(name);}
- static GUITestBase *getGUITestBase() {return getInstance()->_getGUITestBase();}
+ static UGUITestBase *getGUITestBase() {return getInstance()->_getGUITestBase();}
static AppFileStorage *getAppFileStorage() {return getInstance()->_getAppFileStorage();}
@@ -254,6 +255,8 @@ public:
static ProjectFilterTaskRegistry * getProjectFilterTaskRegistry() { return getInstance()->_getProjectFilterTaskRegistry(); }
+ static PasteFactory* getPasteFactory() {return getInstance()->_getPasteFactory();}
+
protected:
static AppContext* getInstance() {assert(instance); return instance;}
@@ -310,7 +313,7 @@ protected:
virtual U2DbiRegistry * _getDbiRegistry() const = 0;
virtual UdrSchemaRegistry * _getUdrSchemaRegistry() const = 0;
virtual CDSearchFactoryRegistry* _getCDSFactoryRegistry() const = 0;
- virtual GUITestBase* _getGUITestBase() const = 0;
+ virtual UGUITestBase* _getGUITestBase() const = 0;
virtual SplicedAlignmentTaskRegistry* _getSplicedAlignmentTaskRegistry() const = 0;
virtual OPCommonWidgetFactoryRegistry* _getOPCommonWidgetFactoryRegistry() const = 0;
virtual OPWidgetFactoryRegistry* _getOPWidgetFactoryRegistry() const = 0;
@@ -324,6 +327,7 @@ protected:
virtual ConvertFactoryRegistry* _getConvertFactoryRegistry() const = 0;
virtual IdRegistry<WelcomePageAction>* _getWelcomePageActionRegistry() const = 0;
virtual ProjectFilterTaskRegistry * _getProjectFilterTaskRegistry() const = 0;
+ virtual PasteFactory * _getPasteFactory() const = 0;
virtual void _registerGlobalObject(AppGlobalObject* go) = 0;
virtual void _unregisterGlobalObject(const QString& id) = 0;
diff --git a/src/corelibs/U2Core/src/globals/AppFileStorage.cpp b/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
index 0910939..959a73a 100644
--- a/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
+++ b/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppFileStorage.h b/src/corelibs/U2Core/src/globals/AppFileStorage.h
index 2837d29..9031b3f 100644
--- a/src/corelibs/U2Core/src/globals/AppFileStorage.h
+++ b/src/corelibs/U2Core/src/globals/AppFileStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp b/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
index 6e7afc3..e66e6a9 100644
--- a/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
+++ b/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppGlobalObject.h b/src/corelibs/U2Core/src/globals/AppGlobalObject.h
index 4bc45f1..7af294a 100644
--- a/src/corelibs/U2Core/src/globals/AppGlobalObject.h
+++ b/src/corelibs/U2Core/src/globals/AppGlobalObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppResources.cpp b/src/corelibs/U2Core/src/globals/AppResources.cpp
index 39bdbcc..daebe60 100644
--- a/src/corelibs/U2Core/src/globals/AppResources.cpp
+++ b/src/corelibs/U2Core/src/globals/AppResources.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppResources.h b/src/corelibs/U2Core/src/globals/AppResources.h
index ff90b22..0a98045 100644
--- a/src/corelibs/U2Core/src/globals/AppResources.h
+++ b/src/corelibs/U2Core/src/globals/AppResources.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AppSettings.h b/src/corelibs/U2Core/src/globals/AppSettings.h
index 5e2d902..022750a 100644
--- a/src/corelibs/U2Core/src/globals/AppSettings.h
+++ b/src/corelibs/U2Core/src/globals/AppSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
index 25b0a90..506a38c 100644
--- a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
+++ b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
index b035e10..b36d517 100644
--- a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
+++ b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
index 13270d1..67dc01f 100644
--- a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
+++ b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
index f12ec7e..a31aa62 100644
--- a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
+++ b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ClipboardController.cpp b/src/corelibs/U2Core/src/globals/ClipboardController.cpp
index e69de29..92fd6d8 100644
--- a/src/corelibs/U2Core/src/globals/ClipboardController.cpp
+++ b/src/corelibs/U2Core/src/globals/ClipboardController.cpp
@@ -0,0 +1,79 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "ClipboardController.h"
+
+#include <U2Core/MAlignmentObject.h>
+#include <U2Core/DNASequenceObject.h>
+
+namespace U2 {
+
+///////////////////
+///PasteFactory
+PasteFactory::PasteFactory(QObject *parent)
+ :QObject(parent){
+}
+
+///////////////////
+///PasteTask
+PasteTask::PasteTask()
+ :Task(tr("Paste data"), TaskFlag_None){
+}
+
+///////////////////
+///PasteUtils
+QList<DNASequence> PasteUtils::getSequences(const QList<Document*>& docs, U2OpStatus& os){
+ QList<DNASequence> res;
+
+ foreach (Document* doc, docs){
+ foreach(GObject *seqObj, doc->findGObjectByType(GObjectTypes::SEQUENCE)) {
+ U2SequenceObject *casted = qobject_cast<U2SequenceObject*>(seqObj);
+ if (casted == NULL){
+ continue;
+ }
+ DNASequence seq = casted->getWholeSequence(os);
+ if (os.hasError()){
+ continue;
+ }
+ seq.alphabet = casted->getAlphabet();
+ res.append(seq);
+
+ }
+
+ foreach(GObject *msaObj, doc->findGObjectByType(GObjectTypes::MULTIPLE_ALIGNMENT)) {
+ MAlignmentObject* casted = qobject_cast<MAlignmentObject*>(msaObj);
+ if (casted == NULL){
+ continue;
+ }
+ foreach(const MAlignmentRow& row, casted->getMAlignment().getRows()) {
+ DNASequence seq = row.getSequence();
+ seq.seq = row.getData();
+ seq.alphabet = casted->getAlphabet();
+ res.append(seq);
+ }
+
+ }
+ }
+
+ return res;
+}
+
+} // U2
diff --git a/src/corelibs/U2Core/src/globals/ClipboardController.h b/src/corelibs/U2Core/src/globals/ClipboardController.h
index e69de29..7189778 100644
--- a/src/corelibs/U2Core/src/globals/ClipboardController.h
+++ b/src/corelibs/U2Core/src/globals/ClipboardController.h
@@ -0,0 +1,61 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_CLIPBOARD_CONTROLLER_H_
+#define _U2_CLIPBOARD_CONTROLLER_H_
+
+#include <U2Core/DocumentUtils.h>
+#include <U2Core/U2OpStatus.h>
+#include <U2Core/Task.h>
+
+#include <QClipboard>
+
+namespace U2 {
+
+class U2CORE_EXPORT PasteTask : public Task{
+ Q_OBJECT
+public:
+ PasteTask();
+
+ virtual QList<GUrl> getUrls() const = 0;
+ virtual QList<Document*> getDocuments() const = 0;
+protected:
+ virtual void processDocument(Document* doc){}
+};
+
+class U2CORE_EXPORT PasteFactory : public QObject {
+ Q_OBJECT
+public:
+ PasteFactory(QObject *parent=0);
+
+ virtual PasteTask* pasteTask(bool useInSequenceWidget) = 0;
+};
+
+class U2CORE_EXPORT PasteUtils : public QObject {
+ Q_OBJECT
+public:
+ static QList<DNASequence> getSequences(const QList<Document*>& docs, U2OpStatus& os);
+};
+
+
+} // U2
+
+#endif // _U2_CLIPBOARD_CONTROLLER_H_
diff --git a/src/corelibs/U2Core/src/globals/Counter.cpp b/src/corelibs/U2Core/src/globals/Counter.cpp
index 2d5ae9b..c0ad381 100644
--- a/src/corelibs/U2Core/src/globals/Counter.cpp
+++ b/src/corelibs/U2Core/src/globals/Counter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Counter.h b/src/corelibs/U2Core/src/globals/Counter.h
index d33c589..0bccae4 100644
--- a/src/corelibs/U2Core/src/globals/Counter.h
+++ b/src/corelibs/U2Core/src/globals/Counter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp b/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
index a711052..b788b85 100644
--- a/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
+++ b/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
* UGENE - Integrated Bioinformatics Tools.
*
diff --git a/src/corelibs/U2Core/src/globals/CredentialsAsker.h b/src/corelibs/U2Core/src/globals/CredentialsAsker.h
index 01b6064..0163d16 100644
--- a/src/corelibs/U2Core/src/globals/CredentialsAsker.h
+++ b/src/corelibs/U2Core/src/globals/CredentialsAsker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp b/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
index cf61d85..08eba02 100644
--- a/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DBXRefRegistry.h b/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
index 829a329..3be387b 100644
--- a/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp b/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
index 6388e99..e3f45b4 100644
--- a/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DataBaseRegistry.h b/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
index 2666fb1..90e59ac 100644
--- a/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp b/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
index ea5220a..e376053 100644
--- a/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/DataPathRegistry.h b/src/corelibs/U2Core/src/globals/DataPathRegistry.h
index 88a966f..79c1943 100644
--- a/src/corelibs/U2Core/src/globals/DataPathRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DataPathRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
index e72731b..59bf348 100644
--- a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
index cedd0d8..c58c2bd 100644
--- a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/FormatSettings.cpp b/src/corelibs/U2Core/src/globals/FormatSettings.cpp
index 6210ad0..23ea22a 100644
--- a/src/corelibs/U2Core/src/globals/FormatSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/FormatSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/FormatSettings.h b/src/corelibs/U2Core/src/globals/FormatSettings.h
index 74ab6f8..f325bb0 100644
--- a/src/corelibs/U2Core/src/globals/FormatSettings.h
+++ b/src/corelibs/U2Core/src/globals/FormatSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/GUrl.cpp b/src/corelibs/U2Core/src/globals/GUrl.cpp
index 9b06f44..0ab9a73 100644
--- a/src/corelibs/U2Core/src/globals/GUrl.cpp
+++ b/src/corelibs/U2Core/src/globals/GUrl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/GUrl.h b/src/corelibs/U2Core/src/globals/GUrl.h
index 39d649a..d7a54fb 100644
--- a/src/corelibs/U2Core/src/globals/GUrl.h
+++ b/src/corelibs/U2Core/src/globals/GUrl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Identifiable.h b/src/corelibs/U2Core/src/globals/Identifiable.h
index 0b6b809..09b9698 100644
--- a/src/corelibs/U2Core/src/globals/Identifiable.h
+++ b/src/corelibs/U2Core/src/globals/Identifiable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/L10n.h b/src/corelibs/U2Core/src/globals/L10n.h
index d8ea137..cc9b364 100644
--- a/src/corelibs/U2Core/src/globals/L10n.h
+++ b/src/corelibs/U2Core/src/globals/L10n.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Log.cpp b/src/corelibs/U2Core/src/globals/Log.cpp
index 681d3db..4ddf5cc 100644
--- a/src/corelibs/U2Core/src/globals/Log.cpp
+++ b/src/corelibs/U2Core/src/globals/Log.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Log.h b/src/corelibs/U2Core/src/globals/Log.h
index 6548a9f..58c6ea3 100644
--- a/src/corelibs/U2Core/src/globals/Log.h
+++ b/src/corelibs/U2Core/src/globals/Log.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/LogCache.cpp b/src/corelibs/U2Core/src/globals/LogCache.cpp
index e35ff1a..6ffdc2d 100644
--- a/src/corelibs/U2Core/src/globals/LogCache.cpp
+++ b/src/corelibs/U2Core/src/globals/LogCache.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/LogCache.h b/src/corelibs/U2Core/src/globals/LogCache.h
index 5d7c135..54f9292 100644
--- a/src/corelibs/U2Core/src/globals/LogCache.h
+++ b/src/corelibs/U2Core/src/globals/LogCache.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp b/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
index 6803732..4f8eeec 100644
--- a/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
+++ b/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/NetworkConfiguration.h b/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
index 98ae2de..c783203 100644
--- a/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
+++ b/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/PasswordStorage.cpp b/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
index 6448aaf..b18f436 100644
--- a/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
+++ b/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/PasswordStorage.h b/src/corelibs/U2Core/src/globals/PasswordStorage.h
index 0375ddc..bcdb8d5 100644
--- a/src/corelibs/U2Core/src/globals/PasswordStorage.h
+++ b/src/corelibs/U2Core/src/globals/PasswordStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/PluginModel.cpp b/src/corelibs/U2Core/src/globals/PluginModel.cpp
index 5ce2a5d..dc87a4b 100644
--- a/src/corelibs/U2Core/src/globals/PluginModel.cpp
+++ b/src/corelibs/U2Core/src/globals/PluginModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/PluginModel.h b/src/corelibs/U2Core/src/globals/PluginModel.h
index 5d3589b..1fe3452 100644
--- a/src/corelibs/U2Core/src/globals/PluginModel.h
+++ b/src/corelibs/U2Core/src/globals/PluginModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
index 824fcdd..20e56ed 100644
--- a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
index c5aaeb4..495c157 100644
--- a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectService.cpp b/src/corelibs/U2Core/src/globals/ProjectService.cpp
index 9aaf88f..029e423 100644
--- a/src/corelibs/U2Core/src/globals/ProjectService.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectService.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectService.h b/src/corelibs/U2Core/src/globals/ProjectService.h
index ab02133..6d383cd 100644
--- a/src/corelibs/U2Core/src/globals/ProjectService.h
+++ b/src/corelibs/U2Core/src/globals/ProjectService.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
index 8443e42..753a22b 100644
--- a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
index d3e85c0..59065db 100644
--- a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
+++ b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -63,10 +63,19 @@ public:
class U2CORE_EXPORT ProjectTreeControllerModeSettings {
public:
- ProjectTreeControllerModeSettings()
- : allowMultipleSelection(true), readOnlyFilter(TriState_Unknown), loadTaskProvider(NULL),
- groupMode(ProjectTreeGroupMode_ByDocument), allowSelectUnloaded(false), objectFilter(NULL), documentFilter(NULL),
- markActive(false) {}
+ ProjectTreeControllerModeSettings() :
+ allowMultipleSelection(true),
+ readOnlyFilter(TriState_Unknown),
+ loadTaskProvider(NULL),
+ groupMode(ProjectTreeGroupMode_ByDocument),
+ allowSelectUnloaded(false),
+ ignoreRemoteObjects(false),
+ objectFilter(NULL),
+ documentFilter(NULL),
+ markActive(false)
+ {
+
+ }
QSet<GObjectType> objectTypesToShow; // show only objects of specified type
QSet<GObjectConstraints*> objectConstraints; // show only objects that fits constraints
@@ -78,6 +87,7 @@ public:
LoadDocumentTaskProvider* loadTaskProvider; // use custom LoadDocumentTask factory instead of default
ProjectTreeGroupMode groupMode; // group mode for objects
bool allowSelectUnloaded; // ability to select unloaded objects
+ bool ignoreRemoteObjects; // do not load from remote database
//Note that objectFilter and documentFilter are called only on object add/remove ops!
//WARN: object and document filters live-range is controlled by the side created these objects
diff --git a/src/corelibs/U2Core/src/globals/ResourceTracker.cpp b/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
index b707667..f63896a 100644
--- a/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
+++ b/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ResourceTracker.h b/src/corelibs/U2Core/src/globals/ResourceTracker.h
index ca69b34..61e4517 100644
--- a/src/corelibs/U2Core/src/globals/ResourceTracker.h
+++ b/src/corelibs/U2Core/src/globals/ResourceTracker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
index 91ae573..441f8a9 100644
--- a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
index 45e34a5..93bc8ca 100644
--- a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ServiceModel.cpp b/src/corelibs/U2Core/src/globals/ServiceModel.cpp
index 84d13a1..d183564 100644
--- a/src/corelibs/U2Core/src/globals/ServiceModel.cpp
+++ b/src/corelibs/U2Core/src/globals/ServiceModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ServiceModel.h b/src/corelibs/U2Core/src/globals/ServiceModel.h
index b0b4e20..98e0265 100644
--- a/src/corelibs/U2Core/src/globals/ServiceModel.h
+++ b/src/corelibs/U2Core/src/globals/ServiceModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/ServiceTypes.h b/src/corelibs/U2Core/src/globals/ServiceTypes.h
index b8d72e8..9f7da3f 100644
--- a/src/corelibs/U2Core/src/globals/ServiceTypes.h
+++ b/src/corelibs/U2Core/src/globals/ServiceTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Settings.h b/src/corelibs/U2Core/src/globals/Settings.h
index 677a923..745274a 100644
--- a/src/corelibs/U2Core/src/globals/Settings.h
+++ b/src/corelibs/U2Core/src/globals/Settings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Task.cpp b/src/corelibs/U2Core/src/globals/Task.cpp
index 90ad34f..567db9a 100644
--- a/src/corelibs/U2Core/src/globals/Task.cpp
+++ b/src/corelibs/U2Core/src/globals/Task.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Task.h b/src/corelibs/U2Core/src/globals/Task.h
index e046913..cd98e5b 100644
--- a/src/corelibs/U2Core/src/globals/Task.h
+++ b/src/corelibs/U2Core/src/globals/Task.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Timer.cpp b/src/corelibs/U2Core/src/globals/Timer.cpp
index ecda6fb..ad350e3 100644
--- a/src/corelibs/U2Core/src/globals/Timer.cpp
+++ b/src/corelibs/U2Core/src/globals/Timer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Timer.h b/src/corelibs/U2Core/src/globals/Timer.h
index 4db6861..0f8394f 100644
--- a/src/corelibs/U2Core/src/globals/Timer.h
+++ b/src/corelibs/U2Core/src/globals/Timer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/U2OpStatus.h b/src/corelibs/U2Core/src/globals/U2OpStatus.h
index eff57d3..16fb5c0 100644
--- a/src/corelibs/U2Core/src/globals/U2OpStatus.h
+++ b/src/corelibs/U2Core/src/globals/U2OpStatus.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/U2SafePoints.h b/src/corelibs/U2Core/src/globals/U2SafePoints.h
index f8e2f77..27e1b2a 100644
--- a/src/corelibs/U2Core/src/globals/U2SafePoints.h
+++ b/src/corelibs/U2Core/src/globals/U2SafePoints.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp b/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
index 2ae3134..7a73435 100644
--- a/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
+++ b/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/UserActionsWriter.h b/src/corelibs/U2Core/src/globals/UserActionsWriter.h
index d6b0a30..5ae3853 100644
--- a/src/corelibs/U2Core/src/globals/UserActionsWriter.h
+++ b/src/corelibs/U2Core/src/globals/UserActionsWriter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
index a1db3b0..3f032df 100644
--- a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
index 9838856..23d9014 100644
--- a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
+++ b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Version.cpp b/src/corelibs/U2Core/src/globals/Version.cpp
index 0637778..66ce305 100644
--- a/src/corelibs/U2Core/src/globals/Version.cpp
+++ b/src/corelibs/U2Core/src/globals/Version.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/Version.h b/src/corelibs/U2Core/src/globals/Version.h
index f5d917e..27fd29c 100644
--- a/src/corelibs/U2Core/src/globals/Version.h
+++ b/src/corelibs/U2Core/src/globals/Version.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/global.h b/src/corelibs/U2Core/src/globals/global.h
index 0a1308d..ea384cc 100644
--- a/src/corelibs/U2Core/src/globals/global.h
+++ b/src/corelibs/U2Core/src/globals/global.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
index 5db4737..8d0f1ed 100644
--- a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
index 4bb8d3f..e318161 100644
--- a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
+++ b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp b/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
index e162bb9..90f7444 100644
--- a/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/AssemblyObject.h b/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
index 3daf1d8..d570b96 100644
--- a/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
+++ b/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
index 22cf1c9..f2bc820 100644
--- a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
index 2488061..bb3fd9a 100644
--- a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
+++ b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
index fe49d64..f62129e 100644
--- a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
index 66ca6fc..88e1b80 100644
--- a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
+++ b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
index 4cc3c36..dbd302a 100644
--- a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
index 030a000..62eda74 100644
--- a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
+++ b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
index 1027d06..0dfd42c 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
index 9af91b9..d855686 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp b/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
index bf76c70..2d94a10 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectTypes.h b/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
index 2bb890b..76538b5 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp b/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
index b62a06a..466a653 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/GObjectUtils.h b/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
index fd2131b..105077d 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
index ab508aa..7920728 100644
--- a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
index 575d8ac..f0c5e2e 100644
--- a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
+++ b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
index a38e43b..2dfb9ef 100644
--- a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
index 38f45cc..4c3632c 100644
--- a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
index 06ac5c0..c367572 100644
--- a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
index a3a9a20..e2d6151 100644
--- a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
index f18865f..f4e31d5 100644
--- a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
index bc5c005..fc58075 100644
--- a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/TextObject.cpp b/src/corelibs/U2Core/src/gobjects/TextObject.cpp
index af972bc..2567e23 100644
--- a/src/corelibs/U2Core/src/gobjects/TextObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/TextObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/TextObject.h b/src/corelibs/U2Core/src/gobjects/TextObject.h
index 47043c1..0cab266 100644
--- a/src/corelibs/U2Core/src/gobjects/TextObject.h
+++ b/src/corelibs/U2Core/src/gobjects/TextObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp b/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
index 727191b..a253f5c 100644
--- a/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/UnloadedObject.h b/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
index 1012569..a7f64c9 100644
--- a/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
+++ b/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
index bf2987c..3ff5604 100644
--- a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
index 87712c1..66e0fbc 100644
--- a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
+++ b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
index 4eaf6ff..4f6de72 100644
--- a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
index 70416c8..dcf5482 100644
--- a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
+++ b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp b/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
index 1b55371..426e094 100644
--- a/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/HttpFileAdapter.h b/src/corelibs/U2Core/src/io/HttpFileAdapter.h
index 00cb0de..5f1d914 100644
--- a/src/corelibs/U2Core/src/io/HttpFileAdapter.h
+++ b/src/corelibs/U2Core/src/io/HttpFileAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/IOAdapter.cpp b/src/corelibs/U2Core/src/io/IOAdapter.cpp
index 63a25e9..69f4ff9 100644
--- a/src/corelibs/U2Core/src/io/IOAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/IOAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/IOAdapter.h b/src/corelibs/U2Core/src/io/IOAdapter.h
index 382f05c..c53ea4b 100644
--- a/src/corelibs/U2Core/src/io/IOAdapter.h
+++ b/src/corelibs/U2Core/src/io/IOAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/InputStream.h b/src/corelibs/U2Core/src/io/InputStream.h
index 980d5c8..00cb24c 100644
--- a/src/corelibs/U2Core/src/io/InputStream.h
+++ b/src/corelibs/U2Core/src/io/InputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp b/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
index 3bc8847..f77bf5b 100644
--- a/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ IOAdapter* GzippedLocalFileAdapterFactory::createIOAdapter() {
const quint64 LocalFileAdapter::BUF_SIZE = DocumentFormat::READ_BUFF_SIZE;
LocalFileAdapter::LocalFileAdapter(LocalFileAdapterFactory* factory, QObject* o, bool b)
- : IOAdapter(factory, o), f(NULL), bufferOptimization(b), fileSize(0)
+ : IOAdapter(factory, o), f(NULL), fileSize(0), bufferOptimization(b)
{
bufferOptimization = true;
if (bufferOptimization) {
diff --git a/src/corelibs/U2Core/src/io/LocalFileAdapter.h b/src/corelibs/U2Core/src/io/LocalFileAdapter.h
index cbf1c86..4911d3c 100644
--- a/src/corelibs/U2Core/src/io/LocalFileAdapter.h
+++ b/src/corelibs/U2Core/src/io/LocalFileAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/OutputStream.h b/src/corelibs/U2Core/src/io/OutputStream.h
index 5f43f44..8f0825f 100644
--- a/src/corelibs/U2Core/src/io/OutputStream.h
+++ b/src/corelibs/U2Core/src/io/OutputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/StringAdapter.cpp b/src/corelibs/U2Core/src/io/StringAdapter.cpp
index e6db555..d088662 100644
--- a/src/corelibs/U2Core/src/io/StringAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/StringAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/StringAdapter.h b/src/corelibs/U2Core/src/io/StringAdapter.h
index 52d748c..f86eec8 100644
--- a/src/corelibs/U2Core/src/io/StringAdapter.h
+++ b/src/corelibs/U2Core/src/io/StringAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/VFSAdapter.cpp b/src/corelibs/U2Core/src/io/VFSAdapter.cpp
index 2bc22fc..9705eff 100644
--- a/src/corelibs/U2Core/src/io/VFSAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/VFSAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/VFSAdapter.h b/src/corelibs/U2Core/src/io/VFSAdapter.h
index 1162c9d..648b18c 100644
--- a/src/corelibs/U2Core/src/io/VFSAdapter.h
+++ b/src/corelibs/U2Core/src/io/VFSAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp b/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
index 9ac6434..a8b56fd 100644
--- a/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
+++ b/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/VirtualFileSystem.h b/src/corelibs/U2Core/src/io/VirtualFileSystem.h
index b444026..d282a18 100644
--- a/src/corelibs/U2Core/src/io/VirtualFileSystem.h
+++ b/src/corelibs/U2Core/src/io/VirtualFileSystem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/ZlibAdapter.cpp b/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
index 233867b..84f5e4a 100644
--- a/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/io/ZlibAdapter.h b/src/corelibs/U2Core/src/io/ZlibAdapter.h
index 8653dd4..b1bc1cf 100644
--- a/src/corelibs/U2Core/src/io/ZlibAdapter.h
+++ b/src/corelibs/U2Core/src/io/ZlibAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/BunchMimeData.cpp b/src/corelibs/U2Core/src/models/BunchMimeData.cpp
index f058c00..adad1a0 100644
--- a/src/corelibs/U2Core/src/models/BunchMimeData.cpp
+++ b/src/corelibs/U2Core/src/models/BunchMimeData.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/BunchMimeData.h b/src/corelibs/U2Core/src/models/BunchMimeData.h
index c3059a2..caeca85 100644
--- a/src/corelibs/U2Core/src/models/BunchMimeData.h
+++ b/src/corelibs/U2Core/src/models/BunchMimeData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/DocumentImport.cpp b/src/corelibs/U2Core/src/models/DocumentImport.cpp
index 350d724..71af220 100644
--- a/src/corelibs/U2Core/src/models/DocumentImport.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentImport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/DocumentImport.h b/src/corelibs/U2Core/src/models/DocumentImport.h
index 1661c02..55adde7 100644
--- a/src/corelibs/U2Core/src/models/DocumentImport.h
+++ b/src/corelibs/U2Core/src/models/DocumentImport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/DocumentModel.cpp b/src/corelibs/U2Core/src/models/DocumentModel.cpp
index 5915681..73c0fd7 100644
--- a/src/corelibs/U2Core/src/models/DocumentModel.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ const QString DocumentFormat::DBI_FOLDER_HINT("dbi_folder");
const QString DocumentFormat::DEEP_COPY_OBJECT("deep_copy_object");
const QString DocumentMimeData::MIME_TYPE("application/x-ugene-document-mime");
-const int DocumentFormat::READ_BUFF_SIZE = 4096; //4Mb optimal buffer size for reading from network drives
+const int DocumentFormat::READ_BUFF_SIZE = 4194304; //4Mb optimal buffer size for reading from network drives
Document* DocumentFormat::createNewLoadedDocument(IOAdapterFactory* iof, const GUrl& url,
U2OpStatus& os, const QVariantMap& hints)
@@ -514,6 +514,8 @@ void Document::loadFrom(Document* sourceDoc) {
foreach(const QString& k, info.hints.keys()) {
if (!mergedHints.contains(k)) {
mergedHints.insert(k, info.hints.value(k));
+ } else if (k == GObjectHint_RelatedObjects) {
+ mergedHints[k] = info.hints[k];
}
}
obj->getGHints()->setMap(mergedHints);
diff --git a/src/corelibs/U2Core/src/models/DocumentModel.h b/src/corelibs/U2Core/src/models/DocumentModel.h
index cc37351..cf3c744 100644
--- a/src/corelibs/U2Core/src/models/DocumentModel.h
+++ b/src/corelibs/U2Core/src/models/DocumentModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/DocumentUtils.cpp b/src/corelibs/U2Core/src/models/DocumentUtils.cpp
index 822ff12..b51bc9e 100644
--- a/src/corelibs/U2Core/src/models/DocumentUtils.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/DocumentUtils.h b/src/corelibs/U2Core/src/models/DocumentUtils.h
index f45487b..096a442 100644
--- a/src/corelibs/U2Core/src/models/DocumentUtils.h
+++ b/src/corelibs/U2Core/src/models/DocumentUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/Folder.cpp b/src/corelibs/U2Core/src/models/Folder.cpp
index 81d0676..e8d029b 100644
--- a/src/corelibs/U2Core/src/models/Folder.cpp
+++ b/src/corelibs/U2Core/src/models/Folder.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/Folder.h b/src/corelibs/U2Core/src/models/Folder.h
index a45546e..7aa3716 100644
--- a/src/corelibs/U2Core/src/models/Folder.h
+++ b/src/corelibs/U2Core/src/models/Folder.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GHints.cpp b/src/corelibs/U2Core/src/models/GHints.cpp
index deaf213..f9503dd 100644
--- a/src/corelibs/U2Core/src/models/GHints.cpp
+++ b/src/corelibs/U2Core/src/models/GHints.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GHints.h b/src/corelibs/U2Core/src/models/GHints.h
index 070eb5a..5479a43 100644
--- a/src/corelibs/U2Core/src/models/GHints.h
+++ b/src/corelibs/U2Core/src/models/GHints.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GObject.cpp b/src/corelibs/U2Core/src/models/GObject.cpp
index 914ea45..0b3b298 100644
--- a/src/corelibs/U2Core/src/models/GObject.cpp
+++ b/src/corelibs/U2Core/src/models/GObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GObject.h b/src/corelibs/U2Core/src/models/GObject.h
index 6effbe8..544316a 100644
--- a/src/corelibs/U2Core/src/models/GObject.h
+++ b/src/corelibs/U2Core/src/models/GObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GObjectReference.cpp b/src/corelibs/U2Core/src/models/GObjectReference.cpp
index 8fa31fd..14e3cd3 100644
--- a/src/corelibs/U2Core/src/models/GObjectReference.cpp
+++ b/src/corelibs/U2Core/src/models/GObjectReference.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/GObjectReference.h b/src/corelibs/U2Core/src/models/GObjectReference.h
index ffec94b..dd3814f 100644
--- a/src/corelibs/U2Core/src/models/GObjectReference.h
+++ b/src/corelibs/U2Core/src/models/GObjectReference.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/MimeDataIterator.cpp b/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
index 7a27930..b40eee8 100644
--- a/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
+++ b/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/MimeDataIterator.h b/src/corelibs/U2Core/src/models/MimeDataIterator.h
index 6f295b0..8b745e2 100644
--- a/src/corelibs/U2Core/src/models/MimeDataIterator.h
+++ b/src/corelibs/U2Core/src/models/MimeDataIterator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/ProjectModel.cpp b/src/corelibs/U2Core/src/models/ProjectModel.cpp
index b874ee2..5fda342 100644
--- a/src/corelibs/U2Core/src/models/ProjectModel.cpp
+++ b/src/corelibs/U2Core/src/models/ProjectModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/ProjectModel.h b/src/corelibs/U2Core/src/models/ProjectModel.h
index 6042637..48bc862 100644
--- a/src/corelibs/U2Core/src/models/ProjectModel.h
+++ b/src/corelibs/U2Core/src/models/ProjectModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp b/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
index 2850f3b..bab4820 100644
--- a/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
+++ b/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/models/StateLockableDataModel.h b/src/corelibs/U2Core/src/models/StateLockableDataModel.h
index 2c20eb6..bb14713 100644
--- a/src/corelibs/U2Core/src/models/StateLockableDataModel.h
+++ b/src/corelibs/U2Core/src/models/StateLockableDataModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp b/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
index 33b3543..46e1cd1 100644
--- a/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/AnnotationSelection.h b/src/corelibs/U2Core/src/selection/AnnotationSelection.h
index efefb62..10bae17 100644
--- a/src/corelibs/U2Core/src/selection/AnnotationSelection.h
+++ b/src/corelibs/U2Core/src/selection/AnnotationSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/DNASequenceSelection.h b/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
index 9455a65..703b5bb 100644
--- a/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
+++ b/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/DocumentSelection.cpp b/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
index 18b6727..4ac3690 100644
--- a/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/DocumentSelection.h b/src/corelibs/U2Core/src/selection/DocumentSelection.h
index 1525af1..8477a86 100644
--- a/src/corelibs/U2Core/src/selection/DocumentSelection.h
+++ b/src/corelibs/U2Core/src/selection/DocumentSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/FolderSelection.cpp b/src/corelibs/U2Core/src/selection/FolderSelection.cpp
index c1b0ae8..2ce89ed 100644
--- a/src/corelibs/U2Core/src/selection/FolderSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/FolderSelection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/FolderSelection.h b/src/corelibs/U2Core/src/selection/FolderSelection.h
index 40d8d9b..d2735b9 100644
--- a/src/corelibs/U2Core/src/selection/FolderSelection.h
+++ b/src/corelibs/U2Core/src/selection/FolderSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/GObjectSelection.cpp b/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
index 120b258..793a889 100644
--- a/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/GObjectSelection.h b/src/corelibs/U2Core/src/selection/GObjectSelection.h
index 90ac11c..27acfe0 100644
--- a/src/corelibs/U2Core/src/selection/GObjectSelection.h
+++ b/src/corelibs/U2Core/src/selection/GObjectSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp b/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
index b771d9a..33a80d2 100644
--- a/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/LRegionsSelection.h b/src/corelibs/U2Core/src/selection/LRegionsSelection.h
index 8e22228..c3875ba 100644
--- a/src/corelibs/U2Core/src/selection/LRegionsSelection.h
+++ b/src/corelibs/U2Core/src/selection/LRegionsSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionModel.cpp b/src/corelibs/U2Core/src/selection/SelectionModel.cpp
index 76985be..ba3fc5c 100644
--- a/src/corelibs/U2Core/src/selection/SelectionModel.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionModel.h b/src/corelibs/U2Core/src/selection/SelectionModel.h
index cd42554..6a31293 100644
--- a/src/corelibs/U2Core/src/selection/SelectionModel.h
+++ b/src/corelibs/U2Core/src/selection/SelectionModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionTypes.cpp b/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
index b5b5f4f..0685f88 100644
--- a/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionTypes.h b/src/corelibs/U2Core/src/selection/SelectionTypes.h
index 3614ea2..7538cbf 100644
--- a/src/corelibs/U2Core/src/selection/SelectionTypes.h
+++ b/src/corelibs/U2Core/src/selection/SelectionTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionUtils.cpp b/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
index 3e9ae0d..ae29c53 100644
--- a/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/SelectionUtils.h b/src/corelibs/U2Core/src/selection/SelectionUtils.h
index 4c2b311..6335105 100644
--- a/src/corelibs/U2Core/src/selection/SelectionUtils.h
+++ b/src/corelibs/U2Core/src/selection/SelectionUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/selection/TextSelection.h b/src/corelibs/U2Core/src/selection/TextSelection.h
index b64f845..60b1da3 100644
--- a/src/corelibs/U2Core/src/selection/TextSelection.h
+++ b/src/corelibs/U2Core/src/selection/TextSelection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
index 04085c7..27c72b9 100644
--- a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
index f5e896e..07cdc5d 100644
--- a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
+++ b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
index 8e78017..0603f5d 100644
--- a/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AddDocumentTask.h b/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
index 4c1f826..238bae3 100644
--- a/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
index a00bb08..33772c1 100644
--- a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
index 881b643..82f2e3c 100644
--- a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
index 012bd5b..12f0561 100644
--- a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
*/
#include <U2Core/AppContext.h>
+#include <U2Core/ClipboardController.h>
#include <U2Core/DNASequenceObject.h>
#include <U2Core/DocumentModel.h>
#include <U2Core/DocumentUtils.h>
@@ -37,7 +38,7 @@ namespace U2 {
const int AddSequenceObjectsToAlignmentTask::maxErrorListSize = 5;
-AddSequenceObjectsToAlignmentTask::AddSequenceObjectsToAlignmentTask(MAlignmentObject* obj, const QList<U2SequenceObject *>& seqList)
+AddSequenceObjectsToAlignmentTask::AddSequenceObjectsToAlignmentTask(MAlignmentObject* obj, const QList<DNASequence>& seqList)
: Task("Add sequences to alignment task", TaskFlags(TaskFlags_FOSE_COSC)), seqList(seqList), maObj(obj),
stateLock(NULL), msaAlphabet(maObj->getAlphabet()), dbi(NULL), modStep(NULL) {
entityRef = maObj->getEntityRef();
@@ -65,8 +66,14 @@ void AddSequenceObjectsToAlignmentTask::prepare() {
}
void AddSequenceObjectsToAlignmentTask::run() {
+ if (seqList.isEmpty()) {
+ return;
+ }
QList<U2MsaRow> rows;
qint64 maxLength = createRows(rows);
+ if (isCanceled() || hasError()) {
+ return;
+ }
CHECK_OP(stateInfo, );
addRows(rows, maxLength);
CHECK_OP(stateInfo, );
@@ -74,22 +81,24 @@ void AddSequenceObjectsToAlignmentTask::run() {
}
void AddSequenceObjectsToAlignmentTask::processObjectsAndSetResultingAlphabet() {
- foreach(U2SequenceObject* dnaObj, seqList) {
- const DNAAlphabet* newAlphabet = U2AlphabetUtils::deriveCommonAlphabet(dnaObj->getAlphabet(), msaAlphabet);
+ QList<DNASequence> newSeqList;
+ foreach(const DNASequence& dnaObj, seqList) {
+ const DNAAlphabet* newAlphabet = U2AlphabetUtils::deriveCommonAlphabet(dnaObj.alphabet, msaAlphabet);
if (newAlphabet != NULL) {
msaAlphabet = newAlphabet;
+ newSeqList.append(dnaObj);
} else {
- errorList << dnaObj->getGObjectName();
- seqList.removeAll(dnaObj);
+ errorList << dnaObj.getName();
}
}
+ seqList = newSeqList;
}
Task::ReportResult AddSequenceObjectsToAlignmentTask::report() {
delete modStep;
releaseLock();
- if (isCanceled() || hasError()) {
+ if (isCanceled() || hasError() || seqList.size() == 0) {
return ReportResult_Finished;
}
@@ -105,11 +114,14 @@ Task::ReportResult AddSequenceObjectsToAlignmentTask::report() {
qint64 AddSequenceObjectsToAlignmentTask::createRows(QList<U2MsaRow> &rows) {
qint64 maxLength = 0;
U2EntityRef entityRef = maObj->getEntityRef();
- foreach (U2SequenceObject *seqObj, seqList) {
+ foreach (const DNASequence& seqObj, seqList) {
+ if (isCanceled() || hasError()) {
+ return 0;
+ }
U2MsaRow row = MSAUtils::copyRowFromSequence(seqObj, entityRef.dbiRef, stateInfo);
if (0 < row.gend) {
rows << row;
- maxLength = qMax(maxLength, seqObj->getSequenceLength());
+ maxLength = qMax(maxLength, (qint64)seqObj.length());
}
CHECK_OP(stateInfo, 0);
}
@@ -159,7 +171,7 @@ void AddSequenceObjectsToAlignmentTask::releaseLock(){
}
AddSequencesFromFilesToAlignmentTask::AddSequencesFromFilesToAlignmentTask(MAlignmentObject* obj, const QStringList& urls)
- : AddSequenceObjectsToAlignmentTask(obj, QList<U2SequenceObject *>()), urlList(urls), loadTask(NULL) {
+ : AddSequenceObjectsToAlignmentTask(obj, QList<DNASequence>()), urlList(urls), loadTask(NULL) {
connect(maObj, SIGNAL(si_invalidateAlignmentObject()), SLOT(sl_onCancel()));
}
@@ -192,12 +204,27 @@ QList<Task*> AddSequencesFromFilesToAlignmentTask::onSubTaskFinished(Task* subTa
foreach(GObject *seqObj, doc->findGObjectByType(GObjectTypes::SEQUENCE)) {
U2SequenceObject *casted = qobject_cast<U2SequenceObject*>(seqObj);
SAFE_POINT(casted != NULL, "Cast to U2SequenceObject failed", subTasks);
- seqList.append(casted);
+ DNASequence seq = casted->getWholeSequence(stateInfo);
+ CHECK(!stateInfo.isCoR(), subTasks);
+ seq.alphabet = casted->getAlphabet();
+ seqList.append(seq);
}
processObjectsAndSetResultingAlphabet();
return subTasks;
}
+
+////////////////////////////////////////////////////////////////////////////////
+//AddSequencesFromDocumentsToAlignmentTask
+AddSequencesFromDocumentsToAlignmentTask::AddSequencesFromDocumentsToAlignmentTask(MAlignmentObject* obj, const QList<Document*>& docs)
+ : AddSequenceObjectsToAlignmentTask(obj, QList<DNASequence>()), docs(docs) {}
+
+void AddSequencesFromDocumentsToAlignmentTask::prepare() {
+ AddSequenceObjectsToAlignmentTask::prepare();
+ seqList = PasteUtils::getSequences(docs, stateInfo);
+ processObjectsAndSetResultingAlphabet();
+}
+
void AddSequencesFromFilesToAlignmentTask::sl_onCancel() {
if (loadTask != NULL && !loadTask->isFinished() && !loadTask->isCanceled()) {
loadTask->cancel();
@@ -206,3 +233,4 @@ void AddSequencesFromFilesToAlignmentTask::sl_onCancel() {
}
}
+
diff --git a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
index 4925249..8db22ce 100644
--- a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,13 +34,12 @@ class StateLock;
class LoadDocumentTask;
class DNASequence;
class U2MsaDbi;
-class U2SequenceObject;
class U2UseCommonUserModStep;
class U2CORE_EXPORT AddSequenceObjectsToAlignmentTask : public Task {
Q_OBJECT
public:
- AddSequenceObjectsToAlignmentTask(MAlignmentObject* obj, const QList<U2SequenceObject *>& seqList);
+ AddSequenceObjectsToAlignmentTask(MAlignmentObject* obj, const QList<DNASequence>& seqList);
virtual void prepare();
virtual void run();
@@ -48,7 +47,7 @@ public:
protected:
void processObjectsAndSetResultingAlphabet();
- QList<U2SequenceObject*> seqList;
+ QList<DNASequence> seqList;
QPointer<MAlignmentObject> maObj;
protected:
void releaseLock();
@@ -83,6 +82,16 @@ private:
LoadDocumentTask* loadTask;
};
+class U2CORE_EXPORT AddSequencesFromDocumentsToAlignmentTask : public AddSequenceObjectsToAlignmentTask {
+ Q_OBJECT
+public:
+ AddSequencesFromDocumentsToAlignmentTask(MAlignmentObject* obj, const QList<Document*>& docs);
+
+ virtual void prepare();
+private:
+ QList<Document*> docs;
+};
+
}// namespace
#endif //_U2_ADD_SEQUENCES_TO_ALIGNMENT_TASK_H_
diff --git a/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h b/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
index ba3b0a5..0ebbad2 100644
--- a/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
+++ b/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
index fe43eba..7c0ab3b 100644
--- a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
index f705c91..a8a7b85 100644
--- a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
+++ b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp b/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
index 05ca36b..33eabea 100644
--- a/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CloneObjectTask.h b/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
index fc29f21..5539388 100644
--- a/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
+++ b/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
index 70bea33..a1d8ac8 100644
--- a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
index 6f546c7..0782b5e 100644
--- a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
index b71b0de..e427baa 100644
--- a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
index 31b767b..59b503f 100644
--- a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
+++ b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp b/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
index 8f0496e..5bab6eb 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CopyDataTask.h b/src/corelibs/U2Core/src/tasks/CopyDataTask.h
index 727c5f3..c7a751b 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDataTask.h
+++ b/src/corelibs/U2Core/src/tasks/CopyDataTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
index 54e3147..a32299a 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
index d7fdb63..437f7d7 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
index d055c43..e07a35f 100644
--- a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
index 5a791eb..3962cc2 100644
--- a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
+++ b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
index 8b041df..3f9b313 100644
--- a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
index d7d4c90..52ee07e 100644
--- a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
+++ b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
index f07b965..9f98833 100644
--- a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
index 7a9569f..4d6254e 100644
--- a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
+++ b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
index eb06877..5506e6a 100644
--- a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
@@ -1,23 +1,23 @@
/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+* UGENE - Integrated Bioinformatics Tools.
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+* http://ugene.unipro.ru
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+*/
#include "ExternalToolRunTask.h"
@@ -54,30 +54,30 @@ namespace U2 {
#define START_WAIT_MSEC 3000
ExternalToolRunTask::ExternalToolRunTask(const QString &_toolName, const QStringList &_arguments,
-ExternalToolLogParser *_logParser, const QString &_workingDirectory, const QStringList &_additionalPaths,
-const QString &_additionalProcessToKill)
-: Task(_toolName + tr(" tool"), TaskFlag_None),
- arguments(_arguments),
- logParser(_logParser),
- toolName(_toolName),
- workingDirectory(_workingDirectory),
- additionalPaths(_additionalPaths),
- externalToolProcess(NULL),
- helper(NULL),
- listener(NULL),
- additionalProcessToKill(_additionalProcessToKill)
-{
+ ExternalToolLogParser *_logParser, const QString &_workingDirectory, const QStringList &_additionalPaths,
+ const QString &_additionalProcessToKill, bool parseOutputFile)
+ : Task(_toolName + tr(" tool"), TaskFlag_None),
+ arguments(_arguments),
+ logParser(_logParser),
+ toolName(_toolName),
+ workingDirectory(_workingDirectory),
+ additionalPaths(_additionalPaths),
+ externalToolProcess(NULL),
+ helper(NULL),
+ listener(NULL),
+ additionalProcessToKill(_additionalProcessToKill),
+ parseOutputFile(parseOutputFile) {
coreLog.trace("Creating run task for: " + toolName);
if (NULL != logParser) {
logParser->setParent(this);
}
}
-ExternalToolRunTask::~ExternalToolRunTask(){
+ExternalToolRunTask::~ExternalToolRunTask() {
delete externalToolProcess;
}
-void ExternalToolRunTask::run(){
+void ExternalToolRunTask::run() {
if (hasError() || isCanceled()) {
return;
}
@@ -94,32 +94,32 @@ void ExternalToolRunTask::run(){
}
if (!additionalEnvVariables.isEmpty()) {
QProcessEnvironment processEnvironment = externalToolProcess->processEnvironment();
- foreach (const QString& envVarName, additionalEnvVariables.keys()) {
+ foreach(const QString& envVarName, additionalEnvVariables.keys()) {
processEnvironment.insert(envVarName, additionalEnvVariables.value(envVarName));
}
externalToolProcess->setProcessEnvironment(processEnvironment);
}
helper.reset(new ExternalToolRunTaskHelper(this));
- if(NULL != listener) {
+ if (NULL != listener) {
helper->addOutputListener(listener);
}
externalToolProcess->start(pRun.program, pRun.arguments);
bool started = externalToolProcess->waitForStarted(START_WAIT_MSEC);
- if (!started){
+ if (!started) {
ExternalTool* tool = AppContext::getExternalToolRegistry()->getByName(toolName);
- if (tool->isValid()){
+ if (tool->isValid()) {
stateInfo.setError(tr("Can not run %1 tool.").arg(toolName));
} else {
stateInfo.setError(tr("Can not run %1 tool. May be tool path '%2' not valid?")
- .arg(toolName)
- .arg(AppContext::getExternalToolRegistry()->getByName(toolName)->getPath()));
+ .arg(toolName)
+ .arg(AppContext::getExternalToolRegistry()->getByName(toolName)->getPath()));
}
return;
}
- while(!externalToolProcess->waitForFinished(1000)){
+ while (!externalToolProcess->waitForFinished(1000)) {
if (isCanceled()) {
killProcess();
algoLog.details(tr("Tool %1 is cancelled").arg(toolName));
@@ -129,40 +129,45 @@ void ExternalToolRunTask::run(){
{
int exitCode = externalToolProcess->exitCode();
- if(exitCode != EXIT_SUCCESS && !hasError()) {
- setError(tr("%1 tool exited with code %2").arg(toolName).arg(exitCode));
+ if (exitCode != EXIT_SUCCESS && !hasError()) {
+ QString error;
+ if (parseOutputFile) {
+ parseStandartOutputFile(outputFile);
+ error = logParser->getLastError();
+ }
+ setError(error.isEmpty() ? tr("%1 tool exited with code %2").arg(toolName).arg(exitCode) : error);
} else {
algoLog.details(tr("Tool %1 finished successfully").arg(toolName));
}
}
}
-void ExternalToolRunTask::killProcess() const{
+void ExternalToolRunTask::killProcess() const {
#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)) || defined(qdoc)
- long numPid = externalToolProcess->pid();
- Q_UNUSED(numPid);
+ long numPid = externalToolProcess->pid();
+ Q_UNUSED(numPid);
#else
- Q_PID pid = externalToolProcess->pid();
- long numPid = pid->dwProcessId;
- Q_UNUSED(numPid);
+ Q_PID pid = externalToolProcess->pid();
+ long numPid = pid->dwProcessId;
+ Q_UNUSED(numPid);
#endif
#ifdef Q_OS_WIN
- QProcess::execute(QString("taskkill /PID %1 /T /F").arg(numPid));
- if (!additionalProcessToKill.isEmpty()) {
- QProcess::execute(QString("taskkill /IM %1 /T /F").arg(additionalProcessToKill));
- }
+ QProcess::execute(QString("taskkill /PID %1 /T /F").arg(numPid));
+ if (!additionalProcessToKill.isEmpty()) {
+ QProcess::execute(QString("taskkill /IM %1 /T /F").arg(additionalProcessToKill));
+ }
#endif
#ifdef Q_OS_UNIX
- QList<long> pids = getChildPidsRecursive(numPid);
- pids << numPid;
- foreach (const long pid, pids) {
- taskLog.trace(QString("Kill process: %1").arg(pid));
- kill(pid, SIGTERM);
- }
+ QList<long> pids = getChildPidsRecursive(numPid);
+ pids << numPid;
+ foreach(const long pid, pids) {
+ taskLog.trace(QString("Kill process: %1").arg(pid));
+ kill(pid, SIGTERM);
+ }
#endif
}
-QList<long> ExternalToolRunTask::getChildPidsRecursive(long parentPid) const{
+QList<long> ExternalToolRunTask::getChildPidsRecursive(long parentPid) const {
QList<long> res;
QProcess p;
@@ -171,7 +176,7 @@ QList<long> ExternalToolRunTask::getChildPidsRecursive(long parentPid) const{
const QStringList lines = QString(p.readAllStandardOutput()).split('\n');
p.close();
- foreach (const QString& line, lines) {
+ foreach(const QString& line, lines) {
CHECK_OPERATION(line.contains(QString::number(parentPid)), continue);
const QStringList pidStrings = line.split(QRegExp("\\s"), QString::SkipEmptyParts);
@@ -181,8 +186,8 @@ QList<long> ExternalToolRunTask::getChildPidsRecursive(long parentPid) const{
bool ok = false;
long pid = pidStrings.first().toLong(&ok);
CHECK_OPERATIONS(ok,
- taskLog.trace(QString("Fail to convert process' PID to number: '%1'").arg(pidStrings.first())),
- continue);
+ taskLog.trace(QString("Fail to convert process' PID to number: '%1'").arg(pidStrings.first())),
+ continue);
res << getChildPidsRecursive(pid);
res << pid;
@@ -192,12 +197,25 @@ QList<long> ExternalToolRunTask::getChildPidsRecursive(long parentPid) const{
}
void ExternalToolRunTask::addOutputListener(ExternalToolListener* outputListener) {
- if(helper) {
+ if (helper) {
helper->addOutputListener(outputListener);
}
listener = outputListener;
}
+void ExternalToolRunTask::parseStandartOutputFile(QString &filepath) {
+ QFile f(filepath);
+ if (!f.open(QIODevice::ReadOnly)) {
+ return;
+ }
+ QString output;
+ for (QByteArray line = f.readLine(); line.length() > 0; line = f.readLine()) {
+ output += line;
+ }
+ f.close();
+ logParser->parseOutput(output);
+}
+
////////////////////////////////////////
//ExternalToolSupportTask
void ExternalToolSupportTask::setListenerForTask(ExternalToolRunTask* runTask, int listenerNumber) {
@@ -218,22 +236,20 @@ ExternalToolListener* ExternalToolSupportTask::getListener(int listenerNumber) {
////////////////////////////////////////
//ExternalToolRunTaskHelper
ExternalToolRunTaskHelper::ExternalToolRunTaskHelper(ExternalToolRunTask* t)
-: process(t->externalToolProcess), logParser(t->logParser), os(t->stateInfo), listener(NULL)
-{
+ : process(t->externalToolProcess), logParser(t->logParser), os(t->stateInfo), listener(NULL) {
logData.resize(1000);
connect(process, SIGNAL(readyReadStandardOutput()), SLOT(sl_onReadyToReadLog()));
connect(process, SIGNAL(readyReadStandardError()), SLOT(sl_onReadyToReadErrLog()));
}
ExternalToolRunTaskHelper::ExternalToolRunTaskHelper(QProcess *_process, ExternalToolLogParser *_logParser, U2OpStatus &_os)
-: process(_process), logParser(_logParser), os(_os), listener(NULL)
-{
+ : process(_process), logParser(_logParser), os(_os), listener(NULL) {
logData.resize(1000);
connect(process, SIGNAL(readyReadStandardOutput()), SLOT(sl_onReadyToReadLog()));
connect(process, SIGNAL(readyReadStandardError()), SLOT(sl_onReadyToReadErrLog()));
}
-void ExternalToolRunTaskHelper::sl_onReadyToReadLog(){
+void ExternalToolRunTaskHelper::sl_onReadyToReadLog() {
QMutexLocker locker(&logMutex);
CHECK(NULL != process, );
@@ -241,11 +257,11 @@ void ExternalToolRunTaskHelper::sl_onReadyToReadLog(){
process->setReadChannel(QProcess::StandardOutput);
}
int numberReadChars = process->read(logData.data(), logData.size());
- while(numberReadChars > 0){
+ while (numberReadChars > 0) {
//call log parser
QString line = QString::fromLocal8Bit(logData.constData(), numberReadChars);
logParser->parseOutput(line);
- if(NULL != listener) {
+ if (NULL != listener) {
listener->addNewLogMessage(line, OUTPUT_LOG);
}
numberReadChars = process->read(logData.data(), logData.size());
@@ -253,7 +269,7 @@ void ExternalToolRunTaskHelper::sl_onReadyToReadLog(){
os.setProgress(logParser->getProgress());
}
-void ExternalToolRunTaskHelper::sl_onReadyToReadErrLog(){
+void ExternalToolRunTaskHelper::sl_onReadyToReadErrLog() {
QMutexLocker locker(&logMutex);
CHECK(NULL != process, );
@@ -261,11 +277,11 @@ void ExternalToolRunTaskHelper::sl_onReadyToReadErrLog(){
process->setReadChannel(QProcess::StandardError);
}
int numberReadChars = process->read(logData.data(), logData.size());
- while(numberReadChars > 0){
+ while (numberReadChars > 0) {
//call log parser
QString line = QString::fromLocal8Bit(logData.constData(), numberReadChars);
logParser->parseErrOutput(line);
- if(NULL != listener) {
+ if (NULL != listener) {
listener->addNewLogMessage(line, ERROR_LOG);
}
numberReadChars = process->read(logData.data(), logData.size());
@@ -284,32 +300,32 @@ void ExternalToolRunTaskHelper::addOutputListener(ExternalToolListener* _listene
////////////////////////////////////////
//ExternalToolLogParser
ExternalToolLogParser::ExternalToolLogParser() {
- progress=-1;
- lastLine="";
- lastErrLine="";
- lastError="";
-}
-void ExternalToolLogParser::parseOutput(const QString& partOfLog){
- lastPartOfLog=partOfLog.split(QChar('\n'));
- lastPartOfLog.first()=lastLine+lastPartOfLog.first();
- lastLine=lastPartOfLog.takeLast();
- foreach(QString buf, lastPartOfLog){
- if(buf.contains("error",Qt::CaseInsensitive)){
+ progress = -1;
+ lastLine = "";
+ lastErrLine = "";
+ lastError = "";
+}
+void ExternalToolLogParser::parseOutput(const QString& partOfLog) {
+ lastPartOfLog = partOfLog.split(QChar('\n'));
+ lastPartOfLog.first() = lastLine + lastPartOfLog.first();
+ lastLine = lastPartOfLog.takeLast();
+ foreach(QString buf, lastPartOfLog) {
+ if (buf.contains("error", Qt::CaseInsensitive)) {
setLastError(buf);
- }else{
+ } else {
ioLog.trace(buf);
}
}
}
-void ExternalToolLogParser::parseErrOutput(const QString& partOfLog){
- lastPartOfLog=partOfLog.split(QChar('\n'));
- lastPartOfLog.first()=lastErrLine+lastPartOfLog.first();
- lastErrLine=lastPartOfLog.takeLast();
- foreach(const QString& buf, lastPartOfLog){
- if(buf.contains("error",Qt::CaseInsensitive)){
+void ExternalToolLogParser::parseErrOutput(const QString& partOfLog) {
+ lastPartOfLog = partOfLog.split(QChar('\n'));
+ lastPartOfLog.first() = lastErrLine + lastPartOfLog.first();
+ lastErrLine = lastPartOfLog.takeLast();
+ foreach(const QString& buf, lastPartOfLog) {
+ if (buf.contains("error", Qt::CaseInsensitive)) {
setLastError(buf);
- }else{
+ } else {
ioLog.trace(buf);
}
}
@@ -324,19 +340,19 @@ void ExternalToolLogParser::setLastError(const QString &value) {
////////////////////////////////////////
//ExternalToolSupportUtils
-void ExternalToolSupportUtils::removeTmpDir( const QString& tmpDirUrl, U2OpStatus& os) {
+void ExternalToolSupportUtils::removeTmpDir(const QString& tmpDirUrl, U2OpStatus& os) {
if (tmpDirUrl.isEmpty()) {
os.setError(tr("Can not remove temporary directory: path is empty."));
return;
}
QDir tmpDir(tmpDirUrl);
- foreach(const QString& file, tmpDir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries)){
+ foreach(const QString& file, tmpDir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries)) {
if (!tmpDir.remove(file)) {
os.setError(tr("Can not remove files from temporary directory."));
return;
}
}
- if (!tmpDir.rmdir(tmpDir.absolutePath())){
+ if (!tmpDir.rmdir(tmpDir.absolutePath())) {
os.setError(tr("Can not remove directory for temporary files."));
}
}
@@ -375,9 +391,9 @@ bool ExternalToolSupportUtils::startExternalProcess(QProcess *process, const QSt
bool started = process->waitForStarted(START_WAIT_MSEC);
#ifdef Q_OS_WIN32
- if(!started) {
+ if (!started) {
QString execStr = WIN_LAUNCH_CMD_COMMAND + program;
- foreach (const QString arg, arguments) {
+ foreach(const QString arg, arguments) {
execStr += " " + arg;
}
process->start(execStr);
@@ -408,17 +424,17 @@ ProcessRun ExternalToolSupportUtils::prepareProcess(const QString &toolName, con
QString toolRunnerProgram = tool->getToolRunnerProgram();
QString listenerProgramMessage = result.program;
- if (!toolRunnerProgram.isEmpty()){
+ if (!toolRunnerProgram.isEmpty()) {
ScriptingToolRegistry *stregister = AppContext::getScriptingToolRegistry();
SAFE_POINT_EXT(NULL != stregister, os.setError("No scripting tool registry"), result);
ScriptingTool *stool = stregister->getByName(toolRunnerProgram);
- if (NULL == stool || stool->getPath().isEmpty()){
+ if (NULL == stool || stool->getPath().isEmpty()) {
os.setError(QString("The tool %1 that runs %2 is not installed. Please set the path of the tool in the External Tools settings").arg(toolRunnerProgram).arg(toolName));
return result;
}
result.arguments.prepend(result.program);
- for (int i = stool->getRunParameters().size() - 1; i >= 0; i--){
+ for (int i = stool->getRunParameters().size() - 1; i >= 0; i--) {
result.arguments.prepend(stool->getRunParameters().at(i));
}
foreach(const QString ¶m, tool->getToolRunnerAdditionalOptions()) {
@@ -443,7 +459,7 @@ ProcessRun ExternalToolSupportUtils::prepareProcess(const QString &toolName, con
result.process = new QProcess();
result.process->setProcessEnvironment(processEnvironment);
- if (!workingDirectory.isEmpty()){
+ if (!workingDirectory.isEmpty()) {
result.process->setWorkingDirectory(workingDirectory);
algoLog.details(tr("Working directory is \"%1\"").arg(result.process->workingDirectory()));
}
@@ -451,12 +467,12 @@ ProcessRun ExternalToolSupportUtils::prepareProcess(const QString &toolName, con
// QProcess wraps arguments that contain spaces in quotes automatically.
// But launched line should look correctly in the log.
QStringList argumentListForDisplay;
- foreach (const QString& arg, result.arguments) {
+ foreach(const QString& arg, result.arguments) {
argumentListForDisplay << GUrlUtils::getQuotedString(arg);
}
algoLog.details(tr("Launching %1 tool: %2 %3").arg(toolName).arg(result.program).arg(argumentListForDisplay.join(" ")));
- if(NULL != listener) {
+ if (NULL != listener) {
listener->setToolName(toolName);
listener->addNewLogMessage(listenerProgramMessage, PROGRAM_PATH);
QString argumentsLine = ExternalToolSupportUtils::prepareArgumentsForCmdLine(arguments);
@@ -552,8 +568,7 @@ ExternalToolLogProcessor::~ExternalToolLogProcessor() {
}
ExternalToolListener::ExternalToolListener(ExternalToolLogProcessor *logProcessor) :
- logProcessor(logProcessor)
-{
+logProcessor(logProcessor) {
}
diff --git a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
index c8cf957..dd10bb8 100644
--- a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
+++ b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
@@ -1,23 +1,23 @@
/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+* UGENE - Integrated Bioinformatics Tools.
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+* http://ugene.unipro.ru
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+*/
#ifndef _U2_EXTERNAL_TOOL_RUN_TASK_H
#define _U2_EXTERNAL_TOOL_RUN_TASK_H
@@ -37,7 +37,7 @@ class ExternalToolListener;
//using namespace Workflow;
-enum LogType {ERROR_LOG, OUTPUT_LOG, PROGRAM_PATH, ARGUMENTS};
+enum LogType { ERROR_LOG, OUTPUT_LOG, PROGRAM_PATH, ARGUMENTS };
class U2CORE_EXPORT ProcessRun {
public:
@@ -46,16 +46,17 @@ public:
QStringList arguments;
};
-class U2CORE_EXPORT ExternalToolRunTask: public Task {
+class U2CORE_EXPORT ExternalToolRunTask : public Task {
Q_OBJECT
- Q_DISABLE_COPY(ExternalToolRunTask)
- friend class ExternalToolRunTaskHelper;
+ Q_DISABLE_COPY(ExternalToolRunTask)
+ friend class ExternalToolRunTaskHelper;
public:
/**
- * Don't delete logParser, it will be deleted automatically.
- */
+ * Don't delete logParser, it will be deleted automatically.
+ */
ExternalToolRunTask(const QString& toolName, const QStringList& arguments, ExternalToolLogParser* logParser,
- const QString& workingDirectory = "", const QStringList& additionalPaths = QStringList(), const QString &additionalProcessToKill = QString());
+ const QString& workingDirectory = "", const QStringList& additionalPaths = QStringList(),
+ const QString &additionalProcessToKill = QString(), bool parseOutputFile = false);
~ExternalToolRunTask();
void addOutputListener(ExternalToolListener* outputListener);
@@ -64,11 +65,12 @@ public:
void setStandartInputFile(const QString& file) { inputFile = file; }
void setStandartOutputFile(const QString& file) { outputFile = file; }
- void setAdditionalEnvVariables(const QMap<QString, QString> &envVariable) {additionalEnvVariables = envVariable; }
+ void setAdditionalEnvVariables(const QMap<QString, QString> &envVariable) { additionalEnvVariables = envVariable; }
private:
void killProcess() const;
QList<long> getChildPidsRecursive(long parentPid) const;
+ void parseStandartOutputFile(QString &filepath);
QStringList arguments;
ExternalToolLogParser* logParser;
@@ -82,16 +84,17 @@ private:
QScopedPointer<ExternalToolRunTaskHelper> helper;
ExternalToolListener* listener;
QString additionalProcessToKill;
+ bool parseOutputFile;
};
-class U2CORE_EXPORT ExternalToolSupportTask: public Task{
+class U2CORE_EXPORT ExternalToolSupportTask : public Task {
public:
ExternalToolSupportTask(const QString& _name, TaskFlags f)
: Task(_name, f) {}
- virtual ~ExternalToolSupportTask(){}
+ virtual ~ExternalToolSupportTask() {}
- void addListeners(const QList<ExternalToolListener*>& _listeners){listeners.append(_listeners);}
- const QList<ExternalToolListener*>& getListeners() const{return listeners;}
+ void addListeners(const QList<ExternalToolListener*>& _listeners) { listeners.append(_listeners); }
+ const QList<ExternalToolListener*>& getListeners() const { return listeners; }
ExternalToolListener* getListener(int listenerNumber);
protected:
@@ -111,7 +114,7 @@ public:
void addOutputListener(ExternalToolListener* listener);
-public slots:
+ public slots:
void sl_onReadyToReadLog();
void sl_onReadyToReadErrLog();
@@ -130,8 +133,8 @@ public:
static void removeTmpDir(const QString &absoulutePath, U2OpStatus &os);
static QString createTmpDir(const QString &domain, U2OpStatus &os);
/**
- * Creates a new directory: prePath/domain/tmp_dir_name
- */
+ * Creates a new directory: prePath/domain/tmp_dir_name
+ */
static QString createTmpDir(const QString &prePath, const QString &domain, U2OpStatus &os);
static void appendExistingFile(const QString &path, QStringList &files);
static bool startExternalProcess(QProcess *process, const QString &program, const QStringList &arguments);
@@ -145,10 +148,10 @@ class U2CORE_EXPORT ExternalToolLogParser : public QObject {
Q_OBJECT
public:
ExternalToolLogParser();
- virtual int getProgress(){ return progress; }
+ virtual int getProgress() { return progress; }
virtual void parseOutput(const QString& partOfLog);
virtual void parseErrOutput(const QString& partOfLog);
- QString getLastError() const {return lastError;}
+ QString getLastError() const { return lastError; }
protected:
void setLastError(const QString &value);
@@ -168,10 +171,10 @@ protected:
};
/**
- * @brief The ExternalToolLogProcessor class
- * Log processor is supposed to do some additional action
- * on every new output line.
- */
+* @brief The ExternalToolLogProcessor class
+* Log processor is supposed to do some additional action
+* on every new output line.
+*/
class U2CORE_EXPORT ExternalToolLogProcessor {
public:
diff --git a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
index 5110083..86739dd 100644
--- a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
index 210e2d3..44d51f0 100644
--- a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
+++ b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/FailTask.h b/src/corelibs/U2Core/src/tasks/FailTask.h
index bf2c308..94e22d6 100644
--- a/src/corelibs/U2Core/src/tasks/FailTask.h
+++ b/src/corelibs/U2Core/src/tasks/FailTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
index a316208..85c52fb 100644
--- a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
index 5fed829..c99ce8b 100644
--- a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
index c62d310..c048a66 100644
--- a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
index f8e8f6e..d3769b4 100644
--- a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
index 6d25da5..6024f0b 100644
--- a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
index 75b27e7..211fbb6 100644
--- a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
+++ b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/MultiTask.cpp b/src/corelibs/U2Core/src/tasks/MultiTask.cpp
index 54c09cc..3db5d3b 100644
--- a/src/corelibs/U2Core/src/tasks/MultiTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/MultiTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/MultiTask.h b/src/corelibs/U2Core/src/tasks/MultiTask.h
index a520fb3..a6ea8c5 100644
--- a/src/corelibs/U2Core/src/tasks/MultiTask.h
+++ b/src/corelibs/U2Core/src/tasks/MultiTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
index 28dc859..7ad3157 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
index 35bd5c0..3f6c255 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
+++ b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
index 1f6e750..9f1caee 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
index beb82c7..0a99c1a 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
index f165f3b..a286413 100644
--- a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
index 75c0817..0772680 100644
--- a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
+++ b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
index 77539b7..44e8e9d 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
index 9bbdfa5..2f01c3c 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
index 6f27b66..7aff44d 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
index fc9025d..96665df 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ScriptTask.cpp b/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
index 1ebf2c7..ef7960b 100644
--- a/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/ScriptTask.h b/src/corelibs/U2Core/src/tasks/ScriptTask.h
index 1106858..d83977d 100644
--- a/src/corelibs/U2Core/src/tasks/ScriptTask.h
+++ b/src/corelibs/U2Core/src/tasks/ScriptTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
index 655af68..81f1775 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
index 5e59ed3..0793922 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
+++ b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
index da2a4d0..974252c 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
index af40d6f..8989ca6 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
+++ b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TLSTask.cpp b/src/corelibs/U2Core/src/tasks/TLSTask.cpp
index 8481ebc..6eaa476 100644
--- a/src/corelibs/U2Core/src/tasks/TLSTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/TLSTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TLSTask.h b/src/corelibs/U2Core/src/tasks/TLSTask.h
index e0f00bb..c797d9d 100644
--- a/src/corelibs/U2Core/src/tasks/TLSTask.h
+++ b/src/corelibs/U2Core/src/tasks/TLSTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
index 635fedc..cf10cf7 100644
--- a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
+++ b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
index 2276f03..a7ce077 100644
--- a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
+++ b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TaskStarter.cpp b/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
index 28dca15..718a7ec 100644
--- a/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
+++ b/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TaskStarter.h b/src/corelibs/U2Core/src/tasks/TaskStarter.h
index ee4a0e1..d6cf4cc 100644
--- a/src/corelibs/U2Core/src/tasks/TaskStarter.h
+++ b/src/corelibs/U2Core/src/tasks/TaskStarter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp b/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
index 14ebd6c..ec708e4 100644
--- a/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
+++ b/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/TmpDirChecker.h b/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
index 6868a66..207ef71 100644
--- a/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
+++ b/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
index 3b47369..49d3370 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
index 859061d..af622e9 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
index 0ca5a95..4f8a219 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
index 2a41493..30e90e8 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
index 80bb7c5..4c6866f 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
index a73f991..3ccfcf5 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
index 742cd0e..02dd0e9 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
index c006dc7..056abd1 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
index 81e38dc..ecf1061 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
index f0bf614..9d2a591 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/AssemblyImporter.cpp b/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
index 57266c1..e0f2323 100644
--- a/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
+++ b/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/AssemblyImporter.h b/src/corelibs/U2Core/src/util/AssemblyImporter.h
index 0b4e171..00f16fe 100644
--- a/src/corelibs/U2Core/src/util/AssemblyImporter.h
+++ b/src/corelibs/U2Core/src/util/AssemblyImporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
index ea49a23..06660e7 100644
--- a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
index 3a8a5f8..7d3c73a 100644
--- a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
+++ b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
index 97e97d0..3cc4bd8 100644
--- a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
index 51f156f..b214265 100644
--- a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
+++ b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FileStorageUtils.cpp b/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
index 6a8c7d6..9e35427 100644
--- a/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FileStorageUtils.h b/src/corelibs/U2Core/src/util/FileStorageUtils.h
index c389d27..9015638 100644
--- a/src/corelibs/U2Core/src/util/FileStorageUtils.h
+++ b/src/corelibs/U2Core/src/util/FileStorageUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FilesIterator.cpp b/src/corelibs/U2Core/src/util/FilesIterator.cpp
index e0312fd..6792093 100644
--- a/src/corelibs/U2Core/src/util/FilesIterator.cpp
+++ b/src/corelibs/U2Core/src/util/FilesIterator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FilesIterator.h b/src/corelibs/U2Core/src/util/FilesIterator.h
index 383a5fe..c3c6866 100644
--- a/src/corelibs/U2Core/src/util/FilesIterator.h
+++ b/src/corelibs/U2Core/src/util/FilesIterator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FormatUtils.cpp b/src/corelibs/U2Core/src/util/FormatUtils.cpp
index 5c9f75b..43d1971 100644
--- a/src/corelibs/U2Core/src/util/FormatUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FormatUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/FormatUtils.h b/src/corelibs/U2Core/src/util/FormatUtils.h
index de14248..0d1d7b4 100644
--- a/src/corelibs/U2Core/src/util/FormatUtils.h
+++ b/src/corelibs/U2Core/src/util/FormatUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp b/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
index 2fe463d..ff419dc 100644
--- a/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
+++ b/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GAutoDeleteList.h b/src/corelibs/U2Core/src/util/GAutoDeleteList.h
index e7c4839..f8a8ac7 100644
--- a/src/corelibs/U2Core/src/util/GAutoDeleteList.h
+++ b/src/corelibs/U2Core/src/util/GAutoDeleteList.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GUrlUtils.cpp b/src/corelibs/U2Core/src/util/GUrlUtils.cpp
index afa37d1..120c310 100644
--- a/src/corelibs/U2Core/src/util/GUrlUtils.cpp
+++ b/src/corelibs/U2Core/src/util/GUrlUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GUrlUtils.h b/src/corelibs/U2Core/src/util/GUrlUtils.h
index 8741620..a69b8b6 100644
--- a/src/corelibs/U2Core/src/util/GUrlUtils.h
+++ b/src/corelibs/U2Core/src/util/GUrlUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GenbankFeatures.cpp b/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
index 5ce2871..a442d93 100644
--- a/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
+++ b/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/GenbankFeatures.h b/src/corelibs/U2Core/src/util/GenbankFeatures.h
index e3a0874..cc81321 100644
--- a/src/corelibs/U2Core/src/util/GenbankFeatures.h
+++ b/src/corelibs/U2Core/src/util/GenbankFeatures.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp b/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
index 178bc67..2c542be 100644
--- a/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
+++ b/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/IOAdapterUtils.h b/src/corelibs/U2Core/src/util/IOAdapterUtils.h
index 01f40d9..d5ec37e 100644
--- a/src/corelibs/U2Core/src/util/IOAdapterUtils.h
+++ b/src/corelibs/U2Core/src/util/IOAdapterUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
index 6727deb..fa9adab 100644
--- a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
+++ b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
index 7cb0e16..987938b 100644
--- a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
+++ b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp b/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
index d159216..ef1c3a8 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentExporter.h b/src/corelibs/U2Core/src/util/MAlignmentExporter.h
index db99cd4..b85a51d 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentExporter.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentExporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp b/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
index 73e3f9f..2745e8c 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentImporter.h b/src/corelibs/U2Core/src/util/MAlignmentImporter.h
index d8f4ffd..d54958f 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentImporter.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentImporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp b/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
index 7957b0f..1c0ce4c 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MAlignmentWalker.h b/src/corelibs/U2Core/src/util/MAlignmentWalker.h
index b8fa59e..435499a 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentWalker.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentWalker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MSAUtils.cpp b/src/corelibs/U2Core/src/util/MSAUtils.cpp
index b47f115..b1d2588 100644
--- a/src/corelibs/U2Core/src/util/MSAUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MSAUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -42,10 +42,12 @@ bool MSAUtils::equalsIgnoreGaps(const MAlignmentRow& row, int startPos, const QB
int sLen = row.getCoreEnd();
int pLen = pat.size();
int i = startPos;
+ int gapsCounter = 0;
for (int j = 0; i < sLen && j < pLen; i++, j++) {
char c1 = row.charAt(i);
char c2 = pat[j];
while(c1 == MAlignment_GapChar && ++i < sLen) {
+ gapsCounter++;
c1 = row.charAt(i);
}
if (c1 != c2) {
@@ -54,7 +56,7 @@ bool MSAUtils::equalsIgnoreGaps(const MAlignmentRow& row, int startPos, const QB
}
}
alternateLen = i - startPos;
- if (alternateLen < pLen) {
+ if (alternateLen - gapsCounter < pLen) {
return false;
}
return true;
@@ -345,11 +347,17 @@ QList<qint64> MSAUtils::compareRowsAfterAlignment(const MAlignment& origMsa, MAl
U2MsaRow MSAUtils::copyRowFromSequence(U2SequenceObject *seqObj, const U2DbiRef &dstDbi, U2OpStatus &os) {
U2MsaRow row;
CHECK_EXT(NULL != seqObj, os.setError("NULL sequence object"), row);
- row.rowId = -1; // set the ID automatically
DNASequence dnaSeq = seqObj->getWholeSequence(os);
CHECK_OP(os, row);
+ return copyRowFromSequence(dnaSeq, dstDbi, os);
+}
+
+U2MsaRow MSAUtils::copyRowFromSequence(DNASequence dnaSeq, const U2DbiRef &dstDbi, U2OpStatus &os) {
+ U2MsaRow row;
+ row.rowId = -1; // set the ID automatically
+
QByteArray oldSeqData = dnaSeq.seq;
int tailGapsIndex = QRegExp(MAlignment_TailedGapsPattern).indexIn(oldSeqData);
if (tailGapsIndex >= 0) {
@@ -368,6 +376,7 @@ U2MsaRow MSAUtils::copyRowFromSequence(U2SequenceObject *seqObj, const U2DbiRef
return row;
}
+
void MSAUtils::copyRowFromSequence(MAlignmentObject *msaObj, U2SequenceObject *seqObj, U2OpStatus &os) {
CHECK_EXT(NULL != msaObj, os.setError("NULL msa object"), );
diff --git a/src/corelibs/U2Core/src/util/MSAUtils.h b/src/corelibs/U2Core/src/util/MSAUtils.h
index 789ef60..6e82c6e 100644
--- a/src/corelibs/U2Core/src/util/MSAUtils.h
+++ b/src/corelibs/U2Core/src/util/MSAUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -73,6 +73,7 @@ public:
static QList<qint64> compareRowsAfterAlignment(const MAlignment& origMsa, MAlignment& newMsa, U2OpStatus& os);
static void copyRowFromSequence(MAlignmentObject *msaObj, U2SequenceObject *seqObj, U2OpStatus &os);
static U2MsaRow copyRowFromSequence(U2SequenceObject *seqObj, const U2DbiRef &dstDbi, U2OpStatus &os);
+ static U2MsaRow copyRowFromSequence(DNASequence seq, const U2DbiRef &dstDbi, U2OpStatus &os);
static MAlignment setUniqueRowNames(const MAlignment& ma);
/**
diff --git a/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp b/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
index 4691cb5..1fab4ce 100644
--- a/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MsaDbiUtils.h b/src/corelibs/U2Core/src/util/MsaDbiUtils.h
index 95e292b..f5e6abf 100644
--- a/src/corelibs/U2Core/src/util/MsaDbiUtils.h
+++ b/src/corelibs/U2Core/src/util/MsaDbiUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MsaRowUtils.cpp b/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
index b215014..769abf6 100644
--- a/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/MsaRowUtils.h b/src/corelibs/U2Core/src/util/MsaRowUtils.h
index 2cd71a6..2a4b473 100644
--- a/src/corelibs/U2Core/src/util/MsaRowUtils.h
+++ b/src/corelibs/U2Core/src/util/MsaRowUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h b/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
index 60e6df3..226e86a 100644
--- a/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
+++ b/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/QObjectScopedPointer.h b/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
index 3a9ea6c..9b674ca 100644
--- a/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
+++ b/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/QVariantUtils.cpp b/src/corelibs/U2Core/src/util/QVariantUtils.cpp
index 5a49962..561ca43 100644
--- a/src/corelibs/U2Core/src/util/QVariantUtils.cpp
+++ b/src/corelibs/U2Core/src/util/QVariantUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/QVariantUtils.h b/src/corelibs/U2Core/src/util/QVariantUtils.h
index a9f8dff..0999b6d 100644
--- a/src/corelibs/U2Core/src/util/QVariantUtils.h
+++ b/src/corelibs/U2Core/src/util/QVariantUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/SNPTablesUtils.cpp b/src/corelibs/U2Core/src/util/SNPTablesUtils.cpp
index 6a82b94..8e2522b 100644
--- a/src/corelibs/U2Core/src/util/SNPTablesUtils.cpp
+++ b/src/corelibs/U2Core/src/util/SNPTablesUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/SequenceUtils.cpp b/src/corelibs/U2Core/src/util/SequenceUtils.cpp
index 52a677a..08ba950 100644
--- a/src/corelibs/U2Core/src/util/SequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/util/SequenceUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/SequenceUtils.h b/src/corelibs/U2Core/src/util/SequenceUtils.h
index 904a35e..8f5e862 100644
--- a/src/corelibs/U2Core/src/util/SequenceUtils.h
+++ b/src/corelibs/U2Core/src/util/SequenceUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/TaskWatchdog.cpp b/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
index febfb3a..c219bc6 100644
--- a/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
+++ b/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/TaskWatchdog.h b/src/corelibs/U2Core/src/util/TaskWatchdog.h
index bf0df4f..0f9f18a 100644
--- a/src/corelibs/U2Core/src/util/TaskWatchdog.h
+++ b/src/corelibs/U2Core/src/util/TaskWatchdog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/TextUtils.cpp b/src/corelibs/U2Core/src/util/TextUtils.cpp
index d4d1f39..1031cbd 100644
--- a/src/corelibs/U2Core/src/util/TextUtils.cpp
+++ b/src/corelibs/U2Core/src/util/TextUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/TextUtils.h b/src/corelibs/U2Core/src/util/TextUtils.h
index 54983f8..52cc131 100644
--- a/src/corelibs/U2Core/src/util/TextUtils.h
+++ b/src/corelibs/U2Core/src/util/TextUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp b/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
index 0dcc66d..6e53f96 100644
--- a/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U1AnnotationUtils.h b/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
index 13075ed..ab1146f 100644
--- a/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
+++ b/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp b/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
index 80b555a..9ef3422 100644
--- a/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AlphabetUtils.h b/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
index 3c476d2..b9711fc 100644
--- a/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
index 0eabb10..ab0a2ce 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
+++ b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
index 2c721d3..162a702 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
+++ b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp b/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
index 8560b32..8a910c2 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AssemblyUtils.h b/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
index 6bbc5bd..4ef7d63 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp b/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
index 2cd912a..af0ff15 100644
--- a/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2AttributeUtils.h b/src/corelibs/U2Core/src/util/U2AttributeUtils.h
index d1cb3ab..ccfe063 100644
--- a/src/corelibs/U2Core/src/util/U2AttributeUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AttributeUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2Bits.cpp b/src/corelibs/U2Core/src/util/U2Bits.cpp
index dfd7719..aa7984e 100644
--- a/src/corelibs/U2Core/src/util/U2Bits.cpp
+++ b/src/corelibs/U2Core/src/util/U2Bits.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2Bits.h b/src/corelibs/U2Core/src/util/U2Bits.h
index 0c17c61..3c130c0 100644
--- a/src/corelibs/U2Core/src/util/U2Bits.h
+++ b/src/corelibs/U2Core/src/util/U2Bits.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp b/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
index e2e3bf5..6118eca 100644
--- a/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
+++ b/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2DbiUpgrader.h b/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
index 5487dcd..a2c3994 100644
--- a/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
+++ b/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp b/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
index e35869e..e768a2e 100644
--- a/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -192,6 +192,28 @@ void U2FeatureUtils::addSubFeatures(const QVector<U2Region> ®ions, const U2St
}
}
+QList<FeatureAndKey> U2FeatureUtils::getSortedSubgroups(QList<FeatureAndKey> &fkList, const U2DataId &parentId) {
+ QList<FeatureAndKey> result;
+ if (fkList.size() == 0) {
+ return result;
+ }
+ int i = 0;
+ FeatureAndKey fk = fkList[i];
+ while (fk.feature.featureClass == U2Feature::Group) {
+ if (fk.feature.parentFeatureId == parentId) {
+ result.append(fk);
+ fkList.removeAt(i);
+ } else {
+ i++;
+ }
+ fk = fkList[i];
+ }
+ foreach(const FeatureAndKey &fk, result) {
+ result.append(getSortedSubgroups(fkList, fk.feature.id));
+ }
+ return result;
+}
+
AnnotationGroup * U2FeatureUtils::loadAnnotationTable(const U2DataId &rootFeatureId, const U2DbiRef &dbiRef,
AnnotationTableObject *parentObj, U2OpStatus &os)
{
@@ -207,7 +229,10 @@ AnnotationGroup * U2FeatureUtils::loadAnnotationTable(const U2DataId &rootFeatur
AnnotationGroup *rootGroup = new AnnotationGroup(rootFeatureId, AnnotationGroup::ROOT_GROUP_NAME, NULL, parentObj);
Annotation *currentAnnotation = NULL;
- const QList<FeatureAndKey> rawData = dbi->getFeatureTable(rootFeatureId, os);
+ QList<FeatureAndKey> rawData = dbi->getFeatureTable(rootFeatureId, os);
+ QList<FeatureAndKey> groups = getSortedSubgroups(rawData, rootFeatureId);
+ rawData = groups + rawData;
+
foreach (const FeatureAndKey &fnk, rawData) {
if (U2Feature::Group == fnk.feature.featureClass) {
rootGroup->addSubgroup(fnk.feature);
diff --git a/src/corelibs/U2Core/src/util/U2FeatureUtils.h b/src/corelibs/U2Core/src/util/U2FeatureUtils.h
index e817723..d93600a 100644
--- a/src/corelibs/U2Core/src/util/U2FeatureUtils.h
+++ b/src/corelibs/U2Core/src/util/U2FeatureUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#define _U2_FEATURE_UTILS_H_
#include <U2Core/AnnotationData.h>
-#include <U2Core/U2Feature.h>
+#include <U2Core/U2FeatureDbi.h>
namespace U2 {
@@ -131,6 +131,8 @@ public:
*/
static QList<U2Feature> getSubGroups(const U2DataId &parentFeatureId, const U2DbiRef &dbiRef, U2OpStatus &os,
OperationScope scope = Recursive, ParentFeatureStatus parent = Nonroot);
+
+ static QList<FeatureAndKey> getSortedSubgroups(QList<FeatureAndKey> &fkList, const U2DataId &parentId);
private:
static QList<U2Feature> getFeaturesByParent(const U2DataId &parentFeatureId, const U2DbiRef &dbiRef, U2OpStatus &os,
diff --git a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
index 530233f..807657c 100644
--- a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
index 600425e..799a3d2 100644
--- a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
+++ b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2OpStatusUtils.h b/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
index 6241549..cc90d6f 100644
--- a/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
+++ b/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp b/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
index 6b4a21e..c2d185c 100644
--- a/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -76,6 +76,10 @@ U2Sequence U2SequenceUtils::copySequence(const DNASequence& srcSeq, const U2DbiR
TmpDbiObjects tmpObjects(dstDbi, os);
+ if (os.isCoR()) {
+ return res;
+ }
+
DbiConnection dstCon(dstDbi, os);
CHECK_OP(os, res);
dstCon.dbi->getSequenceDbi()->createSequenceObject(res, dstFolder, os);
diff --git a/src/corelibs/U2Core/src/util/U2SequenceUtils.h b/src/corelibs/U2Core/src/util/U2SequenceUtils.h
index 3b281b8..44b62e6 100644
--- a/src/corelibs/U2Core/src/util/U2SequenceUtils.h
+++ b/src/corelibs/U2Core/src/util/U2SequenceUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2VariationUtils.cpp b/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
index 9e89a53..3dbd1a7 100644
--- a/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/U2VariationUtils.h b/src/corelibs/U2Core/src/util/U2VariationUtils.h
index 513d02a..5dc28ac 100644
--- a/src/corelibs/U2Core/src/util/U2VariationUtils.h
+++ b/src/corelibs/U2Core/src/util/U2VariationUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h b/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
index 42e386c..8c5cad5 100644
--- a/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
+++ b/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/transl/english.ts b/src/corelibs/U2Core/transl/english.ts
index a86fcbf..5e483ce 100644
--- a/src/corelibs/U2Core/transl/english.ts
+++ b/src/corelibs/U2Core/transl/english.ts
@@ -206,12 +206,12 @@
<translation>Unsupported object type: %1</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="405"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="409"/>
<source>Unable to detect sequence alphabet. Probably, this is because some of merged sequences are empty.</source>
<translation>Unable to detect sequence alphabet. Probably, this is because some of merged sequences are empty.</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="560"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="564"/>
<source>Invalid number of symbols: %1</source>
<translation>Invalid number of symbols: %1</translation>
</message>
@@ -671,7 +671,7 @@
<translation>Unexpected number of sequences in a multiple alignment</translation>
</message>
<message>
- <location filename="../src/util/MAlignmentImporter.cpp" line="82"/>
+ <location filename="../src/util/MAlignmentImporter.cpp" line="83"/>
<source>Unexpected error on MSA rows import</source>
<translation>Unexpected error on MSA rows import</translation>
</message>
@@ -719,22 +719,22 @@
<context>
<name>U2::AddSequenceObjectsToAlignmentTask</name>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="45"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="49"/>
<source>Object is empty.</source>
<translation>Object is empty.</translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="50"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="54"/>
<source>Object is locked for modifications.</source>
<translation>Object is locked for modifications.</translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="136"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="155"/>
<source>Some sequences have wrong alphabet: </source>
<translation>Some sequences have wrong alphabet: </translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="139"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="158"/>
<source> and others</source>
<translation> and others</translation>
</message>
@@ -959,37 +959,31 @@ The session database file is removed after closing of UGENE.</translation>
<context>
<name>U2::ConvertDasIdTask</name>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="279"/>
<source>Convert resource id: %1</source>
- <translation>Convert resource id: %1</translation>
+ <translation type="vanished">Convert resource id: %1</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="361"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="383"/>
<source>Remote server does not respond</source>
- <translation>Remote server does not respond</translation>
+ <translation type="vanished">Remote server does not respond</translation>
</message>
</context>
<context>
<name>U2::ConvertIdAndLoadDasFeaturesTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="783"/>
<source>Convert ID and load DAS features for: %1</source>
- <translation>Convert ID and load DAS features for: %1</translation>
+ <translation type="vanished">Convert ID and load DAS features for: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="799"/>
<source>Convert IDs task</source>
- <translation>Convert IDs task</translation>
+ <translation type="vanished">Convert IDs task</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="819"/>
<source>"%1" was converted into "%2"</source>
- <translation>"%1" was converted into "%2"</translation>
+ <translation type="vanished">"%1" was converted into "%2"</translation>
</message>
</context>
<context>
@@ -1034,113 +1028,94 @@ The session database file is removed after closing of UGENE.</translation>
<context>
<name>U2::DASSourceRegistry</name>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="113"/>
<source>UniProt (DAS)</source>
- <translation>UniProt (DAS)</translation>
+ <translation type="vanished">UniProt (DAS)</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="114"/>
- <location filename="../src/datatype/DASSource.cpp" line="123"/>
<source>http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</source>
- <translation>http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="116"/>
<source>Use Swiss-Prot, TrEMBL, UniProt, IPI or UniParc accession number. For example: %1</source>
- <translation>Use Swiss-Prot, TrEMBL, UniProt, IPI or UniParc accession number. For example: %1</translation>
+ <translation type="vanished">Use Swiss-Prot, TrEMBL, UniProt, IPI or UniParc accession number. For example: %1</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="117"/>
<source>UniProt database of protein sequences and features.</source>
- <translation>UniProt database of protein sequences and features.</translation>
+ <translation type="vanished">UniProt database of protein sequences and features.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="122"/>
<source>UniProt</source>
- <translation>UniProt</translation>
+ <translation type="vanished">UniProt</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="125"/>
<source>DAS 1 reference server for sequence and features from UniProt.
UniProt (Universal Protein Resource) is the worlds most comprehensive catalog of information on proteins.
It is a central repository of protein sequence and function created by joining the information contained
in Swiss-Prot, TrEMBL, and PIR.</source>
- <translation>DAS 1 reference server for sequence and features from UniProt.
+ <translation type="vanished">DAS 1 reference server for sequence and features from UniProt.
UniProt (Universal Protein Resource) is the worlds most comprehensive catalog of information on proteins.
It is a central repository of protein sequence and function created by joining the information contained
in Swiss-Prot, TrEMBL, and PIR.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="134"/>
<source>Pride DAS 1.6</source>
- <translation>Pride DAS 1.6</translation>
+ <translation type="vanished">Pride DAS 1.6</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="135"/>
<source>http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</source>
- <translation>http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="137"/>
<source>The PRIDE database is a centralized, public data repository for proteomics data.
It has been developed to provide the proteomics community with a public repository
for protein and peptide identifications together with the evidence supporting these
identifications. In addition to identifications, PRIDE is able to capture details of
post-translational modifications coordinated relative to the peptides in which they have been found.</source>
- <translation>The PRIDE database is a centralized, public data repository for proteomics data.
+ <translation type="vanished">The PRIDE database is a centralized, public data repository for proteomics data.
It has been developed to provide the proteomics community with a public repository
for protein and peptide identifications together with the evidence supporting these
identifications. In addition to identifications, PRIDE is able to capture details of
post-translational modifications coordinated relative to the peptides in which they have been found.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="147"/>
<source>cbs_sort</source>
- <translation>cbs_sort</translation>
+ <translation type="vanished">cbs_sort</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="148"/>
<source>http://das.cbs.dtu.dk:9000/das/cbs_sort/</source>
- <translation>http://das.cbs.dtu.dk:9000/das/cbs_sort/</translation>
+ <translation type="vanished">http://das.cbs.dtu.dk:9000/das/cbs_sort/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="150"/>
<source>The combined result of the signalp, secretomep, targetp, netnes & lipop server for the given id.</source>
- <translation>The combined result of the signalp, secretomep, targetp, netnes & lipop server for the given id.</translation>
+ <translation type="vanished">The combined result of the signalp, secretomep, targetp, netnes & lipop server for the given id.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="156"/>
<source>signalp</source>
- <translation>signalp</translation>
+ <translation type="vanished">signalp</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="157"/>
<source>http://das.cbs.dtu.dk:9000/das/signalp/</source>
- <translation>http://das.cbs.dtu.dk:9000/das/signalp/</translation>
+ <translation type="vanished">http://das.cbs.dtu.dk:9000/das/signalp/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="159"/>
<source>SignalP (http://www.cbs.dtu.dk/services/SignalP) predictions for UniProt.</source>
- <translation>SignalP (http://www.cbs.dtu.dk/services/SignalP) predictions for UniProt.</translation>
+ <translation type="vanished">SignalP (http://www.cbs.dtu.dk/services/SignalP) predictions for UniProt.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="165"/>
<source>InterPro-Matches-Overview</source>
- <translation>InterPro-Matches-Overview</translation>
+ <translation type="vanished">InterPro-Matches-Overview</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="166"/>
<source>http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</source>
- <translation>http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="168"/>
<source>Shows the maximum extent of the matches from all signatures that are
integrated into a single InterPro entry against UniProtKB protein sequences
(i.e. if an InterPro entry contains 2 signatures, A and B, and both of
these match a protein, A between residue 3 and 125 and B between residue
5 and 127, the overview supermatch of these signatures is between 3 and 127).</source>
- <translation>Shows the maximum extent of the matches from all signatures that are
+ <translation type="vanished">Shows the maximum extent of the matches from all signatures that are
integrated into a single InterPro entry against UniProtKB protein sequences
(i.e. if an InterPro entry contains 2 signatures, A and B, and both of
these match a protein, A between residue 3 and 125 and B between residue
@@ -1163,9 +1138,13 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::DNAAlphabetRegistryImpl</name>
<message>
- <location filename="../src/datatype/BaseAlphabets.cpp" line="63"/>
<source>All symbols</source>
- <translation>All symbols</translation>
+ <translation type="vanished">All symbols</translation>
+ </message>
+ <message>
+ <location filename="../src/datatype/BaseAlphabets.cpp" line="63"/>
+ <source>Raw</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="71"/>
@@ -1189,13 +1168,21 @@ these match a protein, A between residue 3 and 125 and B between residue
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="114"/>
- <source>Standard amino</source>
- <translation>Standard amino</translation>
+ <source>Standard amino acid</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="133"/>
+ <source>Extended amino acid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Standard amino</source>
+ <translation type="vanished">Standard amino</translation>
+ </message>
+ <message>
<source>Extended amino</source>
- <translation>Extended amino</translation>
+ <translation type="vanished">Extended amino</translation>
</message>
<message>
<location filename="../src/datatype/BaseTranslations.cpp" line="270"/>
@@ -1504,27 +1491,27 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::Document</name>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="542"/>
+ <location filename="../src/models/DocumentModel.cpp" line="546"/>
<source>Document is not loaded</source>
<translation>Document is not loaded</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="555"/>
+ <location filename="../src/models/DocumentModel.cpp" line="559"/>
<source>IO adapter does not support write operation</source>
<translation>IO adapter does not support write operation</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="561"/>
+ <location filename="../src/models/DocumentModel.cpp" line="565"/>
<source>No write support for document format</source>
<translation>No write support for document format</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="631"/>
+ <location filename="../src/models/DocumentModel.cpp" line="635"/>
<source>Locked by user</source>
<translation>Locked by user</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="655"/>
+ <location filename="../src/models/DocumentModel.cpp" line="659"/>
<source>Lock is NULL</source>
<translation>Lock is NULL</translation>
</message>
@@ -1532,8 +1519,8 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::DocumentFormat</name>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="123"/>
- <location filename="../src/models/DocumentModel.cpp" line="128"/>
+ <location filename="../src/models/DocumentModel.cpp" line="125"/>
+ <location filename="../src/models/DocumentModel.cpp" line="130"/>
<source>Writing is not supported for this format (%1). Feel free to send a feature request though.</source>
<translation>Writing is not supported for this format (%1). Feel free to send a feature request though.</translation>
</message>
@@ -1820,14 +1807,12 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::GetDasIdsBySequenceTask</name>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="423"/>
<source>Get an ID for the sequence</source>
- <translation>Get an ID for the sequence</translation>
+ <translation type="vanished">Get an ID for the sequence</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="494"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
</context>
<context>
@@ -1841,7 +1826,7 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::GzippedLocalFileAdapterFactory</name>
<message>
- <location filename="../src/io/LocalFileAdapter.cpp" line="38"/>
+ <location filename="../src/io/LocalFileAdapter.cpp" line="40"/>
<source>GZIP file</source>
<translation>GZIP file</translation>
</message>
@@ -2123,17 +2108,17 @@ these match a protein, A between residue 3 and 125 and B between residue
<translation>'%1' does not match database folder URL format</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="96"/>
+ <location filename="../src/globals/L10n.h" line="100"/>
<source>Direct</source>
<translation>Direct</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="97"/>
+ <location filename="../src/globals/L10n.h" line="101"/>
<source>Reverse-complementary</source>
<translation>Reverse-complementary</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="99"/>
+ <location filename="../src/globals/L10n.h" line="103"/>
<source>Required</source>
<translation>Required</translation>
</message>
@@ -2198,8 +2183,8 @@ these match a protein, A between residue 3 and 125 and B between residue
<translation> bp</translation>
</message>
<message>
- <location filename="../src/util/IOAdapterUtils.cpp" line="97"/>
- <location filename="../src/util/IOAdapterUtils.cpp" line="105"/>
+ <location filename="../src/util/IOAdapterUtils.cpp" line="98"/>
+ <location filename="../src/util/IOAdapterUtils.cpp" line="106"/>
<source>Failed to detect IO adapter for %1</source>
<translation>Failed to detect IO adapter for %1</translation>
</message>
@@ -2207,65 +2192,54 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::LoadDasDocumentTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="110"/>
<source>Cannot load cached document: %1</source>
- <translation>Cannot load cached document: %1</translation>
+ <translation type="vanished">Cannot load cached document: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="116"/>
<source>Cannot save document: %1</source>
- <translation>Cannot save document: %1</translation>
+ <translation type="vanished">Cannot save document: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="128"/>
<source>Cannot find DAS reference sequence: %1</source>
- <translation>Cannot find DAS reference sequence: %1</translation>
+ <translation type="vanished">Cannot find DAS reference sequence: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="147"/>
<source>Cannot find DAS features for '%1' on %2</source>
- <translation>Cannot find DAS features for '%1' on %2</translation>
+ <translation type="vanished">Cannot find DAS features for '%1' on %2</translation>
</message>
</context>
<context>
<name>U2::LoadDasFeaturesTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="391"/>
<source>Load DAS annotations for current sequence</source>
- <translation>Load DAS annotations for current sequence</translation>
+ <translation type="vanished">Load DAS annotations for current sequence</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="416"/>
<source>Can not receive response from the server "</source>
- <translation>Can not receive response from the server</translation>
+ <translation type="vanished">Can not receive response from the server</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="424"/>
<source><font size="5" color="green">Received %1 annotations from the server "%2"</font><br></source>
- <translation><font size="5" color="green">Received %1 annotations from the server "%2"</font><br></translation>
+ <translation type="vanished"><font size="5" color="green">Received %1 annotations from the server "%2"</font><br></translation>
</message>
</context>
<context>
<name>U2::LoadDasObjectTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="242"/>
<source>Load DAS data for '%1' from %2</source>
- <translation>Load DAS data for '%1' from %2</translation>
+ <translation type="vanished">Load DAS data for '%1' from %2</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="301"/>
<source>Sequence with ID=%1 is not found.</source>
- <translation>Sequence with ID=%1 is not found.</translation>
+ <translation type="vanished">Sequence with ID=%1 is not found.</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="353"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="375"/>
<source>Remote server does not respond</source>
- <translation>Remote server does not respond</translation>
+ <translation type="vanished">Remote server does not respond</translation>
</message>
</context>
<context>
@@ -2374,7 +2348,7 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::LocalFileAdapterFactory</name>
<message>
- <location filename="../src/io/LocalFileAdapter.cpp" line="29"/>
+ <location filename="../src/io/LocalFileAdapter.cpp" line="31"/>
<source>Local file</source>
<translation>Local file</translation>
</message>
@@ -2415,28 +2389,28 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::MSAUtils</name>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="181"/>
+ <location filename="../src/util/MSAUtils.cpp" line="183"/>
<source>Alphabets of the alignment and the sequence cannot be derived</source>
<translation>Alphabets of the alignment and the sequence cannot be derived</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="189"/>
+ <location filename="../src/util/MSAUtils.cpp" line="191"/>
<source>Sequences have different alphabets.</source>
<translation>Sequences have different alphabets.</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="217"/>
- <location filename="../src/util/MSAUtils.cpp" line="222"/>
+ <location filename="../src/util/MSAUtils.cpp" line="219"/>
+ <location filename="../src/util/MSAUtils.cpp" line="224"/>
<source>Alignment is empty!</source>
<translation>Alignment is empty!</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="229"/>
+ <location filename="../src/util/MSAUtils.cpp" line="231"/>
<source>Sequences in alignment have different sizes!</source>
<translation>Sequences in alignment have different sizes!</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="338"/>
+ <location filename="../src/util/MSAUtils.cpp" line="340"/>
<source>Can't find a row in an alignment!</source>
<translation>Can't find a row in an alignment!</translation>
</message>
@@ -2520,7 +2494,7 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::PasteTask</name>
<message>
- <location filename="../src/globals/ClipboardController.cpp" line="36"/>
+ <location filename="../src/globals/ClipboardController.cpp" line="38"/>
<source>Paste data</source>
<translation type="unfinished"></translation>
</message>
@@ -2572,29 +2546,24 @@ these match a protein, A between residue 3 and 125 and B between residue
<context>
<name>U2::ReplyHandler</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="90"/>
<source>Can't receive result from the server: nothing to download</source>
- <translation>Can't receive result from the server: nothing to download</translation>
+ <translation type="vanished">Can't receive result from the server: nothing to download</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="139"/>
<source>Unexpected server response</source>
- <translation>Unexpected server response</translation>
+ <translation type="vanished">Unexpected server response</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="169"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="171"/>
<source>Network error: %1</source>
- <translation>Network error: %1</translation>
+ <translation type="vanished">Network error: %1</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="189"/>
<source>Remote server doesn't respond</source>
- <translation>Remote server doesn't respond</translation>
+ <translation type="vanished">Remote server doesn't respond</translation>
</message>
</context>
<context>
@@ -2959,14 +2928,14 @@ UGENE contains unsaved modifications.</translation>
<translation>Alphabet is not found!</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="98"/>
- <location filename="../src/util/U2SequenceUtils.cpp" line="111"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="102"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="115"/>
<source>Invalid sequence DBI</source>
<translation>Invalid sequence DBI</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="370"/>
- <location filename="../src/util/U2SequenceUtils.cpp" line="549"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="374"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="553"/>
<source>Failed to derive sequence alphabet!</source>
<translation>Failed to derive sequence alphabet!</translation>
</message>
@@ -2974,37 +2943,31 @@ UGENE contains unsaved modifications.</translation>
<context>
<name>U2::UniprotBlastAndLoadDASAnnotations</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="602"/>
<source>BLAST IDs and DAS annotations</source>
- <translation>BLAST IDs and DAS annotations</translation>
+ <translation type="vanished">BLAST IDs and DAS annotations</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="657"/>
<source>Server "%1" is not available!</source>
- <translation>Server "%1" is not available!</translation>
+ <translation type="vanished">Server "%1" is not available!</translation>
</message>
</context>
<context>
<name>U2::UniprotBlastTask</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="504"/>
<source>Get an ID for the sequence</source>
- <translation>Get an ID for the sequence</translation>
+ <translation type="vanished">Get an ID for the sequence</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="544"/>
<source>Reply from the BLAST server is empty. Similar sequences not found</source>
- <translation>Reply from the BLAST server is empty. Similar sequences not found</translation>
+ <translation type="vanished">Reply from the BLAST server is empty. Similar sequences not found</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="586"/>
<source>An empty sequence is searched</source>
- <translation>An empty sequence is searched</translation>
+ <translation type="vanished">An empty sequence is searched</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="587"/>
<source>Settings are invalid</source>
- <translation>Settings are invalid</translation>
+ <translation type="vanished">Settings are invalid</translation>
</message>
</context>
<context>
@@ -3026,7 +2989,7 @@ UGENE contains unsaved modifications.</translation>
<context>
<name>U2SequenceImporter</name>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="292"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="296"/>
<source>Sequence was not imported. Probably, this is because the sequence is empty.</source>
<translation>Sequence was not imported. Probably, this is because the sequence is empty.</translation>
</message>
diff --git a/src/corelibs/U2Core/transl/russian.ts b/src/corelibs/U2Core/transl/russian.ts
index 20250ac..2e48e90 100644
--- a/src/corelibs/U2Core/transl/russian.ts
+++ b/src/corelibs/U2Core/transl/russian.ts
@@ -206,12 +206,12 @@
<translation>Неподдерживаемый тип объекта: %1</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="405"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="409"/>
<source>Unable to detect sequence alphabet. Probably, this is because some of merged sequences are empty.</source>
<translation>Невозможно определить алфавит последовательности. Возможно это вызвано тем, что некоторые из последовательностей являются пустыми.</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="560"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="564"/>
<source>Invalid number of symbols: %1</source>
<translation>Неверное число символов: %1</translation>
</message>
@@ -671,7 +671,7 @@
<translation>Unexpected number of sequences in a multiple alignment</translation>
</message>
<message>
- <location filename="../src/util/MAlignmentImporter.cpp" line="82"/>
+ <location filename="../src/util/MAlignmentImporter.cpp" line="83"/>
<source>Unexpected error on MSA rows import</source>
<translation>Unexpected error on MSA rows import</translation>
</message>
@@ -719,22 +719,22 @@
<context>
<name>U2::AddSequenceObjectsToAlignmentTask</name>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="45"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="49"/>
<source>Object is empty.</source>
<translation>Объект пуст.</translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="50"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="54"/>
<source>Object is locked for modifications.</source>
<translation>Объект заблокирован для редактирования.</translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="136"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="155"/>
<source>Some sequences have wrong alphabet: </source>
<translation>Некоторые последовательности имеют неправильный алфавит: </translation>
</message>
<message>
- <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="139"/>
+ <location filename="../src/tasks/AddSequencesToAlignmentTask.cpp" line="158"/>
<source> and others</source>
<translation> и другие</translation>
</message>
@@ -959,37 +959,31 @@ The session database file is removed after closing of UGENE.</source>
<context>
<name>U2::ConvertDasIdTask</name>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="279"/>
<source>Convert resource id: %1</source>
- <translation>Способ конвертации: %1</translation>
+ <translation type="vanished">Способ конвертации: %1</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="361"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="383"/>
<source>Remote server does not respond</source>
- <translation>Удаленный сервер не отвечает</translation>
+ <translation type="vanished">Удаленный сервер не отвечает</translation>
</message>
</context>
<context>
<name>U2::ConvertIdAndLoadDasFeaturesTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="783"/>
<source>Convert ID and load DAS features for: %1</source>
- <translation>Convert ID and load DAS features for: %1</translation>
+ <translation type="vanished">Convert ID and load DAS features for: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="799"/>
<source>Convert IDs task</source>
- <translation>Convert IDs task</translation>
+ <translation type="vanished">Convert IDs task</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="819"/>
<source>"%1" was converted into "%2"</source>
- <translation>"%1" was converted into "%2"</translation>
+ <translation type="vanished">"%1" was converted into "%2"</translation>
</message>
</context>
<context>
@@ -1034,114 +1028,95 @@ The session database file is removed after closing of UGENE.</source>
<context>
<name>U2::DASSourceRegistry</name>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="113"/>
<source>UniProt (DAS)</source>
- <translation>UniProt (DAS)</translation>
+ <translation type="vanished">UniProt (DAS)</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="114"/>
- <location filename="../src/datatype/DASSource.cpp" line="123"/>
<source>http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</source>
- <translation>http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/das-srv/uniprot/das/uniprot/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="116"/>
<source>Use Swiss-Prot, TrEMBL, UniProt, IPI or UniParc accession number. For example: %1</source>
- <translation>Используйте Swiss-Prot, TrEMBL, UniProt, IPI или UniParc Accession Number. Например: %1</translation>
+ <translation type="vanished">Используйте Swiss-Prot, TrEMBL, UniProt, IPI или UniParc Accession Number. Например: %1</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="117"/>
<source>UniProt database of protein sequences and features.</source>
- <translation>База данных UniProt белковых последовательностей и их функций.</translation>
+ <translation type="vanished">База данных UniProt белковых последовательностей и их функций.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="122"/>
<source>UniProt</source>
- <translation>UniProt</translation>
+ <translation type="vanished">UniProt</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="125"/>
<source>DAS 1 reference server for sequence and features from UniProt.
UniProt (Universal Protein Resource) is the worlds most comprehensive catalog of information on proteins.
It is a central repository of protein sequence and function created by joining the information contained
in Swiss-Prot, TrEMBL, and PIR.</source>
- <translation>DAS 1 референсный сервер для последовательностей и аннотаций из UniProt.
+ <translation type="vanished">DAS 1 референсный сервер для последовательностей и аннотаций из UniProt.
UniProt (Universal Protein Resource) это наиболее полный каталог информации о белках.
Он является центральным хранилищем последовательностей и аннотаций,
созданный путем соединения информации содержащейся в Swiss-Prot, TrEMBL, и PIR.
</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="134"/>
<source>Pride DAS 1.6</source>
- <translation>Pride DAS 1.6</translation>
+ <translation type="vanished">Pride DAS 1.6</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="135"/>
<source>http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</source>
- <translation>http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/pride-das/das/PrideDataSource/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="137"/>
<source>The PRIDE database is a centralized, public data repository for proteomics data.
It has been developed to provide the proteomics community with a public repository
for protein and peptide identifications together with the evidence supporting these
identifications. In addition to identifications, PRIDE is able to capture details of
post-translational modifications coordinated relative to the peptides in which they have been found.</source>
- <translation>База данных PRIDE database это централизованное публичное хранилище данных для данных протеомики.
+ <translation type="vanished">База данных PRIDE database это централизованное публичное хранилище данных для данных протеомики.
Она была разработана чтобы обеспечить пользователей публичным хранилищем
для протеиновых и пептидных идентификаторов совместно с поддержкой этих идентификаторов.
Кроме этого PRIDE предоставояет детали о пост-трансляционных модификациях согласованных
по отношению к пептидам, в которых они были найдены.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="147"/>
<source>cbs_sort</source>
- <translation>cbs_sort</translation>
+ <translation type="vanished">cbs_sort</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="148"/>
<source>http://das.cbs.dtu.dk:9000/das/cbs_sort/</source>
- <translation>http://das.cbs.dtu.dk:9000/das/cbs_sort/</translation>
+ <translation type="vanished">http://das.cbs.dtu.dk:9000/das/cbs_sort/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="150"/>
<source>The combined result of the signalp, secretomep, targetp, netnes & lipop server for the given id.</source>
- <translation>Совокупный результат из signalp, secretomep, targetp, netnes и lipop сервера для данного id.</translation>
+ <translation type="vanished">Совокупный результат из signalp, secretomep, targetp, netnes и lipop сервера для данного id.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="156"/>
<source>signalp</source>
- <translation>signalp</translation>
+ <translation type="vanished">signalp</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="157"/>
<source>http://das.cbs.dtu.dk:9000/das/signalp/</source>
- <translation>http://das.cbs.dtu.dk:9000/das/signalp/</translation>
+ <translation type="vanished">http://das.cbs.dtu.dk:9000/das/signalp/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="159"/>
<source>SignalP (http://www.cbs.dtu.dk/services/SignalP) predictions for UniProt.</source>
- <translation>SignalP (http://www.cbs.dtu.dk/services/SignalP) опреления для UniProt.</translation>
+ <translation type="vanished">SignalP (http://www.cbs.dtu.dk/services/SignalP) опреления для UniProt.</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="165"/>
<source>InterPro-Matches-Overview</source>
- <translation>InterPro-Matches-Overview</translation>
+ <translation type="vanished">InterPro-Matches-Overview</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="166"/>
<source>http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</source>
- <translation>http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</translation>
+ <translation type="vanished">http://www.ebi.ac.uk/das-srv/interpro/das/InterPro-matches-overview/</translation>
</message>
<message>
- <location filename="../src/datatype/DASSource.cpp" line="168"/>
<source>Shows the maximum extent of the matches from all signatures that are
integrated into a single InterPro entry against UniProtKB protein sequences
(i.e. if an InterPro entry contains 2 signatures, A and B, and both of
these match a protein, A between residue 3 and 125 and B between residue
5 and 127, the overview supermatch of these signatures is between 3 and 127).</source>
- <translation>Показывает максимальную степень совпадения от всех подписей, которые
+ <translation type="vanished">Показывает максимальную степень совпадения от всех подписей, которые
интегрированы в единую запись InterPro для белковых последовательностей UniProtKB
(т.е. если запись InterPro содержит 2 подписи, A и B, и они обе соотвествуют белку,
A между остатком 3 и 125 и B между остатком 5 and 127,
@@ -1164,9 +1139,13 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::DNAAlphabetRegistryImpl</name>
<message>
- <location filename="../src/datatype/BaseAlphabets.cpp" line="63"/>
<source>All symbols</source>
- <translation>Любые символы</translation>
+ <translation type="vanished">Любые символы</translation>
+ </message>
+ <message>
+ <location filename="../src/datatype/BaseAlphabets.cpp" line="63"/>
+ <source>Raw</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="71"/>
@@ -1190,13 +1169,21 @@ A между остатком 3 и 125 и B между остатком 5 and 12
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="114"/>
- <source>Standard amino</source>
- <translation>Стандартный амино</translation>
+ <source>Standard amino acid</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/datatype/BaseAlphabets.cpp" line="133"/>
+ <source>Extended amino acid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Standard amino</source>
+ <translation type="vanished">Стандартный амино</translation>
+ </message>
+ <message>
<source>Extended amino</source>
- <translation>Расширенный амино</translation>
+ <translation type="vanished">Расширенный амино</translation>
</message>
<message>
<location filename="../src/datatype/BaseTranslations.cpp" line="270"/>
@@ -1507,27 +1494,27 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::Document</name>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="542"/>
+ <location filename="../src/models/DocumentModel.cpp" line="546"/>
<source>Document is not loaded</source>
<translation>Документ не загружен</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="555"/>
+ <location filename="../src/models/DocumentModel.cpp" line="559"/>
<source>IO adapter does not support write operation</source>
<translation>Адаптер ввода/вывода не поддерживает запись</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="561"/>
+ <location filename="../src/models/DocumentModel.cpp" line="565"/>
<source>No write support for document format</source>
<translation>Запись для данного формата не поддерживается</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="631"/>
+ <location filename="../src/models/DocumentModel.cpp" line="635"/>
<source>Locked by user</source>
<translation>Заблокирован пользователем</translation>
</message>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="655"/>
+ <location filename="../src/models/DocumentModel.cpp" line="659"/>
<source>Lock is NULL</source>
<translation>Lock is NULL</translation>
</message>
@@ -1535,8 +1522,8 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::DocumentFormat</name>
<message>
- <location filename="../src/models/DocumentModel.cpp" line="123"/>
- <location filename="../src/models/DocumentModel.cpp" line="128"/>
+ <location filename="../src/models/DocumentModel.cpp" line="125"/>
+ <location filename="../src/models/DocumentModel.cpp" line="130"/>
<source>Writing is not supported for this format (%1). Feel free to send a feature request though.</source>
<translation>Запись в этот формат (%1) сейчас не поддерживается. Пожалуйста, сделайте запрос разработчикам.</translation>
</message>
@@ -1823,14 +1810,12 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::GetDasIdsBySequenceTask</name>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="423"/>
<source>Get an ID for the sequence</source>
- <translation>Получить идентификатор для последовательности</translation>
+ <translation type="vanished">Получить идентификатор для последовательности</translation>
</message>
<message>
- <location filename="../src/tasks/PicrApiTask.cpp" line="494"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
</context>
<context>
@@ -1844,7 +1829,7 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::GzippedLocalFileAdapterFactory</name>
<message>
- <location filename="../src/io/LocalFileAdapter.cpp" line="38"/>
+ <location filename="../src/io/LocalFileAdapter.cpp" line="40"/>
<source>GZIP file</source>
<translation>Локальный GZIP адаптер</translation>
</message>
@@ -2182,17 +2167,17 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<translation> п.о</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="96"/>
+ <location filename="../src/globals/L10n.h" line="100"/>
<source>Direct</source>
<translation>Прямая</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="97"/>
+ <location filename="../src/globals/L10n.h" line="101"/>
<source>Reverse-complementary</source>
<translation>Обратно-комплементарная</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="99"/>
+ <location filename="../src/globals/L10n.h" line="103"/>
<source>Required</source>
<translation>Требуемый</translation>
</message>
@@ -2202,8 +2187,8 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<translation>Внутренняя ошибка! Неверный аргумент: %1</translation>
</message>
<message>
- <location filename="../src/util/IOAdapterUtils.cpp" line="97"/>
- <location filename="../src/util/IOAdapterUtils.cpp" line="105"/>
+ <location filename="../src/util/IOAdapterUtils.cpp" line="98"/>
+ <location filename="../src/util/IOAdapterUtils.cpp" line="106"/>
<source>Failed to detect IO adapter for %1</source>
<translation>Невозможно определить IO адаптер для %1</translation>
</message>
@@ -2211,65 +2196,54 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::LoadDasDocumentTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="110"/>
<source>Cannot load cached document: %1</source>
- <translation>Невозможно загрузить кэшированный документ: %1</translation>
+ <translation type="vanished">Невозможно загрузить кэшированный документ: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="116"/>
<source>Cannot save document: %1</source>
- <translation>Невозможно сохранить документ: %1</translation>
+ <translation type="vanished">Невозможно сохранить документ: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="128"/>
<source>Cannot find DAS reference sequence: %1</source>
- <translation>Невозможно найти референсную последовательность DAS: %1</translation>
+ <translation type="vanished">Невозможно найти референсную последовательность DAS: %1</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="147"/>
<source>Cannot find DAS features for '%1' on %2</source>
- <translation>Невозможно найти аннотации DAS для '%1' в %2</translation>
+ <translation type="vanished">Невозможно найти аннотации DAS для '%1' в %2</translation>
</message>
</context>
<context>
<name>U2::LoadDasFeaturesTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="391"/>
<source>Load DAS annotations for current sequence</source>
- <translation>Загрузка DAS аннотаций для текущей последовательности</translation>
+ <translation type="vanished">Загрузка DAS аннотаций для текущей последовательности</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="416"/>
<source>Can not receive response from the server "</source>
- <translation>Невозможно получить ответ от сервера</translation>
+ <translation type="vanished">Невозможно получить ответ от сервера</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="424"/>
<source><font size="5" color="green">Received %1 annotations from the server "%2"</font><br></source>
- <translation><font size="5" color="green">Поступили %1 аннотации от сервера "%2"</font><br></translation>
+ <translation type="vanished"><font size="5" color="green">Поступили %1 аннотации от сервера "%2"</font><br></translation>
</message>
</context>
<context>
<name>U2::LoadDasObjectTask</name>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="242"/>
<source>Load DAS data for '%1' from %2</source>
- <translation>Загрузка данных DAS для '%1' из %2</translation>
+ <translation type="vanished">Загрузка данных DAS для '%1' из %2</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="301"/>
<source>Sequence with ID=%1 is not found.</source>
- <translation>Последовательность с идентификатором=%1 не найдена.</translation>
+ <translation type="vanished">Последовательность с идентификатором=%1 не найдена.</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="353"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/LoadDASDocumentTask.cpp" line="375"/>
<source>Remote server does not respond</source>
- <translation>Удаленный сервер не отвечает</translation>
+ <translation type="vanished">Удаленный сервер не отвечает</translation>
</message>
</context>
<context>
@@ -2378,7 +2352,7 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::LocalFileAdapterFactory</name>
<message>
- <location filename="../src/io/LocalFileAdapter.cpp" line="29"/>
+ <location filename="../src/io/LocalFileAdapter.cpp" line="31"/>
<source>Local file</source>
<translation>Локальный адаптер</translation>
</message>
@@ -2419,28 +2393,28 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::MSAUtils</name>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="181"/>
+ <location filename="../src/util/MSAUtils.cpp" line="183"/>
<source>Alphabets of the alignment and the sequence cannot be derived</source>
<translation>Алфавиты выравнивания и последовательности не могут быть получены</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="189"/>
+ <location filename="../src/util/MSAUtils.cpp" line="191"/>
<source>Sequences have different alphabets.</source>
<translation>Алфавиты последовательностей не совпадают.</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="217"/>
- <location filename="../src/util/MSAUtils.cpp" line="222"/>
+ <location filename="../src/util/MSAUtils.cpp" line="219"/>
+ <location filename="../src/util/MSAUtils.cpp" line="224"/>
<source>Alignment is empty!</source>
<translation>Выравнивание пусто!</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="229"/>
+ <location filename="../src/util/MSAUtils.cpp" line="231"/>
<source>Sequences in alignment have different sizes!</source>
<translation>Последовательности в выравнивании имеют разный размер!</translation>
</message>
<message>
- <location filename="../src/util/MSAUtils.cpp" line="338"/>
+ <location filename="../src/util/MSAUtils.cpp" line="340"/>
<source>Can't find a row in an alignment!</source>
<translation>Невозможно найти строку в выравнивании!</translation>
</message>
@@ -2524,7 +2498,7 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::PasteTask</name>
<message>
- <location filename="../src/globals/ClipboardController.cpp" line="36"/>
+ <location filename="../src/globals/ClipboardController.cpp" line="38"/>
<source>Paste data</source>
<translation type="unfinished"></translation>
</message>
@@ -2576,29 +2550,24 @@ A между остатком 3 и 125 и B между остатком 5 and 12
<context>
<name>U2::ReplyHandler</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="90"/>
<source>Can't receive result from the server: nothing to download</source>
- <translation>Невозможно получить результат с сервера: ничего не скачано</translation>
+ <translation type="vanished">Невозможно получить результат с сервера: ничего не скачано</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="139"/>
<source>Unexpected server response</source>
- <translation>Неожиданный ответ сервера</translation>
+ <translation type="vanished">Неожиданный ответ сервера</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="169"/>
<source>undefined error (code %1)</source>
- <translation>undefined error (code %1)</translation>
+ <translation type="vanished">undefined error (code %1)</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="171"/>
<source>Network error: %1</source>
- <translation>Network error: %1</translation>
+ <translation type="vanished">Network error: %1</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="189"/>
<source>Remote server doesn't respond</source>
- <translation>Удаленный сервер не отвечает</translation>
+ <translation type="vanished">Удаленный сервер не отвечает</translation>
</message>
</context>
<context>
@@ -2963,14 +2932,14 @@ UGENE содержит несохраненные изменения.</translati
<translation>Алфавит не найден!</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="98"/>
- <location filename="../src/util/U2SequenceUtils.cpp" line="111"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="102"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="115"/>
<source>Invalid sequence DBI</source>
<translation>Invalid sequence DBI</translation>
</message>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="370"/>
- <location filename="../src/util/U2SequenceUtils.cpp" line="549"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="374"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="553"/>
<source>Failed to derive sequence alphabet!</source>
<translation>Не удалось распознать алфавит!</translation>
</message>
@@ -2978,37 +2947,31 @@ UGENE содержит несохраненные изменения.</translati
<context>
<name>U2::UniprotBlastAndLoadDASAnnotations</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="602"/>
<source>BLAST IDs and DAS annotations</source>
- <translation>BLAST идентификаторы и DAS аннотации</translation>
+ <translation type="vanished">BLAST идентификаторы и DAS аннотации</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="657"/>
<source>Server "%1" is not available!</source>
- <translation>Сервер "%1" недоступен!</translation>
+ <translation type="vanished">Сервер "%1" недоступен!</translation>
</message>
</context>
<context>
<name>U2::UniprotBlastTask</name>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="504"/>
<source>Get an ID for the sequence</source>
- <translation>Получить идентификатор для последовательности</translation>
+ <translation type="vanished">Получить идентификатор для последовательности</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="544"/>
<source>Reply from the BLAST server is empty. Similar sequences not found</source>
- <translation>Не поступило ответа от сервера BLAST. Похожие последовательности не найдены</translation>
+ <translation type="vanished">Не поступило ответа от сервера BLAST. Похожие последовательности не найдены</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="586"/>
<source>An empty sequence is searched</source>
- <translation>Найдена пустая последовательность</translation>
+ <translation type="vanished">Найдена пустая последовательность</translation>
</message>
<message>
- <location filename="../src/tasks/UniprotBlastTask.cpp" line="587"/>
<source>Settings are invalid</source>
- <translation>Неверные настройки</translation>
+ <translation type="vanished">Неверные настройки</translation>
</message>
</context>
<context>
@@ -3030,7 +2993,7 @@ UGENE содержит несохраненные изменения.</translati
<context>
<name>U2SequenceImporter</name>
<message>
- <location filename="../src/util/U2SequenceUtils.cpp" line="292"/>
+ <location filename="../src/util/U2SequenceUtils.cpp" line="296"/>
<source>Sequence was not imported. Probably, this is because the sequence is empty.</source>
<translation>Последовательность не была импортирована. Возможно это произошло из-за того, что последовательность является пустой.</translation>
</message>
diff --git a/src/corelibs/U2Designer/html/Dashboard.css b/src/corelibs/U2Designer/html/Dashboard.css
index 9fafebc..e9762fc 100644
--- a/src/corelibs/U2Designer/html/Dashboard.css
+++ b/src/corelibs/U2Designer/html/Dashboard.css
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/html/Dashboard.html b/src/corelibs/U2Designer/html/Dashboard.html
index 583c0da..33d5151 100644
--- a/src/corelibs/U2Designer/html/Dashboard.html
+++ b/src/corelibs/U2Designer/html/Dashboard.html
@@ -1,6 +1,6 @@
<!--
UGENE - Integrated Bioinformatics Tools.
- Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
http://ugene.unipro.ru
This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/html/EstimationReport.css b/src/corelibs/U2Designer/html/EstimationReport.css
index ff015f3..77677b0 100644
--- a/src/corelibs/U2Designer/html/EstimationReport.css
+++ b/src/corelibs/U2Designer/html/EstimationReport.css
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/html/EstimationReport.html b/src/corelibs/U2Designer/html/EstimationReport.html
index fb514bf..61e789b 100644
--- a/src/corelibs/U2Designer/html/EstimationReport.html
+++ b/src/corelibs/U2Designer/html/EstimationReport.html
@@ -1,6 +1,6 @@
<!--
UGENE - Integrated Bioinformatics Tools.
- Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
http://ugene.unipro.ru
This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/javascript/Common.js b/src/corelibs/U2Designer/javascript/Common.js
index 785879c..31abedf 100644
--- a/src/corelibs/U2Designer/javascript/Common.js
+++ b/src/corelibs/U2Designer/javascript/Common.js
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/javascript/ContextMenu.js b/src/corelibs/U2Designer/javascript/ContextMenu.js
index 9c99da5..807ccce 100644
--- a/src/corelibs/U2Designer/javascript/ContextMenu.js
+++ b/src/corelibs/U2Designer/javascript/ContextMenu.js
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/javascript/ExternalToolsWidget.js b/src/corelibs/U2Designer/javascript/ExternalToolsWidget.js
index e44a48b..1dee7b5 100644
--- a/src/corelibs/U2Designer/javascript/ExternalToolsWidget.js
+++ b/src/corelibs/U2Designer/javascript/ExternalToolsWidget.js
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/javascript/ParametersWidget.js b/src/corelibs/U2Designer/javascript/ParametersWidget.js
index 0597b66..e122804 100644
--- a/src/corelibs/U2Designer/javascript/ParametersWidget.js
+++ b/src/corelibs/U2Designer/javascript/ParametersWidget.js
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
index 7f3cf86..b1acdb9 100644
--- a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
+++ b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ BreakpointHitCountDialog::BreakpointHitCountDialog(const QStringList &hitCountCo
{
ui = new Ui_BreakpointHitCountDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466603");
+ new HelpButton(this, ui->buttonBox, "17468146");
ui->hitConditionCombo->addItems(hitCountConditions);
ui->hitConditionCombo->setCurrentIndex(hitCountConditions.indexOf(conditionOnLaunch));
diff --git a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
index 3ce602a..536d9ee 100644
--- a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
+++ b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetWidget.cpp b/src/corelibs/U2Designer/src/DatasetWidget.cpp
index fb81038..7d2f0aa 100644
--- a/src/corelibs/U2Designer/src/DatasetWidget.cpp
+++ b/src/corelibs/U2Designer/src/DatasetWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetWidget.h b/src/corelibs/U2Designer/src/DatasetWidget.h
index 5cfddcf..703305b 100644
--- a/src/corelibs/U2Designer/src/DatasetWidget.h
+++ b/src/corelibs/U2Designer/src/DatasetWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetsController.cpp b/src/corelibs/U2Designer/src/DatasetsController.cpp
index b13a91a..c5d202d 100644
--- a/src/corelibs/U2Designer/src/DatasetsController.cpp
+++ b/src/corelibs/U2Designer/src/DatasetsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetsController.h b/src/corelibs/U2Designer/src/DatasetsController.h
index 92c9341..104ea50 100644
--- a/src/corelibs/U2Designer/src/DatasetsController.h
+++ b/src/corelibs/U2Designer/src/DatasetsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetsListWidget.cpp b/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
index d8af860..3cca7bc 100644
--- a/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
+++ b/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DatasetsListWidget.h b/src/corelibs/U2Designer/src/DatasetsListWidget.h
index bc6fb7b..c56b6b6 100644
--- a/src/corelibs/U2Designer/src/DatasetsListWidget.h
+++ b/src/corelibs/U2Designer/src/DatasetsListWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DbFolderItem.cpp b/src/corelibs/U2Designer/src/DbFolderItem.cpp
index 0701a2f..41abb3b 100644
--- a/src/corelibs/U2Designer/src/DbFolderItem.cpp
+++ b/src/corelibs/U2Designer/src/DbFolderItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DbFolderItem.h b/src/corelibs/U2Designer/src/DbFolderItem.h
index c464b32..8615811 100644
--- a/src/corelibs/U2Designer/src/DbFolderItem.h
+++ b/src/corelibs/U2Designer/src/DbFolderItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DbObjectItem.cpp b/src/corelibs/U2Designer/src/DbObjectItem.cpp
index 4024b11..7623783 100644
--- a/src/corelibs/U2Designer/src/DbObjectItem.cpp
+++ b/src/corelibs/U2Designer/src/DbObjectItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DbObjectItem.h b/src/corelibs/U2Designer/src/DbObjectItem.h
index bf72b0a..3b2e821 100644
--- a/src/corelibs/U2Designer/src/DbObjectItem.h
+++ b/src/corelibs/U2Designer/src/DbObjectItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DelegateEditors.cpp b/src/corelibs/U2Designer/src/DelegateEditors.cpp
index 01c8d9d..0b33c6f 100644
--- a/src/corelibs/U2Designer/src/DelegateEditors.cpp
+++ b/src/corelibs/U2Designer/src/DelegateEditors.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DelegateEditors.h b/src/corelibs/U2Designer/src/DelegateEditors.h
index 92072b2..c151084 100644
--- a/src/corelibs/U2Designer/src/DelegateEditors.h
+++ b/src/corelibs/U2Designer/src/DelegateEditors.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DesignerUtils.cpp b/src/corelibs/U2Designer/src/DesignerUtils.cpp
index 575185b..b76270c 100644
--- a/src/corelibs/U2Designer/src/DesignerUtils.cpp
+++ b/src/corelibs/U2Designer/src/DesignerUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DesignerUtils.h b/src/corelibs/U2Designer/src/DesignerUtils.h
index 1267b48..525b21d 100644
--- a/src/corelibs/U2Designer/src/DesignerUtils.h
+++ b/src/corelibs/U2Designer/src/DesignerUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DirectoryItem.cpp b/src/corelibs/U2Designer/src/DirectoryItem.cpp
index 32f9005..512c378 100644
--- a/src/corelibs/U2Designer/src/DirectoryItem.cpp
+++ b/src/corelibs/U2Designer/src/DirectoryItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/DirectoryItem.h b/src/corelibs/U2Designer/src/DirectoryItem.h
index 554545b..2afbf09 100644
--- a/src/corelibs/U2Designer/src/DirectoryItem.h
+++ b/src/corelibs/U2Designer/src/DirectoryItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
index 4081af2..4d6abf3 100644
--- a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
+++ b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ EditBreakpointLabelsDialog::EditBreakpointLabelsDialog(const QStringList &existi
ui(new Ui::EditBreakpointLabelsDialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466603");
+ new HelpButton(this, ui->buttonBox, "17468146");
ui->addLabelButton->setEnabled(false);
initExistingLabelsList(existingLabels);
diff --git a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
index 4b6b9fe..ea61ab0 100644
--- a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
+++ b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
index 586369f..bbde160 100644
--- a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
+++ b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
*/
#include <QMessageBox>
+#include <QPushButton>
#include <U2Designer/MarkerEditor.h>
#include <U2Designer/MarkerEditorWidget.h>
@@ -41,7 +42,9 @@ EditMarkerGroupDialog::EditMarkerGroupDialog(bool isNew, Marker *marker, Workflo
: QDialog(parent), isNew(isNew), marker(NULL), allModel(_allModel)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466486");
+ new HelpButton(this, buttonBox, "17468029");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
{
QStringList types;
types << MarkerTypes::SEQ_LENGTH().getDisplayName(); typeIds << MarkerTypes::SEQ_LENGTH().getId();
@@ -394,7 +397,9 @@ EditMarkerDialog::EditMarkerDialog(bool isNew, const QString &type, const QStrin
: QDialog(parent), isNew(isNew), type(type), name(name), values(values), editWidget(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466486");
+ new HelpButton(this, buttonBox, "17468029");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (!isNew) {
markerNameEdit->setText(name);
diff --git a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
index b28b00b..33b55f9 100644
--- a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
+++ b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/EstimationReporter.cpp b/src/corelibs/U2Designer/src/EstimationReporter.cpp
index c1fd7a2..6e7cdf3 100644
--- a/src/corelibs/U2Designer/src/EstimationReporter.cpp
+++ b/src/corelibs/U2Designer/src/EstimationReporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/EstimationReporter.h b/src/corelibs/U2Designer/src/EstimationReporter.h
index 2514db9..515ad8c 100644
--- a/src/corelibs/U2Designer/src/EstimationReporter.h
+++ b/src/corelibs/U2Designer/src/EstimationReporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/FileItem.cpp b/src/corelibs/U2Designer/src/FileItem.cpp
index 873d86a..2429aff 100644
--- a/src/corelibs/U2Designer/src/FileItem.cpp
+++ b/src/corelibs/U2Designer/src/FileItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/FileItem.h b/src/corelibs/U2Designer/src/FileItem.h
index 7c1a243..1c48b0b 100644
--- a/src/corelibs/U2Designer/src/FileItem.h
+++ b/src/corelibs/U2Designer/src/FileItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/GrouperEditor.cpp b/src/corelibs/U2Designer/src/GrouperEditor.cpp
index 910ccf9..4e7dd3c 100644
--- a/src/corelibs/U2Designer/src/GrouperEditor.cpp
+++ b/src/corelibs/U2Designer/src/GrouperEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/GrouperEditor.h b/src/corelibs/U2Designer/src/GrouperEditor.h
index cc0434d..b7866f6 100644
--- a/src/corelibs/U2Designer/src/GrouperEditor.h
+++ b/src/corelibs/U2Designer/src/GrouperEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp b/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
index 860f017..20c21ef 100644
--- a/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
+++ b/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/GrouperEditorWidget.h b/src/corelibs/U2Designer/src/GrouperEditorWidget.h
index 09b9ff1..21116e8 100644
--- a/src/corelibs/U2Designer/src/GrouperEditorWidget.h
+++ b/src/corelibs/U2Designer/src/GrouperEditorWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/MarkerEditor.cpp b/src/corelibs/U2Designer/src/MarkerEditor.cpp
index 34ed885..24826ec 100644
--- a/src/corelibs/U2Designer/src/MarkerEditor.cpp
+++ b/src/corelibs/U2Designer/src/MarkerEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/MarkerEditor.h b/src/corelibs/U2Designer/src/MarkerEditor.h
index 488cf71..739434b 100644
--- a/src/corelibs/U2Designer/src/MarkerEditor.h
+++ b/src/corelibs/U2Designer/src/MarkerEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp b/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
index 3ec799e..c7ba933 100644
--- a/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
+++ b/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/MarkerEditorWidget.h b/src/corelibs/U2Designer/src/MarkerEditorWidget.h
index e6fe066..c3faca2 100644
--- a/src/corelibs/U2Designer/src/MarkerEditorWidget.h
+++ b/src/corelibs/U2Designer/src/MarkerEditorWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp b/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
index cb87475..d8e408f 100644
--- a/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
+++ b/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ NewBreakpointDialog::NewBreakpointDialog(const QStringList &elementsNames, QWidg
Qt::WindowFlags f) : QDialog(parent, f), ui(new Ui::NewBreakpointDialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466602");
+ new HelpButton(this, ui->buttonBox, "17468145");
ui->elementCombo->addItems(elementsNames);
QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/corelibs/U2Designer/src/NewBreakpointDialog.h b/src/corelibs/U2Designer/src/NewBreakpointDialog.h
index 50abd7a..fc7e596 100644
--- a/src/corelibs/U2Designer/src/NewBreakpointDialog.h
+++ b/src/corelibs/U2Designer/src/NewBreakpointDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
index 6c2a38e..9dbf6ef 100644
--- a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
+++ b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
*/
#include <QMessageBox>
+#include <QPushButton>
#include <U2Lang/BaseTypes.h>
@@ -34,7 +35,9 @@ NewGrouperSlotDialog::NewGrouperSlotDialog(QWidget *parent, QList<Descriptor> &i
: QDialog(parent), inSlots(inSlots), names(names)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466484");
+ new HelpButton(this, buttonBox, "17468027");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
foreach (const Descriptor &d, inSlots) {
slotBox->addItem(d.getDisplayName(), d.getId());
@@ -102,9 +105,11 @@ AnnsActionDialog::AnnsActionDialog(QWidget *parent, GrouperSlotAction *action, Q
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466484");
+ new HelpButton(this, buttonBox, "17468027");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
- slotBox->addItem(tr("<Don't shift>"));
+ slotBox->addItem(tr("Don't shift"));
foreach (const QString &slot, mergeSeqSlots) {
slotBox->addItem(slot);
}
@@ -147,7 +152,9 @@ SequeceActionDialog::SequeceActionDialog(QWidget *parent, GrouperSlotAction *act
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466484");
+ new HelpButton(this, buttonBox, "17468027");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (NULL != action) {
if (ActionTypes::MERGE_SEQUENCE == action->getType()) {
@@ -210,7 +217,9 @@ MsaActionDialog::MsaActionDialog(QWidget *parent, GrouperSlotAction *action)
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466484");
+ new HelpButton(this, buttonBox, "17468027");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (NULL != action) {
assert(ActionTypes::MERGE_MSA == action->getType());
if (action->hasParameter(ActionParameters::MSA_NAME)) {
@@ -242,7 +251,9 @@ StringActionDialog::StringActionDialog(QWidget *parent, GrouperSlotAction *actio
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466484");
+ new HelpButton(this, buttonBox, "17468027");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (NULL != action) {
assert(ActionTypes::MERGE_STRING == action->getType());
if (action->hasParameter(ActionParameters::SEPARATOR)) {
diff --git a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
index 00b29f4..523ab24 100644
--- a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
+++ b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/OutputFileDialog.cpp b/src/corelibs/U2Designer/src/OutputFileDialog.cpp
index 33d6bf3..0d49535 100644
--- a/src/corelibs/U2Designer/src/OutputFileDialog.cpp
+++ b/src/corelibs/U2Designer/src/OutputFileDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/OutputFileDialog.h b/src/corelibs/U2Designer/src/OutputFileDialog.h
index 643d2f4..068e3e9 100644
--- a/src/corelibs/U2Designer/src/OutputFileDialog.h
+++ b/src/corelibs/U2Designer/src/OutputFileDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/PropertyWidget.cpp b/src/corelibs/U2Designer/src/PropertyWidget.cpp
index 1b7b54a..f519b97 100644
--- a/src/corelibs/U2Designer/src/PropertyWidget.cpp
+++ b/src/corelibs/U2Designer/src/PropertyWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/PropertyWidget.h b/src/corelibs/U2Designer/src/PropertyWidget.h
index 2d4c2aa..2490f9a 100644
--- a/src/corelibs/U2Designer/src/PropertyWidget.h
+++ b/src/corelibs/U2Designer/src/PropertyWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/QDScheduler.cpp b/src/corelibs/U2Designer/src/QDScheduler.cpp
index 16c2700..f0575ee 100644
--- a/src/corelibs/U2Designer/src/QDScheduler.cpp
+++ b/src/corelibs/U2Designer/src/QDScheduler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/QDScheduler.h b/src/corelibs/U2Designer/src/QDScheduler.h
index 550480c..5299f90 100644
--- a/src/corelibs/U2Designer/src/QDScheduler.h
+++ b/src/corelibs/U2Designer/src/QDScheduler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/UrlItem.cpp b/src/corelibs/U2Designer/src/UrlItem.cpp
index f4bb572..50deaa4 100644
--- a/src/corelibs/U2Designer/src/UrlItem.cpp
+++ b/src/corelibs/U2Designer/src/UrlItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/UrlItem.h b/src/corelibs/U2Designer/src/UrlItem.h
index d624b10..4b2aa77 100644
--- a/src/corelibs/U2Designer/src/UrlItem.h
+++ b/src/corelibs/U2Designer/src/UrlItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp b/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
index 4084a04..0b4edd3 100644
--- a/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
+++ b/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/WorkflowGUIUtils.h b/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
index 07c9512..4e526a5 100644
--- a/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
+++ b/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp b/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
index 4134784..e3c94ff 100644
--- a/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/Dashboard.h b/src/corelibs/U2Designer/src/dashboard/Dashboard.h
index 0bd3855..90a860d 100644
--- a/src/corelibs/U2Designer/src/dashboard/Dashboard.h
+++ b/src/corelibs/U2Designer/src/dashboard/Dashboard.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
index 0bf6bcc..72006e5 100644
--- a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
index 6257d3b..b470e2a 100644
--- a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
index d0b5962..be6c932 100644
--- a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
index 42c9bed..cff22c4 100644
--- a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
index 31dd041..e3be6c6 100644
--- a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
index cd933ba..8607a9e 100644
--- a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
index 1470515..fdebf6e 100644
--- a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
index 524d02d..72f7854 100644
--- a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
index 75043d3..b49810c 100644
--- a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
index 2204fd3..7bd54fd 100644
--- a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
index 31a7489..4a8425f 100644
--- a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
index 3534f82..90dfff4 100644
--- a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp b/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
index 823e9b6..76bc253 100644
--- a/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/dashboard/TableWidget.h b/src/corelibs/U2Designer/src/dashboard/TableWidget.h
index 0bfa675..5739207 100644
--- a/src/corelibs/U2Designer/src/dashboard/TableWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/TableWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
index 46b4864..70870a0 100644
--- a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
+++ b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
index 176cf28..fc0e756 100644
--- a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
+++ b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/support/URLLineEdit.cpp b/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
index 00120df..4887628 100644
--- a/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
+++ b/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/support/URLLineEdit.h b/src/corelibs/U2Designer/src/support/URLLineEdit.h
index 5fcee46..445de26 100644
--- a/src/corelibs/U2Designer/src/support/URLLineEdit.h
+++ b/src/corelibs/U2Designer/src/support/URLLineEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
index 3274560..856887c 100644
--- a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
index 959a1fb..457bc3f 100644
--- a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
index 90e07d6..99085a8 100644
--- a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
index 518c4f7..8c32f36 100644
--- a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
+++ b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
index 7d66e0d..16dd1ce 100644
--- a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
index 0c0a3e2..cce8def 100644
--- a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
+++ b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
index a2f6e50..5c6835d 100644
--- a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
index 7bd3283..0f9cf63 100644
--- a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/RadioController.cpp b/src/corelibs/U2Designer/src/wizard/RadioController.cpp
index c2f25b7..67150b3 100644
--- a/src/corelibs/U2Designer/src/wizard/RadioController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/RadioController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/RadioController.h b/src/corelibs/U2Designer/src/wizard/RadioController.h
index e57b1bb..67cca57 100644
--- a/src/corelibs/U2Designer/src/wizard/RadioController.h
+++ b/src/corelibs/U2Designer/src/wizard/RadioController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp b/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
index d8b9777..58d1e84 100644
--- a/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
+++ b/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/SelectorActors.h b/src/corelibs/U2Designer/src/wizard/SelectorActors.h
index cd414fa..470dee3 100644
--- a/src/corelibs/U2Designer/src/wizard/SelectorActors.h
+++ b/src/corelibs/U2Designer/src/wizard/SelectorActors.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/SettingsController.cpp b/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
index 672dc99..631b379 100644
--- a/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/SettingsController.h b/src/corelibs/U2Designer/src/wizard/SettingsController.h
index 0025f49..1f96478 100644
--- a/src/corelibs/U2Designer/src/wizard/SettingsController.h
+++ b/src/corelibs/U2Designer/src/wizard/SettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
index 8bb9e68..c9c0637 100644
--- a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
index 4cdd490..6966d37 100644
--- a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
index 29e01bf..f1079b3 100644
--- a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
index bf40a87..308532d 100644
--- a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp b/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
index be01eda..0c7af64 100644
--- a/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WDWizardPage.h b/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
index ddf9f16..cb64b51 100644
--- a/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
+++ b/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WidgetController.cpp b/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
index ad28827..79bb098 100644
--- a/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WidgetController.h b/src/corelibs/U2Designer/src/wizard/WidgetController.h
index 437123c..1ae68c7 100644
--- a/src/corelibs/U2Designer/src/wizard/WidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/WidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WizardController.cpp b/src/corelibs/U2Designer/src/wizard/WizardController.cpp
index 9985a1f..5b74e0d 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WizardController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -532,13 +532,13 @@ void WizardController::setAttributeValue(const AttributeInfo &info, const QVaria
/* WidgetCreator */
/************************************************************************/
WidgetCreator::WidgetCreator(WizardController *_wc)
-: wc(_wc), labelSize(0), result(NULL), layout(NULL), fullWidth(false), widgetsArea(NULL)
+: wc(_wc), labelSize(0), result(NULL), layout(NULL), widgetsArea(NULL), fullWidth(false)
{
}
WidgetCreator::WidgetCreator(WizardController *_wc, int _labelSize)
-: wc(_wc), labelSize(_labelSize), result(NULL), layout(NULL), fullWidth(false), widgetsArea(NULL)
+: wc(_wc), labelSize(_labelSize), result(NULL), layout(NULL), widgetsArea(NULL), fullWidth(false)
{
}
diff --git a/src/corelibs/U2Designer/src/wizard/WizardController.h b/src/corelibs/U2Designer/src/wizard/WizardController.h
index b34d307..c001a8c 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/WizardController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp b/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
index 22334ba..d4fd678 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/src/wizard/WizardPageController.h b/src/corelibs/U2Designer/src/wizard/WizardPageController.h
index 6cde6bb..e87e942 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardPageController.h
+++ b/src/corelibs/U2Designer/src/wizard/WizardPageController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Designer/transl/english.ts b/src/corelibs/U2Designer/transl/english.ts
index 69df353..5b206ad 100644
--- a/src/corelibs/U2Designer/transl/english.ts
+++ b/src/corelibs/U2Designer/transl/english.ts
@@ -635,9 +635,23 @@ Set up the directory:</translation>
<context>
<name>U2::AnnsActionDialog</name>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="107"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="109"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="110"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="112"/>
+ <source>Don't shift</source>
+ <translation>Don't shift</translation>
+ </message>
+ <message>
<source><Don't shift></source>
- <translation><Don't shift></translation>
+ <translation type="vanished"><Don't shift></translation>
</message>
</context>
<context>
@@ -754,34 +768,34 @@ bowtie index file</translation>
<context>
<name>U2::DatasetsListWidget</name>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="50"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="51"/>
<source>Add dataset</source>
<translation>Add dataset</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="91"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="94"/>
<source>Enter Dataset Name</source>
<translation>Enter Dataset Name</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="92"/>
- <location filename="../src/DatasetsListWidget.cpp" line="123"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="95"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="127"/>
<source>New dataset name:</source>
<translation>New dataset name:</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="102"/>
- <location filename="../src/DatasetsListWidget.cpp" line="132"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="105"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="136"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="122"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="126"/>
<source>Rename Dataset</source>
<translation>Rename Dataset</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="142"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="146"/>
<source>Rename dataset</source>
<translation>Rename dataset</translation>
</message>
@@ -813,13 +827,23 @@ bowtie index file</translation>
<context>
<name>U2::EditMarkerDialog</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="405"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="401"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="402"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="410"/>
<source>Create Marker</source>
<translation>Create Marker</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="443"/>
<location filename="../src/EditMarkerGroupDialog.cpp" line="448"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="453"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -827,53 +851,63 @@ bowtie index file</translation>
<context>
<name>U2::EditMarkerGroupDialog</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="81"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="46"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="47"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="84"/>
<source>Create Marker Group</source>
<translation>Create Marker Group</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="184"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="285"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="292"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="297"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="187"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="288"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="295"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="300"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="184"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="187"/>
<source>You can not remove the required marker "rest"</source>
<translation>You can not remove the required marker "rest"</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="203"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="206"/>
<source>Warning</source>
<translation>Warning</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="203"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="206"/>
<source>Are you really want to change marker's type? Some data can be lost!</source>
<translation>Are you really want to change marker's type? Some data can be lost!</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="235"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="259"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="238"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="262"/>
<source>Marker's name contains a comma symbol: "%1". It is not permitted for marker names</source>
<translation>Marker's name contains a comma symbol: "%1". It is not permitted for marker names</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="241"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="264"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="244"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="267"/>
<source>Duplicate marker's value: %1</source>
<translation>Duplicate marker's value: %1</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="248"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="269"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="251"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="272"/>
<source>Duplicate marker's name: %1</source>
<translation>Duplicate marker's name: %1</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="285"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="288"/>
<source>Parameter '%1' is not set</source>
<translation>Parameter '%1' is not set</translation>
</message>
@@ -967,35 +1001,58 @@ bowtie index file</translation>
<context>
<name>U2::MarkerListCfgModel</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="346"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="349"/>
<source>Marker name</source>
<translation>Marker name</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="348"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="351"/>
<source>Marker value</source>
<translation>Marker value</translation>
</message>
</context>
<context>
+ <name>U2::MsaActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="221"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="222"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::NewGrouperSlotDialog</name>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="50"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="39"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="40"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="53"/>
<source>Empty output slot name.</source>
<translation>Empty output slot name.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="52"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="55"/>
<source>Invalid symbols in the output slot name. Use letters and digits only.</source>
<translation>Invalid symbols in the output slot name. Use letters and digits only.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="54"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="57"/>
<source>This output out slot already exists.</source>
<translation>This output out slot already exists.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="60"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="63"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -1064,7 +1121,7 @@ bowtie index file</translation>
<message>
<location filename="../src/dashboard/ProblemsWidget.cpp" line="62"/>
<source>Information</source>
- <translation type="unfinished"></translation>
+ <translation>Information</translation>
</message>
<message>
<location filename="../src/dashboard/ProblemsWidget.cpp" line="118"/>
@@ -1220,6 +1277,19 @@ bowtie index file</translation>
</message>
</context>
<context>
+ <name>U2::SequeceActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="156"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="157"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::StatisticsWidget</name>
<message>
<location filename="../src/dashboard/StatisticsWidget.cpp" line="61"/>
@@ -1238,6 +1308,19 @@ bowtie index file</translation>
</message>
</context>
<context>
+ <name>U2::StringActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="255"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="256"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::StringListDelegate</name>
<message>
<location filename="../src/DelegateEditors.cpp" line="682"/>
diff --git a/src/corelibs/U2Designer/transl/russian.ts b/src/corelibs/U2Designer/transl/russian.ts
index 44981f6..bf760c9 100644
--- a/src/corelibs/U2Designer/transl/russian.ts
+++ b/src/corelibs/U2Designer/transl/russian.ts
@@ -23,7 +23,7 @@ this merge sequence slot:</source>
<message>
<location filename="../src/ui/AnnsActionDialog.ui" line="64"/>
<source>Filter duplicated annotations</source>
- <translation>Фильтровать повторы</translation>
+ <translation>Отфильтровать повторы</translation>
</message>
</context>
<context>
@@ -400,7 +400,7 @@ this merge sequence slot:</source>
<message>
<location filename="../src/ui/MsaActionDialog.ui" line="60"/>
<source>Filter duplicated rows</source>
- <translation>Фильтровать повторяющиеся строки</translation>
+ <translation>Отфильтровать повторяющиеся строки</translation>
</message>
</context>
<context>
@@ -426,17 +426,17 @@ this merge sequence slot:</source>
<message>
<location filename="../src/ui/NewGrouperSlotDialog.ui" line="32"/>
<source>Setup New Data Merge Action</source>
- <translation>Слияние данных</translation>
+ <translation>Объединение данных</translation>
</message>
<message>
<location filename="../src/ui/NewGrouperSlotDialog.ui" line="43"/>
<source>Source data slot</source>
- <translation>Слот</translation>
+ <translation>Слот с данными</translation>
</message>
<message>
<location filename="../src/ui/NewGrouperSlotDialog.ui" line="60"/>
<source>Name of new slot with merged data</source>
- <translation>Имя нового слота</translation>
+ <translation>Имя нового слота с объединенными данными</translation>
</message>
</context>
<context>
@@ -611,7 +611,7 @@ Set up the directory:</source>
<message>
<location filename="../src/ui/SequenceActionDialog.ui" line="128"/>
<source>Filter duplicated sequences</source>
- <translation>Фильтровать повторяющиеся</translation>
+ <translation>Отфильтровать повторяющиеся последовательности</translation>
</message>
</context>
<context>
@@ -635,9 +635,23 @@ Set up the directory:</source>
<context>
<name>U2::AnnsActionDialog</name>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="107"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="109"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="110"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="112"/>
+ <source>Don't shift</source>
+ <translation>Не сдвигать</translation>
+ </message>
+ <message>
<source><Don't shift></source>
- <translation><Don't shift></translation>
+ <translation type="vanished"><Don't shift></translation>
</message>
</context>
<context>
@@ -754,34 +768,34 @@ bowtie index file</source>
<context>
<name>U2::DatasetsListWidget</name>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="50"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="51"/>
<source>Add dataset</source>
<translation>Добавить набор данных</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="91"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="94"/>
<source>Enter Dataset Name</source>
<translation>Ввести имя набора данных</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="92"/>
- <location filename="../src/DatasetsListWidget.cpp" line="123"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="95"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="127"/>
<source>New dataset name:</source>
<translation>Имя нового набора данных:</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="102"/>
- <location filename="../src/DatasetsListWidget.cpp" line="132"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="105"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="136"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="122"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="126"/>
<source>Rename Dataset</source>
<translation>Переименовать набор данных</translation>
</message>
<message>
- <location filename="../src/DatasetsListWidget.cpp" line="142"/>
+ <location filename="../src/DatasetsListWidget.cpp" line="146"/>
<source>Rename dataset</source>
<translation>Переименовать набор данных</translation>
</message>
@@ -813,13 +827,23 @@ bowtie index file</source>
<context>
<name>U2::EditMarkerDialog</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="405"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="401"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="402"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="410"/>
<source>Create Marker</source>
<translation>Создание маркера</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="443"/>
<location filename="../src/EditMarkerGroupDialog.cpp" line="448"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="453"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
@@ -827,53 +851,63 @@ bowtie index file</source>
<context>
<name>U2::EditMarkerGroupDialog</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="81"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="46"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="47"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="84"/>
<source>Create Marker Group</source>
<translation>Создание группы маркеров</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="184"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="285"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="292"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="297"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="187"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="288"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="295"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="300"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="184"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="187"/>
<source>You can not remove the required marker "rest"</source>
<translation>Вы не можете удалить выбранный маркер "rest"</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="203"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="206"/>
<source>Warning</source>
<translation>Ожидание</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="203"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="206"/>
<source>Are you really want to change marker's type? Some data can be lost!</source>
<translation>Вы действиетльно хотите изменить тип маркера? Некоторые данные могут быть утеряны!</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="235"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="259"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="238"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="262"/>
<source>Marker's name contains a comma symbol: "%1". It is not permitted for marker names</source>
<translation>Имя маркера содержит запрещенный символ: "%1". Это недопустимо для имени маркера</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="241"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="264"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="244"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="267"/>
<source>Duplicate marker's value: %1</source>
<translation>Повторяющееся значение маркера: %1</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="248"/>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="269"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="251"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="272"/>
<source>Duplicate marker's name: %1</source>
<translation>Повторящееся имя маркера: %1</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="285"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="288"/>
<source>Parameter '%1' is not set</source>
<translation>Параметр '%1' не установлен</translation>
</message>
@@ -967,35 +1001,58 @@ bowtie index file</source>
<context>
<name>U2::MarkerListCfgModel</name>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="346"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="349"/>
<source>Marker name</source>
<translation>Имя маркера</translation>
</message>
<message>
- <location filename="../src/EditMarkerGroupDialog.cpp" line="348"/>
+ <location filename="../src/EditMarkerGroupDialog.cpp" line="351"/>
<source>Marker value</source>
<translation>Значение маркера</translation>
</message>
</context>
<context>
+ <name>U2::MsaActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="221"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="222"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::NewGrouperSlotDialog</name>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="50"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="39"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="40"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="53"/>
<source>Empty output slot name.</source>
<translation>Имя выходного слота пусто.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="52"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="55"/>
<source>Invalid symbols in the output slot name. Use letters and digits only.</source>
<translation>Запрещенные символы в имени выходного слота. Используйте только буквы и цифры.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="54"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="57"/>
<source>This output out slot already exists.</source>
<translation>Такой выходной слот уже существует.</translation>
</message>
<message>
- <location filename="../src/NewGrouperSlotDialog.cpp" line="60"/>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="63"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
@@ -1064,7 +1121,7 @@ bowtie index file</source>
<message>
<location filename="../src/dashboard/ProblemsWidget.cpp" line="62"/>
<source>Information</source>
- <translation type="unfinished"></translation>
+ <translation>Информация</translation>
</message>
<message>
<location filename="../src/dashboard/ProblemsWidget.cpp" line="118"/>
@@ -1220,6 +1277,19 @@ bowtie index file</source>
</message>
</context>
<context>
+ <name>U2::SequeceActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="156"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="157"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::StatisticsWidget</name>
<message>
<location filename="../src/dashboard/StatisticsWidget.cpp" line="61"/>
@@ -1238,6 +1308,19 @@ bowtie index file</source>
</message>
</context>
<context>
+ <name>U2::StringActionDialog</name>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="255"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/NewGrouperSlotDialog.cpp" line="256"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::StringListDelegate</name>
<message>
<location filename="../src/DelegateEditors.cpp" line="682"/>
diff --git a/src/corelibs/U2Formats/src/ABIFormat.cpp b/src/corelibs/U2Formats/src/ABIFormat.cpp
index ec8216e..2796e74 100644
--- a/src/corelibs/U2Formats/src/ABIFormat.cpp
+++ b/src/corelibs/U2Formats/src/ABIFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ABIFormat.h b/src/corelibs/U2Formats/src/ABIFormat.h
index 04f5000..8f6c128 100644
--- a/src/corelibs/U2Formats/src/ABIFormat.h
+++ b/src/corelibs/U2Formats/src/ABIFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ASNFormat.cpp b/src/corelibs/U2Formats/src/ASNFormat.cpp
index 46fcb00..8442cb6 100644
--- a/src/corelibs/U2Formats/src/ASNFormat.cpp
+++ b/src/corelibs/U2Formats/src/ASNFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ASNFormat.h b/src/corelibs/U2Formats/src/ASNFormat.h
index 5ffa679..a67aa45 100644
--- a/src/corelibs/U2Formats/src/ASNFormat.h
+++ b/src/corelibs/U2Formats/src/ASNFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp b/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
index 8a3f558..deb9ad1 100644
--- a/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/AbstractVariationFormat.h b/src/corelibs/U2Formats/src/AbstractVariationFormat.h
index 10e52b9..0ae2b64 100644
--- a/src/corelibs/U2Formats/src/AbstractVariationFormat.h
+++ b/src/corelibs/U2Formats/src/AbstractVariationFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/BAMUtils.cpp b/src/corelibs/U2Formats/src/BAMUtils.cpp
index 93dbc7e..e2a0e11 100644
--- a/src/corelibs/U2Formats/src/BAMUtils.cpp
+++ b/src/corelibs/U2Formats/src/BAMUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/BAMUtils.h b/src/corelibs/U2Formats/src/BAMUtils.h
index 64e98ff..1409927 100644
--- a/src/corelibs/U2Formats/src/BAMUtils.h
+++ b/src/corelibs/U2Formats/src/BAMUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/BedFormat.cpp b/src/corelibs/U2Formats/src/BedFormat.cpp
index c9c1aa9..70e65c9 100644
--- a/src/corelibs/U2Formats/src/BedFormat.cpp
+++ b/src/corelibs/U2Formats/src/BedFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/BedFormat.h b/src/corelibs/U2Formats/src/BedFormat.h
index 241cae2..73e3247 100644
--- a/src/corelibs/U2Formats/src/BedFormat.h
+++ b/src/corelibs/U2Formats/src/BedFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp b/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
index 5accadc..831c17b 100644
--- a/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
+++ b/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ClustalWAlnFormat.h b/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
index 770b7d4..061c036 100644
--- a/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
+++ b/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ColumnDataParser.cpp b/src/corelibs/U2Formats/src/ColumnDataParser.cpp
index 3633a5e..d880caf 100644
--- a/src/corelibs/U2Formats/src/ColumnDataParser.cpp
+++ b/src/corelibs/U2Formats/src/ColumnDataParser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ColumnDataParser.h b/src/corelibs/U2Formats/src/ColumnDataParser.h
index 2ce3390..c9333ea 100644
--- a/src/corelibs/U2Formats/src/ColumnDataParser.h
+++ b/src/corelibs/U2Formats/src/ColumnDataParser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp b/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
index 2fcd87e..127d26e 100644
--- a/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
+++ b/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DNAQualityIOUtils.h b/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
index a214f9c..275c342 100644
--- a/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
+++ b/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/Database.cpp b/src/corelibs/U2Formats/src/Database.cpp
index 17cfa86..e843e30 100644
--- a/src/corelibs/U2Formats/src/Database.cpp
+++ b/src/corelibs/U2Formats/src/Database.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/Database.h b/src/corelibs/U2Formats/src/Database.h
index b23a169..3e77c05 100644
--- a/src/corelibs/U2Formats/src/Database.h
+++ b/src/corelibs/U2Formats/src/Database.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
index bb187bc..b4bb891 100644
--- a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
+++ b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
index db9ae45..f98abc1 100644
--- a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
+++ b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DifferentialFormat.cpp b/src/corelibs/U2Formats/src/DifferentialFormat.cpp
index 630cb32..481a954 100644
--- a/src/corelibs/U2Formats/src/DifferentialFormat.cpp
+++ b/src/corelibs/U2Formats/src/DifferentialFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DifferentialFormat.h b/src/corelibs/U2Formats/src/DifferentialFormat.h
index 0580cb8..39882bc 100644
--- a/src/corelibs/U2Formats/src/DifferentialFormat.h
+++ b/src/corelibs/U2Formats/src/DifferentialFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp b/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
index 7c8aa81..9c15047 100644
--- a/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
+++ b/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/DocumentFormatUtils.h b/src/corelibs/U2Formats/src/DocumentFormatUtils.h
index 6250d09..7748edb 100644
--- a/src/corelibs/U2Formats/src/DocumentFormatUtils.h
+++ b/src/corelibs/U2Formats/src/DocumentFormatUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
index 1eda7be..87805a0 100644
--- a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
+++ b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
index b4ed308..8f43b9d 100644
--- a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
+++ b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
index 6ba97bf..8a503a5 100644
--- a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
index 61f217c..79e2ab7 100644
--- a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FastaFormat.cpp b/src/corelibs/U2Formats/src/FastaFormat.cpp
index b89998c..b248ca6 100644
--- a/src/corelibs/U2Formats/src/FastaFormat.cpp
+++ b/src/corelibs/U2Formats/src/FastaFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FastaFormat.h b/src/corelibs/U2Formats/src/FastaFormat.h
index d76ae8b..536808e 100644
--- a/src/corelibs/U2Formats/src/FastaFormat.h
+++ b/src/corelibs/U2Formats/src/FastaFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FastqFormat.cpp b/src/corelibs/U2Formats/src/FastqFormat.cpp
index b880e44..a4002ef 100644
--- a/src/corelibs/U2Formats/src/FastqFormat.cpp
+++ b/src/corelibs/U2Formats/src/FastqFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FastqFormat.h b/src/corelibs/U2Formats/src/FastqFormat.h
index a9e5aca..45d47c5 100644
--- a/src/corelibs/U2Formats/src/FastqFormat.h
+++ b/src/corelibs/U2Formats/src/FastqFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp b/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
index 0a6a20d..f5b9652 100644
--- a/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
+++ b/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/FpkmTrackingFormat.h b/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
index 923a3e4..75d80f5 100644
--- a/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
+++ b/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GFFFormat.cpp b/src/corelibs/U2Formats/src/GFFFormat.cpp
index 1b6ead4..493a969 100644
--- a/src/corelibs/U2Formats/src/GFFFormat.cpp
+++ b/src/corelibs/U2Formats/src/GFFFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GFFFormat.h b/src/corelibs/U2Formats/src/GFFFormat.h
index eabe53d..a2a49bd 100644
--- a/src/corelibs/U2Formats/src/GFFFormat.h
+++ b/src/corelibs/U2Formats/src/GFFFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GTFFormat.cpp b/src/corelibs/U2Formats/src/GTFFormat.cpp
index bec1341..8d86cce 100644
--- a/src/corelibs/U2Formats/src/GTFFormat.cpp
+++ b/src/corelibs/U2Formats/src/GTFFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GTFFormat.h b/src/corelibs/U2Formats/src/GTFFormat.h
index 4961be3..5102dbd 100644
--- a/src/corelibs/U2Formats/src/GTFFormat.h
+++ b/src/corelibs/U2Formats/src/GTFFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GenbankLocationParser.cpp b/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
index aa1c0b4..4568b78 100644
--- a/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
+++ b/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GenbankLocationParser.h b/src/corelibs/U2Formats/src/GenbankLocationParser.h
index dab2255..b58678f 100644
--- a/src/corelibs/U2Formats/src/GenbankLocationParser.h
+++ b/src/corelibs/U2Formats/src/GenbankLocationParser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
index 6d331c8..6eefb41 100644
--- a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
index 61ad726..47e5102 100644
--- a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/MSFFormat.cpp b/src/corelibs/U2Formats/src/MSFFormat.cpp
index 07d6bad..05b6db0 100644
--- a/src/corelibs/U2Formats/src/MSFFormat.cpp
+++ b/src/corelibs/U2Formats/src/MSFFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/MSFFormat.h b/src/corelibs/U2Formats/src/MSFFormat.h
index a77b26b..ddb0177 100644
--- a/src/corelibs/U2Formats/src/MSFFormat.h
+++ b/src/corelibs/U2Formats/src/MSFFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/MegaFormat.cpp b/src/corelibs/U2Formats/src/MegaFormat.cpp
index d339659..3000cc3 100644
--- a/src/corelibs/U2Formats/src/MegaFormat.cpp
+++ b/src/corelibs/U2Formats/src/MegaFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/MegaFormat.h b/src/corelibs/U2Formats/src/MegaFormat.h
index 28bc046..9ff45c4 100644
--- a/src/corelibs/U2Formats/src/MegaFormat.h
+++ b/src/corelibs/U2Formats/src/MegaFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/NEXUSFormat.cpp b/src/corelibs/U2Formats/src/NEXUSFormat.cpp
index f866ef6..624f125 100644
--- a/src/corelibs/U2Formats/src/NEXUSFormat.cpp
+++ b/src/corelibs/U2Formats/src/NEXUSFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/NEXUSFormat.h b/src/corelibs/U2Formats/src/NEXUSFormat.h
index f695b71..a454229 100644
--- a/src/corelibs/U2Formats/src/NEXUSFormat.h
+++ b/src/corelibs/U2Formats/src/NEXUSFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/NEXUSParser.h b/src/corelibs/U2Formats/src/NEXUSParser.h
index 58f5ff1..5e9441f 100644
--- a/src/corelibs/U2Formats/src/NEXUSParser.h
+++ b/src/corelibs/U2Formats/src/NEXUSParser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/NewickFormat.cpp b/src/corelibs/U2Formats/src/NewickFormat.cpp
index f721a53..4f75c13 100644
--- a/src/corelibs/U2Formats/src/NewickFormat.cpp
+++ b/src/corelibs/U2Formats/src/NewickFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/NewickFormat.h b/src/corelibs/U2Formats/src/NewickFormat.h
index 71de08b..8e50198 100644
--- a/src/corelibs/U2Formats/src/NewickFormat.h
+++ b/src/corelibs/U2Formats/src/NewickFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PDBFormat.cpp b/src/corelibs/U2Formats/src/PDBFormat.cpp
index d61684c..f00e0b1 100644
--- a/src/corelibs/U2Formats/src/PDBFormat.cpp
+++ b/src/corelibs/U2Formats/src/PDBFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PDBFormat.h b/src/corelibs/U2Formats/src/PDBFormat.h
index f3de7b0..694b4e7 100644
--- a/src/corelibs/U2Formats/src/PDBFormat.h
+++ b/src/corelibs/U2Formats/src/PDBFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PDWFormat.cpp b/src/corelibs/U2Formats/src/PDWFormat.cpp
index dc87b15..d0598cb 100644
--- a/src/corelibs/U2Formats/src/PDWFormat.cpp
+++ b/src/corelibs/U2Formats/src/PDWFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PDWFormat.h b/src/corelibs/U2Formats/src/PDWFormat.h
index 1c3f120..62a3f92 100644
--- a/src/corelibs/U2Formats/src/PDWFormat.h
+++ b/src/corelibs/U2Formats/src/PDWFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PhylipFormat.cpp b/src/corelibs/U2Formats/src/PhylipFormat.cpp
index 9c79ebf..4b5189d 100644
--- a/src/corelibs/U2Formats/src/PhylipFormat.cpp
+++ b/src/corelibs/U2Formats/src/PhylipFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PhylipFormat.h b/src/corelibs/U2Formats/src/PhylipFormat.h
index 846898b..8de8008 100644
--- a/src/corelibs/U2Formats/src/PhylipFormat.h
+++ b/src/corelibs/U2Formats/src/PhylipFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PlainTextFormat.cpp b/src/corelibs/U2Formats/src/PlainTextFormat.cpp
index 1b76b1c..a74a06e 100644
--- a/src/corelibs/U2Formats/src/PlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/PlainTextFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/PlainTextFormat.h b/src/corelibs/U2Formats/src/PlainTextFormat.h
index 29e0637..7bd5e7d 100644
--- a/src/corelibs/U2Formats/src/PlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/PlainTextFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp b/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
index 535e64f..eae3668 100644
--- a/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
+++ b/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -46,9 +46,19 @@ RawDNASequenceFormat::RawDNASequenceFormat(QObject* p) : DocumentFormat(p, Docum
formatName = tr("Raw sequence");
fileExtensions << "seq" << "txt";
supportedObjectTypes+=GObjectTypes::SEQUENCE;
- formatDescription = tr("Raw sequence file - a whole content of the file is treated either as a single nucleotide or peptide sequence UGENE will remove all non-alphabetic chars from the result sequence");
+ formatDescription = tr("Raw sequence file - a whole content of the file is treated either as a single/multiple nucleotide or peptide sequence(s). UGENE will remove all non-alphabetic chars from the result sequence. By default the characters in the file are considered a single sequence.");
}
+void finishSequence(QList<GObject*>& objects, IOAdapter* io, U2OpStatus& os, const U2DbiRef& dbiRef, const QVariantMap& fs, TmpDbiObjects& dbiObjects, U2SequenceImporter& seqImporter){
+ U2Sequence u2seq = seqImporter.finalizeSequence(os);
+ dbiObjects.objects << u2seq.id;
+ CHECK_OP(os, );
+
+ GObjectReference sequenceRef(io->getURL().getURLString(), u2seq.visualName, GObjectTypes::SEQUENCE, U2EntityRef(dbiRef, u2seq.id));
+ U1AnnotationUtils::addAnnotations(objects, seqImporter.getCaseAnnotations(), sequenceRef, NULL, fs);
+
+ objects << new U2SequenceObject(u2seq.visualName,U2EntityRef(dbiRef, u2seq.id));
+}
static void load(IOAdapter* io, const U2DbiRef& dbiRef, QList<GObject*>& objects, const QVariantMap& fs, U2OpStatus& os) {
DbiOperationsBlock opBlock(dbiRef, os);
@@ -61,18 +71,29 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, QList<GObject*>& object
QByteArray readBuffer(DocumentFormat::READ_BUFF_SIZE, '\0');
char* buff = readBuffer.data();
- const QBitArray& ALPHAS = TextUtils::ALPHA_NUMS;
+ QBitArray ALPHAS = TextUtils::ALPHA_NUMS;
+ ALPHAS['-'] = true;
QByteArray seq;
QString seqName(io->getURL().baseFileName());
//reading sequence
QBuffer writer(&seq);
writer.open(QIODevice::WriteOnly);
+ TmpDbiObjects dbiObjects(dbiRef, os);
bool ok = true;
int len = 0;
bool isStarted = false;
+ int sequenceCounter = 0;
+ bool terminatorFound = false;
+ bool isSplit = fs.value((DocumentReadingMode_SequenceAsSeparateHint), false).toBool();
+
+
+ while (ok && !io->isEof()) {
+ len = io->readLine(buff, DocumentFormat::READ_BUFF_SIZE, &terminatorFound);
+ if (len <= 0){
+ continue;
+ }
- while (ok && (len = io->readBlock(buff, DocumentFormat::READ_BUFF_SIZE)) > 0) {
seq.clear();
bool isSeek = writer.seek(0);
assert(isSeek); Q_UNUSED(isSeek);
@@ -87,12 +108,18 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, QList<GObject*>& object
}
}
if(seq.size()>0 && isStarted == false ){
+ QString name = sequenceCounter == 0 ? seqName : seqName + QString("_%1").arg(sequenceCounter);
isStarted = true;
- seqImporter.startSequence(dbiRef, folder, seqName, false, os);
+ seqImporter.startSequence(dbiRef, folder, name, false, os);
}
if(isStarted){
seqImporter.addBlock(seq.data(),seq.size(),os);
}
+ if (seq.size()>0 && isStarted && terminatorFound && isSplit){
+ finishSequence(objects, io, os, dbiRef, fs, dbiObjects, seqImporter);
+ sequenceCounter++;
+ isStarted = false;
+ }
if (os.isCoR()) {
break;
}
@@ -101,22 +128,17 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, QList<GObject*>& object
writer.close();
CHECK_OP(os, );
-
- CHECK_EXT(isStarted == true, os.setError(RawDNASequenceFormat::tr("Sequence is empty")), );
- U2Sequence u2seq = seqImporter.finalizeSequence(os);
- TmpDbiObjects dbiObjects(dbiRef, os);
- dbiObjects.objects << u2seq.id;
- CHECK_OP(os, );
-
- GObjectReference sequenceRef(io->getURL().getURLString(), u2seq.visualName, GObjectTypes::SEQUENCE, U2EntityRef(dbiRef, u2seq.id));
- U1AnnotationUtils::addAnnotations(objects, seqImporter.getCaseAnnotations(), sequenceRef, NULL, fs);
-
- objects << new U2SequenceObject(u2seq.visualName,U2EntityRef(dbiRef, u2seq.id));
+ if (sequenceCounter == 0){
+ CHECK_EXT(isStarted == true, os.setError(RawDNASequenceFormat::tr("Sequence is empty")), );
+ }
+ if (isStarted){
+ finishSequence(objects, io, os, dbiRef, fs, dbiObjects, seqImporter);
+ }
}
Document* RawDNASequenceFormat::loadDocument(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& fs, U2OpStatus& os) {
QList<GObject*> objects;
- load(io, dbiRef, objects, fs, os);
+ load(io, dbiRef, objects, fs, os);
CHECK_OP(os, NULL);
Document* doc = new Document(this, io->getFactory(), io->getURL(), dbiRef, objects, fs);
return doc;
@@ -125,7 +147,7 @@ Document* RawDNASequenceFormat::loadDocument(IOAdapter* io, const U2DbiRef& dbiR
FormatCheckResult RawDNASequenceFormat::checkRawData(const QByteArray& rawData, const GUrl&) const {
const char* data = rawData.constData();
int size = rawData.size();
- if(QRegExp("[a-zA-Z\r\n]*").exactMatch(rawData)) {
+ if(QRegExp("[a-zA-Z\r\n-]*").exactMatch(rawData)) {
return FormatDetection_VeryHighSimilarity;
}
bool hasBinaryData = TextUtils::contains(TextUtils::BINARY, data, size);
diff --git a/src/corelibs/U2Formats/src/RawDNASequenceFormat.h b/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
index 5e746e2..0f2d93f 100644
--- a/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
+++ b/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SAMFormat.cpp b/src/corelibs/U2Formats/src/SAMFormat.cpp
index 83856db..a45d26e 100644
--- a/src/corelibs/U2Formats/src/SAMFormat.cpp
+++ b/src/corelibs/U2Formats/src/SAMFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SAMFormat.h b/src/corelibs/U2Formats/src/SAMFormat.h
index 088a15b..044441f 100644
--- a/src/corelibs/U2Formats/src/SAMFormat.h
+++ b/src/corelibs/U2Formats/src/SAMFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SCFFormat.cpp b/src/corelibs/U2Formats/src/SCFFormat.cpp
index 8e6403b..6e7be59 100644
--- a/src/corelibs/U2Formats/src/SCFFormat.cpp
+++ b/src/corelibs/U2Formats/src/SCFFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SCFFormat.h b/src/corelibs/U2Formats/src/SCFFormat.h
index 60590ac..a706629 100644
--- a/src/corelibs/U2Formats/src/SCFFormat.h
+++ b/src/corelibs/U2Formats/src/SCFFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp b/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
index bb86c3b..b58ff98 100644
--- a/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
+++ b/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SNPDatabaseUtils.h b/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
index 88a8018..21dc3c9 100644
--- a/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
+++ b/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
index 32ebef1..9ef1c37 100644
--- a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
index c3e4357..730f473 100644
--- a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
+++ b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StdResidueDictionary.cpp b/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
index 016b173..63665a2 100644
--- a/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
+++ b/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StdResidueDictionary.h b/src/corelibs/U2Formats/src/StdResidueDictionary.h
index 5133b3a..5a8d999 100644
--- a/src/corelibs/U2Formats/src/StdResidueDictionary.h
+++ b/src/corelibs/U2Formats/src/StdResidueDictionary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StockholmFormat.cpp b/src/corelibs/U2Formats/src/StockholmFormat.cpp
index 11c98da..daed886 100644
--- a/src/corelibs/U2Formats/src/StockholmFormat.cpp
+++ b/src/corelibs/U2Formats/src/StockholmFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StockholmFormat.h b/src/corelibs/U2Formats/src/StockholmFormat.h
index a59fef5..a902fbc 100644
--- a/src/corelibs/U2Formats/src/StockholmFormat.h
+++ b/src/corelibs/U2Formats/src/StockholmFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StreamSequenceReader.cpp b/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
index f66ed48..228081b 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
+++ b/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StreamSequenceReader.h b/src/corelibs/U2Formats/src/StreamSequenceReader.h
index f4897e7..598954c 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceReader.h
+++ b/src/corelibs/U2Formats/src/StreamSequenceReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp b/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
index 9b72354..ff5f18c 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
+++ b/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/StreamSequenceWriter.h b/src/corelibs/U2Formats/src/StreamSequenceWriter.h
index b8d8eed..2fdea18 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceWriter.h
+++ b/src/corelibs/U2Formats/src/StreamSequenceWriter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
index dbf316f..8ea8404 100644
--- a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
index 84f6261..ae182ad 100644
--- a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp b/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
index f82871f..20bae88 100644
--- a/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/VCF4VariationFormat.h b/src/corelibs/U2Formats/src/VCF4VariationFormat.h
index 3a8d9c2..2b2b353 100644
--- a/src/corelibs/U2Formats/src/VCF4VariationFormat.h
+++ b/src/corelibs/U2Formats/src/VCF4VariationFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
index 6d6cb73..a150348 100644
--- a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
+++ b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
index b3e8bb5..76097a3 100644
--- a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
+++ b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceFormat.cpp b/src/corelibs/U2Formats/src/ace/AceFormat.cpp
index d8cf1cc..1ccd4ae 100644
--- a/src/corelibs/U2Formats/src/ace/AceFormat.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceFormat.h b/src/corelibs/U2Formats/src/ace/AceFormat.h
index edf6d8f..5654396 100644
--- a/src/corelibs/U2Formats/src/ace/AceFormat.h
+++ b/src/corelibs/U2Formats/src/ace/AceFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp b/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
index 70ad648..2034726 100644
--- a/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceImportUtils.h b/src/corelibs/U2Formats/src/ace/AceImportUtils.h
index b26e8fa..22fa4a4 100644
--- a/src/corelibs/U2Formats/src/ace/AceImportUtils.h
+++ b/src/corelibs/U2Formats/src/ace/AceImportUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceImporter.cpp b/src/corelibs/U2Formats/src/ace/AceImporter.cpp
index a8a395e..103e2dc 100644
--- a/src/corelibs/U2Formats/src/ace/AceImporter.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceImporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/AceImporter.h b/src/corelibs/U2Formats/src/ace/AceImporter.h
index ed3018e..022d0cb 100644
--- a/src/corelibs/U2Formats/src/ace/AceImporter.h
+++ b/src/corelibs/U2Formats/src/ace/AceImporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
index c0e6c65..683134b 100644
--- a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
+++ b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
index 54aa37d..f7f616e 100644
--- a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
+++ b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
index cdec6b4..9e5cc5b 100644
--- a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
+++ b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
index 9150221..8848d27 100644
--- a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
+++ b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
index 4be85f3..33d60c5 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
index 5f72249..ab87a7a 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
index 9b7fadd..dbc5d9d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
index 6431419..aa721d3 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright ( C ) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright ( C ) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
index d3d5974..658721d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
index d518102..786c40b 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
index 47a4cba..d4ed9ce 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
index 949ffb6..a8bf0bb 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
index 124927c..a8cfea5 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
index 852aae3..016688d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
index 1d9de97..61972ab 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
index 88cedd7..50d2533 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
index a4669e0..aed4167 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
index 759f77b..c081433 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
index 8f540cd..d505e30 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
index 42b20be..bdfb82b 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
index 48e3952..78d4236 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
index fa7c324..555ab7f 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
index 2e66cc3..ef41c65 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
index f6ebf37..5cb5ad4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
index 1d56d98..059c0f7 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
index dfd88af..cc74511 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
index 4fa4504..d93eb85 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
index f30e48b..ab75f6a 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
index d822ea1..854d975 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
index 545b2e0..9f18531 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
index c2c6a45..3a01606 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
index 3cf847e..bfb7a99 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
index 6658fd1..75c23fe 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
index 92ec356..88ce8cf 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
index a5786dd..5c34482 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
index af0f650..9552af9 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
index bf5d2cc..38e193c 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
index 1c092cd..78e643e 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
index 08c635a..a9d5ed4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
index 2c5c8a2..8f99c8b 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
index 3dd17a8..a456400 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
index e5457d7..f388425 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
index f67f94e..8d89c27 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
index 75cc365..6e16959 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
index b5b99bc..f19e95b 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
index 62286d0..8868561 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp
index ec02269..516e090 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
index 751bbf6..a3b8615 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.cpp
index 2067678..debd1f0 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.h
index 1e6bd9a..0e4408d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_14_To_1_15.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp
index 9731ad9..51c9abb 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h
index edc63f7..dd7f006 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp
index 92327d7..0495cda 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h
index b42b34f..ee96f3c 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
index 865e56f..e727097 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
index 98f69fa..537bb61 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
index db83861..88aaed6 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
index 0bf015a..aa57a88 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
index fba6f6e..d249fb3 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
index 2d2f3bc..5a4bc71 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
index 3de03d6..fffb8c3 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
index 0b6b541..66032e3 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
index 8cd98e3..f1f017c 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
index 59c2752..47bfaba 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
index 40f5dba..c1afe99 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -820,7 +820,7 @@ U2DbiIterator<U2Feature> * SQLiteFeatureDbi::getFeaturesByName(const U2DataId &r
QList<FeatureAndKey> SQLiteFeatureDbi::getFeatureTable(const U2DataId &rootFeatureId, U2OpStatus &os) {
SQLiteTransaction t(db, os);
static const QString queryStringk("SELECT " + FDBI_FIELDS + ", fk.name, fk.value FROM Feature AS f "
- "LEFT OUTER JOIN FeatureKey AS fk ON f.id = fk.feature WHERE f.root = ?1 ORDER BY f.class DESC, f.parent ASC, f.start, f.len");
+ "LEFT OUTER JOIN FeatureKey AS fk ON f.id = fk.feature WHERE f.root = ?1 ORDER BY f.class DESC, f.start, f.len");
QSharedPointer<SQLiteQuery> q = t.getPreparedQuery(queryStringk, db, os);
q->bindDataId(1, rootFeatureId);
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
index ccda804..2a92e6f 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
index 97f1bcc..8e500e4 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
index e5b25a8..6f850f9 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
index 4d6c7ea..ec2d950 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
index 3182d71..c1cbcd4 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
index d03f1f4..50d5352 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
index 4fe9eb2..2581ed2 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
index 7703dec..54ad8f9 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
index 7e4119a..b01f77c 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
index baf7dec..b4a4944 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
index 45cd212..beeafa3 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
index 3748184..64a1b1c 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
index 0a998ae..6166b38 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
index 1c1b319..c2a7149 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
index 61bcd10..b1d88b5 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
index ad6da19..2f6ac97 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
index 3737541..a3b939d 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
index 10fab03..03ddb1d 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
index 313faa4..2b59f40 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
index 9ed2a64..d56dce9 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
index 197d321..2382122 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
index b52e36f..45a6ab0 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
index e8f97e4..410c16d 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp
index d4714a6..b1f7b95 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h
index 6fe4d4a..5ea378b 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp b/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
index af5e583..e3316ed 100644
--- a/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/BgzipTask.h b/src/corelibs/U2Formats/src/tasks/BgzipTask.h
index a31cf50..1623ba8 100644
--- a/src/corelibs/U2Formats/src/tasks/BgzipTask.h
+++ b/src/corelibs/U2Formats/src/tasks/BgzipTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
index 4bdc0cb..06459a5 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
index a9f0924..e502deb 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
+++ b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
index 7ae7bab..30cf59a 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
index be69ef0..898e113 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
+++ b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp b/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
index 0506402..25fa440 100644
--- a/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/MergeBamTask.h b/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
index 52df65a..4690336 100644
--- a/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
+++ b/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
index 1338bfd..9714f6f 100644
--- a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
index 6d92493..2908bc6 100644
--- a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
+++ b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/util/AssemblyAdapter.h b/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
index 6e46006..c15e1a4 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
index 477e47d..be764c7 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
+++ b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
index 677f310..3551973 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
+++ b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Formats/transl/english.ts b/src/corelibs/U2Formats/transl/english.ts
index 193bbac..dad8ef7 100644
--- a/src/corelibs/U2Formats/transl/english.ts
+++ b/src/corelibs/U2Formats/transl/english.ts
@@ -104,7 +104,7 @@
<context>
<name>U2</name>
<message>
- <location filename="../src/GFFFormat.cpp" line="214"/>
+ <location filename="../src/GFFFormat.cpp" line="215"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
@@ -140,43 +140,43 @@
<translation>ACE</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="219"/>
+ <location filename="../src/ace/AceFormat.cpp" line="216"/>
<source>Line is too long</source>
<translation>Line is too long</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="384"/>
+ <location filename="../src/ace/AceFormat.cpp" line="381"/>
<source>A name is not match with AF names</source>
<translation>A name is not match with AF names</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="427"/>
+ <location filename="../src/ace/AceFormat.cpp" line="424"/>
<source>First line is not an ace header</source>
<translation>First line is not an ace header</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="432"/>
+ <location filename="../src/ace/AceFormat.cpp" line="429"/>
<source>No contig count tag in the header line</source>
<translation>No contig count tag in the header line</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="446"/>
+ <location filename="../src/ace/AceFormat.cpp" line="443"/>
<source>Must be CO keyword</source>
<translation>Must be CO keyword</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="215"/>
+ <location filename="../src/ace/AceFormat.cpp" line="212"/>
<source>Unexpected end of file</source>
<translation>Unexpected end of file</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="460"/>
+ <location filename="../src/ace/AceFormat.cpp" line="457"/>
<source>There is no note about reads count</source>
<translation>There is no note about reads count</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="231"/>
- <location filename="../src/ace/AceFormat.cpp" line="284"/>
+ <location filename="../src/ace/AceFormat.cpp" line="228"/>
+ <location filename="../src/ace/AceFormat.cpp" line="281"/>
<source>There is no AF note</source>
<translation>There is no AF note</translation>
</message>
@@ -186,70 +186,70 @@
<translation>ACE is a format used for storing information about genomic confgurations</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="235"/>
- <location filename="../src/ace/AceFormat.cpp" line="304"/>
+ <location filename="../src/ace/AceFormat.cpp" line="232"/>
+ <location filename="../src/ace/AceFormat.cpp" line="301"/>
<source>A name is duplicated</source>
<translation>A name is duplicated</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="243"/>
+ <location filename="../src/ace/AceFormat.cpp" line="240"/>
<source>No consensus</source>
<translation>No consensus</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="254"/>
+ <location filename="../src/ace/AceFormat.cpp" line="251"/>
<source>BQ keyword hasn't been found</source>
<translation>BQ keyword hasn't been found</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="259"/>
+ <location filename="../src/ace/AceFormat.cpp" line="256"/>
<source>Bad consensus data</source>
<translation>Bad consensus data</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="291"/>
- <location filename="../src/ace/AceFormat.cpp" line="297"/>
+ <location filename="../src/ace/AceFormat.cpp" line="288"/>
+ <location filename="../src/ace/AceFormat.cpp" line="294"/>
<source>Bad AF note</source>
<translation>Bad AF note</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="334"/>
+ <location filename="../src/ace/AceFormat.cpp" line="331"/>
<source>There is no read note</source>
<translation>There is no read note</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="342"/>
+ <location filename="../src/ace/AceFormat.cpp" line="339"/>
<source>No sequence</source>
<translation>No sequence</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="353"/>
+ <location filename="../src/ace/AceFormat.cpp" line="350"/>
<source>QA keyword hasn't been found</source>
<translation>QA keyword hasn't been found</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="361"/>
- <location filename="../src/ace/AceFormat.cpp" line="367"/>
+ <location filename="../src/ace/AceFormat.cpp" line="358"/>
+ <location filename="../src/ace/AceFormat.cpp" line="364"/>
<source>QA error no clear range</source>
<translation>QA error no clear range</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="373"/>
+ <location filename="../src/ace/AceFormat.cpp" line="370"/>
<source>QA error bad range</source>
<translation>QA error bad range</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="379"/>
+ <location filename="../src/ace/AceFormat.cpp" line="376"/>
<source>Bad sequence data</source>
<translation>Bad sequence data</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="513"/>
+ <location filename="../src/ace/AceFormat.cpp" line="510"/>
<source>Alphabet unknown</source>
<translation>Alphabet unknown</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="539"/>
+ <location filename="../src/ace/AceFormat.cpp" line="536"/>
<source>File doesn't contain any msa objects</source>
<translation>File doesn't contain any msa objects</translation>
</message>
@@ -273,22 +273,22 @@
</message>
<message>
<location filename="../src/ASNFormat.cpp" line="206"/>
- <location filename="../src/ASNFormat.cpp" line="605"/>
+ <location filename="../src/ASNFormat.cpp" line="602"/>
<source>Unknown error occurred</source>
<translation>Unknown error occurred</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="589"/>
+ <location filename="../src/ASNFormat.cpp" line="586"/>
<source>no root element</source>
<translation>no root element</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="595"/>
+ <location filename="../src/ASNFormat.cpp" line="592"/>
<source>states stack is not empty</source>
<translation>states stack is not empty</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="622"/>
+ <location filename="../src/ASNFormat.cpp" line="619"/>
<source>First line is too long</source>
<translation>First line is too long</translation>
</message>
@@ -615,32 +615,32 @@
<translation>Clustalw is a format for storing multiple sequence alignments</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="84"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="83"/>
<source>Illegal header line</source>
<translation>Illegal header line</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="104"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="103"/>
<source>Error parsing file</source>
<translation>Error parsing file</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="116"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="115"/>
<source>Invalid alignment format</source>
<translation>Invalid alignment format</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="157"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="156"/>
<source>Incorrect number of sequences in block</source>
<translation>Incorrect number of sequences in block</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="163"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="162"/>
<source>Sequence names are not matched</source>
<translation>Sequence names are not matched</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="187"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="186"/>
<source>Alphabet is unknown</source>
<translation>Alphabet is unknown</translation>
</message>
@@ -772,10 +772,10 @@
<context>
<name>U2::Document</name>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="258"/>
- <location filename="../src/FastaFormat.cpp" line="273"/>
- <location filename="../src/FastqFormat.cpp" line="339"/>
- <location filename="../src/PDWFormat.cpp" line="156"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="260"/>
+ <location filename="../src/FastaFormat.cpp" line="272"/>
+ <location filename="../src/FastqFormat.cpp" line="337"/>
+ <location filename="../src/PDWFormat.cpp" line="154"/>
<source>Document is empty.</source>
<translation>Document is empty.</translation>
</message>
@@ -806,166 +806,166 @@
<context>
<name>U2::DocumentFormatUtils</name>
<message>
- <location filename="../src/DocumentFormatUtils.cpp" line="232"/>
+ <location filename="../src/DocumentFormatUtils.cpp" line="231"/>
<source>Undefined sequence alphabet</source>
<translation>Undefined sequence alphabet</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="136"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="135"/>
<source>First line is not an ace header</source>
<translation>First line is not an ace header</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="140"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="139"/>
<source>There is no assemblies in input file</source>
<translation>There is no assemblies in input file</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="156"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="155"/>
<source>There are not enough assemblies</source>
<translation>There are not enough assemblies</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="212"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="466"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="211"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="465"/>
<source>Unexpected end of file</source>
<translation>Unexpected end of file</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="213"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="212"/>
<source>Line is too long</source>
<translation>Line is too long</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="220"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="219"/>
<source>No contig count tag in the header line</source>
<translation>No contig count tag in the header line</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="232"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="231"/>
<source>Not enough parameters in current line</source>
<translation>Not enough parameters in current line</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="243"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="242"/>
<source>Parameter is not a digit</source>
<translation>Parameter is not a digit</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="251"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="250"/>
<source>There is no note about reads count</source>
<translation>There is no note about reads count</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="263"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="262"/>
<source>A name is duplicated</source>
<translation>A name is duplicated</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="270"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="269"/>
<source>No consensus</source>
<translation>No consensus</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="280"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="279"/>
<source>BQ keyword hasn't been found</source>
<translation>BQ keyword hasn't been found</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="283"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="282"/>
<source>Unexpected symbols in consensus data</source>
<translation>Unexpected symbols in consensus data</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="294"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="293"/>
<source>Can't find a sequence name in current line</source>
<translation>Can't find a sequence name in current line</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="304"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="303"/>
<source>An empty sequence name</source>
<translation>An empty sequence name</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="356"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="355"/>
<source>Invalid AF tag</source>
<translation>Invalid AF tag</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="373"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="372"/>
<source>A name is duplicated: %1</source>
<translation>A name is duplicated: %1</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="379"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="378"/>
<source>Not all reads were found</source>
<translation>Not all reads were found</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="388"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="392"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="424"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="436"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="387"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="391"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="423"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="435"/>
<source>Bad AF note</source>
<translation>Bad AF note</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="462"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="461"/>
<source>There is no read note</source>
<translation>There is no read note</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="475"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="474"/>
<source>Invalid RD part</source>
<translation>Invalid RD part</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="476"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="475"/>
<source>Can't find the RD tag</source>
<translation>Can't find the RD tag</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="485"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="484"/>
<source>QA keyword hasn't been found</source>
<translation>QA keyword hasn't been found</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="494"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="493"/>
<source>QA error bad range</source>
<translation>QA error bad range</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="497"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="496"/>
<source>Unexpected symbols in sequence data</source>
<translation>Unexpected symbols in sequence data</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="499"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="498"/>
<source>A name is not match with AF names</source>
<translation>A name is not match with AF names</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="506"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="505"/>
<source>Can't find clear range start in current line</source>
<translation>Can't find clear range start in current line</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="507"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="506"/>
<source>Clear range start is invalid</source>
<translation>Clear range start is invalid</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="514"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="513"/>
<source>Can't find clear range end in current line</source>
<translation>Can't find clear range end in current line</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="515"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="514"/>
<source>Clear range end is invalid</source>
<translation>Clear range end is invalid</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="539"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="538"/>
<source>There is no next element</source>
<translation>There is no next element</translation>
</message>
@@ -983,50 +983,50 @@
<context>
<name>U2::EMBLGenbankAbstractDocument</name>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="122"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="124"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="139"/>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="308"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="141"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="310"/>
<source>Reading entry header</source>
<translation>Reading entry header</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="213"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="215"/>
<source>Merge error: found annotations without sequence</source>
<translation>Merge error: found annotations without sequence</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="464"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="466"/>
<source>The file contains an incorrect data that describes a qualifier value. </source>
<translation>The file contains an incorrect data that describes a qualifier value. </translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="465"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="467"/>
<source>The value cannot contain a single quote character. The qualifier is '%1'</source>
<translation>The value cannot contain a single quote character. The qualifier is '%1'</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="535"/>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="316"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="537"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="315"/>
<source>Annotation name is empty</source>
<translation>Annotation name is empty</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="544"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="546"/>
<source>Error parsing location</source>
<translation>Error parsing location</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="572"/>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="370"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="574"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="369"/>
<source>Unexpected line format</source>
<translation>Unexpected line format</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="626"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="628"/>
<source>Reading sequence %1</source>
<translation>Reading sequence %1</translation>
</message>
@@ -1078,12 +1078,12 @@
<translation>Record is truncated.</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="325"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="324"/>
<source>Annotation start position is empty</source>
<translation>Annotation start position is empty</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="330"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="329"/>
<source>Annotation end position is empty</source>
<translation>Annotation end position is empty</translation>
</message>
@@ -1124,37 +1124,37 @@
<translation>FASTA format is a text-based format for representing either nucleotide sequences or peptide sequences, in which base pairs or amino acids are represented using single-letter codes. The format also allows for sequence names and comments to precede the sequences.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="180"/>
- <location filename="../src/FastaFormat.cpp" line="410"/>
+ <location filename="../src/FastaFormat.cpp" line="179"/>
+ <location filename="../src/FastaFormat.cpp" line="409"/>
<source>Line is too long</source>
<translation>Line is too long</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="183"/>
- <location filename="../src/FastaFormat.cpp" line="412"/>
+ <location filename="../src/FastaFormat.cpp" line="182"/>
+ <location filename="../src/FastaFormat.cpp" line="411"/>
<source>First line is not a FASTA header</source>
<translation>First line is not a FASTA header</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="241"/>
+ <location filename="../src/FastaFormat.cpp" line="240"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="279"/>
+ <location filename="../src/FastaFormat.cpp" line="278"/>
<source>Loaded sequences: %1.
</source>
<translation>Loaded sequences: %1.
</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="280"/>
+ <location filename="../src/FastaFormat.cpp" line="279"/>
<source>Skipped sequences: %1.
</source>
<translation>Skipped sequences: %1.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="281"/>
+ <location filename="../src/FastaFormat.cpp" line="280"/>
<source>The following sequences are empty:
%1</source>
<translation>The following sequences are empty:
@@ -1168,7 +1168,7 @@ The following sequences are empty:
The following sequences are empty:</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="478"/>
+ <location filename="../src/FastaFormat.cpp" line="477"/>
<source>Unreferenced sequence in the beginning of patterns: %1</source>
<translation>Unreferenced sequence in the beginning of patterns: %1</translation>
</message>
@@ -1186,38 +1186,38 @@ The following sequences are empty:</translation>
<translation>FASTQ format is a text-based format for storing both a biological sequence (usually nucleotide sequence) and its corresponding quality scores. Both the sequence letter and quality score are encoded with a single ASCII character for brevity. It was originally developed at the Wellcome Trust Sanger Institute to bundle a FASTA sequence and its quality data, but has recently become the de facto standard for storing the output of high throughput se [...]
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="136"/>
+ <location filename="../src/FastqFormat.cpp" line="134"/>
<source>Error while trying to find sequence name start</source>
<translation>Error while trying to find sequence name start</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="174"/>
- <location filename="../src/FastqFormat.cpp" line="200"/>
+ <location filename="../src/FastqFormat.cpp" line="172"/>
+ <location filename="../src/FastqFormat.cpp" line="198"/>
<source>Error while reading sequence</source>
<translation>Error while reading sequence</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="292"/>
+ <location filename="../src/FastqFormat.cpp" line="290"/>
<source>Not a valid FASTQ file: %1, sequence name differs from quality scores name: %2 and %3</source>
<translation>Not a valid FASTQ file: %1, sequence name differs from quality scores name: %2 and %3</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="313"/>
+ <location filename="../src/FastqFormat.cpp" line="311"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="491"/>
+ <location filename="../src/FastqFormat.cpp" line="489"/>
<source>Not a valid FASTQ file, sequence name differs from quality scores name</source>
<translation>Not a valid FASTQ file, sequence name differs from quality scores name</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="500"/>
+ <location filename="../src/FastqFormat.cpp" line="498"/>
<source>Not a valid FASTQ file. Bad quality scores: inconsistent size.</source>
<translation>Not a valid FASTQ file. Bad quality scores: inconsistent size.</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="302"/>
+ <location filename="../src/FastqFormat.cpp" line="300"/>
<source>Not a valid FASTQ file: %1. Bad quality scores: inconsistent size.</source>
<translation>Not a valid FASTQ file: %1. Bad quality scores: inconsistent size.</translation>
</message>
@@ -1230,67 +1230,67 @@ The following sequences are empty:</translation>
<translation>The FPKM (fragments per kilobase of exon model per million mapped fragments) Tracking Format is a native Cufflinks format to output estimated expression values.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="129"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="128"/>
<source>Internal error: qualifier with name '%1' and '%2' can't be added</source>
<translation>Internal error: qualifier with name '%1' and '%2' can't be added</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="160"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="159"/>
<source>FPKM Tracking Format parsing error: incorrect number of fields at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect number of fields at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="165"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="164"/>
<source>FPKM Tracking Format parsing error: a field at line %1 is empty!</source>
<translation>FPKM Tracking Format parsing error: a field at line %1 is empty!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="170"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="169"/>
<source>FPKM Tracking Format parsing error: incorrect coordinates at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect coordinates at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="182"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="181"/>
<source>FPKM Tracking Format parsing error: different sequence names were detected in an input file. Sequence name '%1' is used.</source>
<translation>FPKM Tracking Format parsing error: different sequence names were detected in an input file. Sequence name '%1' is used.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="198"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="197"/>
<source>FPKM Tracking Format parsing error: tracking ID value is empty at line %1!</source>
<translation>FPKM Tracking Format parsing error: tracking ID value is empty at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="221"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="220"/>
<source>FPKM Tracking Format parsing error: incorrect length value at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect length value at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="226"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="225"/>
<source>FPKM Tracking Format parsing error: incorrect coverage value at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect coverage value at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="516"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="515"/>
<source>Skipped qualifier '%1' while saving a FPKM header.</source>
<translation>Skipped qualifier '%1' while saving a FPKM header.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="586"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="585"/>
<source>FPKM Tracking Format saving error: tracking ID shouldn't be empty!</source>
<translation>FPKM Tracking Format saving error: tracking ID shouldn't be empty!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="611"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="610"/>
<source>FPKM Tracking Format saving error: failed to parse locus qualifier '%1', writing it to the output file anyway!</source>
<translation>FPKM Tracking Format saving error: failed to parse locus qualifier '%1', writing it to the output file anyway!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="618"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="617"/>
<source>FPKM Tracking Format saving error: an annotation region (%1, %2) differs from the information stored in the 'locus' qualifier (%3, %4). Writing the 'locus' qualifier to output!</source>
<translation>FPKM Tracking Format saving error: an annotation region (%1, %2) differs from the information stored in the 'locus' qualifier (%3, %4). Writing the 'locus' qualifier to output!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="652"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="651"/>
<source>FPKM Tracking Format saving error: one or more errors occurred while saving a file, see TRACE log for details!</source>
<translation>FPKM Tracking Format saving error: one or more errors occurred while saving a file, see TRACE log for details!</translation>
</message>
@@ -1298,92 +1298,92 @@ The following sequences are empty:</translation>
<context>
<name>U2::GFFFormat</name>
<message>
- <location filename="../src/GFFFormat.cpp" line="50"/>
+ <location filename="../src/GFFFormat.cpp" line="51"/>
<source>GFF</source>
<translation>GFF</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="51"/>
+ <location filename="../src/GFFFormat.cpp" line="52"/>
<source>GFF is a format used for storing features and annotations</source>
<translation>GFF is a format used for storing features and annotations</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="86"/>
+ <location filename="../src/GFFFormat.cpp" line="87"/>
<source>Parsing error: invalid header</source>
<translation>Parsing error: invalid header</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="90"/>
+ <location filename="../src/GFFFormat.cpp" line="91"/>
<source>Parsing error: file does not contain version header</source>
<translation>Parsing error: file does not contain version header</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="94"/>
+ <location filename="../src/GFFFormat.cpp" line="95"/>
<source>Parsing error: format version is not an integer</source>
<translation>Parsing error: format version is not an integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="98"/>
+ <location filename="../src/GFFFormat.cpp" line="99"/>
<source>Parsing error: GFF version %1 is not supported</source>
<translation>Parsing error: GFF version %1 is not supported</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="258"/>
+ <location filename="../src/GFFFormat.cpp" line="259"/>
<source>Parsing error: file contains empty line %1, line skipped</source>
<translation>Parsing error: file contains empty line %1, line skipped</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="291"/>
+ <location filename="../src/GFFFormat.cpp" line="292"/>
<source>Parsing error: sequence in FASTA sequence has whitespaces at line %1</source>
<translation>Parsing error: sequence in FASTA sequence has whitespaces at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="298"/>
+ <location filename="../src/GFFFormat.cpp" line="299"/>
<source>Parsing error: too few fields at line %1</source>
<translation>Parsing error: too few fields at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="304"/>
+ <location filename="../src/GFFFormat.cpp" line="305"/>
<source>Parsing error: start position at line %1 is not integer</source>
<translation>Parsing error: start position at line %1 is not integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="310"/>
+ <location filename="../src/GFFFormat.cpp" line="311"/>
<source>Parsing error: end position at line %1 is not integer</source>
<translation>Parsing error: end position at line %1 is not integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="315"/>
+ <location filename="../src/GFFFormat.cpp" line="316"/>
<source>Parsing error: incorrect annotation region at line %1</source>
<translation>Parsing error: incorrect annotation region at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="366"/>
+ <location filename="../src/GFFFormat.cpp" line="367"/>
<source>Parsing error: incorrect attributes field %1 at line %2</source>
<translation>Parsing error: incorrect attributes field %1 at line %2</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="405"/>
+ <location filename="../src/GFFFormat.cpp" line="406"/>
<source>Parsing error: incorrect score parameter at line %1. Score can be a float number or '.' symbol</source>
<translation>Parsing error: incorrect score parameter at line %1. Score can be a float number or '.' symbol</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="415"/>
+ <location filename="../src/GFFFormat.cpp" line="416"/>
<source>Parsing error: incorrect frame parameter at line %1. Frame can be a number between 0-2 or '.' symbol</source>
<translation>Parsing error: incorrect frame parameter at line %1. Frame can be a number between 0-2 or '.' symbol</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="425"/>
+ <location filename="../src/GFFFormat.cpp" line="426"/>
<source>Parsing error: incorrect strand patameter at line %1. Strand can be '+','-' or '.'</source>
<translation>Parsing error: incorrect strand patameter at line %1. Strand can be '+','-' or '.'</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="591"/>
+ <location filename="../src/GFFFormat.cpp" line="592"/>
<source>Can not detect chromosome name. 'Chr' name will be used.</source>
<translation>Can not detect chromosome name. 'Chr' name will be used.</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="356"/>
+ <location filename="../src/GFFFormat.cpp" line="357"/>
<source>Wrong location for joined annotation at line %1. Line was skipped.</source>
<translation>Wrong location for joined annotation at line %1. Line was skipped.</translation>
</message>
@@ -1396,70 +1396,70 @@ The following sequences are empty:</translation>
<translation>The Gene transfer format (GTF) is a file format used to hold information about gene structure.</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="159"/>
+ <location filename="../src/GTFFormat.cpp" line="158"/>
<source>GTF parsing error: incorrect number of fields at line %1!</source>
<translation>GTF parsing error: incorrect number of fields at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="164"/>
+ <location filename="../src/GTFFormat.cpp" line="163"/>
<source>GTF parsing error: a field at line %1 is empty!</source>
<translation>GTF parsing error: a field at line %1 is empty!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="169"/>
+ <location filename="../src/GTFFormat.cpp" line="168"/>
<source>GTF parsing error: incorrect coordinates at line %1!</source>
<translation>GTF parsing error: incorrect coordinates at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="181"/>
+ <location filename="../src/GTFFormat.cpp" line="180"/>
<source>GTF parsing error: unexpected value of the "feature" value "%1" at line %2!</source>
<translation>GTF parsing error: unexpected value of the "feature" value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="199"/>
+ <location filename="../src/GTFFormat.cpp" line="198"/>
<source>GTF parsing error: incorrect score value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect score value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="207"/>
+ <location filename="../src/GTFFormat.cpp" line="206"/>
<source>GTF parsing error: incorrect frame value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect frame value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="228"/>
+ <location filename="../src/GTFFormat.cpp" line="227"/>
<source>GTF parsing error: invalid attributes format at line %1!</source>
<translation>GTF parsing error: invalid attributes format at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="235"/>
- <location filename="../src/GTFFormat.cpp" line="240"/>
+ <location filename="../src/GTFFormat.cpp" line="234"/>
+ <location filename="../src/GTFFormat.cpp" line="239"/>
<source>GTF parsing error: mandatory attribute '</source>
<translation>GTF parsing error: mandatory attribute '</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="236"/>
- <location filename="../src/GTFFormat.cpp" line="241"/>
+ <location filename="../src/GTFFormat.cpp" line="235"/>
+ <location filename="../src/GTFFormat.cpp" line="240"/>
<source>' is absent at line %1!</source>
<translation>' is absent at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="248"/>
+ <location filename="../src/GTFFormat.cpp" line="247"/>
<source>GTF parsing error: incorrect strand value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect strand value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="295"/>
+ <location filename="../src/GTFFormat.cpp" line="294"/>
<source>File "%1" contains too many annotation tables to be displayed. However, you can process these data using pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many annotation tables to be displayed. However, you can process these data using pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="630"/>
- <location filename="../src/GTFFormat.cpp" line="635"/>
+ <location filename="../src/GTFFormat.cpp" line="629"/>
+ <location filename="../src/GTFFormat.cpp" line="634"/>
<source>Can't save an annotation to a GTF file - the annotation doesn't have the '%1' qualifier!</source>
<translation>Can't save an annotation to a GTF file - the annotation doesn't have the '%1' qualifier!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="654"/>
+ <location filename="../src/GTFFormat.cpp" line="653"/>
<source>GTF saving error: one or more errors occurred while saving a file, see TRACE log for details!</source>
<translation>GTF saving error: one or more errors occurred while saving a file, see TRACE log for details!</translation>
</message>
@@ -1685,23 +1685,23 @@ The following sequences are empty:</translation>
<translation>MSF format is used to store multiple aligned sequences. Files include the sequence name and the sequence itself, which is usually aligned with other sequences in the file.</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="126"/>
+ <location filename="../src/MSFFormat.cpp" line="125"/>
<source>Incorrect format</source>
<translation>Incorrect format</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="145"/>
+ <location filename="../src/MSFFormat.cpp" line="144"/>
<source>Unexpected end of file</source>
<translation>Unexpected end of file</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="172"/>
- <location filename="../src/MSFFormat.cpp" line="213"/>
+ <location filename="../src/MSFFormat.cpp" line="171"/>
+ <location filename="../src/MSFFormat.cpp" line="212"/>
<source>Check sum test failed</source>
<translation>Check sum test failed</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="221"/>
+ <location filename="../src/MSFFormat.cpp" line="220"/>
<source>Alphabet unknown</source>
<translation>Alphabet unknown</translation>
</message>
@@ -1719,91 +1719,91 @@ The following sequences are empty:</translation>
<translation>Mega is a file format of native MEGA program</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="316"/>
+ <location filename="../src/MegaFormat.cpp" line="315"/>
<source>Found sequences of different sizes</source>
<translation>Found sequences of different sizes</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="149"/>
+ <location filename="../src/MegaFormat.cpp" line="148"/>
<source>Bad name of sequence</source>
<translation>Bad name of sequence</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="169"/>
+ <location filename="../src/MegaFormat.cpp" line="168"/>
<source>Unexpected # in comments</source>
<translation>Unexpected # in comments</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="178"/>
+ <location filename="../src/MegaFormat.cpp" line="177"/>
<source>A comment has not end</source>
<translation>A comment has not end</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="200"/>
+ <location filename="../src/MegaFormat.cpp" line="199"/>
<source>Unexpected symbol between comments</source>
<translation>Unexpected symbol between comments</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="261"/>
+ <location filename="../src/MegaFormat.cpp" line="260"/>
<source>Incorrect format</source>
<translation>Incorrect format</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="274"/>
+ <location filename="../src/MegaFormat.cpp" line="273"/>
<source>Identical symbol at the first sequence</source>
<translation>Identical symbol at the first sequence</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="298"/>
+ <location filename="../src/MegaFormat.cpp" line="297"/>
<source>Incorrect order of sequences' names</source>
<translation>Incorrect order of sequences' names</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="304"/>
+ <location filename="../src/MegaFormat.cpp" line="303"/>
<source>Incorrect sequence</source>
<translation>Incorrect sequence</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="324"/>
+ <location filename="../src/MegaFormat.cpp" line="323"/>
<source>Alphabet is unknown</source>
<translation>Alphabet is unknown</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="394"/>
- <location filename="../src/MegaFormat.cpp" line="406"/>
+ <location filename="../src/MegaFormat.cpp" line="393"/>
+ <location filename="../src/MegaFormat.cpp" line="405"/>
<source>No header</source>
<translation>No header</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="399"/>
+ <location filename="../src/MegaFormat.cpp" line="398"/>
<source>No # before header</source>
<translation>No # before header</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="411"/>
+ <location filename="../src/MegaFormat.cpp" line="410"/>
<source>Not MEGA-header</source>
<translation>Not MEGA-header</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="434"/>
- <location filename="../src/MegaFormat.cpp" line="445"/>
- <location filename="../src/MegaFormat.cpp" line="472"/>
+ <location filename="../src/MegaFormat.cpp" line="433"/>
+ <location filename="../src/MegaFormat.cpp" line="444"/>
+ <location filename="../src/MegaFormat.cpp" line="471"/>
<source>No data in file</source>
<translation>No data in file</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="454"/>
- <location filename="../src/MegaFormat.cpp" line="460"/>
+ <location filename="../src/MegaFormat.cpp" line="453"/>
+ <location filename="../src/MegaFormat.cpp" line="459"/>
<source>Incorrect title</source>
<translation>Incorrect title</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="504"/>
+ <location filename="../src/MegaFormat.cpp" line="503"/>
<source>Sequence has empty part</source>
<translation>Sequence has empty part</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="524"/>
+ <location filename="../src/MegaFormat.cpp" line="523"/>
<source>Bad symbols in a sequence</source>
<translation>Bad symbols in a sequence</translation>
</message>
@@ -1860,27 +1860,27 @@ The following sequences are empty:</translation>
<translation>The Protein Data Bank (PDB) format provides a standard representation for macromolecular structure data derived from X-ray diffraction and NMR studies.</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="191"/>
+ <location filename="../src/PDBFormat.cpp" line="189"/>
<source>Line is too long</source>
<translation>Line is too long</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="247"/>
+ <location filename="../src/PDBFormat.cpp" line="251"/>
<source>Some mandatory records are absent</source>
<translation>Some mandatory records are absent</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="355"/>
+ <location filename="../src/PDBFormat.cpp" line="395"/>
<source>PDB warning: unknown residue name: %1</source>
<translation>PDB warning: unknown residue name: %1</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="445"/>
+ <location filename="../src/PDBFormat.cpp" line="485"/>
<source>Invalid secondary structure record</source>
<translation>Invalid secondary structure record</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="482"/>
+ <location filename="../src/PDBFormat.cpp" line="522"/>
<source>Invalid SEQRES: less then 24 charachters</source>
<translation>Invalid SEQRES: less then 24 charachters</translation>
</message>
@@ -1898,8 +1898,8 @@ The following sequences are empty:</translation>
<translation>pDRAW is a sequence file format used by pDRAW software</translation>
</message>
<message>
- <location filename="../src/PDWFormat.cpp" line="102"/>
- <location filename="../src/PDWFormat.cpp" line="192"/>
+ <location filename="../src/PDWFormat.cpp" line="100"/>
+ <location filename="../src/PDWFormat.cpp" line="190"/>
<source>Line is too long</source>
<translation>Line is too long</translation>
</message>
@@ -1917,7 +1917,7 @@ The following sequences are empty:</translation>
<translation>Alphabet is unknown</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="352"/>
+ <location filename="../src/PhylipFormat.cpp" line="351"/>
<source>Error parsing file</source>
<translation>Error parsing file</translation>
</message>
@@ -1925,32 +1925,32 @@ The following sequences are empty:</translation>
<context>
<name>U2::PhylipInterleavedFormat</name>
<message>
- <location filename="../src/PhylipFormat.cpp" line="240"/>
+ <location filename="../src/PhylipFormat.cpp" line="239"/>
<source>PHYLIP Interleaved</source>
<translation>PHYLIP Interleaved</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="339"/>
+ <location filename="../src/PhylipFormat.cpp" line="338"/>
<source>Illegal line</source>
<translation>Illegal line</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="346"/>
+ <location filename="../src/PhylipFormat.cpp" line="345"/>
<source>Wrong header</source>
<translation>Wrong header</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="382"/>
+ <location filename="../src/PhylipFormat.cpp" line="381"/>
<source>Block is incomplete</source>
<translation>Block is incomplete</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="393"/>
+ <location filename="../src/PhylipFormat.cpp" line="392"/>
<source>Block is incomlete</source>
<translation>Block is incomlete</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="400"/>
+ <location filename="../src/PhylipFormat.cpp" line="399"/>
<source>Number of characters does not correspond to the stated number</source>
<translation>Number of characters does not correspond to the stated number</translation>
</message>
@@ -1958,34 +1958,34 @@ The following sequences are empty:</translation>
<context>
<name>U2::PhylipSequentialFormat</name>
<message>
- <location filename="../src/PhylipFormat.cpp" line="121"/>
+ <location filename="../src/PhylipFormat.cpp" line="120"/>
<source>PHYLIP Sequential</source>
<translation>PHYLIP Sequential</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="202"/>
+ <location filename="../src/PhylipFormat.cpp" line="201"/>
<source>Illegal line</source>
<translation>Illegal line</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="209"/>
+ <location filename="../src/PhylipFormat.cpp" line="208"/>
<source>Wrong header</source>
<translation>Wrong header</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="212"/>
- <location filename="../src/PhylipFormat.cpp" line="350"/>
+ <location filename="../src/PhylipFormat.cpp" line="211"/>
+ <location filename="../src/PhylipFormat.cpp" line="349"/>
<source>There is not enough data</source>
<translation>There is not enough data</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="217"/>
- <location filename="../src/PhylipFormat.cpp" line="360"/>
+ <location filename="../src/PhylipFormat.cpp" line="216"/>
+ <location filename="../src/PhylipFormat.cpp" line="359"/>
<source>Error parsing file</source>
<translation>Error parsing file</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="231"/>
+ <location filename="../src/PhylipFormat.cpp" line="230"/>
<source>Number of characters does not correspond to the stated number</source>
<translation>Number of characters does not correspond to the stated number</translation>
</message>
@@ -2012,11 +2012,15 @@ The following sequences are empty:</translation>
</message>
<message>
<location filename="../src/RawDNASequenceFormat.cpp" line="49"/>
+ <source>Raw sequence file - a whole content of the file is treated either as a single/multiple nucleotide or peptide sequence(s). UGENE will remove all non-alphabetic chars from the result sequence. By default the characters in the file are considered a single sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Raw sequence file - a whole content of the file is treated either as a single nucleotide or peptide sequence UGENE will remove all non-alphabetic chars from the result sequence</source>
- <translation>Raw sequence file - a whole content of the file is treated either as a single nucleotide or peptide sequence UGENE will remove all non-alphabetic chars from the result sequence</translation>
+ <translation type="vanished">Raw sequence file - a whole content of the file is treated either as a single nucleotide or peptide sequence UGENE will remove all non-alphabetic chars from the result sequence</translation>
</message>
<message>
- <location filename="../src/RawDNASequenceFormat.cpp" line="106"/>
+ <location filename="../src/RawDNASequenceFormat.cpp" line="131"/>
<source>Sequence is empty</source>
<translation>Sequence is empty</translation>
</message>
@@ -2057,7 +2061,7 @@ The following sequences are empty:</translation>
<translation>Failed to parse SCF file: %1</translation>
</message>
<message>
- <location filename="../src/SCFFormat.cpp" line="1232"/>
+ <location filename="../src/SCFFormat.cpp" line="1233"/>
<source>Failed to load sequence from SCF file %1</source>
<translation>Failed to load sequence from SCF file %1</translation>
</message>
@@ -2150,27 +2154,27 @@ The following sequences are empty:</translation>
<translation>Reading sequence %1</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="237"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="236"/>
<source>Error parsing sequence: unexpected empty line</source>
<translation>Error parsing sequence: unexpected empty line</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="260"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="259"/>
<source>Error reading sequence: memory allocation failed</source>
<translation>Error reading sequence: memory allocation failed</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="275"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="274"/>
<source>Sequence is truncated</source>
<translation>Sequence is truncated</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="282"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="281"/>
<source>Reading annotations %1</source>
<translation>Reading annotations %1</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="289"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="288"/>
<source>Invalid format of feature table</source>
<translation>Invalid format of feature table</translation>
</message>
diff --git a/src/corelibs/U2Formats/transl/russian.ts b/src/corelibs/U2Formats/transl/russian.ts
index 3e36c62..301d6b2 100644
--- a/src/corelibs/U2Formats/transl/russian.ts
+++ b/src/corelibs/U2Formats/transl/russian.ts
@@ -104,7 +104,7 @@
<context>
<name>U2</name>
<message>
- <location filename="../src/GFFFormat.cpp" line="214"/>
+ <location filename="../src/GFFFormat.cpp" line="215"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
@@ -140,43 +140,43 @@
<translation>ACE</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="219"/>
+ <location filename="../src/ace/AceFormat.cpp" line="216"/>
<source>Line is too long</source>
<translation>Строка слишком длинная</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="384"/>
+ <location filename="../src/ace/AceFormat.cpp" line="381"/>
<source>A name is not match with AF names</source>
<translation>Имя не совпадает с именами AF</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="427"/>
+ <location filename="../src/ace/AceFormat.cpp" line="424"/>
<source>First line is not an ace header</source>
<translation>Первая строка не является заголовком ACE</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="432"/>
+ <location filename="../src/ace/AceFormat.cpp" line="429"/>
<source>No contig count tag in the header line</source>
<translation>Отсутствует тег числа контигов в строке заголовка</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="446"/>
+ <location filename="../src/ace/AceFormat.cpp" line="443"/>
<source>Must be CO keyword</source>
<translation>Ожидается ключевое слово CO</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="215"/>
+ <location filename="../src/ace/AceFormat.cpp" line="212"/>
<source>Unexpected end of file</source>
<translation>Неожиданный конец файла</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="460"/>
+ <location filename="../src/ace/AceFormat.cpp" line="457"/>
<source>There is no note about reads count</source>
<translation>Отсуствтует информация о числе считываний</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="231"/>
- <location filename="../src/ace/AceFormat.cpp" line="284"/>
+ <location filename="../src/ace/AceFormat.cpp" line="228"/>
+ <location filename="../src/ace/AceFormat.cpp" line="281"/>
<source>There is no AF note</source>
<translation>Отсутствует</translation>
</message>
@@ -186,70 +186,70 @@
<translation>ACE это формат используемый для хранения информации о геномных конфигурациях</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="235"/>
- <location filename="../src/ace/AceFormat.cpp" line="304"/>
+ <location filename="../src/ace/AceFormat.cpp" line="232"/>
+ <location filename="../src/ace/AceFormat.cpp" line="301"/>
<source>A name is duplicated</source>
<translation>Повторные вхождения имени</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="243"/>
+ <location filename="../src/ace/AceFormat.cpp" line="240"/>
<source>No consensus</source>
<translation>Отсутствует консенсус</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="254"/>
+ <location filename="../src/ace/AceFormat.cpp" line="251"/>
<source>BQ keyword hasn't been found</source>
<translation>Не найдено ключевое слово BQ</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="259"/>
+ <location filename="../src/ace/AceFormat.cpp" line="256"/>
<source>Bad consensus data</source>
<translation>Плохие данные в консенсусе</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="291"/>
- <location filename="../src/ace/AceFormat.cpp" line="297"/>
+ <location filename="../src/ace/AceFormat.cpp" line="288"/>
+ <location filename="../src/ace/AceFormat.cpp" line="294"/>
<source>Bad AF note</source>
<translation>Плохое примечание AF</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="334"/>
+ <location filename="../src/ace/AceFormat.cpp" line="331"/>
<source>There is no read note</source>
<translation>Отсутствует</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="342"/>
+ <location filename="../src/ace/AceFormat.cpp" line="339"/>
<source>No sequence</source>
<translation>Нет последовательности</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="353"/>
+ <location filename="../src/ace/AceFormat.cpp" line="350"/>
<source>QA keyword hasn't been found</source>
<translation>Ключевое слово QA не было найдено</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="361"/>
- <location filename="../src/ace/AceFormat.cpp" line="367"/>
+ <location filename="../src/ace/AceFormat.cpp" line="358"/>
+ <location filename="../src/ace/AceFormat.cpp" line="364"/>
<source>QA error no clear range</source>
<translation>Ошибка QA нет четкого региона</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="373"/>
+ <location filename="../src/ace/AceFormat.cpp" line="370"/>
<source>QA error bad range</source>
<translation>Ошибка QA: плохой регион</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="379"/>
+ <location filename="../src/ace/AceFormat.cpp" line="376"/>
<source>Bad sequence data</source>
<translation>Некорректные данные в последовательности</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="513"/>
+ <location filename="../src/ace/AceFormat.cpp" line="510"/>
<source>Alphabet unknown</source>
<translation>Неизвестный алфавит</translation>
</message>
<message>
- <location filename="../src/ace/AceFormat.cpp" line="539"/>
+ <location filename="../src/ace/AceFormat.cpp" line="536"/>
<source>File doesn't contain any msa objects</source>
<translation>Файл не содержит msa объектов</translation>
</message>
@@ -278,22 +278,22 @@
</message>
<message>
<location filename="../src/ASNFormat.cpp" line="206"/>
- <location filename="../src/ASNFormat.cpp" line="605"/>
+ <location filename="../src/ASNFormat.cpp" line="602"/>
<source>Unknown error occurred</source>
<translation>Неизвестная ошибка</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="589"/>
+ <location filename="../src/ASNFormat.cpp" line="586"/>
<source>no root element</source>
<translation>Отсутствует корневой элемент</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="595"/>
+ <location filename="../src/ASNFormat.cpp" line="592"/>
<source>states stack is not empty</source>
<translation>Стек состояний не пуст</translation>
</message>
<message>
- <location filename="../src/ASNFormat.cpp" line="622"/>
+ <location filename="../src/ASNFormat.cpp" line="619"/>
<source>First line is too long</source>
<translation>Первая строка слишком длинная</translation>
</message>
@@ -610,32 +610,32 @@
<translation>Clustalw это формат для сохранения множественных выравниваний</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="84"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="83"/>
<source>Illegal header line</source>
<translation>Неправильная строка заголовка</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="104"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="103"/>
<source>Error parsing file</source>
<translation>Ошибка разбора файла</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="116"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="115"/>
<source>Invalid alignment format</source>
<translation>Неверный формат выравнивания</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="157"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="156"/>
<source>Incorrect number of sequences in block</source>
<translation>Неверное количество последовательностей в блоке</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="163"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="162"/>
<source>Sequence names are not matched</source>
<translation>Встретилось непарное имя последовательности</translation>
</message>
<message>
- <location filename="../src/ClustalWAlnFormat.cpp" line="187"/>
+ <location filename="../src/ClustalWAlnFormat.cpp" line="186"/>
<source>Alphabet is unknown</source>
<translation>Неизвестный алфавит</translation>
</message>
@@ -772,10 +772,10 @@
<context>
<name>U2::Document</name>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="258"/>
- <location filename="../src/FastaFormat.cpp" line="273"/>
- <location filename="../src/FastqFormat.cpp" line="339"/>
- <location filename="../src/PDWFormat.cpp" line="156"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="260"/>
+ <location filename="../src/FastaFormat.cpp" line="272"/>
+ <location filename="../src/FastqFormat.cpp" line="337"/>
+ <location filename="../src/PDWFormat.cpp" line="154"/>
<source>Document is empty.</source>
<translation>Документ не содержит данных.</translation>
</message>
@@ -806,166 +806,166 @@
<context>
<name>U2::DocumentFormatUtils</name>
<message>
- <location filename="../src/DocumentFormatUtils.cpp" line="232"/>
+ <location filename="../src/DocumentFormatUtils.cpp" line="231"/>
<source>Undefined sequence alphabet</source>
<translation>Неизвестный алфавит</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="136"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="135"/>
<source>First line is not an ace header</source>
<translation>Первая строка не является заголовком ACE</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="140"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="139"/>
<source>There is no assemblies in input file</source>
<translation>В файле нет сборок</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="156"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="155"/>
<source>There are not enough assemblies</source>
<translation>Недостаточно сборок</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="212"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="466"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="211"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="465"/>
<source>Unexpected end of file</source>
<translation>Неожиданный конец файла</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="213"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="212"/>
<source>Line is too long</source>
<translation>Строка слишком длинная</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="220"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="219"/>
<source>No contig count tag in the header line</source>
<translation>Отсутствует тег числа контигов в строке заголовка</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="232"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="231"/>
<source>Not enough parameters in current line</source>
<translation>Недостаточно параметров в текущей строке</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="243"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="242"/>
<source>Parameter is not a digit</source>
<translation>Параметр не является цифрой</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="251"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="250"/>
<source>There is no note about reads count</source>
<translation>Отсуствтует информация о числе считываний</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="263"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="262"/>
<source>A name is duplicated</source>
<translation>Повторные вхождения имени</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="270"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="269"/>
<source>No consensus</source>
<translation>Отсутствует консенсус</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="280"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="279"/>
<source>BQ keyword hasn't been found</source>
<translation>Не найдено ключевое слово BQ</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="283"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="282"/>
<source>Unexpected symbols in consensus data</source>
<translation>Неоижданные символы в консенсусе</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="294"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="293"/>
<source>Can't find a sequence name in current line</source>
<translation>Невозможно найти имя последовательности в текущей строке</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="304"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="303"/>
<source>An empty sequence name</source>
<translation>Не указано имя последовательности</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="356"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="355"/>
<source>Invalid AF tag</source>
<translation>Invalid AF tag</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="373"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="372"/>
<source>A name is duplicated: %1</source>
<translation>Повторные вхождения имени: %1</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="379"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="378"/>
<source>Not all reads were found</source>
<translation>Не все риды были найдены</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="388"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="392"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="424"/>
- <location filename="../src/ace/AceImportUtils.cpp" line="436"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="387"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="391"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="423"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="435"/>
<source>Bad AF note</source>
<translation>Плохое примечание AF</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="462"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="461"/>
<source>There is no read note</source>
<translation>Отсутствует</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="475"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="474"/>
<source>Invalid RD part</source>
<translation>Неверная часть RD</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="476"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="475"/>
<source>Can't find the RD tag</source>
<translation>Can't find the RD tag</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="485"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="484"/>
<source>QA keyword hasn't been found</source>
<translation>Ключевое слово QA не было найдено</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="494"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="493"/>
<source>QA error bad range</source>
<translation>Ошибка QA: плохой регион</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="497"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="496"/>
<source>Unexpected symbols in sequence data</source>
<translation>Неоижданные символы в последовательности</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="499"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="498"/>
<source>A name is not match with AF names</source>
<translation>Имя не совпадает с именами AF</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="506"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="505"/>
<source>Can't find clear range start in current line</source>
<translation>Невозможно найти начало диапазона в текущей строке</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="507"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="506"/>
<source>Clear range start is invalid</source>
<translation>Неверное начало диапазона</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="514"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="513"/>
<source>Can't find clear range end in current line</source>
<translation>Невозможно найти конец диапазона в текущей строке</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="515"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="514"/>
<source>Clear range end is invalid</source>
<translation>Неверный конец диапазона</translation>
</message>
<message>
- <location filename="../src/ace/AceImportUtils.cpp" line="539"/>
+ <location filename="../src/ace/AceImportUtils.cpp" line="538"/>
<source>There is no next element</source>
<translation>Отсутствует следующий элемент</translation>
</message>
@@ -983,13 +983,13 @@
<context>
<name>U2::EMBLGenbankAbstractDocument</name>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="535"/>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="316"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="537"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="315"/>
<source>Annotation name is empty</source>
<translation>Не указано имя аннотации</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="544"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="546"/>
<source>Error parsing location</source>
<translation>Не указан регион аннотации</translation>
</message>
@@ -1009,39 +1009,39 @@
<translation>Ошибка чтения последовательности: не удалось выделить память</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="572"/>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="370"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="574"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="369"/>
<source>Unexpected line format</source>
<translation>Слишком длинная строка или неожиданный конец файла</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="122"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="124"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="139"/>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="308"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="141"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="310"/>
<source>Reading entry header</source>
<translation>Чтение заголовка</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="213"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="215"/>
<source>Merge error: found annotations without sequence</source>
<translation>Ошибка слияния: обнаружена таблица аннотаций без соотв последовательности</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="464"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="466"/>
<source>The file contains an incorrect data that describes a qualifier value. </source>
<translation>Файл содержит некорректные данные, которые описываются value. </translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="465"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="467"/>
<source>The value cannot contain a single quote character. The qualifier is '%1'</source>
<translation>Значение не может содержать одиночные кавычки. Квалификатор '%1'</translation>
</message>
<message>
- <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="626"/>
+ <location filename="../src/EMBLGenbankAbstractDocument.cpp" line="628"/>
<source>Reading sequence %1</source>
<translation>Чтение последовательности: %1</translation>
</message>
@@ -1078,12 +1078,12 @@
<translation>Данные повреждены.</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="325"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="324"/>
<source>Annotation start position is empty</source>
<translation>Не указано начало аннотации</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="330"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="329"/>
<source>Annotation end position is empty</source>
<translation>Не указан конец аннотации</translation>
</message>
@@ -1119,37 +1119,37 @@
<translation>Формат FASTA является текстовым форматом для представления нуклеотидных или пептидных последовательностей, в котором пары оснований или аминокислоты представлены с использованием одно-буквенных кодов. Формат также позволяет задавать имена и комментарии к последовательностям.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="180"/>
- <location filename="../src/FastaFormat.cpp" line="410"/>
+ <location filename="../src/FastaFormat.cpp" line="179"/>
+ <location filename="../src/FastaFormat.cpp" line="409"/>
<source>Line is too long</source>
<translation>Слишком длинная строка</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="183"/>
- <location filename="../src/FastaFormat.cpp" line="412"/>
+ <location filename="../src/FastaFormat.cpp" line="182"/>
+ <location filename="../src/FastaFormat.cpp" line="411"/>
<source>First line is not a FASTA header</source>
<translation>Неправильный заголовок FASTA</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="241"/>
+ <location filename="../src/FastaFormat.cpp" line="240"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="279"/>
+ <location filename="../src/FastaFormat.cpp" line="278"/>
<source>Loaded sequences: %1.
</source>
<translation>Loaded sequences: %1.
</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="280"/>
+ <location filename="../src/FastaFormat.cpp" line="279"/>
<source>Skipped sequences: %1.
</source>
<translation>Пропущены последовательности: %1.</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="281"/>
+ <location filename="../src/FastaFormat.cpp" line="280"/>
<source>The following sequences are empty:
%1</source>
<translation>Следующие последовательности пусты:
@@ -1163,7 +1163,7 @@ The following sequences are empty:
The following sequences are empty:</translation>
</message>
<message>
- <location filename="../src/FastaFormat.cpp" line="478"/>
+ <location filename="../src/FastaFormat.cpp" line="477"/>
<source>Unreferenced sequence in the beginning of patterns: %1</source>
<translation>Неиспользуемая последовательность в начале образцов: %1</translation>
</message>
@@ -1186,38 +1186,38 @@ The following sequences are empty:</translation>
<translation>Формат FASTQ является текстовым форматом для хранения биологических последовательностей (обычно нуклеотидных) и соответствующих им показателей качества. Последовательность и показатель качества кодируются при помощи одного символа ASCII для краткости. Изначально он был разработан в Wellcome Trust Sanger Institute для связи последовательности в формате FASTA и их данных качества, но в последнее время стал стандартом для хранения выходных данных инструментов секвениро [...]
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="136"/>
+ <location filename="../src/FastqFormat.cpp" line="134"/>
<source>Error while trying to find sequence name start</source>
<translation>Не удалось найти начало имени последовательности</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="174"/>
- <location filename="../src/FastqFormat.cpp" line="200"/>
+ <location filename="../src/FastqFormat.cpp" line="172"/>
+ <location filename="../src/FastqFormat.cpp" line="198"/>
<source>Error while reading sequence</source>
<translation>Ошибка чтения последовательности</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="292"/>
+ <location filename="../src/FastqFormat.cpp" line="290"/>
<source>Not a valid FASTQ file: %1, sequence name differs from quality scores name: %2 and %3</source>
<translation>Некорректный FASTQ файл: %1, имя последовательности отличается от имени показателей качества: %2 и %3</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="313"/>
+ <location filename="../src/FastqFormat.cpp" line="311"/>
<source>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many sequences to be displayed. However, you can process these data using instruments from the menu <i>Tools -> NGS data analysis</i> or pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="491"/>
+ <location filename="../src/FastqFormat.cpp" line="489"/>
<source>Not a valid FASTQ file, sequence name differs from quality scores name</source>
<translation>Некорректный FASTQ файл, имя последовательности отличается от имени показателей качества</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="500"/>
+ <location filename="../src/FastqFormat.cpp" line="498"/>
<source>Not a valid FASTQ file. Bad quality scores: inconsistent size.</source>
<translation>Некорректный FASTQ файл. Плохие показатели качества: несовместимый размер.</translation>
</message>
<message>
- <location filename="../src/FastqFormat.cpp" line="302"/>
+ <location filename="../src/FastqFormat.cpp" line="300"/>
<source>Not a valid FASTQ file: %1. Bad quality scores: inconsistent size.</source>
<translation>Некорректный FASTQ файл: %1. Ошибка вычисления оценки точности: некорректный размер.</translation>
</message>
@@ -1230,67 +1230,67 @@ The following sequences are empty:</translation>
<translation>FPKM (fragments per kilobase of exon model per million mapped fragments) Tracking Format это внутренний Cufflinks формат для выходных значений оценки выражений.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="129"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="128"/>
<source>Internal error: qualifier with name '%1' and '%2' can't be added</source>
<translation>Internal error: qualifier with name '%1' and '%2' can't be added</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="160"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="159"/>
<source>FPKM Tracking Format parsing error: incorrect number of fields at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect number of fields at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="165"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="164"/>
<source>FPKM Tracking Format parsing error: a field at line %1 is empty!</source>
<translation>FPKM Tracking Format parsing error: a field at line %1 is empty!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="170"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="169"/>
<source>FPKM Tracking Format parsing error: incorrect coordinates at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect coordinates at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="182"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="181"/>
<source>FPKM Tracking Format parsing error: different sequence names were detected in an input file. Sequence name '%1' is used.</source>
<translation>FPKM Tracking Format parsing error: different sequence names were detected in an input file. Sequence name '%1' is used.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="198"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="197"/>
<source>FPKM Tracking Format parsing error: tracking ID value is empty at line %1!</source>
<translation>FPKM Tracking Format parsing error: tracking ID value is empty at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="221"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="220"/>
<source>FPKM Tracking Format parsing error: incorrect length value at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect length value at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="226"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="225"/>
<source>FPKM Tracking Format parsing error: incorrect coverage value at line %1!</source>
<translation>FPKM Tracking Format parsing error: incorrect coverage value at line %1!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="516"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="515"/>
<source>Skipped qualifier '%1' while saving a FPKM header.</source>
<translation>Skipped qualifier '%1' while saving a FPKM header.</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="586"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="585"/>
<source>FPKM Tracking Format saving error: tracking ID shouldn't be empty!</source>
<translation>FPKM Tracking Format saving error: tracking ID shouldn't be empty!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="611"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="610"/>
<source>FPKM Tracking Format saving error: failed to parse locus qualifier '%1', writing it to the output file anyway!</source>
<translation>FPKM Tracking Format saving error: failed to parse locus qualifier '%1', writing it to the output file anyway!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="618"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="617"/>
<source>FPKM Tracking Format saving error: an annotation region (%1, %2) differs from the information stored in the 'locus' qualifier (%3, %4). Writing the 'locus' qualifier to output!</source>
<translation>FPKM Tracking Format saving error: an annotation region (%1, %2) differs from the information stored in the 'locus' qualifier (%3, %4). Writing the 'locus' qualifier to output!</translation>
</message>
<message>
- <location filename="../src/FpkmTrackingFormat.cpp" line="652"/>
+ <location filename="../src/FpkmTrackingFormat.cpp" line="651"/>
<source>FPKM Tracking Format saving error: one or more errors occurred while saving a file, see TRACE log for details!</source>
<translation>FPKM Tracking Format saving error: one or more errors occurred while saving a file, see TRACE log for details!</translation>
</message>
@@ -1298,92 +1298,92 @@ The following sequences are empty:</translation>
<context>
<name>U2::GFFFormat</name>
<message>
- <location filename="../src/GFFFormat.cpp" line="50"/>
+ <location filename="../src/GFFFormat.cpp" line="51"/>
<source>GFF</source>
<translation>GFF</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="51"/>
+ <location filename="../src/GFFFormat.cpp" line="52"/>
<source>GFF is a format used for storing features and annotations</source>
<translation>GFF это формат используемый для хранения аннотаций</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="86"/>
+ <location filename="../src/GFFFormat.cpp" line="87"/>
<source>Parsing error: invalid header</source>
<translation>Parsing error: invalid header</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="90"/>
+ <location filename="../src/GFFFormat.cpp" line="91"/>
<source>Parsing error: file does not contain version header</source>
<translation>Parsing error: file does not contain version header</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="94"/>
+ <location filename="../src/GFFFormat.cpp" line="95"/>
<source>Parsing error: format version is not an integer</source>
<translation>Parsing error: format version is not an integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="98"/>
+ <location filename="../src/GFFFormat.cpp" line="99"/>
<source>Parsing error: GFF version %1 is not supported</source>
<translation>Parsing error: GFF version %1 is not supported</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="258"/>
+ <location filename="../src/GFFFormat.cpp" line="259"/>
<source>Parsing error: file contains empty line %1, line skipped</source>
<translation>Parsing error: file contains empty line %1, line skipped</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="291"/>
+ <location filename="../src/GFFFormat.cpp" line="292"/>
<source>Parsing error: sequence in FASTA sequence has whitespaces at line %1</source>
<translation>Parsing error: sequence in FASTA sequence has whitespaces at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="298"/>
+ <location filename="../src/GFFFormat.cpp" line="299"/>
<source>Parsing error: too few fields at line %1</source>
<translation>Parsing error: too few fields at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="304"/>
+ <location filename="../src/GFFFormat.cpp" line="305"/>
<source>Parsing error: start position at line %1 is not integer</source>
<translation>Parsing error: start position at line %1 is not integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="310"/>
+ <location filename="../src/GFFFormat.cpp" line="311"/>
<source>Parsing error: end position at line %1 is not integer</source>
<translation>Parsing error: end position at line %1 is not integer</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="315"/>
+ <location filename="../src/GFFFormat.cpp" line="316"/>
<source>Parsing error: incorrect annotation region at line %1</source>
<translation>Parsing error: incorrect annotation region at line %1</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="366"/>
+ <location filename="../src/GFFFormat.cpp" line="367"/>
<source>Parsing error: incorrect attributes field %1 at line %2</source>
<translation>Parsing error: incorrect attributes field %1 at line %2</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="405"/>
+ <location filename="../src/GFFFormat.cpp" line="406"/>
<source>Parsing error: incorrect score parameter at line %1. Score can be a float number or '.' symbol</source>
<translation>Parsing error: incorrect score parameter at line %1. Score can be a float number or '.' symbol</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="415"/>
+ <location filename="../src/GFFFormat.cpp" line="416"/>
<source>Parsing error: incorrect frame parameter at line %1. Frame can be a number between 0-2 or '.' symbol</source>
<translation>Parsing error: incorrect frame parameter at line %1. Frame can be a number between 0-2 or '.' symbol</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="425"/>
+ <location filename="../src/GFFFormat.cpp" line="426"/>
<source>Parsing error: incorrect strand patameter at line %1. Strand can be '+','-' or '.'</source>
<translation>Parsing error: incorrect strand patameter at line %1. Strand can be '+','-' or '.'</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="591"/>
+ <location filename="../src/GFFFormat.cpp" line="592"/>
<source>Can not detect chromosome name. 'Chr' name will be used.</source>
<translation>Can not detect chromosome name. 'Chr' name will be used.</translation>
</message>
<message>
- <location filename="../src/GFFFormat.cpp" line="356"/>
+ <location filename="../src/GFFFormat.cpp" line="357"/>
<source>Wrong location for joined annotation at line %1. Line was skipped.</source>
<translation>Wrong location for joined annotation at line %1. Line was skipped.</translation>
</message>
@@ -1396,70 +1396,70 @@ The following sequences are empty:</translation>
<translation>The Gene transfer format (GTF) это формат используемый для хранения информации о структуре гена.</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="159"/>
+ <location filename="../src/GTFFormat.cpp" line="158"/>
<source>GTF parsing error: incorrect number of fields at line %1!</source>
<translation>GTF parsing error: incorrect number of fields at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="164"/>
+ <location filename="../src/GTFFormat.cpp" line="163"/>
<source>GTF parsing error: a field at line %1 is empty!</source>
<translation>GTF parsing error: a field at line %1 is empty!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="169"/>
+ <location filename="../src/GTFFormat.cpp" line="168"/>
<source>GTF parsing error: incorrect coordinates at line %1!</source>
<translation>GTF parsing error: incorrect coordinates at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="181"/>
+ <location filename="../src/GTFFormat.cpp" line="180"/>
<source>GTF parsing error: unexpected value of the "feature" value "%1" at line %2!</source>
<translation>GTF parsing error: unexpected value of the "feature" value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="199"/>
+ <location filename="../src/GTFFormat.cpp" line="198"/>
<source>GTF parsing error: incorrect score value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect score value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="207"/>
+ <location filename="../src/GTFFormat.cpp" line="206"/>
<source>GTF parsing error: incorrect frame value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect frame value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="228"/>
+ <location filename="../src/GTFFormat.cpp" line="227"/>
<source>GTF parsing error: invalid attributes format at line %1!</source>
<translation>GTF parsing error: invalid attributes format at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="235"/>
- <location filename="../src/GTFFormat.cpp" line="240"/>
+ <location filename="../src/GTFFormat.cpp" line="234"/>
+ <location filename="../src/GTFFormat.cpp" line="239"/>
<source>GTF parsing error: mandatory attribute '</source>
<translation>GTF parsing error: mandatory attribute '</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="236"/>
- <location filename="../src/GTFFormat.cpp" line="241"/>
+ <location filename="../src/GTFFormat.cpp" line="235"/>
+ <location filename="../src/GTFFormat.cpp" line="240"/>
<source>' is absent at line %1!</source>
<translation>' is absent at line %1!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="248"/>
+ <location filename="../src/GTFFormat.cpp" line="247"/>
<source>GTF parsing error: incorrect strand value "%1" at line %2!</source>
<translation>GTF parsing error: incorrect strand value "%1" at line %2!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="295"/>
+ <location filename="../src/GTFFormat.cpp" line="294"/>
<source>File "%1" contains too many annotation tables to be displayed. However, you can process these data using pipelines built with Workflow Designer.</source>
<translation>File "%1" contains too many annotation tables to be displayed. However, you can process these data using pipelines built with Workflow Designer.</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="630"/>
- <location filename="../src/GTFFormat.cpp" line="635"/>
+ <location filename="../src/GTFFormat.cpp" line="629"/>
+ <location filename="../src/GTFFormat.cpp" line="634"/>
<source>Can't save an annotation to a GTF file - the annotation doesn't have the '%1' qualifier!</source>
<translation>Can't save an annotation to a GTF file - the annotation doesn't have the '%1' qualifier!</translation>
</message>
<message>
- <location filename="../src/GTFFormat.cpp" line="654"/>
+ <location filename="../src/GTFFormat.cpp" line="653"/>
<source>GTF saving error: one or more errors occurred while saving a file, see TRACE log for details!</source>
<translation>GTF saving error: one or more errors occurred while saving a file, see TRACE log for details!</translation>
</message>
@@ -1685,23 +1685,23 @@ The following sequences are empty:</translation>
<translation>MSF формат используется для множественных выравниваний. Файлы включают имя последовательности и последовательность, которая выровнена с другими последовательностями в файле.</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="126"/>
+ <location filename="../src/MSFFormat.cpp" line="125"/>
<source>Incorrect format</source>
<translation>Неверный формат</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="145"/>
+ <location filename="../src/MSFFormat.cpp" line="144"/>
<source>Unexpected end of file</source>
<translation>Неожиданный конец файла</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="172"/>
- <location filename="../src/MSFFormat.cpp" line="213"/>
+ <location filename="../src/MSFFormat.cpp" line="171"/>
+ <location filename="../src/MSFFormat.cpp" line="212"/>
<source>Check sum test failed</source>
<translation>Проверка контрольной суммы не удалась</translation>
</message>
<message>
- <location filename="../src/MSFFormat.cpp" line="221"/>
+ <location filename="../src/MSFFormat.cpp" line="220"/>
<source>Alphabet unknown</source>
<translation>Неизвестный алфавит</translation>
</message>
@@ -1719,91 +1719,91 @@ The following sequences are empty:</translation>
<translation>Mega это формат файла программы MEGA</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="316"/>
+ <location filename="../src/MegaFormat.cpp" line="315"/>
<source>Found sequences of different sizes</source>
<translation>Обнаружены последовательности разной длины</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="149"/>
+ <location filename="../src/MegaFormat.cpp" line="148"/>
<source>Bad name of sequence</source>
<translation>Неверное имя последовательности</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="169"/>
+ <location filename="../src/MegaFormat.cpp" line="168"/>
<source>Unexpected # in comments</source>
<translation>Неожиданный символ "#" в комментариях</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="178"/>
+ <location filename="../src/MegaFormat.cpp" line="177"/>
<source>A comment has not end</source>
<translation>У комментария отсутствует окончание</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="200"/>
+ <location filename="../src/MegaFormat.cpp" line="199"/>
<source>Unexpected symbol between comments</source>
<translation>Неоижданные символы между комментариями</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="261"/>
+ <location filename="../src/MegaFormat.cpp" line="260"/>
<source>Incorrect format</source>
<translation>Неверный формат</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="274"/>
+ <location filename="../src/MegaFormat.cpp" line="273"/>
<source>Identical symbol at the first sequence</source>
<translation>Идентичный символ в первой последовательности</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="298"/>
+ <location filename="../src/MegaFormat.cpp" line="297"/>
<source>Incorrect order of sequences' names</source>
<translation>Неправильный порядок имён последовательностей</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="304"/>
+ <location filename="../src/MegaFormat.cpp" line="303"/>
<source>Incorrect sequence</source>
<translation>Incorrect sequence</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="324"/>
+ <location filename="../src/MegaFormat.cpp" line="323"/>
<source>Alphabet is unknown</source>
<translation>Неизвестный алфавит</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="394"/>
- <location filename="../src/MegaFormat.cpp" line="406"/>
+ <location filename="../src/MegaFormat.cpp" line="393"/>
+ <location filename="../src/MegaFormat.cpp" line="405"/>
<source>No header</source>
<translation>Отсутствует заголовок</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="399"/>
+ <location filename="../src/MegaFormat.cpp" line="398"/>
<source>No # before header</source>
<translation>Отсутствует символ "#" перед заголовком</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="411"/>
+ <location filename="../src/MegaFormat.cpp" line="410"/>
<source>Not MEGA-header</source>
<translation>Не является заголовком MEGA</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="434"/>
- <location filename="../src/MegaFormat.cpp" line="445"/>
- <location filename="../src/MegaFormat.cpp" line="472"/>
+ <location filename="../src/MegaFormat.cpp" line="433"/>
+ <location filename="../src/MegaFormat.cpp" line="444"/>
+ <location filename="../src/MegaFormat.cpp" line="471"/>
<source>No data in file</source>
<translation>Отсутствуют данные в файле</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="454"/>
- <location filename="../src/MegaFormat.cpp" line="460"/>
+ <location filename="../src/MegaFormat.cpp" line="453"/>
+ <location filename="../src/MegaFormat.cpp" line="459"/>
<source>Incorrect title</source>
<translation>Неправильный заголовок</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="504"/>
+ <location filename="../src/MegaFormat.cpp" line="503"/>
<source>Sequence has empty part</source>
<translation>Часть последовательности пустая</translation>
</message>
<message>
- <location filename="../src/MegaFormat.cpp" line="524"/>
+ <location filename="../src/MegaFormat.cpp" line="523"/>
<source>Bad symbols in a sequence</source>
<translation>Некорректные символы в последовательности</translation>
</message>
@@ -1850,7 +1850,7 @@ The following sequences are empty:</translation>
<context>
<name>U2::PDBFormat</name>
<message>
- <location filename="../src/PDBFormat.cpp" line="191"/>
+ <location filename="../src/PDBFormat.cpp" line="189"/>
<source>Line is too long</source>
<translation>Слишком длинная строка</translation>
</message>
@@ -1860,22 +1860,22 @@ The following sequences are empty:</translation>
<translation>The Protein Data Bank (PDB) формат обеспечивает стандартное представление для данных высокомолекулярных структур, полученных из рентгеновской дифракции и исследований ЯМР.</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="247"/>
+ <location filename="../src/PDBFormat.cpp" line="251"/>
<source>Some mandatory records are absent</source>
<translation>Некоторые обязательные записи отсутствуют</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="355"/>
+ <location filename="../src/PDBFormat.cpp" line="395"/>
<source>PDB warning: unknown residue name: %1</source>
<translation>PDB предупреждение: неизвестное имя остатка: %1</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="445"/>
+ <location filename="../src/PDBFormat.cpp" line="485"/>
<source>Invalid secondary structure record</source>
<translation>Неверная запись вторичной структуры</translation>
</message>
<message>
- <location filename="../src/PDBFormat.cpp" line="482"/>
+ <location filename="../src/PDBFormat.cpp" line="522"/>
<source>Invalid SEQRES: less then 24 charachters</source>
<translation>Неверный SEQRES: меньше чем 24 символа</translation>
</message>
@@ -1898,8 +1898,8 @@ The following sequences are empty:</translation>
<translation>pDRAW это формат файла для хранения последовательности используемый инструментом pDRAW</translation>
</message>
<message>
- <location filename="../src/PDWFormat.cpp" line="102"/>
- <location filename="../src/PDWFormat.cpp" line="192"/>
+ <location filename="../src/PDWFormat.cpp" line="100"/>
+ <location filename="../src/PDWFormat.cpp" line="190"/>
<source>Line is too long</source>
<translation>Слишком длинная строка</translation>
</message>
@@ -1917,7 +1917,7 @@ The following sequences are empty:</translation>
<translation>Неизвестный алфавит</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="352"/>
+ <location filename="../src/PhylipFormat.cpp" line="351"/>
<source>Error parsing file</source>
<translation>Ошибка разбора формата</translation>
</message>
@@ -1925,32 +1925,32 @@ The following sequences are empty:</translation>
<context>
<name>U2::PhylipInterleavedFormat</name>
<message>
- <location filename="../src/PhylipFormat.cpp" line="240"/>
+ <location filename="../src/PhylipFormat.cpp" line="239"/>
<source>PHYLIP Interleaved</source>
<translation>PHYLIP Interleaved</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="339"/>
+ <location filename="../src/PhylipFormat.cpp" line="338"/>
<source>Illegal line</source>
<translation>Неправильная строка</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="346"/>
+ <location filename="../src/PhylipFormat.cpp" line="345"/>
<source>Wrong header</source>
<translation>Неверный заголовок</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="382"/>
+ <location filename="../src/PhylipFormat.cpp" line="381"/>
<source>Block is incomplete</source>
<translation>Block is incomplete</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="393"/>
+ <location filename="../src/PhylipFormat.cpp" line="392"/>
<source>Block is incomlete</source>
<translation>Block is incomlete</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="400"/>
+ <location filename="../src/PhylipFormat.cpp" line="399"/>
<source>Number of characters does not correspond to the stated number</source>
<translation>Число символов не соответствует установленному числу</translation>
</message>
@@ -1958,34 +1958,34 @@ The following sequences are empty:</translation>
<context>
<name>U2::PhylipSequentialFormat</name>
<message>
- <location filename="../src/PhylipFormat.cpp" line="121"/>
+ <location filename="../src/PhylipFormat.cpp" line="120"/>
<source>PHYLIP Sequential</source>
<translation>PHYLIP Sequential</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="202"/>
+ <location filename="../src/PhylipFormat.cpp" line="201"/>
<source>Illegal line</source>
<translation>Неправильная строка</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="209"/>
+ <location filename="../src/PhylipFormat.cpp" line="208"/>
<source>Wrong header</source>
<translation>Неверный заголовок</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="212"/>
- <location filename="../src/PhylipFormat.cpp" line="350"/>
+ <location filename="../src/PhylipFormat.cpp" line="211"/>
+ <location filename="../src/PhylipFormat.cpp" line="349"/>
<source>There is not enough data</source>
<translation>Недостаточно данных</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="217"/>
- <location filename="../src/PhylipFormat.cpp" line="360"/>
+ <location filename="../src/PhylipFormat.cpp" line="216"/>
+ <location filename="../src/PhylipFormat.cpp" line="359"/>
<source>Error parsing file</source>
<translation>Ошибка разбора формата</translation>
</message>
<message>
- <location filename="../src/PhylipFormat.cpp" line="231"/>
+ <location filename="../src/PhylipFormat.cpp" line="230"/>
<source>Number of characters does not correspond to the stated number</source>
<translation>Число символов не соответствует установленному числу</translation>
</message>
@@ -2012,11 +2012,15 @@ The following sequences are empty:</translation>
</message>
<message>
<location filename="../src/RawDNASequenceFormat.cpp" line="49"/>
+ <source>Raw sequence file - a whole content of the file is treated either as a single/multiple nucleotide or peptide sequence(s). UGENE will remove all non-alphabetic chars from the result sequence. By default the characters in the file are considered a single sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Raw sequence file - a whole content of the file is treated either as a single nucleotide or peptide sequence UGENE will remove all non-alphabetic chars from the result sequence</source>
- <translation>Сырой файл последовательности - все содержимое файла рассматривается как один нуклеотид или пептидная последовательность. UGENE удалит все символы не принадлежащие алфавиту из результирующей последовательности</translation>
+ <translation type="vanished">Сырой файл последовательности - все содержимое файла рассматривается как один нуклеотид или пептидная последовательность. UGENE удалит все символы не принадлежащие алфавиту из результирующей последовательности</translation>
</message>
<message>
- <location filename="../src/RawDNASequenceFormat.cpp" line="106"/>
+ <location filename="../src/RawDNASequenceFormat.cpp" line="131"/>
<source>Sequence is empty</source>
<translation>Последовательность пуста</translation>
</message>
@@ -2057,7 +2061,7 @@ The following sequences are empty:</translation>
<translation>Failed to parse SCF file: %1</translation>
</message>
<message>
- <location filename="../src/SCFFormat.cpp" line="1232"/>
+ <location filename="../src/SCFFormat.cpp" line="1233"/>
<source>Failed to load sequence from SCF file %1</source>
<translation>Невозможно загрузить последовательность из SCF файла %1</translation>
</message>
@@ -2150,27 +2154,27 @@ The following sequences are empty:</translation>
<translation>Чтение последовательности: %1</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="237"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="236"/>
<source>Error parsing sequence: unexpected empty line</source>
<translation>Ошибка чтения последовательности: пустая строка</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="260"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="259"/>
<source>Error reading sequence: memory allocation failed</source>
<translation>Ошибка чтения последовательности: не удалось выделить память</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="275"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="274"/>
<source>Sequence is truncated</source>
<translation>Последовательность повреждена</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="282"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="281"/>
<source>Reading annotations %1</source>
<translation>Чтение аннотаций: %1</translation>
</message>
<message>
- <location filename="../src/SwissProtPlainTextFormat.cpp" line="289"/>
+ <location filename="../src/SwissProtPlainTextFormat.cpp" line="288"/>
<source>Invalid format of feature table</source>
<translation>Таблица аннотаций повреждена</translation>
</message>
@@ -2349,7 +2353,7 @@ The following sequences are empty:</translation>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="1120"/>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="1236"/>
<source>An error occurred during updating an alignment gaps</source>
- <translation>Возникла ошибка во время обновления промежутков выравнивания</translation>
+ <translation>Возникла ошибка во время обновления пробелов выравнивания</translation>
</message>
<message>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="1133"/>
@@ -2823,7 +2827,7 @@ The following sequences are empty:</translation>
</message>
<message>
<source>An error occurred during updating an alignment gaps</source>
- <translation type="vanished">Возникла ошибка во время обновления промежутков выравнивания</translation>
+ <translation type="vanished">Возникла ошибка во время обновления пробелов выравнивания</translation>
</message>
<message>
<source>An error occurred during updating an alignment row order</source>
diff --git a/src/corelibs/U2Gui/U2Gui.pro b/src/corelibs/U2Gui/U2Gui.pro
index c4ec7c4..5f2de2d 100644
--- a/src/corelibs/U2Gui/U2Gui.pro
+++ b/src/corelibs/U2Gui/U2Gui.pro
@@ -9,6 +9,7 @@ HEADERS += src/AppSettingsGUI.h \
src/ObjectViewModel.h \
src/ObjectViewTasks.h \
src/OpenViewTask.h \
+ src/PasteController.h \
src/PluginViewer.h \
src/ProjectParsing.h \
src/ProjectView.h \
@@ -206,6 +207,7 @@ SOURCES += src/MainWindow.cpp \
src/util/LocalToolbar.cpp \
src/util/ObjectViewTreeController.cpp \
src/util/OrderedToolbar.cpp \
+ src/PasteController.cpp \
src/util/PositionSelector.cpp \
src/util/ProjectDocumentComboBoxController.cpp \
src/util/ProjectTreeItemSelectorDialog.cpp \
diff --git a/src/corelibs/U2Gui/U2Gui.qrc b/src/corelibs/U2Gui/U2Gui.qrc
index 5087109..b0d5355 100644
--- a/src/corelibs/U2Gui/U2Gui.qrc
+++ b/src/corelibs/U2Gui/U2Gui.qrc
@@ -12,6 +12,7 @@
<file>images/group_green_active.png</file>
<file>images/info.png</file>
<file>images/progress.gif</file>
+ <file>images/paste.png</file>
<file>images/set_reference.png</file>
<file>images/zoom_in.png</file>
<file>images/zoom_out.png</file>
diff --git a/src/corelibs/U2Gui/src/AppSettingsGUI.h b/src/corelibs/U2Gui/src/AppSettingsGUI.h
index d675524..e51460d 100644
--- a/src/corelibs/U2Gui/src/AppSettingsGUI.h
+++ b/src/corelibs/U2Gui/src/AppSettingsGUI.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/MainWindow.cpp b/src/corelibs/U2Gui/src/MainWindow.cpp
index 46a20dd..7f14975 100644
--- a/src/corelibs/U2Gui/src/MainWindow.cpp
+++ b/src/corelibs/U2Gui/src/MainWindow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/MainWindow.h b/src/corelibs/U2Gui/src/MainWindow.h
index ff3340c..0c45da8 100644
--- a/src/corelibs/U2Gui/src/MainWindow.h
+++ b/src/corelibs/U2Gui/src/MainWindow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -67,6 +67,7 @@ class QMainWindow;
#define ACTION_PROJECTSUPPORT__NEW_PROJECT "action_projectsupport__new_project"
#define ACTION_PROJECTSUPPORT__OPEN_PROJECT "action_projectsupport__open_project"
+#define ACTION_PROJECTSUPPORT__PASTE "action_projectsupport__paste"
#define ACTION_PROJECTSUPPORT__OPEN_AS "action_projectsupport__open_as"
#define ACTION_PROJECTSUPPORT__SAVE_PROJECT "action_projectsupport__save_project"
#define ACTION_PROJECTSUPPORT__SAVE_AS_PROJECT "action_projectsupport__save_as_project"
diff --git a/src/corelibs/U2Gui/src/Notification.cpp b/src/corelibs/U2Gui/src/Notification.cpp
index 756f7dd..8511aa0 100644
--- a/src/corelibs/U2Gui/src/Notification.cpp
+++ b/src/corelibs/U2Gui/src/Notification.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/Notification.h b/src/corelibs/U2Gui/src/Notification.h
index 30483da..f4d5722 100644
--- a/src/corelibs/U2Gui/src/Notification.h
+++ b/src/corelibs/U2Gui/src/Notification.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/NotificationWidget.cpp b/src/corelibs/U2Gui/src/NotificationWidget.cpp
index cbebab6..2396cfc 100644
--- a/src/corelibs/U2Gui/src/NotificationWidget.cpp
+++ b/src/corelibs/U2Gui/src/NotificationWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/NotificationWidget.h b/src/corelibs/U2Gui/src/NotificationWidget.h
index 5441787..f1af063 100644
--- a/src/corelibs/U2Gui/src/NotificationWidget.h
+++ b/src/corelibs/U2Gui/src/NotificationWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/NotificationsTypes.h b/src/corelibs/U2Gui/src/NotificationsTypes.h
index 43f4f67..00d3e1b 100644
--- a/src/corelibs/U2Gui/src/NotificationsTypes.h
+++ b/src/corelibs/U2Gui/src/NotificationsTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ObjectViewModel.cpp b/src/corelibs/U2Gui/src/ObjectViewModel.cpp
index 015645a..adba0a9 100644
--- a/src/corelibs/U2Gui/src/ObjectViewModel.cpp
+++ b/src/corelibs/U2Gui/src/ObjectViewModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ObjectViewModel.h b/src/corelibs/U2Gui/src/ObjectViewModel.h
index 7b92a53..729541c 100644
--- a/src/corelibs/U2Gui/src/ObjectViewModel.h
+++ b/src/corelibs/U2Gui/src/ObjectViewModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ObjectViewTasks.cpp b/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
index 3571de7..f7ba9f0 100644
--- a/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
+++ b/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ObjectViewTasks.h b/src/corelibs/U2Gui/src/ObjectViewTasks.h
index 9e5c002..8f5b845 100644
--- a/src/corelibs/U2Gui/src/ObjectViewTasks.h
+++ b/src/corelibs/U2Gui/src/ObjectViewTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/OpenViewTask.cpp b/src/corelibs/U2Gui/src/OpenViewTask.cpp
index 11f34c0..d922abc 100644
--- a/src/corelibs/U2Gui/src/OpenViewTask.cpp
+++ b/src/corelibs/U2Gui/src/OpenViewTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/OpenViewTask.h b/src/corelibs/U2Gui/src/OpenViewTask.h
index d7d43de..2e1aefb 100644
--- a/src/corelibs/U2Gui/src/OpenViewTask.h
+++ b/src/corelibs/U2Gui/src/OpenViewTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/PasteController.cpp b/src/corelibs/U2Gui/src/PasteController.cpp
index e69de29..41f1426 100644
--- a/src/corelibs/U2Gui/src/PasteController.cpp
+++ b/src/corelibs/U2Gui/src/PasteController.cpp
@@ -0,0 +1,226 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "PasteController.h"
+
+#include <U2Core/AddDocumentTask.h>
+#include <U2Core/AppContext.h>
+#include <U2Core/AppSettings.h>
+#include <U2Core/GHints.h>
+#include <U2Core/DocumentUtils.h>
+#include <U2Core/DocumentImport.h>
+#include <U2Core/GUrl.h>
+#include <U2Core/GUrlUtils.h>
+#include <U2Core/IOAdapterUtils.h>
+#include <U2Core/L10n.h>
+#include <U2Core/ProjectModel.h>
+#include <U2Core/Task.h>
+#include <U2Core/TaskSignalMapper.h>
+#include <U2Core/StringAdapter.h>
+#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2SafePoints.h>
+#include <U2Core/UserApplicationsSettings.h>
+
+#include <U2Gui/OpenViewTask.h>
+
+#include <QApplication>
+#include <QFileInfo>
+#include <QMimeData>
+#include <QUrl>
+
+namespace U2 {
+namespace {
+QString parseUrl(const QString &url) {
+ const QString fileString = "file://";
+ if (url.startsWith(fileString)) {
+ return url.mid(fileString.length());
+ }
+ return url;
+}
+
+QString joinDirs(const QStringList &dirs, const QString &separator) {
+ static const int maxDirsNumber = 4;
+ QStringList result = dirs.mid(0, maxDirsNumber);
+ if (dirs.size() > maxDirsNumber) {
+ result << "...";
+ }
+ return result.join(separator);
+}
+
+QString fetchClipboardText(const QClipboard *clipboard, U2OpStatus &os) {
+ QString result;
+ try {
+ result = clipboard->text();
+ } catch (std::bad_alloc) {
+ os.setError(PasteFactory::tr("Unable to handle so huge data in clipboard."));
+ return result;
+ }
+ if (result.isEmpty()) {
+ os.setError(PasteFactory::tr("UGENE can not recognize current clipboard content as one of supported formats."));
+ }
+ return result;
+}
+
+QString generateClipboardUrl(const QStringList &extensions, const QSet<QString> &excludedFilenames) {
+ QString result = AppContext::getAppSettings()->getUserAppsSettings()->getDefaultDataDirPath() + "/clipboard";
+ if (!extensions.isEmpty()) {
+ result += "." + extensions.first();
+ }
+ return GUrlUtils::rollFileName(result, DocumentUtils::getNewDocFileNameExcludesHint().unite(excludedFilenames));
+}
+
+void saveFile(const QString& url, const QString& data){
+ QFile outputFile(url);
+ outputFile.open(QIODevice::WriteOnly);
+ outputFile.write(data.toLatin1());
+ outputFile.close();
+}
+
+}
+////////////////////
+///PasteTaskImpl
+PasteTaskImpl::PasteTaskImpl(bool addToProject)
+:PasteTask(), addToProject(addToProject){
+}
+
+void PasteTaskImpl::run(){
+
+}
+
+QList<Task*> PasteTaskImpl::onSubTaskFinished(Task* task){
+ QList<Task*> res;
+ if (task->isCanceled() || task->hasError()){
+ return res;
+ }
+ DocumentProviderTask* loadTask = qobject_cast<DocumentProviderTask*>(task);
+ if (loadTask != NULL){
+ Document* doc = loadTask->takeDocument();
+ processDocument(doc);
+ documents.append(doc);
+ if(addToProject){
+ res << new AddDocumentAndOpenViewTask(doc);
+ }
+ }
+ return res;
+}
+
+///////////////////
+///PasteFactoryImpl
+PasteFactoryImpl::PasteFactoryImpl(QObject *parent)
+ :PasteFactory(parent){
+ excludedFilenames = QSet<QString>();
+}
+
+PasteTask* PasteFactoryImpl::pasteTask(bool addToProject) {
+ PasteTask* res = NULL;
+ const QClipboard *clipboard = QApplication::clipboard();
+ const QMimeData *mdata = clipboard->mimeData();
+ if (mdata->hasUrls()) {
+ res = new PasteUrlsTask(mdata->urls(), addToProject);
+ }else{
+ res = new PasteTextTask(clipboard, excludedFilenames, addToProject);
+ }
+
+ connectExclude(res);
+
+ return res;
+}
+
+void PasteFactoryImpl::connectExclude(PasteTask *task){
+ TaskSignalMapper* loadTaskSignalMapper = new TaskSignalMapper(task);
+ connect(loadTaskSignalMapper, SIGNAL(si_taskFinished(Task *)), SLOT(sl_excludeBack()));
+}
+
+void PasteFactoryImpl::sl_excludeBack() {
+ TaskSignalMapper* mapper = qobject_cast<TaskSignalMapper*>(sender());
+ SAFE_POINT(mapper != NULL, "Incorrect sender", );
+
+ PasteTask *task = qobject_cast<PasteTask*>(mapper->getTask());
+ SAFE_POINT(task != NULL, "Can not convert to LoadDocumentTask", );
+ foreach (const GUrl& gurl, task->getUrls()){
+ excludedFilenames.remove(gurl.getURLString());
+ }
+}
+
+///////////////////////
+///PasteTextTask
+PasteUrlsTask::PasteUrlsTask(const QList<QUrl> &toPasteUrls, bool addToProject)
+ :PasteTaskImpl(addToProject){
+ QStringList dirs;
+ foreach (const QUrl &url, toPasteUrls) {
+ QString parsedUrl = parseUrl(url.toLocalFile());
+ if (QFileInfo(parsedUrl).isDir()) {
+ dirs << parsedUrl;
+ continue;
+ }
+ urls << GUrl(parsedUrl, GUrl_File);
+ }
+
+ if (!dirs.isEmpty()) {
+ setError(tr("Pasting of directories is not supported:") + "\n" + joinDirs(dirs, "\n"));
+ return;
+ }
+ CHECK(!urls.isEmpty(), );
+ foreach (const GUrl& url, urls){
+ DocumentProviderTask* loadDocTask = LoadDocumentTask::getCommonLoadDocTask(url);
+ if (loadDocTask){
+ addSubTask(loadDocTask);
+ }
+ }
+}
+
+///////////////////////
+///PasteTextTask
+PasteTextTask::PasteTextTask(const QClipboard* clipboard, QSet<QString>& excludedFilenames, bool addToProject)
+ :PasteTaskImpl(addToProject){
+
+ QString clipboardText = fetchClipboardText(clipboard, stateInfo);
+ CHECK_OP(stateInfo, );
+
+ QScopedPointer<StringAdapterFactoryWithStringData> siof (new StringAdapterFactoryWithStringData(clipboardText));
+ QScopedPointer<IOAdapter> ioa (siof->createIOAdapter());
+ SAFE_POINT(ioa->isOpen(), L10N::internalError("IOAdapter is not opened"), );
+
+ QList<FormatDetectionResult> dfs = DocumentUtils::detectFormat(ioa.data());
+ if( dfs.isEmpty() ) {
+ setError(tr("Cannot detect file format"));
+ return ;
+ }
+ DocumentFormat * df = dfs.first().format;
+
+ QString clipboardUrl = generateClipboardUrl(df->getSupportedDocumentFileExtensions(), excludedFilenames);
+ excludedFilenames.insert(clipboardUrl);
+
+ urls.append(GUrl(clipboardUrl));
+
+ saveFile(clipboardUrl, clipboardText);
+
+ IOAdapterFactory * iof = AppContext::getIOAdapterRegistry()->getIOAdapterFactoryById( IOAdapterUtils::url2io( clipboardUrl ) );
+ CHECK(iof != NULL, );
+
+ QVariantMap hints;
+ hints[ProjectLoaderHint_DoNotAddToRecentDocuments] = true;
+ hints[DocumentReadingMode_SequenceAsSeparateHint] = true;
+ LoadDocumentTask* loadDocumentTask = new LoadDocumentTask(df->getFormatId(), GUrl(clipboardUrl), iof, hints);
+ addSubTask(loadDocumentTask);
+}
+
+} // U2
diff --git a/src/corelibs/U2Gui/src/PasteController.h b/src/corelibs/U2Gui/src/PasteController.h
index e69de29..b3e17cb 100644
--- a/src/corelibs/U2Gui/src/PasteController.h
+++ b/src/corelibs/U2Gui/src/PasteController.h
@@ -0,0 +1,85 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_PASTE_CONTROLLER_H_
+#define _U2_PASTE_CONTROLLER_H_
+
+#include <U2Core/ClipboardController.h>
+#include <U2Core/DocumentUtils.h>
+#include <U2Core/IOAdapter.h>
+#include <U2Core/LoadDocumentTask.h>
+#include <U2Core/U2OpStatus.h>
+#include <U2Core/Task.h>
+
+#include <QClipboard>
+
+namespace U2 {
+
+class U2GUI_EXPORT PasteTaskImpl : public PasteTask{
+ Q_OBJECT
+public:
+ PasteTaskImpl(bool addToProject);
+ void run();
+
+ QList<GUrl>getUrls() const {return urls;}
+ QList<Document*> getDocuments() const {return documents;}
+
+protected:
+ QList<GUrl> urls;
+ bool addToProject;
+ QList<Document*> documents;
+
+protected:
+ QList<Task*> onSubTaskFinished(Task* task);
+};
+
+class U2GUI_EXPORT PasteFactoryImpl : public PasteFactory {
+ Q_OBJECT
+public:
+ PasteFactoryImpl(QObject *parent=0);
+
+ PasteTask* pasteTask(bool addToProject);
+
+protected:
+ void connectExclude(PasteTask* task);
+
+protected:
+ QSet<QString> excludedFilenames;
+
+protected slots:
+ void sl_excludeBack();
+};
+
+class PasteUrlsTask : public PasteTaskImpl{
+ Q_OBJECT
+public:
+ PasteUrlsTask(const QList<QUrl> &urls, bool addToProject);
+};
+
+class PasteTextTask : public PasteTaskImpl {
+ Q_OBJECT
+public:
+ PasteTextTask(const QClipboard* clipboard, QSet<QString>& excludedFilenames, bool addToProject);
+};
+
+} // U2
+
+#endif // _U2_PASTE_CONTROLLER_H_
diff --git a/src/corelibs/U2Gui/src/PluginViewer.h b/src/corelibs/U2Gui/src/PluginViewer.h
index 0a1337c..424245d 100644
--- a/src/corelibs/U2Gui/src/PluginViewer.h
+++ b/src/corelibs/U2Gui/src/PluginViewer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ProjectParsing.cpp b/src/corelibs/U2Gui/src/ProjectParsing.cpp
index 6c0aa69..e7aa348 100644
--- a/src/corelibs/U2Gui/src/ProjectParsing.cpp
+++ b/src/corelibs/U2Gui/src/ProjectParsing.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ProjectParsing.h b/src/corelibs/U2Gui/src/ProjectParsing.h
index 66c2bbe..5feb27f 100644
--- a/src/corelibs/U2Gui/src/ProjectParsing.h
+++ b/src/corelibs/U2Gui/src/ProjectParsing.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ProjectView.h b/src/corelibs/U2Gui/src/ProjectView.h
index 3d7a5eb..a7a3932 100644
--- a/src/corelibs/U2Gui/src/ProjectView.h
+++ b/src/corelibs/U2Gui/src/ProjectView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ToolsMenu.cpp b/src/corelibs/U2Gui/src/ToolsMenu.cpp
index 1341cee..fa90c8b 100644
--- a/src/corelibs/U2Gui/src/ToolsMenu.cpp
+++ b/src/corelibs/U2Gui/src/ToolsMenu.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/ToolsMenu.h b/src/corelibs/U2Gui/src/ToolsMenu.h
index 2f0ba1c..33d4456 100644
--- a/src/corelibs/U2Gui/src/ToolsMenu.h
+++ b/src/corelibs/U2Gui/src/ToolsMenu.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/U2SavableWidget.cpp b/src/corelibs/U2Gui/src/U2SavableWidget.cpp
index e111582..6fceca7 100644
--- a/src/corelibs/U2Gui/src/U2SavableWidget.cpp
+++ b/src/corelibs/U2Gui/src/U2SavableWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/U2SavableWidget.h b/src/corelibs/U2Gui/src/U2SavableWidget.h
index 8c70e01..5bd73c7 100644
--- a/src/corelibs/U2Gui/src/U2SavableWidget.h
+++ b/src/corelibs/U2Gui/src/U2SavableWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp b/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
index fd1cbe6..9d99257 100644
--- a/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
+++ b/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/U2WidgetStateStorage.h b/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
index f3d6a17..633dae8 100644
--- a/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
+++ b/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp b/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
index 0d2b783..16a0d9f 100644
--- a/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
+++ b/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -212,8 +212,7 @@ QList<Task *> ReloadDocumentTask::onSubTaskFinished( Task* subTask ) {
SAFE_POINT( NULL != currentProj, "Invalid project state!", res );
doc = currentProj->findDocumentByURL( url );
SAFE_POINT( NULL != doc, "Reloaded document not found!", res );
- SAFE_POINT( !doc->isStateLocked( ) && doc->isLoaded( ),
- "Unable to restore relations between external objects!", res );
+ SAFE_POINT(doc->isLoaded(), "The reloaded document unexpectedly has unloaded state", res );
restoreObjectRelationsForDoc( );
// annotation files without seq.reference can be opened after adding relations
diff --git a/src/corelibs/U2Gui/src/UnloadDocumentTask.h b/src/corelibs/U2Gui/src/UnloadDocumentTask.h
index 93565a9..48c6bc8 100644
--- a/src/corelibs/U2Gui/src/UnloadDocumentTask.h
+++ b/src/corelibs/U2Gui/src/UnloadDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/WelcomePageAction.cpp b/src/corelibs/U2Gui/src/WelcomePageAction.cpp
index 5352a21..7919879 100644
--- a/src/corelibs/U2Gui/src/WelcomePageAction.cpp
+++ b/src/corelibs/U2Gui/src/WelcomePageAction.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/WelcomePageAction.h b/src/corelibs/U2Gui/src/WelcomePageAction.h
index f792e7a..19cd746 100644
--- a/src/corelibs/U2Gui/src/WelcomePageAction.h
+++ b/src/corelibs/U2Gui/src/WelcomePageAction.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
index 8b61274..2002451 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
index 09f08b1..f4046f2 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
index 9392da4..6bec23b 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
index 1d379dd..40702ec 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
index b179971..811c4f3 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
index da9d401..9fa8166 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
index fa57e13..038710a 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
index 83e5ef4..2bef9cd 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
index a1d96d5..b936057 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
index e7e7b9e..0149983 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
index 7552170..e7c8b77 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
index f9b9ee5..d67e4f6 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
index 960c8a2..1131aeb 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
index 12ef02a..3c2f47a 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
index ca2f1b4..231f555 100644
--- a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
index 95b4a55..48a3c06 100644
--- a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
index aafb76b..1e2ed3c 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
index f61adf2..551838d 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ AddNewDocumentDialogImpl::AddNewDocumentDialogImpl(QWidget* p, AddNewDocumentDia
: QDialog(p), model(m)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466052");
+ new HelpButton(this, buttonBox, "17467599");
if (model.format.isEmpty()) {
model.format = AppContext::getSettings()->getValue(SETTINGS_LASTFORMAT, QString("")).toString();
}
diff --git a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h
index 187d883..38a83af 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp b/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
index 4fa3474..4d1ac4a 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ AuthenticationDialog::AuthenticationDialog(const QString &text, QWidget* parent)
authenticationWidget(new AuthenticationWidget)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466327");
+ new HelpButton(this, ui->buttonBox, "17467872");
ui->mainLayout->insertWidget(1, authenticationWidget);
if (text.isEmpty()) {
diff --git a/src/corelibs/U2Gui/src/util/AuthenticationDialog.h b/src/corelibs/U2Gui/src/util/AuthenticationDialog.h
index 4f01dd4..7745675 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationDialog.h
+++ b/src/corelibs/U2Gui/src/util/AuthenticationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp b/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
index e6da949..e2493fd 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/AuthenticationWidget.h b/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
index f93b068..f0e4073 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
+++ b/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
index 49c8877..f43852a 100644
--- a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ BreakpointConditionEditDialog::BreakpointConditionEditDialog(QWidget *parent,
{
ui = new Ui_BreakpointConditionEditDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466603");
+ new HelpButton(this, ui->buttonBox, "17468146");
scriptEdit = new ScriptEditorWidget(this);
scriptEdit->setVariablesText(variablesText);
diff --git a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
index a396016..0ef561e 100644
--- a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
+++ b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
index 91340d3..7fd8d44 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ CreateAnnotationDialog::CreateAnnotationDialog(QWidget* p, CreateAnnotationModel
ui->setupUi(this);
annWidgetController = new CreateAnnotationWidgetController(m, this, CreateAnnotationWidgetController::Full);
- new HelpButton(this, ui->buttonBox, "17466019");
+ new HelpButton(this, ui->buttonBox, "17467566");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
ui->mainLayout->insertWidget(0, annWidgetController->getWidget());
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
index ede51a6..567fd8d 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
index 6ea1a6c..22a0016 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
index 62f6ea8..8f52fab 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
index a2c3ea4..4ab8f9d 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
index 97982ff..6f9d026 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
index 7df9ca6..62e641a 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
index ed3b71d..17a9e74 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
index 30d7f74..412d0ab 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
index a19ed18..fe52ed9 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
index 8398011..0471539 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
index 190f47d..4a34272 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
index 0835c17..581fb64 100644
--- a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ namespace U2{
CreateDocumentFromTextDialogController::CreateDocumentFromTextDialogController(QWidget* p): QDialog(p) {
ui = new Ui_CreateDocumentFromTextDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17465955");
+ new HelpButton(this, ui->buttonBox, "17467502");
//TODO: use format name here
ui->formatBox->addItem("FASTA", BaseDocumentFormats::FASTA);
@@ -107,7 +107,7 @@ void CreateDocumentFromTextDialogController::accept(){
CHECK_OP(os, );
GUrl url(fullPath);
- Task *task = new CreateSequenceFromTextAndOpenViewTask(prepareSequences(), ui->formatBox->currentData().toString(), url);
+ Task *task = new CreateSequenceFromTextAndOpenViewTask(prepareSequences(), ui->formatBox->currentData().toString(), url, ui->saveImmediatelyBox->isChecked());
AppContext::getTaskScheduler()->registerTopLevelTask(task);
QDialog::accept();
}
diff --git a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
index 166a55d..b3663b9 100644
--- a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
+++ b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
index 3348df5..3efaa25 100644
--- a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
index 17ed7c2..eeb70dc 100644
--- a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
+++ b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
index 5ffab7f..ee5d6b8 100644
--- a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,10 +36,11 @@
namespace U2 {
-CreateSequenceFromTextAndOpenViewTask::CreateSequenceFromTextAndOpenViewTask(const QList<DNASequence> &sequences, const QString &formatId, const GUrl &saveToPath) :
+CreateSequenceFromTextAndOpenViewTask::CreateSequenceFromTextAndOpenViewTask(const QList<DNASequence> &sequences, const QString &formatId, const GUrl &saveToPath, bool saveImmediately) :
Task(tr("Create sequence from raw data"), TaskFlags_NR_FOSE_COSC),
sequences(sequences),
saveToPath(saveToPath),
+ saveImmediately(saveImmediately),
openProjectTask(NULL),
importedSequences(0),
document(NULL)
@@ -76,7 +77,7 @@ QList<Task *> CreateSequenceFromTextAndOpenViewTask::onSubTaskFinished(Task *sub
if (importedSequences == sequences.size()) {
addDocument();
CHECK_OP(stateInfo, res);
- if (!saveToPath.isEmpty()) {
+ if (saveImmediately && !saveToPath.isEmpty()) {
res << new SaveDocumentTask(document);
}
res << new OpenViewTask(document);
diff --git a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
index 6434582..1812960 100644
--- a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
+++ b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ class ImportSequenceFromRawDataTask;
class CreateSequenceFromTextAndOpenViewTask : public Task {
public:
- CreateSequenceFromTextAndOpenViewTask(const QList<DNASequence> &sequences, const QString &formatId, const GUrl &saveToPath);
+ CreateSequenceFromTextAndOpenViewTask(const QList<DNASequence> &sequences, const QString &formatId, const GUrl &saveToPath, bool saveImmediately);
private:
void prepare();
@@ -47,6 +47,7 @@ private:
const QList<DNASequence> sequences;
DocumentFormat *format;
const GUrl saveToPath;
+ bool saveImmediately;
Task *openProjectTask;
QList<Task *> importTasks;
int importedSequences;
diff --git a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
index 9275f34..1e45cf8 100644
--- a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
+++ b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
index 3b9265b..989694f 100644
--- a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
+++ b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/DialogUtils.cpp b/src/corelibs/U2Gui/src/util/DialogUtils.cpp
index e349075..22a3164 100644
--- a/src/corelibs/U2Gui/src/util/DialogUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/DialogUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/DialogUtils.h b/src/corelibs/U2Gui/src/util/DialogUtils.h
index 78a9a38..0a53869 100644
--- a/src/corelibs/U2Gui/src/util/DialogUtils.h
+++ b/src/corelibs/U2Gui/src/util/DialogUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
index ce6ce16..66b4e0e 100644
--- a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
+++ b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
index 56c5cd7..1c9aea5 100644
--- a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
+++ b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
index e90e1c9..b8c6ff3 100644
--- a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -59,7 +59,7 @@ QString DownloadRemoteFileDialog::defaultDB("");
DownloadRemoteFileDialog::DownloadRemoteFileDialog(QWidget *p):QDialog(p), isQueryDB(false) {
ui = new Ui_DownloadRemoteFileDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17465969");
+ new HelpButton(this, ui->buttonBox, "17467516");
ui->formatBox->hide();
ui->formatLabel->hide();
@@ -94,7 +94,7 @@ DownloadRemoteFileDialog::DownloadRemoteFileDialog( const QString& id, const QSt
{
ui = new Ui_DownloadRemoteFileDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17465982");
+ new HelpButton(this, ui->buttonBox, "17467529");
ui->formatBox->addItem(GENBANK_FORMAT);
ui->formatBox->addItem(FASTA_FORMAT);
diff --git a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h
index c36846e..36d7627 100644
--- a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h
+++ b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp b/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
index 2797682..8ae2077 100644
--- a/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -29,6 +29,7 @@
#include <QtGui/QKeyEvent>
#include <U2Gui/HelpButton.h>
+#include <QPushButton>
#include <ui/ui_EditQualifierDialog.h>
#include "EditQualifierDialog.h"
@@ -40,7 +41,9 @@ EditQualifierDialog::EditQualifierDialog(QWidget* p, const U2Qualifier& q, bool
{
ui = new Ui_EditQualifierDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466026");
+ new HelpButton(this, ui->buttonBox, "17467573");
+ ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if(true == ro){
this->setWindowTitle(tr("View Qualifier"));
diff --git a/src/corelibs/U2Gui/src/util/EditQualifierDialog.h b/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
index a8cfbc2..0864900 100644
--- a/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
+++ b/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
index 8f355aa..d0ec77d 100644
--- a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -70,7 +70,7 @@ EditSequenceDialogController::EditSequenceDialogController(const EditSequencDial
{
ui = new Ui_EditSequenceDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466009");
+ new HelpButton(this, ui->buttonBox, "17467556");
connect(ui->browseButton, SIGNAL(clicked()), SLOT(sl_browseButtonClicked()));
addSeqpasterWidget();
diff --git a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
index dbaa7df..d7a7301 100644
--- a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
index 58f77e3..b760d99 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
index 73a02d1..c0d69f4 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
index 45bbf0d..e68c12e 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -27,6 +27,7 @@
#include <U2Core/FormatUtils.h>
#include <U2Core/U2SafePoints.h>
#include <U2Core/global.h>
+#include <QPushButton>
#include <U2Gui/HelpButton.h>
#include <U2Gui/LastUsedDirHelper.h>
@@ -43,7 +44,9 @@ ExportAnnotationsDialog::ExportAnnotationsDialog( const QString &filename, QWidg
: QDialog( parent ), ui( new Ui::ExportAnnotationsDialog( ) )
{
ui->setupUi( this );
- new HelpButton(this, ui->buttonBox, "17466031");
+ new HelpButton(this, ui->buttonBox, "17467578");
+ ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
ui->fileNameEdit->setText( filename );
connect( ui->chooseFileButton, SIGNAL( clicked( ) ), SLOT( sl_onChooseFileButtonClicked( ) ) );
diff --git a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
index 77c215f..bf0eaad 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
index 3874df3..a36b48d 100644
--- a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ ExportDocumentDialogController::ExportDocumentDialogController(Document* d, QWid
{
ui = new Ui_ExportDocumentDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17465956");
+ new HelpButton(this, ui->buttonBox, "17467503");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -69,7 +69,7 @@ ExportDocumentDialogController::ExportDocumentDialogController(GObject *object,
->getSupportedDocumentFileExtensions().first());
}
ui->fileNameEdit->setText(fileName);
- new HelpButton(this, ui->buttonBox, "17465956");
+ new HelpButton(this, ui->buttonBox, "17467503");
}
void ExportDocumentDialogController::initSaveController(const QList<GObject *> &objects,
diff --git a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
index 9b312d4..dcf0249 100644
--- a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
+++ b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp b/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
index f22bf2a..950b2d3 100644
--- a/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -214,28 +214,28 @@ void ExportImageDialog::init() {
switch (source) {
case WD:
- new HelpButton(this, ui->buttonBox, "17466362");
+ new HelpButton(this, ui->buttonBox, "17467907");
break;
case CircularView:
- new HelpButton(this, ui->buttonBox, "17466035");
+ new HelpButton(this, ui->buttonBox, "17467582");
break;
case MSA:
- new HelpButton(this, ui->buttonBox, "17466105");
+ new HelpButton(this, ui->buttonBox, "17467652");
break;
case SequenceView:
new HelpButton(this, ui->buttonBox, "");
break;
case AssemblyView:
- new HelpButton(this, ui->buttonBox, "17466141");
+ new HelpButton(this, ui->buttonBox, "17467688");
break;
case PHYTreeView:
- new HelpButton(this, ui->buttonBox, "17466169");
+ new HelpButton(this, ui->buttonBox, "17467716");
break;
case DotPlot:
- new HelpButton(this, ui->buttonBox, "17466066");
+ new HelpButton(this, ui->buttonBox, "17467613");
break;
case MolView:
- new HelpButton(this, ui->buttonBox, "17466049");
+ new HelpButton(this, ui->buttonBox, "17467596");
break;
default:
FAIL("Can't find help Id",);
diff --git a/src/corelibs/U2Gui/src/util/ExportImageDialog.h b/src/corelibs/U2Gui/src/util/ExportImageDialog.h
index 9d0eb73..60c8d00 100644
--- a/src/corelibs/U2Gui/src/util/ExportImageDialog.h
+++ b/src/corelibs/U2Gui/src/util/ExportImageDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp b/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
index a06de26..38b3a44 100644
--- a/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ExportObjectUtils.h b/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
index 70d7542..73b9178 100644
--- a/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
+++ b/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
index 1e35391..6f4f834 100644
--- a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
+++ b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
index 30fc19d..58f3e07 100644
--- a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
+++ b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GScrollBar.cpp b/src/corelibs/U2Gui/src/util/GScrollBar.cpp
index 3901998..2f7fdc0 100644
--- a/src/corelibs/U2Gui/src/util/GScrollBar.cpp
+++ b/src/corelibs/U2Gui/src/util/GScrollBar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GScrollBar.h b/src/corelibs/U2Gui/src/util/GScrollBar.h
index 9b60fb1..7278a66 100644
--- a/src/corelibs/U2Gui/src/util/GScrollBar.h
+++ b/src/corelibs/U2Gui/src/util/GScrollBar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GUIUtils.cpp b/src/corelibs/U2Gui/src/util/GUIUtils.cpp
index c716d98..19cdd16 100644
--- a/src/corelibs/U2Gui/src/util/GUIUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/GUIUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GUIUtils.h b/src/corelibs/U2Gui/src/util/GUIUtils.h
index a5d5dab..28c5ce8 100644
--- a/src/corelibs/U2Gui/src/util/GUIUtils.h
+++ b/src/corelibs/U2Gui/src/util/GUIUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
index 486dd6d..619c5b1 100644
--- a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
+++ b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
index f8f8d1c..afe4485 100644
--- a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
+++ b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GlassView.cpp b/src/corelibs/U2Gui/src/util/GlassView.cpp
index b31713b..8950660 100644
--- a/src/corelibs/U2Gui/src/util/GlassView.cpp
+++ b/src/corelibs/U2Gui/src/util/GlassView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GlassView.h b/src/corelibs/U2Gui/src/util/GlassView.h
index 5261e0a..0d866b8 100644
--- a/src/corelibs/U2Gui/src/util/GlassView.h
+++ b/src/corelibs/U2Gui/src/util/GlassView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GraphUtils.cpp b/src/corelibs/U2Gui/src/util/GraphUtils.cpp
index 9d49bf0..2cea3e6 100644
--- a/src/corelibs/U2Gui/src/util/GraphUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/GraphUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/GraphUtils.h b/src/corelibs/U2Gui/src/util/GraphUtils.h
index 1c373b3..82b368d 100644
--- a/src/corelibs/U2Gui/src/util/GraphUtils.h
+++ b/src/corelibs/U2Gui/src/util/GraphUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/HelpButton.cpp b/src/corelibs/U2Gui/src/util/HelpButton.cpp
index 2981e49..d1a8892 100644
--- a/src/corelibs/U2Gui/src/util/HelpButton.cpp
+++ b/src/corelibs/U2Gui/src/util/HelpButton.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/HelpButton.h b/src/corelibs/U2Gui/src/util/HelpButton.h
index 38ef839..a7f855b 100644
--- a/src/corelibs/U2Gui/src/util/HelpButton.h
+++ b/src/corelibs/U2Gui/src/util/HelpButton.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
index 08960aa..32726b2 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ const QString AceImportDialog::EXTENSION = ".ugenedb";
AceImportDialog::AceImportDialog(const QVariantMap& _settings) :
ImportDialog(_settings) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466152");
+ new HelpButton(this, buttonBox, "17467699");
QString src = settings.value(AceImporter::SRC_URL).toString();
leSource->setText(src);
diff --git a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
index a77fa6c..9e727c7 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
+++ b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
index d6ec3da..fd94282 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
index 5e4b949..693004c 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
+++ b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
index 47b05f5..8dbd954 100644
--- a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
index 6d87a92..b6b8b47 100644
--- a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
+++ b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
index 8027e79..91f44df 100644
--- a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
+++ b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
index ccee3fe..d3f77f4 100644
--- a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
+++ b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
index 47b1389..ec3464d 100644
--- a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
+++ b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
index 9c1d7cc..842fe24 100644
--- a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
+++ b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
index 07eedc8..67d5019 100644
--- a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
+++ b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
index b94cf9b..d7eac71 100644
--- a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
+++ b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LocalToolbar.cpp b/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
index 76df406..5d3f03d 100644
--- a/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/LocalToolbar.h b/src/corelibs/U2Gui/src/util/LocalToolbar.h
index 7f65352..84129fd 100644
--- a/src/corelibs/U2Gui/src/util/LocalToolbar.h
+++ b/src/corelibs/U2Gui/src/util/LocalToolbar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
index db1309d..bcf3070 100644
--- a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
+++ b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
index 42232c0..379fee0 100644
--- a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
+++ b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp b/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
index d28ad74..bf9ef92 100644
--- a/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/OrderedToolbar.h b/src/corelibs/U2Gui/src/util/OrderedToolbar.h
index 36d5107..9cfaf77 100644
--- a/src/corelibs/U2Gui/src/util/OrderedToolbar.h
+++ b/src/corelibs/U2Gui/src/util/OrderedToolbar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/PositionSelector.cpp b/src/corelibs/U2Gui/src/util/PositionSelector.cpp
index c237b1a..221a782 100644
--- a/src/corelibs/U2Gui/src/util/PositionSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/PositionSelector.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/PositionSelector.h b/src/corelibs/U2Gui/src/util/PositionSelector.h
index c0d9825..8801dc7 100644
--- a/src/corelibs/U2Gui/src/util/PositionSelector.h
+++ b/src/corelibs/U2Gui/src/util/PositionSelector.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
index f6a3aef..72e8050 100644
--- a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
+++ b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
index 42c0c0b..5fa0097 100644
--- a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
+++ b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
index 735898b..3dec509 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
index b0cbe02..9153007 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
index e72ac36..de26cac 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/RangeSelector.cpp b/src/corelibs/U2Gui/src/util/RangeSelector.cpp
index 922aac2..4092606 100644
--- a/src/corelibs/U2Gui/src/util/RangeSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/RangeSelector.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -240,7 +240,7 @@ MultipleRangeSelector::MultipleRangeSelector(QWidget* _parent, const QVector<U2R
ui = new Ui_RangeSelectionDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466001");
+ new HelpButton(this, ui->buttonBox, "17467548");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Go"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/RangeSelector.h b/src/corelibs/U2Gui/src/util/RangeSelector.h
index 3c99a6a..5680ee0 100644
--- a/src/corelibs/U2Gui/src/util/RangeSelector.h
+++ b/src/corelibs/U2Gui/src/util/RangeSelector.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/RegionSelector.cpp b/src/corelibs/U2Gui/src/util/RegionSelector.cpp
index 1f5a123..a21d4ad 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/RegionSelector.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/RegionSelector.h b/src/corelibs/U2Gui/src/util/RegionSelector.h
index fded979..315f22c 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelector.h
+++ b/src/corelibs/U2Gui/src/util/RegionSelector.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
index 11571c9..ec7cbf8 100644
--- a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ RemovePartFromSequenceDialogController::RemovePartFromSequenceDialogController(U
{
ui = new Ui_RemovePartFromSequenceDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466009");
+ new HelpButton(this, ui->buttonBox, "17467556");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Remove"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h
index 0204e20..2ab4529 100644
--- a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.cpp b/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.cpp
index a5d3e8c..bbc6009 100644
--- a/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.cpp
+++ b/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.h b/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.h
index a728ed8..badaf0e 100644
--- a/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.h
+++ b/src/corelibs/U2Gui/src/util/SaveDocumentGroupController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScaleBar.cpp b/src/corelibs/U2Gui/src/util/ScaleBar.cpp
index 222cbf9..83546c9 100644
--- a/src/corelibs/U2Gui/src/util/ScaleBar.cpp
+++ b/src/corelibs/U2Gui/src/util/ScaleBar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScaleBar.h b/src/corelibs/U2Gui/src/util/ScaleBar.h
index 0917477..bab4617 100644
--- a/src/corelibs/U2Gui/src/util/ScaleBar.h
+++ b/src/corelibs/U2Gui/src/util/ScaleBar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
index dc699db..c68fdd6 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
index 0d329e8..caa303d 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
index 480172a..cd3ed1c 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ ScriptEditorDialog::ScriptEditorDialog(QWidget* w, const QString& roHeaderText,
: QDialog(w), ui(new Ui_ScriptEditorDialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466370");
+ new HelpButton(this, ui->buttonBox, "17467915");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Done"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h
index 5e2c0b7..13a29cd 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
index 55ba589..d2d79a9 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
index 0799b29..0bf1ff5 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp b/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
index 4b6782d..c29af28 100644
--- a/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ScriptHighlighter.h b/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
index a79beb4..e3aebfa 100644
--- a/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
+++ b/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
index ba6262c..287c019 100644
--- a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ SearchGenbankSequenceDialogController::SearchGenbankSequenceDialogController(QWi
{
ui = new Ui_SearchGenbankSequenceDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17465982");
+ new HelpButton(this, ui->buttonBox, "17467529");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Download"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
diff --git a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h
index e02c5c3..d46f5e1 100644
--- a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
index 806f488..5b65343 100644
--- a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
+++ b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
index d71ddce..012df40 100644
--- a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
+++ b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp b/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
index 20050c1..ee66d04 100644
--- a/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
+++ b/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SequenceTextEdit.h b/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
index 046b0d5..432f288 100644
--- a/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
+++ b/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp b/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
index 7fc56d5..cc77d89 100644
--- a/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
+++ b/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/SuggestCompleter.h b/src/corelibs/U2Gui/src/util/SuggestCompleter.h
index 166fe5e..d4f7094 100644
--- a/src/corelibs/U2Gui/src/util/SuggestCompleter.h
+++ b/src/corelibs/U2Gui/src/util/SuggestCompleter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
index 9601f73..f6482a2 100644
--- a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
index 1e84069..4a492c0 100644
--- a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
+++ b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/U2FileDialog.cpp b/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
index 2717e67..d1134d7 100644
--- a/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/U2FileDialog.h b/src/corelibs/U2Gui/src/util/U2FileDialog.h
index 4680bcf..0bbf498 100644
--- a/src/corelibs/U2Gui/src/util/U2FileDialog.h
+++ b/src/corelibs/U2Gui/src/util/U2FileDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp b/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
index 4eeca8e..115ab04 100644
--- a/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
+++ b/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/U2LongLongValidator.h b/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
index df0b18d..87fea6c 100644
--- a/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
+++ b/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
index 100afcd..080e089 100644
--- a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
index b1e7d8b..9c75132 100644
--- a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
+++ b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
index 83547ae..c7fe61a 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
+++ b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
index a14fab2..67ef24f 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
+++ b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
index a86a93b..12f6649 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
+++ b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
index 0da1692..497ba69 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
+++ b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/logview/LogView.cpp b/src/corelibs/U2Gui/src/util/logview/LogView.cpp
index ee79e09..f6a1885 100644
--- a/src/corelibs/U2Gui/src/util/logview/LogView.cpp
+++ b/src/corelibs/U2Gui/src/util/logview/LogView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/logview/LogView.h b/src/corelibs/U2Gui/src/util/logview/LogView.h
index 92ca83c..338679f 100644
--- a/src/corelibs/U2Gui/src/util/logview/LogView.h
+++ b/src/corelibs/U2Gui/src/util/logview/LogView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
index 3beda98..3f20abe 100644
--- a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
index ad70dac..2a7c16b 100644
--- a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
+++ b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp b/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
index 0bb6fac..dead81e 100644
--- a/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
+++ b/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/DocumentFolders.h b/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
index 9de5e4f..e16263b 100644
--- a/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
+++ b/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
index c8d696d..70aac3a 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
index 7816731..481f2ce 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
index 962085b..596c779 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
index 1f1c7e4..194a4c4 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
index 5407ac9..905afd9 100644
--- a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
index 767a8b5..54b886c 100644
--- a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
+++ b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h b/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
index 0cec960..d972063 100644
--- a/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
+++ b/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
index 7b40a3f..f6e291e 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
index 6d5dc65..3c29dd8 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
index 6832fc2..90dde55 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
index 39daf57..fe9b29d 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
index e1b7e88..5ea85da 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
index c8b5034..7a4a56b 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
index 181bf3b..90210ad 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,6 +31,7 @@
#include <U2Core/AddObjectsToDocumentTask.h>
#include <U2Core/AppContext.h>
+#include <U2Core/BaseDocumentFormats.h>
#include <U2Core/DeleteObjectsTask.h>
#include <U2Core/DocumentUtils.h>
#include <U2Core/L10n.h>
@@ -110,6 +111,9 @@ ProjectTreeController::ProjectTreeController(QTreeView *tree, const ProjectTreeC
setupActions();
foreach (Document *doc, project->getDocuments()) {
+ if (settings.ignoreRemoteObjects && doc->isDatabaseConnection()) {
+ continue;
+ }
sl_onDocumentAdded(doc);
}
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
index b2a906c..c51561a 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
index 35b629e..c445b25 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
index a022190..763208f 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp b/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
index 67d16a4..7bf9196 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectUtils.h b/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
index 20bdde2..01fc401 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
index 6d235e6..e60f24a 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
index 4d3f3e4..0635486 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
index ec52643..033c606 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
index a741b87..a38b713 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
index 2c750cf..97283cf 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
index cae9d96..40eb6e6 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
index 5dd0b5e..31c3c69 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
index 213a730..063bc8b 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
index 34bd6c7..a819542 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
index e97ef4e..8ed1aed 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
index 134e145..d721357 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
index 9c005c0..29acc62 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
index 82d4d9a..21dc188 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
index cd82461..9729b80 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
index ad734c5..04989fd 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
index 9e4581a..32b3d5c 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
index 8a28f97..2d1efbf 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ CommonImportOptionsDialog::CommonImportOptionsDialog(const QString& baseFolder,
QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466329");
+ new HelpButton(this, buttonBox, "17467874");
init(baseFolder, options);
}
diff --git a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h
index eabc3c9..ae6e23f 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
index 6637dd8..8d4fced 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ EditConnectionDialog::EditConnectionDialog(QWidget *parent, const QString &dbiUr
ui(new Ui::EditConnectionDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466327");
+ new HelpButton(this, ui->buttonBox, "17467872");
adjustSize();
init(dbiUrl, connectionName, userName);
}
diff --git a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h
index 750d553..77467e9 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
index 58cc205..aba4280 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
index aac599e..7d3c01f 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
index d832a12..273bbe5 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ ImportToDatabaseDialog::ImportToDatabaseDialog(Document *dbConnection, const QSt
baseFolder(U2DbiUtils::makeFolderCanonical(defaultFolder))
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466329");
+ new HelpButton(this, ui->buttonBox, "17467874");
init();
connectSignals();
updateState();
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h
index d734cad..71c3a4a 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
index cc319c1..b7009fc 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ ItemToImportEditDialog::ItemToImportEditDialog(const QString &item, const QStrin
ui(new Ui::ItemToImportEditDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466329");
+ new HelpButton(this, ui->buttonBox, "17467874");
init(item, folder, options);
}
diff --git a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h
index 3d011cf..a22d7f8 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
index f7ccfbb..38d4cac 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -84,7 +84,7 @@ SharedConnectionsDialog::SharedConnectionsDialog(QWidget *parent) :
ui(new Ui::SharedConnectionsDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466327");
+ new HelpButton(this, ui->buttonBox, "17467872");
init();
connectSignals();
@@ -506,7 +506,7 @@ bool SharedConnectionsDialog::checkDbShouldBeUpgraded(const U2DbiRef &ref) {
if (upgradeDatabase) {
QObjectScopedPointer<QMessageBox> question = new QMessageBox(QMessageBox::Question, tr(DATABASE_UPGRADE_TITLE), tr(DATABASE_UPGRADE_TEXT), QMessageBox::Ok | QMessageBox::Cancel| QMessageBox::Help, this);
question->button(QMessageBox::Ok)->setText(tr("Upgrade"));
- HelpButton(question.data(), question->button(QMessageBox::Help), "17466327");
+ HelpButton(question.data(), question->button(QMessageBox::Help), "17467872");
question->setDefaultButton(QMessageBox::Cancel);
const int dialogResult = question->exec();
CHECK(!question.isNull(), true);
diff --git a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h
index 0c07b27..0e72bd7 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Gui/src/util/ui/ExportAnnotationsDialog.ui b/src/corelibs/U2Gui/src/util/ui/ExportAnnotationsDialog.ui
index e5fbe88..0544d02 100644
--- a/src/corelibs/U2Gui/src/util/ui/ExportAnnotationsDialog.ui
+++ b/src/corelibs/U2Gui/src/util/ui/ExportAnnotationsDialog.ui
@@ -22,7 +22,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Export to file:</string>
+ <string>Export to file</string>
</property>
</widget>
</item>
@@ -46,7 +46,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>File format:</string>
+ <string>File format</string>
</property>
</widget>
</item>
diff --git a/src/corelibs/U2Gui/transl/english.ts b/src/corelibs/U2Gui/transl/english.ts
index d027b91..ea3e622 100644
--- a/src/corelibs/U2Gui/transl/english.ts
+++ b/src/corelibs/U2Gui/transl/english.ts
@@ -557,9 +557,8 @@
<translation>Force download the appropriate sequence</translation>
</message>
<message>
- <location filename="../src/util/ui/DownloadRemoteFileDialog.ui" line="160"/>
<source>DAS features</source>
- <translation>DAS features</translation>
+ <translation type="vanished">DAS features</translation>
</message>
</context>
<context>
@@ -800,8 +799,8 @@
<translation>...</translation>
</message>
<message>
- <source> export settings</source>
- <translation type="obsolete">Export settings</translation>
+ <source>Export settings</source>
+ <translation type="vanished">Export settings</translation>
</message>
<message>
<location filename="../src/util/ui/ExportImageDialog.ui" line="56"/>
@@ -1091,24 +1090,24 @@ Remove it from the project first.</translation>
<translation>Error! No object DBI</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1082"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1098"/>
<source>Confirm Deletion</source>
<translation>Confirm Deletion</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1083"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1099"/>
<source>Are you sure you want to delete items in Recycle Bin?
The items cannot be recovered once deleted.</source>
<translation>Are you sure you want to delete items in Recycle Bin?
The items cannot be recovered once deleted.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1096"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1112"/>
<source>Unable to Remove</source>
<translation>Unable to Remove</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1097"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1113"/>
<source>Some of selected objects are being used by the other users of the database. Try to remove them later.</source>
<translation>Some of selected objects are being used by the other users of the database. Try to remove them later.</translation>
</message>
@@ -1491,24 +1490,24 @@ To append data to existing file press 'Append'.</translation>
<context>
<name>U2::AddDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="313"/>
- <location filename="../src/OpenViewTask.cpp" line="327"/>
+ <location filename="../src/OpenViewTask.cpp" line="311"/>
+ <location filename="../src/OpenViewTask.cpp" line="325"/>
<source>Opening view for document: 'NONAME'</source>
<translation>Opening view for document: 'NONAME'</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="317"/>
- <location filename="../src/OpenViewTask.cpp" line="330"/>
+ <location filename="../src/OpenViewTask.cpp" line="315"/>
+ <location filename="../src/OpenViewTask.cpp" line="328"/>
<source>Opening view for document: %1</source>
<translation>Opening view for document: %1</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="319"/>
+ <location filename="../src/OpenViewTask.cpp" line="317"/>
<source>Provided document is NULL</source>
<translation>Provided document is NULL</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="332"/>
+ <location filename="../src/OpenViewTask.cpp" line="330"/>
<source>Document provider is NULL</source>
<translation>Document provider is NULL</translation>
</message>
@@ -1759,37 +1758,37 @@ complement(5..15)</translation>
<context>
<name>U2::DownloadRemoteFileDialog</name>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="137"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="124"/>
<source>Select directory to save</source>
<translation>Select directory to save</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="178"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="165"/>
<source>Resource id is empty!</source>
<translation>Resource id is empty!</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="184"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="171"/>
<source>No directory selected for saving file!</source>
<translation>No directory selected for saving file!</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="215"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="201"/>
<source>Download remote documents</source>
<translation>Download remote documents</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="312"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="241"/>
<source>Hint: </source>
<translation>Hint: </translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="313"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="242"/>
<source>Use database unique identifier.</source>
<translation>Use database unique identifier.</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="315"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="244"/>
<source>You can download multiple items by separating IDs with space or semicolon.</source>
<translation>You can download multiple items by separating IDs with space or semicolon.</translation>
</message>
@@ -1816,23 +1815,33 @@ complement(5..15)</translation>
<context>
<name>U2::EditQualifierDialog</name>
<message>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="45"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
<location filename="../src/util/EditQualifierDialog.cpp" line="46"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="49"/>
<source>View Qualifier</source>
<translation>View Qualifier</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="97"/>
- <location filename="../src/util/EditQualifierDialog.cpp" line="101"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="100"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="104"/>
<source>Error!</source>
<translation>Error!</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="97"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="100"/>
<source>Illegal qualifier name</source>
<translation>Illegal qualifier name</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="101"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="104"/>
<source>Illegal qualifier value</source>
<translation>Illegal qualifier value</translation>
</message>
@@ -1952,8 +1961,8 @@ complement(5..15)</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="25"/>
- <source>Export to file:</source>
- <translation>Export to file:</translation>
+ <source>Export to file</source>
+ <translation>Export to file</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="37"/>
@@ -1962,8 +1971,8 @@ complement(5..15)</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="49"/>
- <source>File format:</source>
- <translation>File format:</translation>
+ <source>File format</source>
+ <translation>File format</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="58"/>
@@ -1976,7 +1985,17 @@ complement(5..15)</translation>
<translation>Save sequence names</translation>
</message>
<message>
- <location filename="../src/util/ExportAnnotationsDialog.cpp" line="140"/>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="48"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="49"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="143"/>
<source>Select file to save annotations</source>
<translation>Select file to save annotations</translation>
</message>
@@ -2304,52 +2323,45 @@ complement(5..15)</translation>
<context>
<name>U2::LoadDASDocumentsAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="355"/>
<source>Load DAS documents and open view</source>
- <translation>Load DAS documents and open view</translation>
+ <translation type="vanished">Load DAS documents and open view</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="373"/>
<source>Resource ID: %1</source>
- <translation>Resource ID: %1</translation>
+ <translation type="vanished">Resource ID: %1</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="379"/>
<source>Converted resource ID: %2</source>
- <translation>Converted resource ID: %2</translation>
+ <translation type="vanished">Converted resource ID: %2</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="384"/>
<source>Resolution: </source>
- <translation>Resolution: </translation>
+ <translation type="vanished">Resolution: </translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="386"/>
<source><font color='%1'>cancelled</font></source>
- <translation><font color='%1'>cancelled</font></translation>
+ <translation type="vanished"><font color='%1'>cancelled</font></translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="388"/>
<source><font color='%1'>error</font></source>
- <translation><font color='%1'>error</font></translation>
+ <translation type="vanished"><font color='%1'>error</font></translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="392"/>
<source><font color='%1'>success</font></source>
- <translation><font color='%1'>success</font></translation>
+ <translation type="vanished"><font color='%1'>success</font></translation>
</message>
</context>
<context>
<name>U2::LoadRemoteDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="269"/>
+ <location filename="../src/OpenViewTask.cpp" line="267"/>
<source>Cannot find %1 in %2 database</source>
<translation>Cannot find %1 in %2 database</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="225"/>
- <location filename="../src/OpenViewTask.cpp" line="232"/>
- <location filename="../src/OpenViewTask.cpp" line="239"/>
+ <location filename="../src/OpenViewTask.cpp" line="223"/>
+ <location filename="../src/OpenViewTask.cpp" line="230"/>
+ <location filename="../src/OpenViewTask.cpp" line="237"/>
<source>Load remote document and open view</source>
<translation>Load remote document and open view</translation>
</message>
@@ -2357,7 +2369,7 @@ complement(5..15)</translation>
<context>
<name>U2::LoadUnloadedDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="71"/>
+ <location filename="../src/OpenViewTask.cpp" line="69"/>
<source>Load document: '%1'</source>
<translation>Load document: '%1'</translation>
</message>
@@ -2477,7 +2489,7 @@ complement(5..15)</translation>
<translation>Rename bookmark</translation>
</message>
<message>
- <location filename="../src/util/ObjectViewTreeController.cpp" line="395"/>
+ <location filename="../src/util/ObjectViewTreeController.cpp" line="397"/>
<source>New bookmark</source>
<translation>New bookmark</translation>
</message>
@@ -2485,12 +2497,12 @@ complement(5..15)</translation>
<context>
<name>U2::OpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="153"/>
+ <location filename="../src/OpenViewTask.cpp" line="151"/>
<source>State is NULL</source>
<translation>State is NULL</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="155"/>
+ <location filename="../src/OpenViewTask.cpp" line="153"/>
<source>GObject factory is NULL</source>
<translation>GObject factory is NULL</translation>
</message>
@@ -2511,7 +2523,7 @@ complement(5..15)</translation>
<context>
<name>U2::PasteTextTask</name>
<message>
- <location filename="../src/PasteController.cpp" line="205"/>
+ <location filename="../src/PasteController.cpp" line="204"/>
<source>Cannot detect file format</source>
<translation type="unfinished"></translation>
</message>
@@ -2519,7 +2531,7 @@ complement(5..15)</translation>
<context>
<name>U2::PasteUrlsTask</name>
<message>
- <location filename="../src/PasteController.cpp" line="179"/>
+ <location filename="../src/PasteController.cpp" line="178"/>
<source>Pasting of directories is not supported:</source>
<translation type="unfinished"></translation>
</message>
@@ -2592,108 +2604,108 @@ complement(5..15)</translation>
<context>
<name>U2::ProjectTreeController</name>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="946"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="962"/>
<source>Load selected documents</source>
<translation>Load selected documents</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="956"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="972"/>
<source>Lock document for editing</source>
<translation>Lock document for editing</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="960"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="976"/>
<source>Unlock document for editing</source>
<translation>Unlock document for editing</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="953"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="969"/>
<source>Unload selected document</source>
<translation>Unload selected document</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="314"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="318"/>
<source>Import to the database...</source>
<translation>Import to the database...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="315"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="319"/>
<source>Import to the folder...</source>
<translation>Import to the folder...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="721"/>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="755"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="726"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="760"/>
<source>Unable to Restore</source>
<translation>Unable to Restore</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="722"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="727"/>
<source>UGENE is unable to restore some object from Recycle Bin because its original location does not exist. You can still restore the objects by dragging them with mouse from Recycle Bin.</source>
<translation>UGENE is unable to restore some object from Recycle Bin because its original location does not exist. You can still restore the objects by dragging them with mouse from Recycle Bin.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="756"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="761"/>
<source>UGENE is unable to restore some folder from Recycle Bin because its original location does not exist. You can still restore the folders by dragging them with mouse from Recycle Bin.</source>
<translation>UGENE is unable to restore some folder from Recycle Bin because its original location does not exist. You can still restore the folders by dragging them with mouse from Recycle Bin.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="822"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="827"/>
<source>Select a database to import anything</source>
<translation>Select a database to import anything</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="936"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="952"/>
<source>Add object to document...</source>
<translation>Add object to document...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="941"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="957"/>
<source>Import...</source>
<translation>Import...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="964"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="980"/>
<source>Rename...</source>
<translation>Rename...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="968"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="984"/>
<source>Remove selected items</source>
<translation>Remove selected items</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="974"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="990"/>
<source>Add folder...</source>
<translation>Add folder...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="979"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="995"/>
<source>Restore selected items</source>
<translation>Restore selected items</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="983"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="999"/>
<source>Empty recycle bin</source>
<translation>Empty recycle bin</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="540"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="544"/>
<source>Add</source>
<translation>Add</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="555"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="559"/>
<source>Edit</source>
<translation>Edit</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="863"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="868"/>
<source>No object to add to view</source>
<translation>No object to add to view</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="869"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="874"/>
<source>No object to remove from view</source>
<translation>No object to remove from view</translation>
</message>
@@ -3052,42 +3064,42 @@ check connection settings</translation>
<context>
<name>U2::ToolsMenu</name>
<message>
- <location filename="../src/ToolsMenu.cpp" line="106"/>
+ <location filename="../src/ToolsMenu.cpp" line="108"/>
<source>Sanger data analysis</source>
<translation>Sanger data analysis</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="116"/>
+ <location filename="../src/ToolsMenu.cpp" line="118"/>
<source>NGS data analysis</source>
<translation>NGS data analysis</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="143"/>
+ <location filename="../src/ToolsMenu.cpp" line="145"/>
<source>BLAST</source>
<translation>BLAST</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="157"/>
+ <location filename="../src/ToolsMenu.cpp" line="159"/>
<source>Multiple sequence alignment</source>
<translation>Multiple sequence alignment</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="169"/>
+ <location filename="../src/ToolsMenu.cpp" line="171"/>
<source>Cloning</source>
<translation>Cloning</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="177"/>
+ <location filename="../src/ToolsMenu.cpp" line="179"/>
<source>Primer</source>
<translation>Primer</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="183"/>
+ <location filename="../src/ToolsMenu.cpp" line="185"/>
<source>Search for TFBS</source>
<translation>Search for TFBS</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="192"/>
+ <location filename="../src/ToolsMenu.cpp" line="194"/>
<source>HMMER tools</source>
<translation>HMMER tools</translation>
</message>
diff --git a/src/corelibs/U2Gui/transl/russian.ts b/src/corelibs/U2Gui/transl/russian.ts
index 64b7d80..742e962 100644
--- a/src/corelibs/U2Gui/transl/russian.ts
+++ b/src/corelibs/U2Gui/transl/russian.ts
@@ -67,12 +67,12 @@
<message>
<location filename="../src/util/ui/AddNewDocumentDialog.ui" line="39"/>
<source>Document format</source>
- <translation>Формат</translation>
+ <translation>Формат документа</translation>
</message>
<message>
<location filename="../src/util/ui/AddNewDocumentDialog.ui" line="46"/>
<source>Document location</source>
- <translation>Адрес документа</translation>
+ <translation>Расположение документа</translation>
</message>
<message>
<location filename="../src/util/ui/AddNewDocumentDialog.ui" line="56"/>
@@ -273,7 +273,7 @@
<message>
<location filename="../src/util/ui/CreateAnnotationFullWidget.ui" line="416"/>
<source>Create new table</source>
- <translation>Новую таблицу</translation>
+ <translation>Новая таблица</translation>
</message>
</context>
<context>
@@ -304,7 +304,7 @@
<message>
<location filename="../src/util/ui/CreateAnnotationNormalWidget.ui" line="78"/>
<source>Create new table</source>
- <translation>Новую таблицу</translation>
+ <translation>Новая таблица</translation>
</message>
<message>
<location filename="../src/util/ui/CreateAnnotationNormalWidget.ui" line="102"/>
@@ -400,7 +400,7 @@
<message>
<location filename="../src/util/ui/CreateAnnotationOptionsPanelWidget.ui" line="76"/>
<source>Create new table:</source>
- <translation>Создать новую таблицу:</translation>
+ <translation>Новая таблица:</translation>
</message>
<message>
<location filename="../src/util/ui/CreateAnnotationOptionsPanelWidget.ui" line="104"/>
@@ -478,7 +478,7 @@
<message>
<location filename="../src/util/ui/CreateDocumentFromTextDialog.ui" line="22"/>
<source>Document location:</source>
- <translation>Адрес документа:</translation>
+ <translation>Расположение документа:</translation>
</message>
<message>
<location filename="../src/util/ui/CreateDocumentFromTextDialog.ui" line="32"/>
@@ -557,9 +557,8 @@
<translation>Принудительно скачать соответствующую последовательность</translation>
</message>
<message>
- <location filename="../src/util/ui/DownloadRemoteFileDialog.ui" line="160"/>
<source>DAS features</source>
- <translation>DAS аннотации</translation>
+ <translation type="vanished">DAS аннотации</translation>
</message>
</context>
<context>
@@ -718,7 +717,7 @@
<message>
<location filename="../src/util/ui/EditSequenceDialog.ui" line="183"/>
<source>Document location:</source>
- <translation>Адрес документа:</translation>
+ <translation>Расположение документа:</translation>
</message>
<message>
<location filename="../src/util/ui/EditSequenceDialog.ui" line="193"/>
@@ -800,8 +799,8 @@
<translation>...</translation>
</message>
<message>
- <source> export settings</source>
- <translation type="obsolete">Настройки экспорта</translation>
+ <source>Export settings</source>
+ <translation type="vanished">Настройки экспорта</translation>
</message>
<message>
<location filename="../src/util/ui/ExportImageDialog.ui" line="56"/>
@@ -1091,24 +1090,24 @@ Remove it from the project first.</source>
<translation>Error! No object DBI</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1082"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1098"/>
<source>Confirm Deletion</source>
<translation>Подтверждение удаления</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1083"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1099"/>
<source>Are you sure you want to delete items in Recycle Bin?
The items cannot be recovered once deleted.</source>
<translation>Вы уверены, что хотите удалить элементы в корзину?
Элементы не могут быть восстановлены после удаления.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1096"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1112"/>
<source>Unable to Remove</source>
<translation>Невозможно удалить</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="1097"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="1113"/>
<source>Some of selected objects are being used by the other users of the database. Try to remove them later.</source>
<translation>Некоторые из выбранных объектов используются другими пользователями базы данных. Попробуйте удалить их позже.</translation>
</message>
@@ -1244,7 +1243,7 @@ The items cannot be recovered once deleted.</source>
<message>
<location filename="../src/util/ui/RemovePartFromSequenceDialog.ui" line="89"/>
<source>Document location:</source>
- <translation>Адрес документа:</translation>
+ <translation>Расположение документа:</translation>
</message>
<message>
<location filename="../src/util/ui/RemovePartFromSequenceDialog.ui" line="99"/>
@@ -1491,24 +1490,24 @@ To append data to existing file press 'Append'.</source>
<context>
<name>U2::AddDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="313"/>
- <location filename="../src/OpenViewTask.cpp" line="327"/>
+ <location filename="../src/OpenViewTask.cpp" line="311"/>
+ <location filename="../src/OpenViewTask.cpp" line="325"/>
<source>Opening view for document: 'NONAME'</source>
<translation>Открытие документа: 'NONAME'</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="317"/>
- <location filename="../src/OpenViewTask.cpp" line="330"/>
+ <location filename="../src/OpenViewTask.cpp" line="315"/>
+ <location filename="../src/OpenViewTask.cpp" line="328"/>
<source>Opening view for document: %1</source>
<translation>Открытие документа: %1</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="319"/>
+ <location filename="../src/OpenViewTask.cpp" line="317"/>
<source>Provided document is NULL</source>
<translation>Provided document is NULL</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="332"/>
+ <location filename="../src/OpenViewTask.cpp" line="330"/>
<source>Document provider is NULL</source>
<translation>Document provider is NULL</translation>
</message>
@@ -1759,37 +1758,37 @@ complement(5..15)</translation>
<context>
<name>U2::DownloadRemoteFileDialog</name>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="137"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="124"/>
<source>Select directory to save</source>
<translation>Папка для сохранения</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="178"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="165"/>
<source>Resource id is empty!</source>
<translation>Идентификатор ресурса пуст!</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="184"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="171"/>
<source>No directory selected for saving file!</source>
<translation>Не задана директория для сохранения файла!</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="215"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="201"/>
<source>Download remote documents</source>
<translation>Скачать удаленные документы</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="312"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="241"/>
<source>Hint: </source>
<translation>Подсказка: </translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="313"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="242"/>
<source>Use database unique identifier.</source>
<translation>Использовать уникальный идентификатор базы данных.</translation>
</message>
<message>
- <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="315"/>
+ <location filename="../src/util/DownloadRemoteFileDialog.cpp" line="244"/>
<source>You can download multiple items by separating IDs with space or semicolon.</source>
<translation>Вы можете скачать несколько элементов разделяя идентификаторы при помощи пробела или точки с запятой.</translation>
</message>
@@ -1816,23 +1815,33 @@ complement(5..15)</translation>
<context>
<name>U2::EditQualifierDialog</name>
<message>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="45"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
<location filename="../src/util/EditQualifierDialog.cpp" line="46"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="49"/>
<source>View Qualifier</source>
<translation>Посмотреть квалификатор</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="97"/>
- <location filename="../src/util/EditQualifierDialog.cpp" line="101"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="100"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="104"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="97"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="100"/>
<source>Illegal qualifier name</source>
<translation>Нелегальные символы в имени квалификатора</translation>
</message>
<message>
- <location filename="../src/util/EditQualifierDialog.cpp" line="101"/>
+ <location filename="../src/util/EditQualifierDialog.cpp" line="104"/>
<source>Illegal qualifier value</source>
<translation>Нелегальные символы в значении квалификатора</translation>
</message>
@@ -1952,8 +1961,8 @@ complement(5..15)</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="25"/>
- <source>Export to file:</source>
- <translation>Экспорт в файл:</translation>
+ <source>Export to file</source>
+ <translation>Экспортировать в файл</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="37"/>
@@ -1962,13 +1971,13 @@ complement(5..15)</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="49"/>
- <source>File format:</source>
- <translation>Формат файла:</translation>
+ <source>File format</source>
+ <translation>Формат файла</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="58"/>
<source>Save sequences under annotations</source>
- <translation>Сохранить последовательности</translation>
+ <translation>Сохранить последовательности аннотаций</translation>
</message>
<message>
<location filename="../src/util/ui/ExportAnnotationsDialog.ui" line="65"/>
@@ -1976,7 +1985,17 @@ complement(5..15)</translation>
<translation>Сохранить имена последовательностей</translation>
</message>
<message>
- <location filename="../src/util/ExportAnnotationsDialog.cpp" line="140"/>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="48"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="49"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/util/ExportAnnotationsDialog.cpp" line="143"/>
<source>Select file to save annotations</source>
<translation>Выберите файл для сохранения аннотаций</translation>
</message>
@@ -2303,52 +2322,45 @@ complement(5..15)</translation>
<context>
<name>U2::LoadDASDocumentsAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="355"/>
<source>Load DAS documents and open view</source>
- <translation>Загрузить и открыть документы DAS</translation>
+ <translation type="vanished">Загрузить и открыть документы DAS</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="373"/>
<source>Resource ID: %1</source>
- <translation>Идентификатор: %1</translation>
+ <translation type="vanished">Идентификатор: %1</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="379"/>
<source>Converted resource ID: %2</source>
- <translation>Конвертированный идентификатор ресурса: %2</translation>
+ <translation type="vanished">Конвертированный идентификатор ресурса: %2</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="384"/>
<source>Resolution: </source>
- <translation>Заключение:</translation>
+ <translation type="vanished">Заключение:</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="386"/>
<source><font color='%1'>cancelled</font></source>
- <translation><font color='%1'>отменено</font></translation>
+ <translation type="vanished"><font color='%1'>отменено</font></translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="388"/>
<source><font color='%1'>error</font></source>
- <translation><font color='%1'>ошибка</font></translation>
+ <translation type="vanished"><font color='%1'>ошибка</font></translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="392"/>
<source><font color='%1'>success</font></source>
- <translation><font color='%1'>успешно</font></translation>
+ <translation type="vanished"><font color='%1'>успешно</font></translation>
</message>
</context>
<context>
<name>U2::LoadRemoteDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="269"/>
+ <location filename="../src/OpenViewTask.cpp" line="267"/>
<source>Cannot find %1 in %2 database</source>
<translation>Невозможно найти %1 в базе данных %2</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="225"/>
- <location filename="../src/OpenViewTask.cpp" line="232"/>
- <location filename="../src/OpenViewTask.cpp" line="239"/>
+ <location filename="../src/OpenViewTask.cpp" line="223"/>
+ <location filename="../src/OpenViewTask.cpp" line="230"/>
+ <location filename="../src/OpenViewTask.cpp" line="237"/>
<source>Load remote document and open view</source>
<translation>Загрузить и открыть удаленный документ</translation>
</message>
@@ -2356,7 +2368,7 @@ complement(5..15)</translation>
<context>
<name>U2::LoadUnloadedDocumentAndOpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="71"/>
+ <location filename="../src/OpenViewTask.cpp" line="69"/>
<source>Load document: '%1'</source>
<translation>Загрузка документа: %1</translation>
</message>
@@ -2476,7 +2488,7 @@ complement(5..15)</translation>
<translation>Переименовать закладку</translation>
</message>
<message>
- <location filename="../src/util/ObjectViewTreeController.cpp" line="395"/>
+ <location filename="../src/util/ObjectViewTreeController.cpp" line="397"/>
<source>New bookmark</source>
<translation>Закладка</translation>
</message>
@@ -2484,12 +2496,12 @@ complement(5..15)</translation>
<context>
<name>U2::OpenViewTask</name>
<message>
- <location filename="../src/OpenViewTask.cpp" line="153"/>
+ <location filename="../src/OpenViewTask.cpp" line="151"/>
<source>State is NULL</source>
<translation>State is NULL</translation>
</message>
<message>
- <location filename="../src/OpenViewTask.cpp" line="155"/>
+ <location filename="../src/OpenViewTask.cpp" line="153"/>
<source>GObject factory is NULL</source>
<translation>GObject factory is NULL</translation>
</message>
@@ -2510,7 +2522,7 @@ complement(5..15)</translation>
<context>
<name>U2::PasteTextTask</name>
<message>
- <location filename="../src/PasteController.cpp" line="205"/>
+ <location filename="../src/PasteController.cpp" line="204"/>
<source>Cannot detect file format</source>
<translation type="unfinished"></translation>
</message>
@@ -2518,7 +2530,7 @@ complement(5..15)</translation>
<context>
<name>U2::PasteUrlsTask</name>
<message>
- <location filename="../src/PasteController.cpp" line="179"/>
+ <location filename="../src/PasteController.cpp" line="178"/>
<source>Pasting of directories is not supported:</source>
<translation type="unfinished"></translation>
</message>
@@ -2591,108 +2603,108 @@ complement(5..15)</translation>
<context>
<name>U2::ProjectTreeController</name>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="946"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="962"/>
<source>Load selected documents</source>
<translation>Загрузить выбранные документы</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="540"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="544"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="953"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="969"/>
<source>Unload selected document</source>
<translation>Выгрузить выбранные документы</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="314"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="318"/>
<source>Import to the database...</source>
<translation>Импортировать в базу данных...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="315"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="319"/>
<source>Import to the folder...</source>
<translation>Импортировать в папку...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="721"/>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="755"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="726"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="760"/>
<source>Unable to Restore</source>
<translation>Невозможно восстановить</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="722"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="727"/>
<source>UGENE is unable to restore some object from Recycle Bin because its original location does not exist. You can still restore the objects by dragging them with mouse from Recycle Bin.</source>
<translation>UGENE не может восстановить некоторые объекты из корзины потому, что их изначальное местоположение не существует. Вы можете восстановить объекты путем перетаскивания мышью из корзины.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="756"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="761"/>
<source>UGENE is unable to restore some folder from Recycle Bin because its original location does not exist. You can still restore the folders by dragging them with mouse from Recycle Bin.</source>
<translation>UGENE не может восстановить некоторые папки из корзины потому, что их изначальное местоположение не существует. Вы можете восстановить папки путем перетаскивания мышью из корзины.</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="822"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="827"/>
<source>Select a database to import anything</source>
<translation>Выберите базу данных для того, чтобы что-то импортировать</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="863"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="868"/>
<source>No object to add to view</source>
<translation>Нет объектов для добавления</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="869"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="874"/>
<source>No object to remove from view</source>
<translation>Нет объектов для удаления</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="936"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="952"/>
<source>Add object to document...</source>
<translation>Добавить объект в документ...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="941"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="957"/>
<source>Import...</source>
<translation>Импорт...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="968"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="984"/>
<source>Remove selected items</source>
<translation>Удалить выбранные элементы</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="974"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="990"/>
<source>Add folder...</source>
<translation>Добавить папку...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="979"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="995"/>
<source>Restore selected items</source>
<translation>Восстановить выбранные элементы</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="983"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="999"/>
<source>Empty recycle bin</source>
<translation>Очистить корзину</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="964"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="980"/>
<source>Rename...</source>
<translation>Переименовать...</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="555"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="559"/>
<source>Edit</source>
<translation>Редактировать</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="956"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="972"/>
<source>Lock document for editing</source>
<translation>Заблокировать внесение изменений</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectTreeController.cpp" line="960"/>
+ <location filename="../src/util/project/ProjectTreeController.cpp" line="976"/>
<source>Unlock document for editing</source>
<translation>Снять блокировку изменений</translation>
</message>
@@ -3050,42 +3062,42 @@ check connection settings</translation>
<context>
<name>U2::ToolsMenu</name>
<message>
- <location filename="../src/ToolsMenu.cpp" line="106"/>
+ <location filename="../src/ToolsMenu.cpp" line="108"/>
<source>Sanger data analysis</source>
<translation>Анализ данных секвенирования по Сэнгеру</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="116"/>
+ <location filename="../src/ToolsMenu.cpp" line="118"/>
<source>NGS data analysis</source>
<translation>Анализ данных NGS</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="143"/>
+ <location filename="../src/ToolsMenu.cpp" line="145"/>
<source>BLAST</source>
<translation>BLAST</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="157"/>
+ <location filename="../src/ToolsMenu.cpp" line="159"/>
<source>Multiple sequence alignment</source>
<translation>Множественное выравнивание</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="169"/>
+ <location filename="../src/ToolsMenu.cpp" line="171"/>
<source>Cloning</source>
<translation>Клонирование</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="177"/>
+ <location filename="../src/ToolsMenu.cpp" line="179"/>
<source>Primer</source>
<translation>Подбор праймеров</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="183"/>
+ <location filename="../src/ToolsMenu.cpp" line="185"/>
<source>Search for TFBS</source>
<translation>Поиск сайтов связывания транскрипционных факторов (TFBS)</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="192"/>
+ <location filename="../src/ToolsMenu.cpp" line="194"/>
<source>HMMER tools</source>
<translation>Инструменты HMMER</translation>
</message>
diff --git a/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp b/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp
index 401916f..15c9079 100644
--- a/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseActorCategories.h b/src/corelibs/U2Lang/src/library/BaseActorCategories.h
index 69c5009..e6fbc79 100644
--- a/src/corelibs/U2Lang/src/library/BaseActorCategories.h
+++ b/src/corelibs/U2Lang/src/library/BaseActorCategories.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseAttributes.cpp b/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
index d309ceb..76738fe 100644
--- a/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseAttributes.h b/src/corelibs/U2Lang/src/library/BaseAttributes.h
index 67a7eed..ef41e56 100644
--- a/src/corelibs/U2Lang/src/library/BaseAttributes.h
+++ b/src/corelibs/U2Lang/src/library/BaseAttributes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
index a41af3a..0c1a983 100644
--- a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
index b944479..676d77f 100644
--- a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
index 81a82ee..0bfb15e 100644
--- a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
index ca48977..939c153 100644
--- a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BasePorts.cpp b/src/corelibs/U2Lang/src/library/BasePorts.cpp
index 02b2dd7..61c7519 100644
--- a/src/corelibs/U2Lang/src/library/BasePorts.cpp
+++ b/src/corelibs/U2Lang/src/library/BasePorts.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BasePorts.h b/src/corelibs/U2Lang/src/library/BasePorts.h
index e329090..fa77e3f 100644
--- a/src/corelibs/U2Lang/src/library/BasePorts.h
+++ b/src/corelibs/U2Lang/src/library/BasePorts.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseSlots.cpp b/src/corelibs/U2Lang/src/library/BaseSlots.cpp
index 23aa722..6ce7e91 100644
--- a/src/corelibs/U2Lang/src/library/BaseSlots.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseSlots.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseSlots.h b/src/corelibs/U2Lang/src/library/BaseSlots.h
index 9acb55f..b4fdd4a 100644
--- a/src/corelibs/U2Lang/src/library/BaseSlots.h
+++ b/src/corelibs/U2Lang/src/library/BaseSlots.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp b/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
index 72d9eb4..8ac47f2 100644
--- a/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseThroughWorker.h b/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
index 67ec3b3..38ff436 100644
--- a/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseTypes.cpp b/src/corelibs/U2Lang/src/library/BaseTypes.cpp
index eef85cf..3c38b88 100644
--- a/src/corelibs/U2Lang/src/library/BaseTypes.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseTypes.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/BaseTypes.h b/src/corelibs/U2Lang/src/library/BaseTypes.h
index c59c485..e031377 100644
--- a/src/corelibs/U2Lang/src/library/BaseTypes.h
+++ b/src/corelibs/U2Lang/src/library/BaseTypes.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp b/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
index dbe54d0..89afbfe 100644
--- a/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
+++ b/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/LastReadyScheduler.h b/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
index d9074f1..eeea506 100644
--- a/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
+++ b/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/LocalDomain.cpp b/src/corelibs/U2Lang/src/library/LocalDomain.cpp
index 9d71ee3..f482646 100644
--- a/src/corelibs/U2Lang/src/library/LocalDomain.cpp
+++ b/src/corelibs/U2Lang/src/library/LocalDomain.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/LocalDomain.h b/src/corelibs/U2Lang/src/library/LocalDomain.h
index 1ef9f7a..357c12d 100644
--- a/src/corelibs/U2Lang/src/library/LocalDomain.h
+++ b/src/corelibs/U2Lang/src/library/LocalDomain.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ActorContext.cpp b/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
index 2fa1d30..7ef0fd6 100644
--- a/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ActorContext.h b/src/corelibs/U2Lang/src/library/script/ActorContext.h
index 8ac8ac8..ff4f385 100644
--- a/src/corelibs/U2Lang/src/library/script/ActorContext.h
+++ b/src/corelibs/U2Lang/src/library/script/ActorContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
index 4d13102..669b080 100644
--- a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
+++ b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
index 8f458db..531467a 100644
--- a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
+++ b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
index 991e0c8..ac794b4 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
index ba578f8..d432514 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
+++ b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
index ffb937c..385d9d9 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
index 173db18..19f6fc0 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
+++ b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp b/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
index de76c61..2b3a357 100644
--- a/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
+++ b/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/library/script/SequencePrototype.h b/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
index 742fe47..e0ab8e7 100644
--- a/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
+++ b/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
index dcbb812..66e0522 100644
--- a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
index aa970b9..5464f3a 100644
--- a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
+++ b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Aliasing.cpp b/src/corelibs/U2Lang/src/model/Aliasing.cpp
index 5044998..b6bce80 100644
--- a/src/corelibs/U2Lang/src/model/Aliasing.cpp
+++ b/src/corelibs/U2Lang/src/model/Aliasing.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Aliasing.h b/src/corelibs/U2Lang/src/model/Aliasing.h
index cef8625..2630368 100644
--- a/src/corelibs/U2Lang/src/model/Aliasing.h
+++ b/src/corelibs/U2Lang/src/model/Aliasing.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Attribute.cpp b/src/corelibs/U2Lang/src/model/Attribute.cpp
index 51637fe..2eda7ea 100644
--- a/src/corelibs/U2Lang/src/model/Attribute.cpp
+++ b/src/corelibs/U2Lang/src/model/Attribute.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Attribute.h b/src/corelibs/U2Lang/src/model/Attribute.h
index e4a5f4e..7ee6d8f 100644
--- a/src/corelibs/U2Lang/src/model/Attribute.h
+++ b/src/corelibs/U2Lang/src/model/Attribute.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/AttributeRelation.cpp b/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
index a969028..8864515 100644
--- a/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
+++ b/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/AttributeRelation.h b/src/corelibs/U2Lang/src/model/AttributeRelation.h
index 58d9beb..7901357 100644
--- a/src/corelibs/U2Lang/src/model/AttributeRelation.h
+++ b/src/corelibs/U2Lang/src/model/AttributeRelation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Configuration.cpp b/src/corelibs/U2Lang/src/model/Configuration.cpp
index fa124d7..4c3200e 100644
--- a/src/corelibs/U2Lang/src/model/Configuration.cpp
+++ b/src/corelibs/U2Lang/src/model/Configuration.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Configuration.h b/src/corelibs/U2Lang/src/model/Configuration.h
index b5db0ab..9544bf7 100644
--- a/src/corelibs/U2Lang/src/model/Configuration.h
+++ b/src/corelibs/U2Lang/src/model/Configuration.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp b/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
index b6f1df4..db310d0 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
+++ b/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ConfigurationEditor.h b/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
index e09c597..1d8b830 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
+++ b/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ConfigurationValidator.h b/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
index 4c94a28..86bc616 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
+++ b/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Datatype.cpp b/src/corelibs/U2Lang/src/model/Datatype.cpp
index 0c62583..d3fee2a 100644
--- a/src/corelibs/U2Lang/src/model/Datatype.cpp
+++ b/src/corelibs/U2Lang/src/model/Datatype.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Datatype.h b/src/corelibs/U2Lang/src/model/Datatype.h
index 3ccbdd3..938f416 100644
--- a/src/corelibs/U2Lang/src/model/Datatype.h
+++ b/src/corelibs/U2Lang/src/model/Datatype.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp b/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
index 8d8320d..fed2608 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
+++ b/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/DbiDataHandler.h b/src/corelibs/U2Lang/src/model/DbiDataHandler.h
index 3cb2fe5..0d05816 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataHandler.h
+++ b/src/corelibs/U2Lang/src/model/DbiDataHandler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp b/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
index 6c8731c..c95ae75 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
+++ b/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/DbiDataStorage.h b/src/corelibs/U2Lang/src/model/DbiDataStorage.h
index ab5f1ac..3562deb 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataStorage.h
+++ b/src/corelibs/U2Lang/src/model/DbiDataStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Descriptor.cpp b/src/corelibs/U2Lang/src/model/Descriptor.cpp
index 4c36224..a837b93 100644
--- a/src/corelibs/U2Lang/src/model/Descriptor.cpp
+++ b/src/corelibs/U2Lang/src/model/Descriptor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Descriptor.h b/src/corelibs/U2Lang/src/model/Descriptor.h
index d977bce..30a53d4 100644
--- a/src/corelibs/U2Lang/src/model/Descriptor.h
+++ b/src/corelibs/U2Lang/src/model/Descriptor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp b/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
index 3e87fc5..aacf93f 100644
--- a/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
+++ b/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ExternalToolCfg.h b/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
index a7cd1a0..89a9b00 100644
--- a/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
+++ b/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp b/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
index 81f82ea..b7073a6 100644
--- a/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
+++ b/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/GrouperOutSlot.h b/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
index 9d1c6be..0a20a4a 100644
--- a/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
+++ b/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
index 5771af3..d9f9c21 100644
--- a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
index cb7a1f8..682770b 100644
--- a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
+++ b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
index 738e752..10b7f99 100644
--- a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
+++ b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
index 313bf5f..933e6c1 100644
--- a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
+++ b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBus.cpp b/src/corelibs/U2Lang/src/model/IntegralBus.cpp
index ba6698f..e41b7f6 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBus.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBus.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBus.h b/src/corelibs/U2Lang/src/model/IntegralBus.h
index 2ed99b6..9741929 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBus.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBus.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp b/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
index b48b1f0..cdfc9c7 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBusModel.h b/src/corelibs/U2Lang/src/model/IntegralBusModel.h
index ca9d02d..ad58280 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusModel.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBusModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBusType.cpp b/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
index efaabda..7044cf1 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/IntegralBusType.h b/src/corelibs/U2Lang/src/model/IntegralBusType.h
index ec53d79..48db3e1 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusType.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBusType.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Marker.cpp b/src/corelibs/U2Lang/src/model/Marker.cpp
index bce1d6a..fba7b8c 100644
--- a/src/corelibs/U2Lang/src/model/Marker.cpp
+++ b/src/corelibs/U2Lang/src/model/Marker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Marker.h b/src/corelibs/U2Lang/src/model/Marker.h
index 79fae45..2bddf71 100644
--- a/src/corelibs/U2Lang/src/model/Marker.h
+++ b/src/corelibs/U2Lang/src/model/Marker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp b/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
index 14e75e9..8e63db1 100644
--- a/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/MarkerAttribute.h b/src/corelibs/U2Lang/src/model/MarkerAttribute.h
index 856abf0..443a3fb 100644
--- a/src/corelibs/U2Lang/src/model/MarkerAttribute.h
+++ b/src/corelibs/U2Lang/src/model/MarkerAttribute.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/MessageMetadata.cpp b/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
index fd51345..71e2d19 100644
--- a/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
+++ b/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/MessageMetadata.h b/src/corelibs/U2Lang/src/model/MessageMetadata.h
index 8234a2e..bd46b4a 100644
--- a/src/corelibs/U2Lang/src/model/MessageMetadata.h
+++ b/src/corelibs/U2Lang/src/model/MessageMetadata.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Peer.h b/src/corelibs/U2Lang/src/model/Peer.h
index 1193369..5dc7dfa 100644
--- a/src/corelibs/U2Lang/src/model/Peer.h
+++ b/src/corelibs/U2Lang/src/model/Peer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Port.cpp b/src/corelibs/U2Lang/src/model/Port.cpp
index d45b7e5..bcb34b2 100644
--- a/src/corelibs/U2Lang/src/model/Port.cpp
+++ b/src/corelibs/U2Lang/src/model/Port.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Port.h b/src/corelibs/U2Lang/src/model/Port.h
index b90a4c4..b992355 100644
--- a/src/corelibs/U2Lang/src/model/Port.h
+++ b/src/corelibs/U2Lang/src/model/Port.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/PortRelation.h b/src/corelibs/U2Lang/src/model/PortRelation.h
index 5777d3e..b942126 100644
--- a/src/corelibs/U2Lang/src/model/PortRelation.h
+++ b/src/corelibs/U2Lang/src/model/PortRelation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QDConstraint.cpp b/src/corelibs/U2Lang/src/model/QDConstraint.cpp
index 15a956a..2293122 100644
--- a/src/corelibs/U2Lang/src/model/QDConstraint.cpp
+++ b/src/corelibs/U2Lang/src/model/QDConstraint.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QDConstraint.h b/src/corelibs/U2Lang/src/model/QDConstraint.h
index 7805082..4775737 100644
--- a/src/corelibs/U2Lang/src/model/QDConstraint.h
+++ b/src/corelibs/U2Lang/src/model/QDConstraint.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QDScheme.cpp b/src/corelibs/U2Lang/src/model/QDScheme.cpp
index b9f3fbc..f45550a 100644
--- a/src/corelibs/U2Lang/src/model/QDScheme.cpp
+++ b/src/corelibs/U2Lang/src/model/QDScheme.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QDScheme.h b/src/corelibs/U2Lang/src/model/QDScheme.h
index 74f64e4..b217207 100644
--- a/src/corelibs/U2Lang/src/model/QDScheme.h
+++ b/src/corelibs/U2Lang/src/model/QDScheme.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
index 3c8de2d..361afb2 100644
--- a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
index b6b47d1..9cb7fcb 100644
--- a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
+++ b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
index c7782d5..1d90db5 100644
--- a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
+++ b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
index 5bc7141..5597439 100644
--- a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
+++ b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/RunFileSystem.cpp b/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
index 0a84cfa..d13bcf3 100644
--- a/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
+++ b/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/RunFileSystem.h b/src/corelibs/U2Lang/src/model/RunFileSystem.h
index 0db7c57..ff29cf8 100644
--- a/src/corelibs/U2Lang/src/model/RunFileSystem.h
+++ b/src/corelibs/U2Lang/src/model/RunFileSystem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Schema.cpp b/src/corelibs/U2Lang/src/model/Schema.cpp
index 0085ebf..fd6443a 100644
--- a/src/corelibs/U2Lang/src/model/Schema.cpp
+++ b/src/corelibs/U2Lang/src/model/Schema.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/Schema.h b/src/corelibs/U2Lang/src/model/Schema.h
index cefb707..071b1e7 100644
--- a/src/corelibs/U2Lang/src/model/Schema.h
+++ b/src/corelibs/U2Lang/src/model/Schema.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
index 437f16c..55cec67 100644
--- a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
index 3bffe4a..cd081d7 100644
--- a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
+++ b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/SchemaConfig.h b/src/corelibs/U2Lang/src/model/SchemaConfig.h
index d2d9378..b2498c8 100644
--- a/src/corelibs/U2Lang/src/model/SchemaConfig.h
+++ b/src/corelibs/U2Lang/src/model/SchemaConfig.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowContext.cpp b/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
index 345f92d..d036dca 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowContext.h b/src/corelibs/U2Lang/src/model/WorkflowContext.h
index 9c3b502..3f23639 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowContext.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp b/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
index 34d251a..1248c4d 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowEnv.h b/src/corelibs/U2Lang/src/model/WorkflowEnv.h
index 5e6f42e..cc98797 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowEnv.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowEnv.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowManager.h b/src/corelibs/U2Lang/src/model/WorkflowManager.h
index e7d52e9..f366f92 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowManager.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
index 70092b4..dbd37fc 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
index 10f9fe5..cbbbe1e 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp b/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
index 7ad2e21..7452d9c 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/WorkflowTransport.h b/src/corelibs/U2Lang/src/model/WorkflowTransport.h
index 3d5ea0b..0bd229d 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowTransport.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowTransport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/Actor.cpp b/src/corelibs/U2Lang/src/model/actor/Actor.cpp
index bf1edd2..2708814 100644
--- a/src/corelibs/U2Lang/src/model/actor/Actor.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/Actor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/Actor.h b/src/corelibs/U2Lang/src/model/actor/Actor.h
index a86e326..14c5bb5 100644
--- a/src/corelibs/U2Lang/src/model/actor/Actor.h
+++ b/src/corelibs/U2Lang/src/model/actor/Actor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
index 2dcee9c..94bae65 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
index 8739e62..9ccdb71 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorDocument.h b/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
index 21493e4..4df0538 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
index 1aca97c..9e2b0ba 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
index 2fac604..98347ce 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
index 18022fc..619b95c 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
index bfe1e4b..115b788 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp b/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
index f598e69..ccb3cfb 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/actor/ActorValidator.h b/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
index fa7044e..48334fc 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
index cb5bf46..d88743d 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
index a8b29ab..4da6dbe 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
index 8a60098..ba43337 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
index 1afd588..77c0814 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
index 8d31d43..7216980 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
index 4083221..a4bf947 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
index d0fb351..798314a 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
index 2b98967..cf34a31 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
index 9f4bbc1..0984777 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
index 6a4a31f..34cc9a9 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
index d065cea..008a216 100644
--- a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
index 7798578..0ab5c3e 100644
--- a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
+++ b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
index d225420..637d1d9 100644
--- a/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/IdMapping.h b/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
index fdf651c..c6b9352 100644
--- a/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
index 47783ac..49341a5 100644
--- a/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/PortMapping.h b/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
index 8e3faf4..25d7108 100644
--- a/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
index bcaa74c..6e49bed 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
index bb3d45c..03f593d 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
+++ b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
index 0f1045b..fc90d3a 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
index 4f89157..1760900 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/Variable.cpp b/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
index 1db1617..a55a19f 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/Variable.h b/src/corelibs/U2Lang/src/model/wizard/Variable.h
index 677c909..e667745 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Variable.h
+++ b/src/corelibs/U2Lang/src/model/wizard/Variable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp b/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
index 3786dfb..f06e240 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/Wizard.h b/src/corelibs/U2Lang/src/model/wizard/Wizard.h
index 14bae39..979f1e1 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Wizard.h
+++ b/src/corelibs/U2Lang/src/model/wizard/Wizard.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp b/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
index 70ef8dc..70cea60 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/WizardPage.h b/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
index fae1b27..5e915db 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
index ae38f63..08e73ef 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
index ca9588c..5e4c106 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h b/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
index 2ec6dbd..d4ca8c5 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp b/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
index 94c8d95..bde97c4 100644
--- a/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
+++ b/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/run/WorkflowMonitor.h b/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
index 1b334c9..73b384f 100644
--- a/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
+++ b/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/AttributeInfo.cpp b/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
index 61392d6..ad68d1a 100644
--- a/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
+++ b/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/AttributeInfo.h b/src/corelibs/U2Lang/src/support/AttributeInfo.h
index 5e2963a..aa094b6 100644
--- a/src/corelibs/U2Lang/src/support/AttributeInfo.h
+++ b/src/corelibs/U2Lang/src/support/AttributeInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
index 67e40cc..e2c4aef 100644
--- a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
index 432c93f..60e389c 100644
--- a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp b/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
index 8c64689..3d24e99 100644
--- a/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
+++ b/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BaseNGSWorker.h b/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
index c8430fc..f8312f0 100644
--- a/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
+++ b/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
index 3f605b6..68e6a2e 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
index ccf5a4c..d8156df 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
index df081bc..e3aa999 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
index e2d4cd7..7ae0cfa 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
index 4b6da3c..38541d6 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
index 59fa4a3..a255ee1 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
index aa7548e..fed8f0a 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
index 37919b6..afe69b5 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp b/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
index 2970cf7..399c71f 100644
--- a/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
+++ b/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/CoreLibConstants.h b/src/corelibs/U2Lang/src/support/CoreLibConstants.h
index 9eefd94..ae91944 100644
--- a/src/corelibs/U2Lang/src/support/CoreLibConstants.h
+++ b/src/corelibs/U2Lang/src/support/CoreLibConstants.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
index fcb834c..a827bfb 100644
--- a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
+++ b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
index 2acb234..b0fc718 100644
--- a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
+++ b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp b/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
index a72287a..ca205c2 100644
--- a/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/IntegralBusUtils.h b/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
index 7a98b0a..967fa79 100644
--- a/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
+++ b/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
index 551067c..abe6059 100644
--- a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
+++ b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
index be9531b..021b4db 100644
--- a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
+++ b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/MarkerUtils.cpp b/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
index 0f289f8..8e282dd 100644
--- a/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/MarkerUtils.h b/src/corelibs/U2Lang/src/support/MarkerUtils.h
index 75f1a68..c023189 100644
--- a/src/corelibs/U2Lang/src/support/MarkerUtils.h
+++ b/src/corelibs/U2Lang/src/support/MarkerUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
index 22642e1..d3fc0be 100644
--- a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
+++ b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
index 5db68a0..a4c8f8e 100644
--- a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
+++ b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp b/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
index 798fa44..5f526e3 100644
--- a/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SchemaSerializer.h b/src/corelibs/U2Lang/src/support/SchemaSerializer.h
index 03f543a..fb9874e 100644
--- a/src/corelibs/U2Lang/src/support/SchemaSerializer.h
+++ b/src/corelibs/U2Lang/src/support/SchemaSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
index 90e392b..7e88e59 100644
--- a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
index 957e18a..0a742ab 100644
--- a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
+++ b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
index 46c3015..aaee837 100644
--- a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
+++ b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -170,8 +170,7 @@ void SimpleMSAWorkflow4GObjectTask::prepare() {
Task::ReportResult SimpleMSAWorkflow4GObjectTask::report() {
if (stateInfo.isCoR()) {
- delete userModStep;
- userModStep = NULL;
+ releaseModStep();
}
if (lock != NULL) {
@@ -182,8 +181,8 @@ Task::ReportResult SimpleMSAWorkflow4GObjectTask::report() {
lock = NULL;
}
CHECK_OP(stateInfo, ReportResult_Finished);
- CHECK_EXT(!obj.isNull(), setError(tr("Object '%1' removed").arg(docName)), ReportResult_Finished);
- CHECK_EXT(!obj->isStateLocked(), setError(tr("Object '%1' is locked").arg(docName)), ReportResult_Finished);
+ CHECK_EXT(!obj.isNull(), releaseModStep(tr("Object '%1' removed").arg(docName)), ReportResult_Finished);
+ CHECK_EXT(!obj->isStateLocked(), releaseModStep(tr("Object '%1' is locked").arg(docName)), ReportResult_Finished);
MAlignment res = getResult();
const MAlignment &originalAlignment = obj->getMAlignment();
@@ -191,12 +190,19 @@ Task::ReportResult SimpleMSAWorkflow4GObjectTask::report() {
res.setName(originalAlignment.getName());
obj->setMAlignment(res);
- delete userModStep;
- userModStep = NULL;
+ releaseModStep();
return ReportResult_Finished;
}
+void SimpleMSAWorkflow4GObjectTask::releaseModStep(const QString error) {
+ if (!error.isEmpty()) {
+ setError(tr("Object '%1' removed").arg(docName));
+ }
+ delete userModStep;
+ userModStep = NULL;
+}
+
MAlignment SimpleMSAWorkflow4GObjectTask::getResult() {
MAlignment res;
CHECK_OP(stateInfo, res);
diff --git a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
index 7360028..84828fd 100644
--- a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
+++ b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -104,6 +104,8 @@ public:
MAlignment getResult();
private:
+ void releaseModStep(const QString error = QString());
+
QPointer<MAlignmentObject> obj;
QPointer<StateLock> lock;
QString docName;
diff --git a/src/corelibs/U2Lang/src/support/SupportClass.cpp b/src/corelibs/U2Lang/src/support/SupportClass.cpp
index 5617292..f08665c 100644
--- a/src/corelibs/U2Lang/src/support/SupportClass.cpp
+++ b/src/corelibs/U2Lang/src/support/SupportClass.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SupportClass.h b/src/corelibs/U2Lang/src/support/SupportClass.h
index 5e5da66..2498f1e 100644
--- a/src/corelibs/U2Lang/src/support/SupportClass.h
+++ b/src/corelibs/U2Lang/src/support/SupportClass.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SupportStructures.cpp b/src/corelibs/U2Lang/src/support/SupportStructures.cpp
index 9ea4d3a..b59ad83 100644
--- a/src/corelibs/U2Lang/src/support/SupportStructures.cpp
+++ b/src/corelibs/U2Lang/src/support/SupportStructures.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/SupportStructures.h b/src/corelibs/U2Lang/src/support/SupportStructures.h
index e4f244a..cf486b7 100644
--- a/src/corelibs/U2Lang/src/support/SupportStructures.h
+++ b/src/corelibs/U2Lang/src/support/SupportStructures.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
index c0ac7bd..0697316 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
index 806ab7a..451093f 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
index f536066..c432303 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
index feeb355..a4f90f9 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
index 9164714..c3d17f2 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
index 25053f6..74b22c8 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
index 9dda420..1c52d87 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
index 022bd39..c4695ea 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
index d46cbcb..eb95038 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
index cab44ca..da3cc30 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
index 21f3765..87db258 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
index 9b179e8..9548f7a 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h b/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
index f4a908c..0598d37 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp b/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
index 0b5ef9a..17d89a1 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowRunTask.h b/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
index 572b9a4..c628ff6 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp b/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
index e47b6c4..928a1e4 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowSettings.h b/src/corelibs/U2Lang/src/support/WorkflowSettings.h
index 3beda92..94e0f45 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowSettings.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp b/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
index c6a57fb..d4a3343 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -93,7 +93,7 @@ QString WorkflowUtils::getRichDoc(const Descriptor& d) {
if(d.getDocumentation().isEmpty()) {
return QString("<b>%1</b>").arg(d.getDisplayName());
} else {
- return QString("<b>%1</b> : %2").arg(d.getDisplayName()).arg(d.getDocumentation());
+ return QString("<b>%1</b>: %2").arg(d.getDisplayName()).arg(d.getDocumentation());
}
}
}
diff --git a/src/corelibs/U2Lang/src/support/WorkflowUtils.h b/src/corelibs/U2Lang/src/support/WorkflowUtils.h
index a235133..dbf08a4 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowUtils.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
index 14b02ba..7846204 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
index 34f9033..913ed33 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
index 9b347e1..13916b1 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
index 5f19815..e4cff93 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
index 9682a7f..b52ba47 100644
--- a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
index 21962f5..1f82b7f 100644
--- a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
+++ b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Constants.cpp b/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
index 17fa19f..257f043 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Constants.h b/src/corelibs/U2Lang/src/support/serialize/Constants.h
index bbde2f7..a5b6084 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Constants.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Constants.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
index cfb3cc7..b8487c8 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
index 2825ff5..d5a0262 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
index 46bf1e9..0a02931 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
index 1477980..f15a836 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
index 934d530..ae1c156 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
index e469206..3db868c 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp b/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
index 18df51f..997b6a5 100644
--- a/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/OldUWL.h b/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
index c53e566..adaae42 100644
--- a/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
+++ b/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
index c985736..cde2f42 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
index bdaeb92..62dfa32 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Utils.cpp b/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
index aa284cb..d016c71 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/support/serialize/Utils.h b/src/corelibs/U2Lang/src/support/serialize/Utils.h
index 974dd61..0294347 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Utils.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Utils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
index 1abaa11..a8bfc84 100644
--- a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
+++ b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
index 99917dc..ff2a044 100644
--- a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
+++ b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
index 45314ff..a5c18cf 100644
--- a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
+++ b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
index 5cb08c5..26219fa 100644
--- a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
+++ b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
index 6d7d31b..4954cd5 100644
--- a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
+++ b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
index 9520f24..b14625d 100644
--- a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
+++ b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Lang/transl/english.ts b/src/corelibs/U2Lang/transl/english.ts
index 48fd522..36dbc13 100644
--- a/src/corelibs/U2Lang/transl/english.ts
+++ b/src/corelibs/U2Lang/transl/english.ts
@@ -1398,27 +1398,27 @@
<translation>Workflow process</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="586"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="587"/>
<source>Cannot start process '%1'</source>
<translation>Cannot start process '%1'</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="593"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="594"/>
<source>The process '%1' failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program</source>
<translation>The process '%1' failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="597"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="598"/>
<source>The process '%1' crashed some time after starting successfully</source>
<translation>The process '%1' crashed some time after starting successfully</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="601"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="602"/>
<source>Error occurred while reading from or writing to channel</source>
<translation>Error occurred while reading from or writing to channel</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="604"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="605"/>
<source>Unknown error occurred</source>
<translation>Unknown error occurred</translation>
</message>
@@ -1466,27 +1466,28 @@
<name>U2::SimpleMSAWorkflow4GObjectTask</name>
<message>
<location filename="../src/support/SimpleWorkflowTask.cpp" line="164"/>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="185"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="184"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="200"/>
<source>Object '%1' removed</source>
<translation>Object '%1' removed</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="186"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="185"/>
<source>Object '%1' is locked</source>
<translation>Object '%1' is locked</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="206"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="212"/>
<source>Result document not found!</source>
<translation>Result document not found!</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="207"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="213"/>
<source>Result document content not matched! %1</source>
<translation>Result document content not matched! %1</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="209"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="215"/>
<source>Result document contains no MSA! %1</source>
<translation>Result document contains no MSA! %1</translation>
</message>
diff --git a/src/corelibs/U2Lang/transl/russian.ts b/src/corelibs/U2Lang/transl/russian.ts
index a4c2cf3..87032e9 100644
--- a/src/corelibs/U2Lang/transl/russian.ts
+++ b/src/corelibs/U2Lang/transl/russian.ts
@@ -1398,27 +1398,27 @@
<translation>Процесс схемы</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="586"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="587"/>
<source>Cannot start process '%1'</source>
<translation>Cannot start process '%1'</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="593"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="594"/>
<source>The process '%1' failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program</source>
<translation>The process '%1' failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="597"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="598"/>
<source>The process '%1' crashed some time after starting successfully</source>
<translation>The process '%1' crashed some time after starting successfully</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="601"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="602"/>
<source>Error occurred while reading from or writing to channel</source>
<translation>Error occurred while reading from or writing to channel</translation>
</message>
<message>
- <location filename="../src/support/WorkflowRunTask.cpp" line="604"/>
+ <location filename="../src/support/WorkflowRunTask.cpp" line="605"/>
<source>Unknown error occurred</source>
<translation>Unknown error occurred</translation>
</message>
@@ -1466,27 +1466,28 @@
<name>U2::SimpleMSAWorkflow4GObjectTask</name>
<message>
<location filename="../src/support/SimpleWorkflowTask.cpp" line="164"/>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="185"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="184"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="200"/>
<source>Object '%1' removed</source>
<translation>Object '%1' removed</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="186"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="185"/>
<source>Object '%1' is locked</source>
<translation>Object '%1' is locked</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="206"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="212"/>
<source>Result document not found!</source>
<translation>Result document not found!</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="207"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="213"/>
<source>Result document content not matched! %1</source>
<translation>Result document content not matched! %1</translation>
</message>
<message>
- <location filename="../src/support/SimpleWorkflowTask.cpp" line="209"/>
+ <location filename="../src/support/SimpleWorkflowTask.cpp" line="215"/>
<source>Result document contains no MSA! %1</source>
<translation>Result document contains no MSA! %1</translation>
</message>
@@ -1604,7 +1605,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="48"/>
<source>Location of output data file. If this attribute is set, slot "Location" in port will not be used.</source>
- <translation>Путь до выходного файла данных. Если даный атрибут задан, то слот "Путь к файлу" порта не будет задействован.</translation>
+ <translation>путь до выходного файла данных. Если даный атрибут задан, то слот "Путь к файлу" порта не будет задействован.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="53"/>
@@ -1614,7 +1615,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="53"/>
<source>This suffix will be used for generating the output file name.</source>
- <translation>Этот суффикс будет использован для создания имени выходного файла.</translation>
+ <translation>этот суффикс будет использован для создания имени выходного файла.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="57"/>
@@ -1634,7 +1635,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="61"/>
<source>Place to store workflow results</source>
- <translation>Место для хранения результатов схемы</translation>
+ <translation>место для хранения результатов выполнения схемы</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="82"/>
@@ -1664,7 +1665,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="90"/>
<source>Document format of output file.</source>
- <translation>Формат выходного файла.</translation>
+ <translation>формат выходного файла.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="94"/>
@@ -1674,7 +1675,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="95"/>
<source>Accumulate all incoming data in one file or create separate files for each input.In the latter case, an incremental numerical suffix is added to the file name.</source>
- <translation>Объединить все данные в один файли или создать отдельные файлы. В последнем случае к имени файлов будет добавлен порядковый суффикс.</translation>
+ <translation>объединить все данные в один файл или создать отдельные файлы. В последнем случае к имени файлов будет добавлен порядковый суффикс.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="100"/>
@@ -1684,7 +1685,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="100"/>
<source>Split each incoming sequence on several parts.</source>
- <translation>Разделить каждую входную последовательность на несколько частей.</translation>
+ <translation>разделить каждую входную последовательность на несколько частей.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="104"/>
@@ -1694,7 +1695,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="104"/>
<source>Reads the input file line by line.</source>
- <translation>Выдает на выходной порт каждую строку входного файла по отдельности.</translation>
+ <translation>этот параметр выдает на выходной порт каждую строку входного файла по отдельности.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="108"/>
@@ -1704,7 +1705,7 @@
<message>
<location filename="../src/library/BaseAttributes.cpp" line="108"/>
<source>If a target file already exists, you can specify how it should be handled: either overwritten, renamed or appended (if supported by file format). If Rename option is chosen existing file will be renamed.</source>
- <translation>Если указанный файл уже существует, вы можете указать как его обработать: переписать, переименовать или добавить к нему данные (если поддерживается форматом). Если выбрана опция переименовать, будет переименован существующий файл.</translation>
+ <translation>если указанный файл уже существует, вы можете указать как его обработать (переписать, переименовать или добавить к нему данные, если формат файла допускает добавление данных). Если выбрана опция переименовать, существующий файл будет переименован.</translation>
</message>
<message>
<location filename="../src/library/BaseAttributes.cpp" line="114"/>
diff --git a/src/corelibs/U2Private/src/AppContextImpl.cpp b/src/corelibs/U2Private/src/AppContextImpl.cpp
index 97464d8..5a28d6c 100644
--- a/src/corelibs/U2Private/src/AppContextImpl.cpp
+++ b/src/corelibs/U2Private/src/AppContextImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/AppContextImpl.h b/src/corelibs/U2Private/src/AppContextImpl.h
index bf03d74..4709ad8 100644
--- a/src/corelibs/U2Private/src/AppContextImpl.h
+++ b/src/corelibs/U2Private/src/AppContextImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -98,6 +98,7 @@ public:
cfr = NULL;
welcomePageActionRegistry = NULL;
projectFilterTaskRegistry = NULL;
+ pf = NULL;
}
~AppContextImpl();
@@ -172,6 +173,8 @@ public:
void setScriptingToolRegistry( ScriptingToolRegistry* _str) { assert( str == NULL || _str == NULL ); str = _str;}
+ void setPasteFactory( PasteFactory* _pf) { assert( pf == NULL || _pf == NULL ); pf = _pf;}
+
void setProtocolInfoRegistry( ProtocolInfoRegistry * pr ) { assert( NULL == protocolInfoRegistry || NULL == pr );
protocolInfoRegistry = pr; }
@@ -332,7 +335,7 @@ public:
workingDirectoryPath = path;
}
- void setGUITestBase(GUITestBase *_tb) {assert(tb == NULL || _tb == NULL); tb = _tb;}
+ void setGUITestBase(UGUITestBase *_tb) {assert(tb == NULL || _tb == NULL); tb = _tb;}
static AppContextImpl* getApplicationContext();
@@ -392,7 +395,7 @@ protected:
virtual CDSearchFactoryRegistry* _getCDSFactoryRegistry() const { return cdsfr; }
virtual U2DbiRegistry * _getDbiRegistry() const { return dbiRegistry; }
virtual UdrSchemaRegistry * _getUdrSchemaRegistry() const { return udrSchemaRegistry; }
- virtual GUITestBase* _getGUITestBase() const {return tb;}
+ virtual UGUITestBase* _getGUITestBase() const {return tb;}
virtual SplicedAlignmentTaskRegistry* _getSplicedAlignmentTaskRegistry() const { return splicedAlignmentTaskRegistry; }
virtual OPCommonWidgetFactoryRegistry* _getOPCommonWidgetFactoryRegistry() const { return opCommonWidgetFactoryRegistry; }
virtual OPWidgetFactoryRegistry* _getOPWidgetFactoryRegistry() const { return opWidgetFactoryRegistry; }
@@ -406,6 +409,7 @@ protected:
virtual ConvertFactoryRegistry* _getConvertFactoryRegistry() const { return cfr; }
virtual IdRegistry<WelcomePageAction>* _getWelcomePageActionRegistry() const { return welcomePageActionRegistry; }
virtual ProjectFilterTaskRegistry * _getProjectFilterTaskRegistry() const { return projectFilterTaskRegistry; }
+ virtual PasteFactory * _getPasteFactory() const { return pf; }
virtual void _registerGlobalObject(AppGlobalObject* go);
virtual void _unregisterGlobalObject(const QString& id);
@@ -462,13 +466,14 @@ private:
DataBaseRegistry* dataBaseRegistry;
ExternalToolRegistry * externalToolRegistry;
RepeatFinderTaskFactoryRegistry* rfr;
+ PasteFactory* pf;
QDActorPrototypeRegistry* qdafr;
CDSearchFactoryRegistry* cdsfr;
StructuralAlignmentAlgorithmRegistry* saar;
AutoAnnotationsSupport* aaSupport;
U2DbiRegistry *dbiRegistry;
UdrSchemaRegistry *udrSchemaRegistry;
- GUITestBase *tb;
+ UGUITestBase *tb;
SplicedAlignmentTaskRegistry* splicedAlignmentTaskRegistry;
OPCommonWidgetFactoryRegistry* opCommonWidgetFactoryRegistry;
OPWidgetFactoryRegistry* opWidgetFactoryRegistry;
diff --git a/src/corelibs/U2Private/src/AppSettingsImpl.cpp b/src/corelibs/U2Private/src/AppSettingsImpl.cpp
index 3e95444..2c5335c 100644
--- a/src/corelibs/U2Private/src/AppSettingsImpl.cpp
+++ b/src/corelibs/U2Private/src/AppSettingsImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/AppSettingsImpl.h b/src/corelibs/U2Private/src/AppSettingsImpl.h
index b4eaccf..92a248d 100644
--- a/src/corelibs/U2Private/src/AppSettingsImpl.h
+++ b/src/corelibs/U2Private/src/AppSettingsImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/ConsoleLogDriver.cpp b/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
index bfa3ccf..cb86b54 100644
--- a/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
+++ b/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/ConsoleLogDriver.h b/src/corelibs/U2Private/src/ConsoleLogDriver.h
index e9783a1..1a4a19c 100644
--- a/src/corelibs/U2Private/src/ConsoleLogDriver.h
+++ b/src/corelibs/U2Private/src/ConsoleLogDriver.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/CredentialsAskerCli.cpp b/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
index d68cce4..38714f7 100644
--- a/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
+++ b/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/CredentialsAskerCli.h b/src/corelibs/U2Private/src/CredentialsAskerCli.h
index e4abb2e..04d88c7 100644
--- a/src/corelibs/U2Private/src/CredentialsAskerCli.h
+++ b/src/corelibs/U2Private/src/CredentialsAskerCli.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
index bbba903..53327e1 100644
--- a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
index c19daf3..e246663 100644
--- a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
+++ b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
index 6f0c501..8dca50e 100644
--- a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
index 77b2d7d..a96e0dd 100644
--- a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
+++ b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/LogSettings.cpp b/src/corelibs/U2Private/src/LogSettings.cpp
index 3f89099..842fda8 100644
--- a/src/corelibs/U2Private/src/LogSettings.cpp
+++ b/src/corelibs/U2Private/src/LogSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/LogSettings.h b/src/corelibs/U2Private/src/LogSettings.h
index bd52466..13d9ba7 100644
--- a/src/corelibs/U2Private/src/LogSettings.h
+++ b/src/corelibs/U2Private/src/LogSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/PluginDescriptor.cpp b/src/corelibs/U2Private/src/PluginDescriptor.cpp
index f5dbe76..5522344 100644
--- a/src/corelibs/U2Private/src/PluginDescriptor.cpp
+++ b/src/corelibs/U2Private/src/PluginDescriptor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/PluginDescriptor.h b/src/corelibs/U2Private/src/PluginDescriptor.h
index 57758fd..402d189 100644
--- a/src/corelibs/U2Private/src/PluginDescriptor.h
+++ b/src/corelibs/U2Private/src/PluginDescriptor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/PluginSupportImpl.cpp b/src/corelibs/U2Private/src/PluginSupportImpl.cpp
index 6775302..e67e526 100644
--- a/src/corelibs/U2Private/src/PluginSupportImpl.cpp
+++ b/src/corelibs/U2Private/src/PluginSupportImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/PluginSupportImpl.h b/src/corelibs/U2Private/src/PluginSupportImpl.h
index 7714e32..b5d20b5 100644
--- a/src/corelibs/U2Private/src/PluginSupportImpl.h
+++ b/src/corelibs/U2Private/src/PluginSupportImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp b/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
index 0bb07bc..9f6e585 100644
--- a/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/ServiceRegistryImpl.h b/src/corelibs/U2Private/src/ServiceRegistryImpl.h
index 2c914f1..985b312 100644
--- a/src/corelibs/U2Private/src/ServiceRegistryImpl.h
+++ b/src/corelibs/U2Private/src/ServiceRegistryImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/SettingsImpl.cpp b/src/corelibs/U2Private/src/SettingsImpl.cpp
index e844aa0..56d9f92 100644
--- a/src/corelibs/U2Private/src/SettingsImpl.cpp
+++ b/src/corelibs/U2Private/src/SettingsImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/SettingsImpl.h b/src/corelibs/U2Private/src/SettingsImpl.h
index f62bdf3..d5dd4fa 100644
--- a/src/corelibs/U2Private/src/SettingsImpl.h
+++ b/src/corelibs/U2Private/src/SettingsImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/SleepPreventerMac.cpp b/src/corelibs/U2Private/src/SleepPreventerMac.cpp
index d3a06a0..ea925b0 100644
--- a/src/corelibs/U2Private/src/SleepPreventerMac.cpp
+++ b/src/corelibs/U2Private/src/SleepPreventerMac.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/SleepPreventerMac.h b/src/corelibs/U2Private/src/SleepPreventerMac.h
index 1bce26d..1d53d96 100644
--- a/src/corelibs/U2Private/src/SleepPreventerMac.h
+++ b/src/corelibs/U2Private/src/SleepPreventerMac.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp b/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
index 453c176..a292bcb 100644
--- a/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
+++ b/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/TaskSchedulerImpl.h b/src/corelibs/U2Private/src/TaskSchedulerImpl.h
index 0151db5..f0cfbf4 100644
--- a/src/corelibs/U2Private/src/TaskSchedulerImpl.h
+++ b/src/corelibs/U2Private/src/TaskSchedulerImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
index d5a829e..eba6e01 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandler.h b/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
index a82e2fd..0e20a4b 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
index 00ed5ec..7b04a08 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
@@ -1,121 +1,135 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <U2Core/AppContext.h>
-#include <U2Core/TmpDirChecker.h>
-#include <U2Core/U2DbiRegistry.h>
-#include <U2Core/U2OpStatusUtils.h>
-#include <U2Core/U2SafePoints.h>
-
-#include "CrashHandlerArgsHelper.h"
-
-namespace U2 {
-
-const QString CrashHandlerArgsHelper::SESSION_DB_FILE_ARG = "-d";
-const QString CrashHandlerArgsHelper::DUMP_FILE_ARG = "-dump";
-const QString CrashHandlerArgsHelper::REPORT_FILE_ARG = "-f";
-
-CrashHandlerArgsHelper::CrashHandlerArgsHelper()
- : useFile(false)
-{
- U2OpStatusImpl os;
- reportUrl = findFilePathToWrite(os);
- CHECK_OP(os, );
-
- file.setFileName(reportUrl);
- useFile = file.open(QIODevice::WriteOnly);
-
- shutdownSessionDatabase();
-}
-
-CrashHandlerArgsHelper::~CrashHandlerArgsHelper() {
- if (file.isOpen()) {
- file.close();
- }
-}
-
-int CrashHandlerArgsHelper::getMaxReportSize() const {
- if (useFile) {
- return MAX_FILE_LOG;
- }
- return MAX_PLAIN_LOG;
-}
-
-QStringList CrashHandlerArgsHelper::getArguments() const {
- QStringList args;
- if (!databaseUrl.isEmpty()) {
- args << SESSION_DB_FILE_ARG << databaseUrl;
- }
- if (!dumpUrl.isEmpty()) {
- args << DUMP_FILE_ARG << dumpUrl;
- }
- if (useFile) {
- args << REPORT_FILE_ARG << reportUrl;
- } else {
- args << report.toUtf8().toBase64();
- }
- return args;
-}
-
-void CrashHandlerArgsHelper::setReportData(const QString &data) {
- if (useFile) {
- QByteArray bytes = data.toUtf8();
- file.write(bytes);
- file.close();
- } else {
- report = data;
- }
-}
-
-void CrashHandlerArgsHelper::setDumpUrl(const QString &url) {
- dumpUrl = url;
-}
-
-QString CrashHandlerArgsHelper::findTempDir(U2OpStatus &os) {
- if (TmpDirChecker::checkWritePermissions(QDir::tempPath())) {
- return QDir::tempPath();
- }
- if (TmpDirChecker::checkWritePermissions(QDir::homePath())) {
- return QDir::homePath();
- }
- os.setError("No accessible dir");
- return "";
-}
-
-QString CrashHandlerArgsHelper::findFilePathToWrite(U2OpStatus &os) {
- QString dirPath = findTempDir(os);
- CHECK_OP(os, "");
-
- return TmpDirChecker::getNewFilePath(dirPath, "crash_report");
-}
-
-void CrashHandlerArgsHelper::shutdownSessionDatabase() {
- U2DbiRegistry *dbiReg = AppContext::getDbiRegistry();
- CHECK(NULL != dbiReg, );
-
- U2OpStatusImpl os;
- const QString url = dbiReg->shutdownSessionDbi(os);
- if (!os.hasError()) {
- databaseUrl = url;
- }
-}
-
-} // namespace U2
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <U2Core/AppContext.h>
+#include <U2Core/CMDLineCoreOptions.h>
+#include <U2Core/CMDLineRegistry.h>
+#include <U2Core/TmpDirChecker.h>
+#include <U2Core/U2DbiRegistry.h>
+#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2SafePoints.h>
+
+#include "CrashHandlerArgsHelper.h"
+
+namespace U2 {
+
+const QString CrashHandlerArgsHelper::SESSION_DB_FILE_ARG = "-d";
+const QString CrashHandlerArgsHelper::DUMP_FILE_ARG = "-dump";
+const QString CrashHandlerArgsHelper::REPORT_FILE_ARG = "-f";
+const QString CrashHandlerArgsHelper::SILENT_SEND_FILE_ARG = "--silent-sending";
+const QString CrashHandlerArgsHelper::FAILED_TEST_FILE_ARG = "--failed-test";
+
+CrashHandlerArgsHelper::CrashHandlerArgsHelper()
+ : useFile(false)
+{
+ U2OpStatusImpl os;
+ reportUrl = findFilePathToWrite(os);
+ CHECK_OP(os, );
+
+ file.setFileName(reportUrl);
+ useFile = file.open(QIODevice::WriteOnly);
+
+ shutdownSessionDatabase();
+}
+
+CrashHandlerArgsHelper::~CrashHandlerArgsHelper() {
+ if (file.isOpen()) {
+ file.close();
+ }
+}
+
+int CrashHandlerArgsHelper::getMaxReportSize() const {
+ if (useFile) {
+ return MAX_FILE_LOG;
+ }
+ return MAX_PLAIN_LOG;
+}
+
+QStringList CrashHandlerArgsHelper::getArguments() const {
+ QStringList args;
+ if (!databaseUrl.isEmpty()) {
+ args << SESSION_DB_FILE_ARG << databaseUrl;
+ }
+ if (!dumpUrl.isEmpty()) {
+ args << DUMP_FILE_ARG << dumpUrl;
+ }
+ if (useFile) {
+ args << REPORT_FILE_ARG << reportUrl;
+ } else {
+ args << report.toUtf8().toBase64();
+ }
+
+ if (qgetenv("UGENE_GUI_TEST").toInt() == 1) {
+ CMDLineRegistry* cmdLine = AppContext::getCMDLineRegistry();
+ if (NULL != cmdLine) {
+ QString testName = cmdLine->getParameterValue(CMDLineCoreOptions::LAUNCH_GUI_TEST);
+ args << SILENT_SEND_FILE_ARG;
+ args << FAILED_TEST_FILE_ARG << testName;
+ }
+ }
+
+ return args;
+}
+
+void CrashHandlerArgsHelper::setReportData(const QString &data) {
+ if (useFile) {
+ QByteArray bytes = data.toUtf8();
+ file.write(bytes);
+ file.close();
+ } else {
+ report = data;
+ }
+}
+
+void CrashHandlerArgsHelper::setDumpUrl(const QString &url) {
+ dumpUrl = url;
+}
+
+QString CrashHandlerArgsHelper::findTempDir(U2OpStatus &os) {
+ if (TmpDirChecker::checkWritePermissions(QDir::tempPath())) {
+ return QDir::tempPath();
+ }
+ if (TmpDirChecker::checkWritePermissions(QDir::homePath())) {
+ return QDir::homePath();
+ }
+ os.setError("No accessible dir");
+ return "";
+}
+
+QString CrashHandlerArgsHelper::findFilePathToWrite(U2OpStatus &os) {
+ QString dirPath = findTempDir(os);
+ CHECK_OP(os, "");
+
+ return TmpDirChecker::getNewFilePath(dirPath, "crash_report");
+}
+
+void CrashHandlerArgsHelper::shutdownSessionDatabase() {
+ U2DbiRegistry *dbiReg = AppContext::getDbiRegistry();
+ CHECK(NULL != dbiReg, );
+
+ U2OpStatusImpl os;
+ const QString url = dbiReg->shutdownSessionDbi(os);
+ if (!os.hasError()) {
+ databaseUrl = url;
+ }
+}
+
+} // namespace U2
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h
index 255e95d..83d894f 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,6 +57,8 @@ private:
static const QString REPORT_FILE_ARG;
static const int MAX_PLAIN_LOG = 70;
static const int MAX_FILE_LOG = 500;
+ static const QString SILENT_SEND_FILE_ARG;
+ static const QString FAILED_TEST_FILE_ARG;
};
} // namespace U2
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
index 88f4444..831e3d8 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
index a0ec17b..29d6563 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
index 8c18704..1c3f59f 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
index 44c4634..90dd9ef 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
index 4ec5db6..ab1b18a 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
index f8bcfc9..d0e2e81 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
index 2602260..6daccb1 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
index 1fa22e0..a8759de 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
index ec1289e..fa3e997 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
index 815ada9..5d56060 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp b/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
index a2e93ef..d177ab8 100644
--- a/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Private/src/crash_handler/StackWalker.h b/src/corelibs/U2Private/src/crash_handler/StackWalker.h
index 5636f4b..c3de9f7 100644
--- a/src/corelibs/U2Private/src/crash_handler/StackWalker.h
+++ b/src/corelibs/U2Private/src/crash_handler/StackWalker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/DistributedComputingUtil.cpp b/src/corelibs/U2Remote/src/DistributedComputingUtil.cpp
index 2dd67eb..a0778d7 100644
--- a/src/corelibs/U2Remote/src/DistributedComputingUtil.cpp
+++ b/src/corelibs/U2Remote/src/DistributedComputingUtil.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/DistributedComputingUtil.h b/src/corelibs/U2Remote/src/DistributedComputingUtil.h
index 3409688..1d0df91 100644
--- a/src/corelibs/U2Remote/src/DistributedComputingUtil.h
+++ b/src/corelibs/U2Remote/src/DistributedComputingUtil.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/PingTask.cpp b/src/corelibs/U2Remote/src/PingTask.cpp
index 453eea3..2087091 100644
--- a/src/corelibs/U2Remote/src/PingTask.cpp
+++ b/src/corelibs/U2Remote/src/PingTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/PingTask.h b/src/corelibs/U2Remote/src/PingTask.h
index c06ee26..e1bda78 100644
--- a/src/corelibs/U2Remote/src/PingTask.h
+++ b/src/corelibs/U2Remote/src/PingTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/ProtocolInfo.cpp b/src/corelibs/U2Remote/src/ProtocolInfo.cpp
index 467acfd..0d4d480 100644
--- a/src/corelibs/U2Remote/src/ProtocolInfo.cpp
+++ b/src/corelibs/U2Remote/src/ProtocolInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/ProtocolInfo.h b/src/corelibs/U2Remote/src/ProtocolInfo.h
index d009bee..2a3c418 100644
--- a/src/corelibs/U2Remote/src/ProtocolInfo.h
+++ b/src/corelibs/U2Remote/src/ProtocolInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/ProtocolUI.cpp b/src/corelibs/U2Remote/src/ProtocolUI.cpp
index dacde89..9523fb1 100644
--- a/src/corelibs/U2Remote/src/ProtocolUI.cpp
+++ b/src/corelibs/U2Remote/src/ProtocolUI.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/ProtocolUI.h b/src/corelibs/U2Remote/src/ProtocolUI.h
index bb96471..3c68d66 100644
--- a/src/corelibs/U2Remote/src/ProtocolUI.h
+++ b/src/corelibs/U2Remote/src/ProtocolUI.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachine.cpp b/src/corelibs/U2Remote/src/RemoteMachine.cpp
index f149701..4ab4bea 100644
--- a/src/corelibs/U2Remote/src/RemoteMachine.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachine.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachine.h b/src/corelibs/U2Remote/src/RemoteMachine.h
index 23f55ce..f3f6172 100644
--- a/src/corelibs/U2Remote/src/RemoteMachine.h
+++ b/src/corelibs/U2Remote/src/RemoteMachine.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitor.cpp b/src/corelibs/U2Remote/src/RemoteMachineMonitor.cpp
index 3ebbc42..c0f6b2d 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitor.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitor.h b/src/corelibs/U2Remote/src/RemoteMachineMonitor.h
index f2385c3..40c01ff 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitor.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.cpp b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.cpp
index 1327bad..f200fd1 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.h b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.h
index fca866c..5d727ef 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.cpp b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.cpp
index 4882e06..33d1c17 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.h b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.h
index aeaafaa..7367d44 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineMonitorDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.cpp b/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.cpp
index a198a26..3aaeb00 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.h b/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.h
index a634415..b9c6073 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineScanDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineScanner.cpp b/src/corelibs/U2Remote/src/RemoteMachineScanner.cpp
index e318b7c..3662416 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineScanner.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineScanner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineScanner.h b/src/corelibs/U2Remote/src/RemoteMachineScanner.h
index 9157148..d24165d 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineScanner.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineScanner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.cpp b/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.cpp
index 5b7b1ac..45f472f 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.h b/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.h
index 3d02f12..a3c7cca 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineTasks.cpp b/src/corelibs/U2Remote/src/RemoteMachineTasks.cpp
index 4f36261..22bbbbe 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineTasks.cpp
+++ b/src/corelibs/U2Remote/src/RemoteMachineTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteMachineTasks.h b/src/corelibs/U2Remote/src/RemoteMachineTasks.h
index 4a06093..30649b8 100644
--- a/src/corelibs/U2Remote/src/RemoteMachineTasks.h
+++ b/src/corelibs/U2Remote/src/RemoteMachineTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.cpp b/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.cpp
index 9d501e7..54107c8 100644
--- a/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.cpp
+++ b/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.h b/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.h
index e1fb8fc..da989ad 100644
--- a/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.h
+++ b/src/corelibs/U2Remote/src/RemoteWorkflowRunTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/Serializable.cpp b/src/corelibs/U2Remote/src/Serializable.cpp
index ae78100..ec50430 100644
--- a/src/corelibs/U2Remote/src/Serializable.cpp
+++ b/src/corelibs/U2Remote/src/Serializable.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/Serializable.h b/src/corelibs/U2Remote/src/Serializable.h
index dd5dbff..8d0db21 100644
--- a/src/corelibs/U2Remote/src/Serializable.h
+++ b/src/corelibs/U2Remote/src/Serializable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/SerializeUtils.cpp b/src/corelibs/U2Remote/src/SerializeUtils.cpp
index 365245b..841cd5a 100644
--- a/src/corelibs/U2Remote/src/SerializeUtils.cpp
+++ b/src/corelibs/U2Remote/src/SerializeUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/SerializeUtils.h b/src/corelibs/U2Remote/src/SerializeUtils.h
index c002aa1..380ef9b 100644
--- a/src/corelibs/U2Remote/src/SerializeUtils.h
+++ b/src/corelibs/U2Remote/src/SerializeUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/SynchHttp.cpp b/src/corelibs/U2Remote/src/SynchHttp.cpp
index a9b886e..307882f 100644
--- a/src/corelibs/U2Remote/src/SynchHttp.cpp
+++ b/src/corelibs/U2Remote/src/SynchHttp.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/SynchHttp.h b/src/corelibs/U2Remote/src/SynchHttp.h
index 4d3be6b..62e08d8 100644
--- a/src/corelibs/U2Remote/src/SynchHttp.h
+++ b/src/corelibs/U2Remote/src/SynchHttp.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Remote/src/TaskDistributor.h b/src/corelibs/U2Remote/src/TaskDistributor.h
index 027328a..f32f1b9 100644
--- a/src/corelibs/U2Remote/src/TaskDistributor.h
+++ b/src/corelibs/U2Remote/src/TaskDistributor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/CommonDbi.cpp b/src/corelibs/U2Script/src/CommonDbi.cpp
index ae95c2f..0ab39a0 100644
--- a/src/corelibs/U2Script/src/CommonDbi.cpp
+++ b/src/corelibs/U2Script/src/CommonDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/CommonDbi.h b/src/corelibs/U2Script/src/CommonDbi.h
index 35aa620..55a8e1d 100644
--- a/src/corelibs/U2Script/src/CommonDbi.h
+++ b/src/corelibs/U2Script/src/CommonDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/FormatDetection.cpp b/src/corelibs/U2Script/src/FormatDetection.cpp
index 5afa39f..b0edfb2 100644
--- a/src/corelibs/U2Script/src/FormatDetection.cpp
+++ b/src/corelibs/U2Script/src/FormatDetection.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/FormatDetection.h b/src/corelibs/U2Script/src/FormatDetection.h
index 91ced79..6f02056 100644
--- a/src/corelibs/U2Script/src/FormatDetection.h
+++ b/src/corelibs/U2Script/src/FormatDetection.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/SchemeHandle.cpp b/src/corelibs/U2Script/src/SchemeHandle.cpp
index a27be11..7d9b4c3 100644
--- a/src/corelibs/U2Script/src/SchemeHandle.cpp
+++ b/src/corelibs/U2Script/src/SchemeHandle.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/SchemeHandle.h b/src/corelibs/U2Script/src/SchemeHandle.h
index 1b55e3d..7d62055 100644
--- a/src/corelibs/U2Script/src/SchemeHandle.h
+++ b/src/corelibs/U2Script/src/SchemeHandle.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/SchemeWrapper.cpp b/src/corelibs/U2Script/src/SchemeWrapper.cpp
index 095ee77..0b1a4a3 100644
--- a/src/corelibs/U2Script/src/SchemeWrapper.cpp
+++ b/src/corelibs/U2Script/src/SchemeWrapper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/SchemeWrapper.h b/src/corelibs/U2Script/src/SchemeWrapper.h
index a2cac7b..1d5893d 100644
--- a/src/corelibs/U2Script/src/SchemeWrapper.h
+++ b/src/corelibs/U2Script/src/SchemeWrapper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/TextConversionUtils.cpp b/src/corelibs/U2Script/src/TextConversionUtils.cpp
index 602af73..7118353 100644
--- a/src/corelibs/U2Script/src/TextConversionUtils.cpp
+++ b/src/corelibs/U2Script/src/TextConversionUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/TextConversionUtils.h b/src/corelibs/U2Script/src/TextConversionUtils.h
index 7ecbe57..c0e782c 100644
--- a/src/corelibs/U2Script/src/TextConversionUtils.h
+++ b/src/corelibs/U2Script/src/TextConversionUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/U2Script.cpp b/src/corelibs/U2Script/src/U2Script.cpp
index 94eeacb..71ccd22 100644
--- a/src/corelibs/U2Script/src/U2Script.cpp
+++ b/src/corelibs/U2Script/src/U2Script.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/U2Script.h b/src/corelibs/U2Script/src/U2Script.h
index fb23ca8..b3659e5 100644
--- a/src/corelibs/U2Script/src/U2Script.h
+++ b/src/corelibs/U2Script/src/U2Script.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/UgeneContextWrapper.cpp b/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
index 2431533..bfedc72 100644
--- a/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
+++ b/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/UgeneContextWrapper.h b/src/corelibs/U2Script/src/UgeneContextWrapper.h
index 9bd027d..756fd47 100644
--- a/src/corelibs/U2Script/src/UgeneContextWrapper.h
+++ b/src/corelibs/U2Script/src/UgeneContextWrapper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/WorkflowElementFacade.cpp b/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
index e3212a8..9092dad 100644
--- a/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
+++ b/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/WorkflowElementFacade.h b/src/corelibs/U2Script/src/WorkflowElementFacade.h
index 6e9bb2c..39e04ad 100644
--- a/src/corelibs/U2Script/src/WorkflowElementFacade.h
+++ b/src/corelibs/U2Script/src/WorkflowElementFacade.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/globals.cpp b/src/corelibs/U2Script/src/globals.cpp
index ff98a53..0357724 100644
--- a/src/corelibs/U2Script/src/globals.cpp
+++ b/src/corelibs/U2Script/src/globals.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/globals.h b/src/corelibs/U2Script/src/globals.h
index 92ea3a2..942e9fa 100644
--- a/src/corelibs/U2Script/src/globals.h
+++ b/src/corelibs/U2Script/src/globals.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/ActorWrap.cpp b/src/corelibs/U2Script/src/js/ActorWrap.cpp
index 6df214d..8878eb5 100644
--- a/src/corelibs/U2Script/src/js/ActorWrap.cpp
+++ b/src/corelibs/U2Script/src/js/ActorWrap.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/ActorWrap.h b/src/corelibs/U2Script/src/js/ActorWrap.h
index cc2f392..9f83b97 100644
--- a/src/corelibs/U2Script/src/js/ActorWrap.h
+++ b/src/corelibs/U2Script/src/js/ActorWrap.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp b/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
index c56d3f1..2f277cb 100644
--- a/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
+++ b/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/DebugStatusWrap.h b/src/corelibs/U2Script/src/js/DebugStatusWrap.h
index 0b98d61..e423999 100644
--- a/src/corelibs/U2Script/src/js/DebugStatusWrap.h
+++ b/src/corelibs/U2Script/src/js/DebugStatusWrap.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/JsContext.cpp b/src/corelibs/U2Script/src/js/JsContext.cpp
index 2c2aac6..42e3d05 100644
--- a/src/corelibs/U2Script/src/js/JsContext.cpp
+++ b/src/corelibs/U2Script/src/js/JsContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/JsContext.h b/src/corelibs/U2Script/src/js/JsContext.h
index 05f20f5..61d05d3 100644
--- a/src/corelibs/U2Script/src/js/JsContext.h
+++ b/src/corelibs/U2Script/src/js/JsContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/JsScheduler.cpp b/src/corelibs/U2Script/src/js/JsScheduler.cpp
index 97ae198..9a99359 100644
--- a/src/corelibs/U2Script/src/js/JsScheduler.cpp
+++ b/src/corelibs/U2Script/src/js/JsScheduler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/JsScheduler.h b/src/corelibs/U2Script/src/js/JsScheduler.h
index e0425b2..fc1f65a 100644
--- a/src/corelibs/U2Script/src/js/JsScheduler.h
+++ b/src/corelibs/U2Script/src/js/JsScheduler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/NodeApiUtils.cpp b/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
index 1fc6db9..761b0d1 100644
--- a/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
+++ b/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/js/NodeApiUtils.h b/src/corelibs/U2Script/src/js/NodeApiUtils.h
index a3398d5..5413d54 100644
--- a/src/corelibs/U2Script/src/js/NodeApiUtils.h
+++ b/src/corelibs/U2Script/src/js/NodeApiUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/src/python/u2py_internals.c b/src/corelibs/U2Script/src/python/u2py_internals.c
index 9f8d3d2..15cb940 100644
--- a/src/corelibs/U2Script/src/python/u2py_internals.c
+++ b/src/corelibs/U2Script/src/python/u2py_internals.c
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Script/transl/english.ts b/src/corelibs/U2Script/transl/english.ts
index 86d5c37..d28308c 100644
--- a/src/corelibs/U2Script/transl/english.ts
+++ b/src/corelibs/U2Script/transl/english.ts
@@ -31,7 +31,7 @@
<translation>The unsupported format was provided</translation>
</message>
<message>
- <location filename="../src/UgeneContextWrapper.cpp" line="443"/>
+ <location filename="../src/UgeneContextWrapper.cpp" line="436"/>
<source>%1-bit version of UGENE started</source>
<translation>%1-bit version of UGENE started</translation>
</message>
@@ -39,7 +39,7 @@
<context>
<name>U2::AppContextImpl</name>
<message>
- <location filename="../src/UgeneContextWrapper.cpp" line="171"/>
+ <location filename="../src/UgeneContextWrapper.cpp" line="170"/>
<source>UGENE script environment initialization started</source>
<translation>UGENE script environment initialization started</translation>
</message>
diff --git a/src/corelibs/U2Script/transl/russian.ts b/src/corelibs/U2Script/transl/russian.ts
index 7688f8a..028829b 100644
--- a/src/corelibs/U2Script/transl/russian.ts
+++ b/src/corelibs/U2Script/transl/russian.ts
@@ -31,7 +31,7 @@
<translation>The unsupported format was provided</translation>
</message>
<message>
- <location filename="../src/UgeneContextWrapper.cpp" line="443"/>
+ <location filename="../src/UgeneContextWrapper.cpp" line="436"/>
<source>%1-bit version of UGENE started</source>
<translation>%1-bit version of UGENE started</translation>
</message>
@@ -39,7 +39,7 @@
<context>
<name>U2::AppContextImpl</name>
<message>
- <location filename="../src/UgeneContextWrapper.cpp" line="171"/>
+ <location filename="../src/UgeneContextWrapper.cpp" line="170"/>
<source>UGENE script environment initialization started</source>
<translation>UGENE script environment initialization started</translation>
</message>
diff --git a/src/corelibs/U2Test/U2Test.pri b/src/corelibs/U2Test/U2Test.pri
index 3e170b1..cbce11f 100644
--- a/src/corelibs/U2Test/U2Test.pri
+++ b/src/corelibs/U2Test/U2Test.pri
@@ -7,8 +7,12 @@ include( ../../ugene_lib_common.pri )
QT += xml gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES+= QT_FATAL_ASSERT BUILDING_U2TEST_DLL
-LIBS += -L../../_release -lU2Core -lhumimit
-INCLUDEPATH += ../../libs_3rdparty/humimit/src
+LIBS += -L../../_release -L../../libs_3rdparty/humimit/ -lU2Core -lhumimit
+INCLUDEPATH += ../../libs_3rdparty/QSpec/src
+
+if(exclude_list_enabled()|!exists( ../../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimit
+}
!debug_and_release|build_pass {
@@ -16,6 +20,9 @@ INCLUDEPATH += ../../libs_3rdparty/humimit/src
DESTDIR=../../_debug
LIBS -= -L../../_release -lU2Core -lhumimit
LIBS += -L../../_debug -lU2Cored -lhumimitd
+ if(exclude_list_enabled()|!exists( ../../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimitd
+ }
}
CONFIG(release, debug|release) {
diff --git a/src/corelibs/U2Test/U2Test.pro b/src/corelibs/U2Test/U2Test.pro
index f11b1f0..6cecc15 100644
--- a/src/corelibs/U2Test/U2Test.pro
+++ b/src/corelibs/U2Test/U2Test.pro
@@ -5,28 +5,49 @@ HEADERS += src/GTest.h \
src/GTestFrameworkComponents.h \
src/TestRunnerSettings.h \
src/TestRunnerTask.h \
- src/gui_tests/GUITestBase.h \
+ src/gui_tests/UGUITestBase.h \
src/gui_tests/GUITestLauncher.h \
src/gui_tests/GUITestService.h \
src/gui_tests/GUITestTeamcityLogger.h \
src/gui_tests/GUITestThread.h \
src/gui_tests/GUITestWindow.h \
src/xmltest/XMLTestFormat.h \
- src/xmltest/XMLTestUtils.h
+ src/xmltest/XMLTestUtils.h \
+ src/gui_tests/UGUITest.h
SOURCES += src/GTest.cpp \
src/GTestFrameworkComponents.cpp \
src/TestRunnerTask.cpp \
- src/gui_tests/GUITestBase.cpp \
+ src/gui_tests/UGUITestBase.cpp \
src/gui_tests/GUITestLauncher.cpp \
src/gui_tests/GUITestService.cpp \
src/gui_tests/GUITestTeamcityLogger.cpp \
src/gui_tests/GUITestThread.cpp \
src/gui_tests/GUITestWindow.cpp \
src/xmltest/XMLTestFormat.cpp \
- src/xmltest/XMLTestUtils.cpp
+ src/xmltest/XMLTestUtils.cpp \
+ src/gui_tests/UGUITest.cpp
TRANSLATIONS += transl/english.ts \
transl/russian.ts
FORMS += GUITestingWindow.ui
+
+if(exclude_list_enabled()|!exists( ../../libs_3rdparty/QSpec/QSpec.pro )) {
+
+HEADERS -= src/gui_tests/UGUITest.h \
+ src/gui_tests/UGUITestBase.h \
+ src/gui_tests/GUITestLauncher.h \
+ src/gui_tests/GUITestService.h \
+ src/gui_tests/GUITestTeamcityLogger.h \
+ src/gui_tests/GUITestThread.h \
+ src/gui_tests/GUITestWindow.h
+
+SOURCES -= src/gui_tests/UGUITest.cpp \
+ src/gui_tests/UGUITestBase.cpp \
+ src/gui_tests/GUITestLauncher.cpp \
+ src/gui_tests/GUITestService.cpp \
+ src/gui_tests/GUITestTeamcityLogger.cpp \
+ src/gui_tests/GUITestThread.cpp \
+ src/gui_tests/GUITestWindow.cpp
+}
diff --git a/src/corelibs/U2Test/src/GTest.cpp b/src/corelibs/U2Test/src/GTest.cpp
index 2303818..9f17959 100644
--- a/src/corelibs/U2Test/src/GTest.cpp
+++ b/src/corelibs/U2Test/src/GTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/GTest.h b/src/corelibs/U2Test/src/GTest.h
index e4cadfa..8dfa358 100644
--- a/src/corelibs/U2Test/src/GTest.h
+++ b/src/corelibs/U2Test/src/GTest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp b/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
index aae7155..7b2e085 100644
--- a/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
+++ b/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/GTestFrameworkComponents.h b/src/corelibs/U2Test/src/GTestFrameworkComponents.h
index 87c7ce4..30f0f60 100644
--- a/src/corelibs/U2Test/src/GTestFrameworkComponents.h
+++ b/src/corelibs/U2Test/src/GTestFrameworkComponents.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/TestRunnerTask.cpp b/src/corelibs/U2Test/src/TestRunnerTask.cpp
index 088b2a6..5be7366 100644
--- a/src/corelibs/U2Test/src/TestRunnerTask.cpp
+++ b/src/corelibs/U2Test/src/TestRunnerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/TestRunnerTask.h b/src/corelibs/U2Test/src/TestRunnerTask.h
index be90b0d..0e05e85 100644
--- a/src/corelibs/U2Test/src/TestRunnerTask.h
+++ b/src/corelibs/U2Test/src/TestRunnerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestBase.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestBase.cpp
deleted file mode 100644
index abe3109..0000000
--- a/src/corelibs/U2Test/src/gui_tests/GUITestBase.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "GUITestBase.h"
-
-namespace U2 {
-
-const QString GUITestBase::unnamedTestsPrefix = "test";
-
-GUITestBase::~GUITestBase() {
-
- qDeleteAll(tests);
- qDeleteAll(preAdditional);
- qDeleteAll(postAdditionalActions);
- qDeleteAll(postAdditionalChecks);
-}
-
-bool GUITestBase::registerTest(HI::GUITest *test, TestType testType) {
-
- Q_ASSERT(test);
-
- test->setName(nameUnnamedTest(test, testType));
-
- if (isNewTest(test, testType)) {
- addTest(test, testType);
- return true;
- }
-
- return false;
-}
-
-QString GUITestBase::nameUnnamedTest(HI::GUITest* test, TestType testType) {
-
- Q_ASSERT(test);
- if (!test) {
- return "";
- }
-
- QString testName = test->getName();
- if (testName.isEmpty()) {
- testName = getNextTestName(testType);
- }
-
- return testName;
-}
-
-bool GUITestBase::isNewTest(HI::GUITest *test, TestType testType) {
-
- return test && !findTest(test->getFullName(), testType);
-}
-
-void GUITestBase::addTest(HI::GUITest *test, TestType testType) {
-
- if (test) {
- getMap(testType).insert(test->getFullName(), test);
- }
-}
-
-QString GUITestBase::getNextTestName(TestType testType) {
-
- int testsCount = getMap(testType).size();
- return unnamedTestsPrefix + QString::number(testsCount);
-}
-
-HI::GUITest *GUITestBase::findTest(const QString &name, TestType testType) {
- GUITestMap map = getMap(testType);
- return map.value(name);
-}
-
-HI::GUITest *GUITestBase::getTest(const QString &suite, const QString &name, TestType testType) {
-
- return getMap(testType).value(suite + ":" + name);
-}
-
-HI::GUITest *GUITestBase::takeTest(const QString &suite, const QString &name, TestType testType) {
-
- return getMap(testType).take(suite + ":" + name);
-}
-
-GUITestMap& GUITestBase::getMap(TestType testType) {
-
- switch(testType) {
- case PreAdditional:
- return preAdditional;
- case PostAdditionalChecks:
- return postAdditionalChecks;
- case PostAdditionalActions:
- return postAdditionalActions;
-
- default:
- case Normal: return tests;
- }
-}
-
-GUITests GUITestBase::getTests(TestType testType) {
-
- GUITests testList = getMap(testType).values();
-
- return testList;
-}
-
-GUITests GUITestBase::takeTests(TestType testType) {
-
- GUITests testList = getMap(testType).values();
- getMap(testType).clear();
-
- return testList;
-}
-
-
-} // namespace
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestBase.h b/src/corelibs/U2Test/src/gui_tests/GUITestBase.h
deleted file mode 100644
index 971d75a..0000000
--- a/src/corelibs/U2Test/src/gui_tests/GUITestBase.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _U2_GUI_TEST_BASE_H_
-#define _U2_GUI_TEST_BASE_H_
-
-#include <U2Core/global.h>
-#include <U2Core/U2IdTypes.h>
-#include <U2Core/Task.h>
-#include <U2Core/MultiTask.h>
-#include <U2Core/GObject.h>
-#include <U2Core/DNASequenceObject.h>
-#include <U2Gui/MainWindow.h>
-#include <U2View/ADVSingleSequenceWidget.h>
-
-#include <QtGui>
-#include <core/GUITest.h>
-
-namespace U2 {
-
-#define TESTNAME(className) #className
-#define SUITENAME(className) QString(GUI_TEST_SUITE)
-
-#define DIALOG_FILLER_DECLARATION(className, DialogName) \
- class className : public Filler { \
- public: \
- className(HI::GUITestOpStatus& os):Filler(os, DialogName){} \
- virtual void run(); \
- }
-
-#define DIALOG_FILLER_DEFFINITION(className) \
- void className::run()
-
-#define GUI_TEST_CLASS_DECLARATION(className) \
- class className : public HI::GUITest { \
- public: \
- className () : HI::GUITest(TESTNAME(className), SUITENAME(className)){} \
- protected: \
- virtual void run(HI::GUITestOpStatus &os); \
- };
-
-#define GUI_TEST_CLASS_DECLARATION_SET_TIMEOUT(className, timeout) \
- class className : public HI::GUITest { \
- public: \
- className () : HI::GUITest(TESTNAME(className), SUITENAME(className), timeout){} \
- protected: \
- virtual void run(HI::GUITestOpStatus &os); \
- };
-
-#define GUI_TEST_CLASS_DEFINITION(className) \
- void className::run(HI::GUITestOpStatus &os)
-
-typedef QMap<QString, HI::GUITest*> GUITestMap;
-typedef QList<HI::GUITest*> GUITests;
-
-class U2TEST_EXPORT GUITestBase {
-public:
- enum TestType {Normal, PreAdditional, PostAdditionalChecks, PostAdditionalActions} type;
-
- virtual ~GUITestBase();
-
- bool registerTest(HI::GUITest *test, TestType testType = Normal);
- HI::GUITest *getTest(const QString &suite, const QString &name, TestType testType = Normal);
- HI::GUITest *takeTest(const QString &suite, const QString &name, TestType testType = Normal); // removes item from GUITestBase
-
- GUITests getTests(TestType testType = Normal);
- GUITests takeTests(TestType testType = Normal); // removes items from GUITestBase
-
- GUITests getTestsWithoutRemoving(TestType testType = Normal);
-
- HI::GUITest *findTest(const QString &name, TestType testType = Normal);
-
- static const QString unnamedTestsPrefix;
-
-private:
- GUITestMap tests;
- GUITestMap preAdditional;
- GUITestMap postAdditionalChecks;
- GUITestMap postAdditionalActions;
- // GUI checks additional to the launched checks
-
- GUITestMap &getMap(TestType testType);
-
- QString getNextTestName(TestType testType);
-
- bool isNewTest(HI::GUITest *test, TestType testType);
- void addTest(HI::GUITest *test, TestType testType);
-
- QString nameUnnamedTest(HI::GUITest* test, TestType testType);
-};
-
-}
-
-#endif
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
index b5951f7..80894cf 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
*/
#include <QApplication>
+#include <QDesktopWidget>
#include <QMap>
#include <U2Core/AppContext.h>
@@ -30,7 +31,7 @@
#include <U2Gui/MainWindow.h>
-#include "GUITestBase.h"
+#include "UGUITestBase.h"
#include "GUITestLauncher.h"
#include "GUITestService.h"
#include "GUITestTeamcityLogger.h"
@@ -38,11 +39,11 @@
#define TIMEOUT 480000
#ifdef Q_OS_MAC
-#define NUMBER_OF_TESTS_IN_SUITE 700
+#define NUMBER_OF_TESTS_IN_SUITE 750
#elif defined(Q_OS_UNIX)
#define NUMBER_OF_TESTS_IN_SUITE 550
#elif defined(Q_OS_WIN)
-#define NUMBER_OF_TESTS_IN_SUITE 700
+#define NUMBER_OF_TESTS_IN_SUITE 750
#endif
#define GUITESTING_REPORT_PREFIX "GUITesting"
@@ -127,7 +128,7 @@ void GUITestLauncher::firstTestRunCheck(const QString& testName) {
}
bool GUITestLauncher::initGUITestBase() {
- GUITestBase* b = AppContext::getGUITestBase();
+ UGUITestBase* b = AppContext::getGUITestBase();
SAFE_POINT(NULL != b, "Test base is NULL", false);
QList<HI::GUITest *> list = b->getTests();
if (list.isEmpty()) {
@@ -191,7 +192,7 @@ void GUITestLauncher::updateProgress(int finishedCount) {
}
QString GUITestLauncher::testOutFile(const QString &testName) {
- return "ugene_"+testName+".out";
+ return QString("ugene_"+testName+".out").replace(':', '_');
}
QString GUITestLauncher::getTestOutDir(){
@@ -234,6 +235,11 @@ QString GUITestLauncher::performTest(const QString& testName) {
process.setProcessEnvironment(getProcessEnvironment(testName));
process.start(path, getTestProcessArguments(testName));
+ QProcess screenRecorder;
+ if(qgetenv("UGENE_SKIP_TEST_RECORDING").toInt() != 1){
+ screenRecorder.start(getScreenRecorderString(testName));
+ }
+
bool started = process.waitForStarted();
if (!started) {
return tr("An error occurred while starting UGENE: ") + process.errorString();
@@ -246,14 +252,23 @@ QString GUITestLauncher::performTest(const QString& testName) {
QProcess::execute("closeErrorReport.exe"); //this exe file, compiled Autoit script
#endif
+ QString testResult = readTestResult(process.readAllStandardOutput());
+
+ if(qgetenv("UGENE_SKIP_TEST_RECORDING").toInt() != 1){
+ screenRecorder.kill();
+ if(!GUITestTeamcityLogger::testFailed(testResult)){
+ QFile(getVideoPath(testName)).remove();
+ }
+ }
+
if (finished && (exitStatus == QProcess::NormalExit)) {
- return readTestResult(process.readAllStandardOutput());
+ return testResult;
}
#ifdef Q_OS_WIN
process.kill();
#endif
if (finished) {
- return tr("An error occurred while finishing UGENE: ") + process.errorString() + '\n' + readTestResult(process.readAllStandardOutput());
+ return tr("An error occurred while finishing UGENE: ") + process.errorString() + '\n' + testResult;
} else {
return tr("Test fails because of timeout.");
}
@@ -302,4 +317,27 @@ QString GUITestLauncher::generateReport() const {
return res;
}
+QString GUITestLauncher::getScreenRecorderString(QString testName){
+ QString result;
+#ifdef Q_OS_LINUX
+ QRect rec = QApplication::desktop()->screenGeometry();
+ int height = rec.height();
+ int width = rec.width();
+ QString display = qgetenv("DISPLAY");
+ result = QString("ffmpeg -video_size %1x%2 -framerate 5 -f x11grab -i %3.0 %4").arg(width).arg(height).arg(display).arg(getVideoPath(testName));
+#elif defined Q_OS_MAC
+ result = QString("ffmpeg -f avfoundation -r 5 -i \"1:none\" \"%1\"").arg(getVideoPath(testName));
+#elif defined Q_OS_WIN
+ result = QString("ffmpeg -f dshow -i video=\"UScreenCapture\" -r 5 %1").arg(getVideoPath(testName.replace(':', '_')));
+#endif
+ return result;
+}
+
+QString GUITestLauncher::getVideoPath(const QString &testName){
+ QDir().mkpath(QDir::currentPath() + "/videos");
+ QString result = QDir::currentPath() + "/videos/" + testName + ".avi";
+ uiLog.trace("going to record video: " + result);
+ return result;
+}
+
}
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
index 5274687..24ec1ab 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -60,6 +60,9 @@ private:
bool initGUITestBase();
void updateProgress(int finishedCount);
+
+ QString getScreenRecorderString(QString testName);
+ QString getVideoPath(const QString &testName);
};
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
index 629d0c1..cc9611c 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,12 +35,13 @@
#include <U2Core/U2SafePoints.h>
#include <core/MainThreadRunnable.h>
-#include "GUITestBase.h"
+#include "UGUITestBase.h"
#include <core/GUITestOpStatus.h>
#include "GUITestService.h"
#include "GUITestTeamcityLogger.h"
#include "GUITestThread.h"
#include "GUITestWindow.h"
+#include "UGUITest.h"
/**************************************************** to use qt file dialog *************************************************************/
#ifdef Q_OS_LINUX
@@ -72,7 +73,8 @@ const qint64 GUITestService::TIMER_INTERVAL = 100;
GUITestService::GUITestService(QObject *) :
Service(Service_GUITesting, tr("GUI test viewer"), tr("Service to support UGENE GUI testing")),
runTestsAction(NULL),
- testLauncher(NULL)
+ testLauncher(NULL),
+ needTeamcityLog(false)
{
connect(AppContext::getPluginSupport(), SIGNAL(si_allStartUpPluginsLoaded()), SLOT(sl_allStartUpPluginsLoaded()));
setQtFileDialogView();
@@ -218,10 +220,10 @@ Task* GUITestService::createTestSuiteLauncherTask() const {
GUITests GUITestService::preChecks() {
- GUITestBase* tb = AppContext::getGUITestBase();
+ UGUITestBase* tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb,"",GUITests());
- GUITests additionalChecks = tb->takeTests(GUITestBase::PreAdditional);
+ GUITests additionalChecks = tb->takeTests(UGUITestBase::PreAdditional);
SAFE_POINT(additionalChecks.size()>0,"",GUITests());
return additionalChecks;
@@ -229,10 +231,10 @@ GUITests GUITestService::preChecks() {
GUITests GUITestService::postChecks() {
- GUITestBase* tb = AppContext::getGUITestBase();
+ UGUITestBase* tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb,"",GUITests());
- GUITests additionalChecks = tb->takeTests(GUITestBase::PostAdditionalChecks);
+ GUITests additionalChecks = tb->takeTests(UGUITestBase::PostAdditionalChecks);
SAFE_POINT(additionalChecks.size()>0,"",GUITests());
return additionalChecks;
@@ -240,10 +242,10 @@ GUITests GUITestService::postChecks() {
GUITests GUITestService::postActions() {
- GUITestBase* tb = AppContext::getGUITestBase();
+ UGUITestBase* tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb,"",GUITests());
- GUITests additionalChecks = tb->takeTests(GUITestBase::PostAdditionalActions);
+ GUITests additionalChecks = tb->takeTests(UGUITestBase::PostAdditionalActions);
SAFE_POINT(additionalChecks.size()>0,"",GUITests());
return additionalChecks;
@@ -323,8 +325,9 @@ void GUITestService::runGUITest() {
CMDLineRegistry* cmdLine = AppContext::getCMDLineRegistry();
SAFE_POINT(NULL != cmdLine,"",);
QString testName = cmdLine->getParameterValue(CMDLineCoreOptions::LAUNCH_GUI_TEST);
+ needTeamcityLog = cmdLine->hasParameter(CMDLineCoreOptions::TEAMCITY_OUTPUT);
- GUITestBase *tb = AppContext::getGUITestBase();
+ UGUITestBase *tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb,"",);
HI::GUITest *t = tb->takeTest(testName.split(":").first(), testName.split(":").last());
@@ -332,7 +335,7 @@ void GUITestService::runGUITest() {
}
void GUITestService::runGUICrazyUserTest() {
- GUITestBase *tb = AppContext::getGUITestBase();
+ UGUITestBase *tb = AppContext::getGUITestBase();
SAFE_POINT(tb,"",);
HI::GUITest *t = tb->takeTest("","simple_crazy_user");
@@ -341,6 +344,11 @@ void GUITestService::runGUICrazyUserTest() {
void GUITestService::runGUITest(HI::GUITest *test) {
SAFE_POINT(NULL != test, "GUITest is NULL", );
+ if(needTeamcityLog){
+ QString testNameForTeamCity = test->getSuite() +"_"+ test->getName();
+ GUITestTeamcityLogger::testStarted(testNameForTeamCity);
+ }
+
GUITestThread *testThread = new GUITestThread(test, log);
connect(testThread, SIGNAL(finished()), SLOT(sl_testThreadFinish()));
testThread->start();
@@ -408,7 +416,7 @@ void GUITestService::clearSandbox()
{
log.trace("GUITestService __ clearSandbox");
- QString pathToSandbox = HI::GUITest::testDir + "_common_data/scenarios/sandbox/";
+ QString pathToSandbox = UGUITest::testDir + "_common_data/scenarios/sandbox/";
QDir sandbox(pathToSandbox);
foreach (QString fileName, sandbox.entryList()) {
@@ -447,6 +455,14 @@ void GUITestService::removeDir(QString dirName)
}
void GUITestService::sl_testThreadFinish() {
+ GUITestThread* testThread = qobject_cast<GUITestThread*>(sender());
+ SAFE_POINT(NULL != testThread, "testThread is NULL", );
+ HI::GUITest* test = testThread->getTest();
+ SAFE_POINT(NULL != test, "GUITest is NULL", );
+ if(needTeamcityLog){
+ QString testNameForTeamCity = test->getSuite() +"_"+ test->getName();
+ GUITestTeamcityLogger::teamCityLogResult(testNameForTeamCity, testThread->getTestResult(), -1);
+ }
sender()->deleteLater();
AppContext::getMainWindow()->getQMainWindow()->close();
}
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestService.h b/src/corelibs/U2Test/src/gui_tests/GUITestService.h
index c50a49a..fa9f014 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestService.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestService.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -96,6 +96,7 @@ private:
QAction *runTestsAction;
Task *testLauncher;
HI::GUITests testsToRun;
+ bool needTeamcityLog;
// MainThreadTimer timer;
};
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
index 62967db..a66f2c0 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
index edf0d34..c3ef785 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
index 420bd60..61c9fd8 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,11 +30,12 @@
#include "core/MainThreadRunnable.h"
#include <core/GUITest.h>
-#include "GUITestBase.h"
+#include "UGUITestBase.h"
#include <core/GUITestOpStatus.h>
#include "GUITestService.h"
#include "GUITestTeamcityLogger.h"
#include "GUITestThread.h"
+#include "UGUITest.h"
namespace U2 {
@@ -109,33 +110,33 @@ QString GUITestThread::launchTest(const GUITests &tests) {
}
GUITests GUITestThread::preChecks() {
- GUITestBase *tb = AppContext::getGUITestBase();
+ UGUITestBase *tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb, "GUITestBase is NULL", GUITests());
// GUITests additionalChecks = tb->takeTests(GUITestBase::PreAdditional);
- GUITests additionalChecks = tb->getTests(GUITestBase::PreAdditional);
+ GUITests additionalChecks = tb->getTests(UGUITestBase::PreAdditional);
SAFE_POINT(!additionalChecks.isEmpty(), "additionalChecks is empty", GUITests());
return additionalChecks;
}
GUITests GUITestThread::postChecks() {
- GUITestBase *tb = AppContext::getGUITestBase();
+ UGUITestBase *tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb, "GUITestBase is NULL", GUITests());
// GUITests additionalChecks = tb->takeTests(GUITestBase::PostAdditionalChecks);
- GUITests additionalChecks = tb->getTests(GUITestBase::PostAdditionalChecks);
+ GUITests additionalChecks = tb->getTests(UGUITestBase::PostAdditionalChecks);
SAFE_POINT(!additionalChecks.isEmpty(), "additionalChecks is empty", GUITests());
return additionalChecks;
}
GUITests GUITestThread::postActions() {
- GUITestBase *tb = AppContext::getGUITestBase();
+ UGUITestBase *tb = AppContext::getGUITestBase();
SAFE_POINT(NULL != tb, "GUITestBase is NULL", GUITests());
// GUITests additionalChecks = tb->takeTests(GUITestBase::PostAdditionalActions);
- GUITests additionalChecks = tb->getTests(GUITestBase::PostAdditionalActions);
+ GUITests additionalChecks = tb->getTests(UGUITestBase::PostAdditionalActions);
SAFE_POINT(!additionalChecks.isEmpty(), "additionalChecks is empty", GUITests());
return additionalChecks;
@@ -144,7 +145,7 @@ GUITests GUITestThread::postActions() {
void GUITestThread::clearSandbox() {
log.trace("GUITestThread __ clearSandbox");
- const QString pathToSandbox = HI::GUITest::testDir + "_common_data/scenarios/sandbox/";
+ const QString pathToSandbox = UGUITest::testDir + "_common_data/scenarios/sandbox/";
QDir sandbox(pathToSandbox);
foreach (const QString &fileName, sandbox.entryList()) {
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestThread.h b/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
index 79907c2..bbe550e 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
index 6ed30be..506c0ec 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
index 1d06873..f797a88 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/gui_tests/UGUITest.cpp b/src/corelibs/U2Test/src/gui_tests/UGUITest.cpp
new file mode 100644
index 0000000..52f3b0d
--- /dev/null
+++ b/src/corelibs/U2Test/src/gui_tests/UGUITest.cpp
@@ -0,0 +1,70 @@
+#include "UGUITest.h"
+#include "core/GUITestOpStatus.h"
+
+#include <QApplication>
+#include <QDate>
+#include <QDesktopWidget>
+#include <QDir>
+#include <QScreen>
+
+namespace U2 {
+
+QString getTestDir(){
+ bool ok;
+ int i = qgetenv("UGENE_GUI_TEST_SUITE_NUMBER").toInt(&ok);
+#ifdef Q_OS_MAC
+ if ( ok && i>1){
+ return QString("../../../../../../test%1/").arg(i-1);
+ }else{
+ return QString("../../../../../../test/");
+ }
+#else
+ if ( ok && i>1){
+ return QString("../../test%1/").arg(i-1);
+ }else{
+ return QString("../../test/");
+ }
+#endif
+}
+
+QString getDataDir(){
+ bool ok;
+ int i = qgetenv("UGENE_GUI_TEST_SUITE_NUMBER").toInt(&ok);
+#ifdef Q_OS_MAC
+ if ( ok && i>1 ){
+ return QString("data%1/").arg(i-1);
+ }else{
+ return QString("data/");
+ }
+#else
+ if ( ok && i>1){
+ return QString("../../data%1/").arg(i-1);
+ }else{
+ return QString("../../data/");
+ }
+#endif
+}
+
+QString getScreenshotDir(){
+ QString result;
+#ifdef Q_OS_MAC
+ result = "../../../../../../screenshotFol/";
+#else
+ QString guiTestOutputDirectory = qgetenv("GUI_TESTING_OUTPUT");
+ if(guiTestOutputDirectory.isEmpty()){
+ result = QDir::homePath() + "/gui_testing_output/" +
+ QDate::currentDate().toString("dd.MM.yyyy") + "/screenshots/";
+ }else{
+ result = guiTestOutputDirectory + "/gui_testing_output/" +
+ QDate::currentDate().toString("dd.MM.yyyy") + "/screenshots/";
+ }
+#endif
+ return result;
+}
+
+const QString UGUITest::testDir = getTestDir();
+const QString UGUITest::dataDir = getDataDir();
+const QString UGUITest::sandBoxDir = testDir + "_common_data/scenarios/sandbox/";
+const QString UGUITest::screenshotDir = getScreenshotDir();
+
+} // namespace
diff --git a/src/corelibs/U2Test/src/gui_tests/UGUITest.h b/src/corelibs/U2Test/src/gui_tests/UGUITest.h
new file mode 100644
index 0000000..3e2d3a1
--- /dev/null
+++ b/src/corelibs/U2Test/src/gui_tests/UGUITest.h
@@ -0,0 +1,53 @@
+#ifndef _U2_UGUI_TEST_H_
+#define _U2_UGUI_TEST_H_
+
+#include <U2Core/global.h>
+
+#include <QtCore/QTimer>
+#include <GTGlobals.h>
+#include <core/GUITestOpStatus.h>
+#include <core/GUITest.h>
+
+namespace U2 {
+using namespace HI;
+
+class U2TEST_EXPORT UGUITest: public GUITest {
+ Q_OBJECT
+public:
+ UGUITest(const QString &_name = "", const QString &_suite = "", int timeout = 240000) : GUITest(_name, _suite, timeout) {}
+ virtual ~UGUITest(){}
+
+ static const QString testDir;
+ static const QString dataDir;
+ static const QString screenshotDir;
+ static const QString sandBoxDir;
+
+};
+
+typedef QList<UGUITest*> UGUITests;
+
+#define TESTNAME(className) #className
+#define SUITENAME(className) QString(GUI_TEST_SUITE)
+
+#define GUI_TEST_CLASS_DECLARATION(className) \
+ class className : public UGUITest { \
+ public: \
+ className () : UGUITest(TESTNAME(className), SUITENAME(className)){} \
+ protected: \
+ virtual void run(HI::GUITestOpStatus &os); \
+ };
+
+#define GUI_TEST_CLASS_DECLARATION_SET_TIMEOUT(className, timeout) \
+ class className : public UGUITest { \
+ public: \
+ className () : UGUITest(TESTNAME(className), SUITENAME(className), timeout){} \
+ protected: \
+ virtual void run(HI::GUITestOpStatus &os); \
+ };
+
+#define GUI_TEST_CLASS_DEFINITION(className) \
+ void className::run(HI::GUITestOpStatus &os)
+
+}
+
+#endif
diff --git a/src/corelibs/U2Test/src/gui_tests/UGUITestBase.cpp b/src/corelibs/U2Test/src/gui_tests/UGUITestBase.cpp
new file mode 100644
index 0000000..79baa88
--- /dev/null
+++ b/src/corelibs/U2Test/src/gui_tests/UGUITestBase.cpp
@@ -0,0 +1,108 @@
+#include "UGUITestBase.h"
+
+namespace U2 {
+
+const QString UGUITestBase::unnamedTestsPrefix = "test";
+
+UGUITestBase::~UGUITestBase() {
+
+ qDeleteAll(tests);
+ qDeleteAll(preAdditional);
+ qDeleteAll(postAdditionalActions);
+ qDeleteAll(postAdditionalChecks);
+}
+
+bool UGUITestBase::registerTest(HI::GUITest *test, TestType testType) {
+
+ Q_ASSERT(test);
+
+ test->setName(nameUnnamedTest(test, testType));
+
+ if (isNewTest(test, testType)) {
+ addTest(test, testType);
+ return true;
+ }
+
+ return false;
+}
+
+QString UGUITestBase::nameUnnamedTest(HI::GUITest* test, TestType testType) {
+
+ Q_ASSERT(test);
+ if (!test) {
+ return "";
+ }
+
+ QString testName = test->getName();
+ if (testName.isEmpty()) {
+ testName = getNextTestName(testType);
+ }
+
+ return testName;
+}
+
+bool UGUITestBase::isNewTest(HI::GUITest *test, TestType testType) {
+
+ return test && !findTest(test->getFullName(), testType);
+}
+
+void UGUITestBase::addTest(HI::GUITest *test, TestType testType) {
+
+ if (test) {
+ getMap(testType).insert(test->getFullName(), test);
+ }
+}
+
+QString UGUITestBase::getNextTestName(TestType testType) {
+
+ int testsCount = getMap(testType).size();
+ return unnamedTestsPrefix + QString::number(testsCount);
+}
+
+HI::GUITest *UGUITestBase::findTest(const QString &name, TestType testType) {
+ GUITestMap map = getMap(testType);
+ return map.value(name);
+}
+
+HI::GUITest *UGUITestBase::getTest(const QString &suite, const QString &name, TestType testType) {
+
+ return getMap(testType).value(suite + ":" + name);
+}
+
+HI::GUITest *UGUITestBase::takeTest(const QString &suite, const QString &name, TestType testType) {
+
+ return getMap(testType).take(suite + ":" + name);
+}
+
+GUITestMap& UGUITestBase::getMap(TestType testType) {
+
+ switch(testType) {
+ case PreAdditional:
+ return preAdditional;
+ case PostAdditionalChecks:
+ return postAdditionalChecks;
+ case PostAdditionalActions:
+ return postAdditionalActions;
+
+ default:
+ case Normal: return tests;
+ }
+}
+
+GUITests UGUITestBase::getTests(TestType testType) {
+
+ GUITests testList = getMap(testType).values();
+
+ return testList;
+}
+
+GUITests UGUITestBase::takeTests(TestType testType) {
+
+ GUITests testList = getMap(testType).values();
+ getMap(testType).clear();
+
+ return testList;
+}
+
+
+} // namespace
diff --git a/src/corelibs/U2Test/src/gui_tests/UGUITestBase.h b/src/corelibs/U2Test/src/gui_tests/UGUITestBase.h
new file mode 100644
index 0000000..48d394f
--- /dev/null
+++ b/src/corelibs/U2Test/src/gui_tests/UGUITestBase.h
@@ -0,0 +1,59 @@
+#ifndef _U2_GUI_TEST_BASE_H_
+#define _U2_GUI_TEST_BASE_H_
+
+#include <U2Core/global.h>
+#include <U2Core/U2IdTypes.h>
+#include <U2Core/Task.h>
+#include <U2Core/MultiTask.h>
+#include <U2Core/GObject.h>
+#include <U2Core/DNASequenceObject.h>
+#include <U2Gui/MainWindow.h>
+#include <U2View/ADVSingleSequenceWidget.h>
+
+#include <QtGui>
+#include <U2Test/UGUITest.h>
+
+namespace U2 {
+
+typedef QMap<QString, HI::GUITest*> GUITestMap;
+typedef QList<HI::GUITest*> GUITests;
+
+class U2TEST_EXPORT UGUITestBase {
+public:
+ enum TestType {Normal, PreAdditional, PostAdditionalChecks, PostAdditionalActions} type;
+
+ virtual ~UGUITestBase();
+
+ bool registerTest(HI::GUITest *test, TestType testType = Normal);
+ HI::GUITest *getTest(const QString &suite, const QString &name, TestType testType = Normal);
+ HI::GUITest *takeTest(const QString &suite, const QString &name, TestType testType = Normal); // removes item from UGUITestBase
+
+ GUITests getTests(TestType testType = Normal);
+ GUITests takeTests(TestType testType = Normal); // removes items from UGUITestBase
+
+ GUITests getTestsWithoutRemoving(TestType testType = Normal);
+
+ HI::GUITest *findTest(const QString &name, TestType testType = Normal);
+
+ static const QString unnamedTestsPrefix;
+
+private:
+ GUITestMap tests;
+ GUITestMap preAdditional;
+ GUITestMap postAdditionalChecks;
+ GUITestMap postAdditionalActions;
+ // GUI checks additional to the launched checks
+
+ GUITestMap &getMap(TestType testType);
+
+ QString getNextTestName(TestType testType);
+
+ bool isNewTest(HI::GUITest *test, TestType testType);
+ void addTest(HI::GUITest *test, TestType testType);
+
+ QString nameUnnamedTest(HI::GUITest* test, TestType testType);
+};
+
+}
+
+#endif
diff --git a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
index 6e135f0..0f12372 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
index 00b16ed..118f70d 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
index 68cdf08..bd96200 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
index 7411020..56d302c 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Test/transl/english.ts b/src/corelibs/U2Test/transl/english.ts
index bec09de..63ec3db 100644
--- a/src/corelibs/U2Test/transl/english.ts
+++ b/src/corelibs/U2Test/transl/english.ts
@@ -99,37 +99,37 @@
<context>
<name>U2::GUITestLauncher</name>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="133"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="135"/>
<source>No tests to run</source>
<translation>No tests to run</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="143"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="145"/>
<source>Invalid suite number: %1. There are %2 suites</source>
<translation>Invalid suite number: %1. There are %2 suites</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="238"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="245"/>
<source>An error occurred while starting UGENE: </source>
<translation>An error occurred while starting UGENE: </translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="255"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="271"/>
<source>An error occurred while finishing UGENE: </source>
<translation>An error occurred while finishing UGENE: </translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="257"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="273"/>
<source>Test fails because of timeout.</source>
<translation>Test fails because of timeout.</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="289"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="305"/>
<source>Test name</source>
<translation>Test name</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="289"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="305"/>
<source>Status</source>
<translation>Status</translation>
</message>
@@ -137,24 +137,23 @@
<context>
<name>U2::GUITestService</name>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="73"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="74"/>
<source>GUI test viewer</source>
<translation>GUI test viewer</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="73"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="74"/>
<source>Service to support UGENE GUI testing</source>
<translation>Service to support UGENE GUI testing</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="259"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="255"/>
<source>Can't connect external tool manager signal</source>
<translation>Can't connect external tool manager signal</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="382"/>
<source>GUI testing</source>
- <translation>GUI testing</translation>
+ <translation type="vanished">GUI testing</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2Test/transl/russian.ts b/src/corelibs/U2Test/transl/russian.ts
index 3424ec0..9b62b52 100644
--- a/src/corelibs/U2Test/transl/russian.ts
+++ b/src/corelibs/U2Test/transl/russian.ts
@@ -99,37 +99,37 @@
<context>
<name>U2::GUITestLauncher</name>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="133"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="135"/>
<source>No tests to run</source>
<translation>No tests to run</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="143"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="145"/>
<source>Invalid suite number: %1. There are %2 suites</source>
<translation>Invalid suite number: %1. There are %2 suites</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="238"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="245"/>
<source>An error occurred while starting UGENE: </source>
<translation>An error occurred while starting UGENE: </translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="255"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="271"/>
<source>An error occurred while finishing UGENE: </source>
<translation>An error occurred while finishing UGENE: </translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="257"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="273"/>
<source>Test fails because of timeout.</source>
<translation>Test fails because of timeout.</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="289"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="305"/>
<source>Test name</source>
<translation>Test name</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestLauncher.cpp" line="289"/>
+ <location filename="../src/gui_tests/GUITestLauncher.cpp" line="305"/>
<source>Status</source>
<translation>Status</translation>
</message>
@@ -137,24 +137,23 @@
<context>
<name>U2::GUITestService</name>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="73"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="74"/>
<source>GUI test viewer</source>
<translation>GUI test viewer</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="73"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="74"/>
<source>Service to support UGENE GUI testing</source>
<translation>Service to support UGENE GUI testing</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="259"/>
+ <location filename="../src/gui_tests/GUITestService.cpp" line="255"/>
<source>Can't connect external tool manager signal</source>
<translation>Can't connect external tool manager signal</translation>
</message>
<message>
- <location filename="../src/gui_tests/GUITestService.cpp" line="382"/>
<source>GUI testing</source>
- <translation>GUI testing</translation>
+ <translation type="vanished">GUI testing</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2View/src/LicenseDialog.cpp b/src/corelibs/U2View/src/LicenseDialog.cpp
index 667a816..24db843 100644
--- a/src/corelibs/U2View/src/LicenseDialog.cpp
+++ b/src/corelibs/U2View/src/LicenseDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/LicenseDialog.h b/src/corelibs/U2View/src/LicenseDialog.h
index b83af59..2a17c2b 100644
--- a/src/corelibs/U2View/src/LicenseDialog.h
+++ b/src/corelibs/U2View/src/LicenseDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/UndoRedoFramework.cpp b/src/corelibs/U2View/src/UndoRedoFramework.cpp
index 773c6ca..d33c802 100644
--- a/src/corelibs/U2View/src/UndoRedoFramework.cpp
+++ b/src/corelibs/U2View/src/UndoRedoFramework.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/UndoRedoFramework.h b/src/corelibs/U2View/src/UndoRedoFramework.h
index 94f9e4b..6cc3c59 100644
--- a/src/corelibs/U2View/src/UndoRedoFramework.h
+++ b/src/corelibs/U2View/src/UndoRedoFramework.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/WebWindow.cpp b/src/corelibs/U2View/src/WebWindow.cpp
index 0615f34..8dcfae5 100644
--- a/src/corelibs/U2View/src/WebWindow.cpp
+++ b/src/corelibs/U2View/src/WebWindow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/WebWindow.h b/src/corelibs/U2View/src/WebWindow.h
index d979869..0b1b475 100644
--- a/src/corelibs/U2View/src/WebWindow.h
+++ b/src/corelibs/U2View/src/WebWindow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
index 28d23c3..d5f4b8f 100644
--- a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
index 7224dea..d83c3a6 100644
--- a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
index b4715cf..9a25bc3 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
index 2c6f9f2..9fc4b06 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
index cb803f0..b9924fd 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
index 1507003..e1fee76 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
index ee6981b..977801c 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
index 35de822..5d6c7b2 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
index 1708d31..07ed7cb 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
index 724321a..32dabde 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
index 84f1de5..51bc0d2 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
index c9d126c..5ebb507 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
index dd2cccc..1fb552d 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
index b1420a5..ff7da50 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
index 0fcf5a8..5758b02 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
index 7bc4b81..106c2ce 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
index b639002..834d997 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
index 3a0b929..026bc7b 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
index 2e4dc54..c97f90e 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
index ddc74f6..90f85ed 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
index e76f589..dcf32b7 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
index 399da3c..cf0b30d 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -118,7 +118,7 @@ AssemblyInfoWidget::AssemblyInfoWidget(AssemblyBrowser *browser, QWidget *p)
const QString AssemblyInfoWidgetFactory::GROUP_ID = "OP_ASS_INFO";
const QString AssemblyInfoWidgetFactory::GROUP_ICON_STR = ":core/images/chart_bar.png";
const QString AssemblyInfoWidgetFactory::GROUP_TITLE = QString(QObject::tr("Assembly Statistics"));
-const QString AssemblyInfoWidgetFactory::GROUP_DOC_PAGE = "17466147";
+const QString AssemblyInfoWidgetFactory::GROUP_DOC_PAGE = "17467694";
AssemblyInfoWidgetFactory::AssemblyInfoWidgetFactory()
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
index 0133240..8ddea2e 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
index cacf990..fdd9d20 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
index 0b3a5fb..377f605 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
index dcf5d1c..6a5ce0e 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -132,7 +132,7 @@ void CoveredRegionsLabel::sl_updateContent() {
const QString AssemblyNavigationWidgetFactory::GROUP_ID = "OP_ASS_NAVIGATION";
const QString AssemblyNavigationWidgetFactory::GROUP_ICON_STR = ":core/images/goto.png";
const QString AssemblyNavigationWidgetFactory::GROUP_TITLE = QString(QObject::tr("Navigation"));
-const QString AssemblyNavigationWidgetFactory::GROUP_DOC_PAGE = "17466145";
+const QString AssemblyNavigationWidgetFactory::GROUP_DOC_PAGE = "17467692";
AssemblyNavigationWidgetFactory::AssemblyNavigationWidgetFactory() {
objectViewOfWidget = ObjViewType_AssemblyBrowser;
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h
index b185fc3..dd3d7f0 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
index 41aa894..354b0f6 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
index 955e8a1..b8da53c 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
index 4d17a34..50cd9fe 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
index 3f167cb..5b55b1f 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
index 5e211f4..4d8cf1b 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
index 3e84644..2b4a979 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
index b187262..1c99175 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
index b276f17..d200a06 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
index 9d80483..c82dbf0 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -231,7 +231,7 @@ QWidget * AssemblySettingsWidget::createRulerSettings() {
const QString AssemblySettingsWidgetFactory::GROUP_ID = "OP_ASS_SETTINGS";
const QString AssemblySettingsWidgetFactory::GROUP_ICON_STR = ":core/images/settings2.png";
const QString AssemblySettingsWidgetFactory::GROUP_TITLE = QString(QObject::tr("Assembly Browser Settings"));
-const QString AssemblySettingsWidgetFactory::GROUP_DOC_PAGE = "17466146";
+const QString AssemblySettingsWidgetFactory::GROUP_DOC_PAGE = "17467693";
AssemblySettingsWidgetFactory::AssemblySettingsWidgetFactory()
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
index 1c5e39f..102bd15 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
index 5b2020d..58f4946 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
index 788fa6c..59d78ba 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
index 06c242e..8871b04 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
index a70cad6..e72ed5a 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
index 53a0cc0..49cc846 100644
--- a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
index 048b6ed..26c9731 100644
--- a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
index d1f2d21..54b73c4 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
index a4d6837..2aae9f7 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
+++ b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
index 0a9ca4c..27699a2 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
index f1c8bc4..0af1a86 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
+++ b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
index a5cd128..fbe599f 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ ExportConsensusDialog::ExportConsensusDialog(QWidget *p, const ExportConsensusTa
: QDialog(p), settings(settings_)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466140");
+ new HelpButton(this, buttonBox, "17467687");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
//hide for this dialog
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h
index 42d04e8..c0a6132 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
index 389cc94..d188298 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
index 9a1aef4..4a221e7 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
index 1f63e2e..3d9fe31 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ ExportConsensusVariationsDialog::ExportConsensusVariationsDialog(QWidget *p, con
{
setupUi(this);
setWindowTitle(tr("Export Consensus Variations"));
- new HelpButton(this, buttonBox, "17466142");
+ new HelpButton(this, buttonBox, "17467689");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
//hide for this dialog
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h
index 5362525..1671ea1 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
index 578bf74..f81c1fe 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
index 6de992d..02f4f06 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
index b6da892..7e0f1ca 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -171,7 +171,7 @@ void ExportCoverageDialog::sl_formatChanged(const QString &format) {
void ExportCoverageDialog::initLayout() {
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
- new HelpButton(this, buttonBox, "17466143");
+ new HelpButton(this, buttonBox, "17467690");
gbAdditionalOptions->hide();
adjustSize();
}
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
index e7e77b2..1a69b85 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
index 16b843f..6207de6 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
index 5dd86ea..afc6c74 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
index 1e7cbae..046c741 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ namespace U2 {
ExportReadsDialog::ExportReadsDialog(QWidget * p, const QList<DocumentFormatId> & formats) : QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466138");
+ new HelpButton(this, buttonBox, "17467685");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h
index 4c598d8..1f6c586 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
index 8fd8199..043b4a5 100644
--- a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
index 680a12e..75b90a6 100644
--- a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
+++ b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
index 1045dbf..30517e0 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
index 63e701a..236f275 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
+++ b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
index a534834..c17b0c7 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
+++ b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
index 90bc3a1..e536ead 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
+++ b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
index c8a7704..497584f 100644
--- a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
index 5b64638..db671c7 100644
--- a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
index 4fd08ee..d9136f7 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ ColorSchemaDialogController::ColorSchemaDialogController(QMap<char, QColor>& col
int ColorSchemaDialogController::adjustAlphabetColors(){
setupUi(this);
- new HelpButton(this, buttonBox, "17466077");
+ new HelpButton(this, buttonBox, "17467624");
alphabetColorsView = new QPixmap(alphabetColorsFrame->size());
connect(clearButton, SIGNAL(clicked()), SLOT(sl_onClear()));
connect(restoreButton, SIGNAL(clicked()), SLOT(sl_onRestore()));
@@ -172,7 +172,7 @@ void ColorSchemaDialogController::mouseReleaseEvent(QMouseEvent * event){
CreateColorSchemaDialog::CreateColorSchemaDialog(CustomColorSchema* _newSchema, QStringList _usedNames) : usedNames(_usedNames), newSchema(_newSchema) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466077");
+ new HelpButton(this, buttonBox, "17467624");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
index 49f8b1b..0344b4f 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
index 4a809b3..1dab0f1 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -91,7 +91,7 @@ static void setSchemaColors(const CustomColorSchema& customSchema){
}
-const QString ColorSchemaSettingsPageController::helpPageId = QString("17465980");
+const QString ColorSchemaSettingsPageController::helpPageId = QString("17467527");
ColorSchemaSettingsPageController::ColorSchemaSettingsPageController(MSAColorSchemeRegistry* mcsr, QObject* p)
: AppSettingsGUIPageController(tr("Alignment Color Scheme"), ColorSchemaSettingsPageId, p) {
diff --git a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h
index 29aa0c9..bc1647c 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
index 8b4982e..e7441f2 100644
--- a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
index 303d859..fb99a86 100644
--- a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
index 645cb62..591aaa7 100644
--- a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ namespace U2{
CreateSubalignmentDialogController::CreateSubalignmentDialogController(MAlignmentObject *_mobj, const QRect& selection, QWidget *p)
: QDialog(p), mobj(_mobj), saveContoller(NULL){
setupUi(this);
- new HelpButton(this, buttonBox, "17466104");
+ new HelpButton(this, buttonBox, "17467651");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Extract"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h
index 94f92a1..25d1141 100644
--- a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
index 3d3c5d4..fe1619f 100644
--- a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ namespace U2 {
DeleteGapsDialog::DeleteGapsDialog(QWidget* parent, int rowNum): QDialog(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466090");
+ new HelpButton(this, buttonBox, "17467637");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Remove"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h
index cd9394e..9cbb565 100644
--- a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h
+++ b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
index 0830aad..6a39e8d 100644
--- a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -236,8 +236,16 @@ void MSAImageExportController::initSettingsWidget() {
CHECK( !selection.isNull(), );
msaSettings.region = U2Region( selection.x(), selection.width());
msaSettings.seqIdx.clear();
- for (qint64 i = selection.y(); i < selection.height() + selection.y(); i++) {
- msaSettings.seqIdx.append( i );
+ if (!ui->isCollapsibleMode()) {
+ for (qint64 i = selection.y(); i < selection.height() + selection.y(); i++) {
+ msaSettings.seqIdx.append( i );
+ }
+ } else {
+ MSACollapsibleItemModel* model = ui->getCollapseModel();
+ SAFE_POINT(model != NULL, tr("MSA Collapsible Model is NULL"), );
+ for (qint64 i = selection.y(); i < selection.height() + selection.y(); i++) {
+ msaSettings.seqIdx.append(model->mapToRow(i));
+ }
}
}
@@ -245,6 +253,7 @@ Task* MSAImageExportController::getExportToBitmapTask(const ImageExportTaskSetti
msaSettings.includeConsensus = settingsUi->exportConsensus->isChecked();
msaSettings.includeRuler = settingsUi->exportRuler->isChecked();
msaSettings.includeSeqNames = settingsUi->exportSeqNames->isChecked();
+ updateSeqIdx();
return new MSAImageExportToBitmapTask(ui, msaSettings, settings);
}
@@ -253,6 +262,7 @@ Task* MSAImageExportController::getExportToSvgTask(const ImageExportTaskSettings
msaSettings.includeConsensus = settingsUi->exportConsensus->isChecked();
msaSettings.includeRuler = settingsUi->exportRuler->isChecked();
msaSettings.includeSeqNames = settingsUi->exportSeqNames->isChecked();
+ updateSeqIdx();
return new MSAImageExportToSvgTask(ui, msaSettings, settings);
}
@@ -289,7 +299,7 @@ bool MSAImageExportController::fitsInLimits() const {
qint64 imageHeight = (msaSettings.exportAll ? editor->getNumSequences() : msaSettings.seqIdx.size()) * editor->getRowHeight();
if (imageWidth > IMAGE_SIZE_LIMIT || imageHeight > IMAGE_SIZE_LIMIT) {
return false;
- }
+ }
if (format.contains("svg", Qt::CaseInsensitive) && imageWidth * imageHeight > MaxSvgImageSize) {
return false;
}
@@ -303,4 +313,26 @@ bool MSAImageExportController::canExportToSvg() const {
return charactersNumber < MaxSvgCharacters;
}
+void MSAImageExportController::updateSeqIdx() const {
+ CHECK(msaSettings.exportAll, );
+ if (!ui->isCollapsibleMode()) {
+ msaSettings.seqIdx.clear();
+ for (qint64 i = 0; i < ui->getEditor()->getNumSequences(); i++) {
+ msaSettings.seqIdx.append(i);
+ }
+ msaSettings.region = U2Region(0, ui->getEditor()->getAlignmentLen());
+ }
+
+ CHECK(ui->isCollapsibleMode(), );
+
+ MSACollapsibleItemModel* model = ui->getCollapseModel();
+ SAFE_POINT(model != NULL, tr("MSA Collapsible Model is NULL"), );
+ msaSettings.seqIdx.clear();
+ for (qint64 i = 0; i < ui->getEditor()->getNumSequences(); i++) {
+ if (model->rowToMap(i, true) != -1) {
+ msaSettings.seqIdx.append(i);
+ }
+ }
+}
+
} // namespace
diff --git a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
index bc1387c..58a384a 100644
--- a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -86,12 +86,6 @@ protected:
if (msaSettings.includeSeqNames) {
MSAEditorNameList* namesArea = ui->getEditorNameList();
SAFE_POINT_EXT( ui->getEditor() != NULL, setError(tr("MSA Editor is NULL")), );
- if (msaSettings.exportAll && msaSettings.seqIdx.size() != ui->getEditor()->getNumSequences()) {
- msaSettings.seqIdx.clear();
- for (qint64 i = 0; i < ui->getEditor()->getNumSequences(); i++) {
- msaSettings.seqIdx.append(i);
- }
- }
namesArea->drawNames(p, msaSettings.seqIdx);
}
}
@@ -112,10 +106,6 @@ protected:
void paintRuler(P& p) {
if (msaSettings.includeRuler) {
MSAEditorConsensusArea* consArea = ui->getConsensusArea();
- if (msaSettings.exportAll) {
- SAFE_POINT_EXT( ui->getEditor() != NULL, setError(tr("MSA Editor is NULL")), );
- msaSettings.region = U2Region(0, ui->getEditor()->getAlignmentLen());
- }
consArea->paintRulerPart(p, msaSettings.region);
}
}
@@ -123,11 +113,7 @@ protected:
template<class P>
bool paintContent(P& p) {
MSAEditorSequenceArea* seqArea = ui->getSequenceArea();
- if (msaSettings.exportAll) {
- return seqArea->drawContent(p);
- } else {
return seqArea->drawContent(p, msaSettings.region, msaSettings.seqIdx);
- }
}
MSAEditorUI* ui;
@@ -178,6 +164,7 @@ private:
void checkRegionToExport();
bool fitsInLimits() const;
bool canExportToSvg() const;
+ void updateSeqIdx() const;
MSAEditorUI* ui;
Ui_MSAExportSettings *settingsUi;
diff --git a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
index 5883a2e..81b9bb8 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -29,6 +29,7 @@
#include <U2Core/L10n.h>
#include <U2Core/U2IdTypes.h>
#include <U2Core/UserApplicationsSettings.h>
+#include <U2Core/TaskWatchdog.h>
#include <U2Gui/DialogUtils.h>
#include <U2Gui/LastUsedDirHelper.h>
@@ -84,12 +85,14 @@ void MSAExportConsensusTab::sl_exportClicked(){
checkEmptyFilepath();
ExportMSAConsensusTaskSettings settings;
settings.format = formatCb->itemData(formatCb->currentIndex()).toString();
- settings.keepGaps = keepGapsChb->isChecked();
+ settings.keepGaps = keepGapsChb->isChecked() || keepGapsChb->isHidden();
settings.msa = msa;
settings.name = msa->getMSAObject()->getGObjectName() + "_consensus";
settings.url = pathLe->text();
- AppContext::getTaskScheduler()->registerTopLevelTask(new ExportMSAConsensusTask(settings));
+ Task *t = new ExportMSAConsensusTask(settings);
+ TaskWatchdog::trackResourceExistence(msa->getMSAObject(), t, tr("A problem occurred during export consensus. The multiple alignment is no more available."));
+ AppContext::getTaskScheduler()->registerTopLevelTask(t);
}
void MSAExportConsensusTab::sl_formatChanged(){
diff --git a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
index 00498a0..d95807b 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
index 2ef27f1..8bb8d59 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString MSAExportConsensusFactoryTab::GROUP_ID = "OP_EXPORT_CONSENSUS";
const QString MSAExportConsensusFactoryTab::GROUP_ICON_STR = ":core/images/consensus.png";
const QString MSAExportConsensusFactoryTab::GROUP_TITLE = QObject::tr("Export Consensus");
-const QString MSAExportConsensusFactoryTab::GROUP_DOC_PAGE = "17466081";
+const QString MSAExportConsensusFactoryTab::GROUP_DOC_PAGE = "17467628";
MSAExportConsensusFactoryTab::MSAExportConsensusFactoryTab() {
objectViewOfWidget = ObjViewType_AlignmentEditor;
diff --git a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h
index 77ec33f..60eb235 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
index a5ec1a0..1350d29 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ namespace U2{
ExportHighligtningDialogController::ExportHighligtningDialogController(MSAEditorUI *msaui_, QWidget* p ): QDialog(p), msaui(msaui_){
setupUi(this);
- new HelpButton(this, buttonBox, "17466082");
+ new HelpButton(this, buttonBox, "17467629");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
CHECK(AppContext::getAppSettings(), );
diff --git a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
index dbb543e..3685cd2 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
index fff5317..dfadc77 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
index 3c71917..a9d8b0c 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
index b82224a..eaf8f54 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString MSAGeneralTabFactory::GROUP_ID = "OP_MSA_GENERAL";
const QString MSAGeneralTabFactory::GROUP_ICON_STR = ":core/images/settings2.png";
const QString MSAGeneralTabFactory::GROUP_TITLE = QString(QObject::tr("General"));
-const QString MSAGeneralTabFactory::GROUP_DOC_PAGE = "17466080";
+const QString MSAGeneralTabFactory::GROUP_DOC_PAGE = "17467627";
MSAGeneralTabFactory::MSAGeneralTabFactory() {
objectViewOfWidget = ObjViewType_AlignmentEditor;
diff --git a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h
index c94fde7..cbcf538 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
index 3d687ba..1855008 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
index 4feda4a..bf15107 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
index 44082b0..88c0a11 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ namespace U2 {
const QString MSAHighlightingFactory::GROUP_ID = "OP_MSA_HIGHLIGHTING";
const QString MSAHighlightingFactory::GROUP_ICON_STR = ":core/images/highlight.png";
const QString MSAHighlightingFactory::GROUP_TITLE = QString(QObject::tr("Highlighting"));
-const QString MSAHighlightingFactory::GROUP_DOC_PAGE = "17466082";
+const QString MSAHighlightingFactory::GROUP_DOC_PAGE = "17467629";
MSAHighlightingFactory::MSAHighlightingFactory() {
objectViewOfWidget = ObjViewType_AlignmentEditor;
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h
index 8c8ca3d..f2b09bd 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
index baf0e65..0d5520d 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
index 3baeb84..fcb70be 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
index 8708f5c..48121bf 100644
--- a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
index cf04afa..3637cf6 100644
--- a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
+++ b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
index 3e025d7..aceba2a 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -58,6 +58,7 @@
#include <U2Core/U2OpStatusUtils.h>
#include <U2Core/U2SafePoints.h>
#include <U2Core/U2SequenceUtils.h>
+#include <U2Core/TaskWatchdog.h>
#include <U2Gui/DialogUtils.h>
#include <U2Gui/ExportDocumentDialogController.h>
@@ -426,7 +427,7 @@ void MSAEditor::buildStaticMenu(QMenu* m) {
void MSAEditor::addCopyMenu(QMenu* m) {
- QMenu* cm = m->addMenu(tr("Copy"));
+ QMenu* cm = m->addMenu(tr("Copy/Paste"));
cm->menuAction()->setObjectName(MSAE_MENU_COPY);
}
@@ -703,8 +704,12 @@ bool MSAEditor::eventFilter(QObject*, QEvent* e) {
if (e->type() == QEvent::DragEnter) {
de->acceptProposedAction();
} else {
- AppContext::getTaskScheduler()->registerTopLevelTask(
- new AddSequenceObjectsToAlignmentTask(msaObject, QList<U2SequenceObject*>() << dnaObj));
+ U2OpStatusImpl os;
+ DNASequence seq = dnaObj->getWholeSequence(os);
+ seq.alphabet = dnaObj->getAlphabet();
+ Task *task = new AddSequenceObjectsToAlignmentTask(msaObject, QList<DNASequence>() << seq);
+ TaskWatchdog::trackResourceExistence(msaObject, task, tr("A problem occurred during adding sequences. The multiple alignment is no more available."));
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
}
}
}
@@ -906,6 +911,11 @@ MSAEditorUI::MSAEditorUI(MSAEditor* _editor)
collapseModel = new MSACollapsibleItemModel(this);
+ delSelectionAction = new QAction(tr("Remove selection"), this);
+ delSelectionAction->setObjectName("Remove selection");
+ delSelectionAction->setShortcut(QKeySequence::Delete);
+ delSelectionAction->setShortcutContext(Qt::WidgetShortcut);
+
copySelectionAction = new QAction(tr("Copy selection"), this);
copySelectionAction->setObjectName("copy_selection");
copySelectionAction->setShortcut(QKeySequence::Copy);
@@ -924,6 +934,15 @@ MSAEditorUI::MSAEditorUI(MSAEditor* _editor)
addAction(copyFormattedSelectionAction);
+ pasteAction = new QAction(tr("Paste"), this);
+ pasteAction->setObjectName("paste");
+ pasteAction->setShortcut(QKeySequence::Paste);
+ pasteAction->setShortcutContext(Qt::WidgetShortcut);
+ pasteAction->setToolTip(QString("%1 (%2)").arg(pasteAction->text())
+ .arg(pasteAction->shortcut().toString()));
+
+ addAction(pasteAction);
+
setContextMenuPolicy(Qt::CustomContextMenu);
setMinimumSize(300, 200);
@@ -1003,6 +1022,10 @@ MSAEditorUI::MSAEditorUI(MSAEditor* _editor)
connect(collapseModel, SIGNAL(toggled()), offsetsView, SLOT(sl_modelChanged()));
connect(collapseModel, SIGNAL(toggled()), seqArea, SLOT(sl_modelChanged()));
+
+ connect(delSelectionAction, SIGNAL(triggered()), seqArea, SLOT(sl_delCurrentSelection()));
+
+ nameList->addAction(delSelectionAction);
}
QWidget* MSAEditorUI::createLabelWidget(const QString& text, Qt::Alignment ali){
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditor.h b/src/corelibs/U2View/src/ov_msa/MSAEditor.h
index dc8fff6..330ce14 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditor.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -315,6 +315,7 @@ public:
QAction* getRedoAction() const;
QAction* getCopySelectionAction() const {return copySelectionAction;}
QAction* getCopyFormattedSelectionAction() const {return copyFormattedSelectionAction;}
+ QAction* getPasteAction() const {return pasteAction;}
bool isCollapsibleMode() const { return collapsibleMode; }
void setCollapsibleMode(bool collapse) { collapsibleMode = collapse; }
@@ -382,8 +383,10 @@ private:
MsaEditorAlignmentDependentWidget* similarityStatistics;
MSAEditorTreeViewer* treeViewer;
+ QAction *delSelectionAction;
QAction *copySelectionAction;
QAction *copyFormattedSelectionAction;
+ QAction *pasteAction;
};
class MSAWidget : public QWidget {
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
index b177860..89ea352 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -96,6 +96,7 @@ MSAEditorConsensusArea::MSAEditorConsensusArea(MSAEditorUI *_ui)
consensusCache = QSharedPointer<MSAEditorConsensusCache>(new MSAEditorConsensusCache(NULL, editor->getMSAObject(), algo));
connect(consensusCache->getConsensusAlgorithm(), SIGNAL(si_thresholdChanged(int)), SLOT(sl_onConsensusThresholdChanged(int)));
addAction(ui->getCopySelectionAction());
+ addAction(ui->getPasteAction());
restoreLastUsedConsensusThreshold();
setObjectName("consArea");
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
index a13da5b..98d3da2 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
index e7e9710..dbb639f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
index a3c3c85..4b516e5 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,6 +33,7 @@ class MAlignment;
class MAlignmentModInfo;
class MSAConsensusAlgorithm;
class MSAConsensusAlgorithmFactory;
+class U2OpStatus;
class MSAEditorConsensusCache : public QObject {
Q_OBJECT
@@ -52,7 +53,6 @@ public:
MSAConsensusAlgorithm* getConsensusAlgorithm() const {return algorithm;}
QByteArray getConsensusLine(bool withGaps);
-
private slots:
void sl_alignmentChanged(const MAlignment&, const MAlignmentModInfo&);
void sl_thresholdChanged(int newValue);
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
index e0d9e0e..0ac359f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
index 5949154..d803963 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
index a7b7593..1713a63 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -71,9 +71,10 @@ MSAEditorNameList::MSAEditorNameList(MSAEditorUI* _ui, QScrollBar* _nhBar)
copyCurrentSequenceAction->setObjectName("Copy current sequence");
connect(copyCurrentSequenceAction, SIGNAL(triggered()), SLOT(sl_copyCurrentSequence()));
- removeCurrentSequenceAction = new QAction("Remove current sequence", this);
- removeCurrentSequenceAction->setObjectName("Remove current sequence");
- connect(removeCurrentSequenceAction, SIGNAL(triggered()), SLOT(sl_removeCurrentSequence()));
+ removeSequenceAction = new QAction(tr("Remove sequence(s)"), this);
+ removeSequenceAction->setObjectName("Remove sequence");
+ connect(removeSequenceAction, SIGNAL(triggered()), SLOT(sl_removeSequence()));
+ addAction(removeSequenceAction);
connect(editor, SIGNAL(si_buildPopupMenu(GObjectView* , QMenu*)), SLOT(sl_buildContextMenu(GObjectView*, QMenu*)));
if (editor->getMSAObject()) {
@@ -150,9 +151,10 @@ void MSAEditorNameList::updateActions() {
MAlignmentObject* maObj = editor->getMSAObject();
if (maObj){
- removeCurrentSequenceAction->setEnabled(!maObj->isStateLocked() && maObj->getNumRows() > 1);
+ removeSequenceAction->setEnabled(!maObj->isStateLocked() && getSelectedRow() != -1);
editSequenceNameAction->setEnabled(!maObj->isStateLocked());
addAction(ui->getCopySelectionAction());
+ addAction(ui->getPasteAction());
}
}
@@ -203,20 +205,21 @@ void MSAEditorNameList::sl_buildContextMenu(GObjectView* v, QMenu* m) {
}
void MSAEditorNameList::buildMenu(QMenu* m) {
+ QMenu* editMenu = GUIUtils::findSubMenu(m, MSAE_MENU_EDIT);
+ SAFE_POINT(editMenu != NULL, "editMenu not found", );
+
+ editMenu->insertAction(editMenu->actions().last(), removeSequenceAction);
+
if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
return;
}
QMenu* copyMenu = GUIUtils::findSubMenu(m, MSAE_MENU_COPY);
- SAFE_POINT(copyMenu != NULL, "copyMenu", );
+ SAFE_POINT(copyMenu != NULL, "copyMenu not found", );
copyMenu->addAction(copyCurrentSequenceAction);
copyCurrentSequenceAction->setDisabled(getSelectedRow() == -1);
-
- QMenu* editMenu = GUIUtils::findSubMenu(m, MSAE_MENU_EDIT);
- SAFE_POINT(editMenu != NULL, "copyMenu", );
editMenu->insertAction(editMenu->actions().first(), editSequenceNameAction);
- editMenu->insertAction(editMenu->actions().last(), removeCurrentSequenceAction);
}
int MSAEditorNameList::getSelectedRow() const {
@@ -256,20 +259,12 @@ void MSAEditorNameList::sl_nameBarMoved(int) {
update();
}
-void MSAEditorNameList::sl_removeCurrentSequence() {
- MAlignmentObject* maObj = editor->getMSAObject();
- if (maObj) {
- int n = getSelectedRow();
- if (n < 0) {
- return;
- }
- assert(!maObj->isStateLocked());
- // UGENE cannot show empty alignment
- if (maObj->getNumRows() > 1) {
- editor->resetCollapsibleModel();
- maObj->removeRow(n);
- }
- }
+void MSAEditorNameList::sl_removeSequence() {
+ int width = editor->getAlignmentLen();
+ MSAEditorSelection oldSelection = ui->seqArea->getSelection();
+ MSAEditorSelection selection(0, oldSelection.y(), width, oldSelection.height());
+ ui->seqArea->setSelection(selection);
+ ui->seqArea->sl_delCurrentSelection();
}
void MSAEditorNameList::sl_selectReferenceSequence() {
@@ -302,9 +297,6 @@ void MSAEditorNameList::keyPressEvent(QKeyEvent *e) {
int key = e->key();
static int newSeq = 0;
switch(key) {
- case Qt::Key_Delete:
- ui->seqArea->sl_delCurrentSelection();
- break;
case Qt::Key_Up:
if (0 != (Qt::ShiftModifier & e->modifiers()) && ui->seqArea->isSeqInRange(newSeq - 1)) {
newSeq--;
@@ -575,6 +567,7 @@ void MSAEditorNameList::sl_selectionChanged(const MSAEditorSelection& current, c
}
completeRedraw = true;
update();
+ updateActions();
}
void MSAEditorNameList::focusInEvent(QFocusEvent* fe) {
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
index 40caa49..7009652 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@ private slots:
void sl_copyCurrentSequence();
void sl_editSequenceName();
void sl_lockedStateChanged();
- void sl_removeCurrentSequence();
+ void sl_removeSequence();
void sl_selectReferenceSequence();
void sl_alignmentChanged(const MAlignment&, const MAlignmentModInfo&);
void sl_onScrollBarActionTriggered( int scrollAction );
@@ -142,7 +142,7 @@ private:
QRubberBand* rubberBand;
QAction* editSequenceNameAction;
QAction* copyCurrentSequenceAction;
- QAction* removeCurrentSequenceAction;
+ QAction* removeSequenceAction;
QPixmap* cachedView;
static const int CROSS_SIZE = 9;
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
index c856639..37e7498 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
index 77bdff1..628e93f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
index 2f8ee05..bf944c6 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
index 6f57c9c..9589653 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
index 94b9405..38f1d2f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,6 +31,7 @@
#include <U2Algorithm/MSAColorScheme.h>
#include <U2Core/AddSequencesToAlignmentTask.h>
#include <U2Core/AppContext.h>
+#include <U2Core/ClipboardController.h>
#include <U2Core/DNAAlphabet.h>
#include <U2Core/DNASequenceObject.h>
#include <U2Core/DNATranslation.h>
@@ -48,6 +49,8 @@
#include <U2Core/Settings.h>
#include <U2Core/Settings.h>
#include <U2Core/Task.h>
+#include <U2Core/TaskSignalMapper.h>
+#include <U2Core/TaskWatchdog.h>
#include <U2Core/TextUtils.h>
#include <U2Core/U2AlphabetUtils.h>
#include <U2Core/U2ObjectDbi.h>
@@ -114,16 +117,15 @@ MSAEditorSequenceArea::MSAEditorSequenceArea(MSAEditorUI* _ui, GScrollBar* hb, G
rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
- delSelectionAction = new QAction(tr("Remove selection"), this);
- delSelectionAction->setObjectName("Remove selection");
- connect(delSelectionAction, SIGNAL(triggered()), SLOT(sl_delCurrentSelection()));
-
connect(ui->getCopySelectionAction(), SIGNAL(triggered()), SLOT(sl_copyCurrentSelection()));
addAction(ui->getCopySelectionAction());
connect(ui->getCopyFormattedSelectionAction(), SIGNAL(triggered()), SLOT(sl_copyFormattedSelection()));
addAction(ui->getCopyFormattedSelectionAction());
+ connect(ui->getPasteAction(), SIGNAL(triggered()), SLOT(sl_paste()));
+ addAction(ui->getPasteAction());
+
delColAction = new QAction(QIcon(":core/images/msaed_remove_columns_with_gaps.png"), tr("Remove columns of gaps..."), this);
delColAction->setObjectName("remove_columns_of_gaps");
delColAction->setShortcut(QKeySequence(Qt::SHIFT| Qt::Key_Delete));
@@ -229,7 +231,7 @@ MSAEditorSequenceArea::MSAEditorSequenceArea(MSAEditorUI* _ui, GScrollBar* hb, G
useDotsAction->setCheckable(true);
useDotsAction->setChecked(false);
connect(useDotsAction, SIGNAL(triggered()), SLOT(sl_useDots()));
- connect(editor->getMSAObject(), SIGNAL(si_alphabetChanged(const MAlignmentModInfo &, const DNAAlphabet*)),
+ connect(editor->getMSAObject(), SIGNAL(si_alphabetChanged(const MAlignmentModInfo &, const DNAAlphabet*)),
SLOT(sl_alphabetChanged(const MAlignmentModInfo &, const DNAAlphabet*)));
updateColorAndHighlightSchemes();
@@ -442,17 +444,25 @@ bool MSAEditorSequenceArea::hasAminoAlphabet() {
}
bool MSAEditorSequenceArea::drawContent(QPainter &p) {
- return drawContent(p, QRect(0, 0, editor->getAlignmentLen(), editor->getNumSequences()));
+ qint64 seqNum = editor->getNumSequences();
+ if (ui->isCollapsibleMode()) {
+ seqNum = ui->getCollapseModel()->rowToMap(seqNum);
+ }
+ return drawContent(p, QRect(0, 0, editor->getAlignmentLen(), seqNum));
}
bool MSAEditorSequenceArea::drawContent(QPixmap &pixmap) {
CHECK(editor->getColumnWidth() * editor->getAlignmentLen() < 32768 &&
editor->getRowHeight() * editor->getNumSequences() < 32768, false);
+ qint64 seqNum = editor->getNumSequences();
+ if (ui->isCollapsibleMode()) {
+ seqNum = ui->getCollapseModel()->rowToMap(seqNum);
+ }
pixmap = QPixmap(editor->getColumnWidth() * editor->getAlignmentLen(),
- editor->getRowHeight() * editor->getNumSequences());
+ editor->getRowHeight() * seqNum);
QPainter p(&pixmap);
- return drawContent(p, QRect(0, 0, editor->getAlignmentLen(), editor->getNumSequences()));
+ return drawContent(p, QRect(0, 0, editor->getAlignmentLen(), seqNum));
}
bool MSAEditorSequenceArea::drawContent(QPixmap &pixmap,
@@ -650,7 +660,8 @@ void MSAEditorSequenceArea::updateActions() {
//Update actions of "Edit" group
bool canEditAlignment = !readOnly && !isAlignmentEmpty();
bool canEditSelectedArea = canEditAlignment && !selection.isNull();
- delSelectionAction->setEnabled(canEditSelectedArea);
+ ui->delSelectionAction->setEnabled(canEditSelectedArea);
+
insSymAction->setEnabled(canEditSelectedArea);
bool oneCharacterIsSelected = selection.width() == 1 && selection.height() == 1;
replaceCharacterAction->setEnabled(canEditSelectedArea && oneCharacterIsSelected);
@@ -718,6 +729,7 @@ bool MSAEditorSequenceArea::drawContent(QPainter &p, const U2Region ®ion, con
p.fillRect(QRect(0, 0, editor->getColumnWidth() * region.length,
editor->getRowHeight() * seqIdx.size()),
Qt::white);
+ p.setPen(Qt::black);
p.setFont(editor->getFont());
MAlignmentObject* maObj = editor->getMSAObject();
@@ -1502,6 +1514,12 @@ void MSAEditorSequenceArea::keyPressEvent(QKeyEvent *e) {
}
}
break;
+ case Qt::Key_Delete:
+ if (!isAlignmentLocked() && !shift) {
+ emit si_startMsaChanging();
+ deleteCurrentSelection();
+ }
+ break;
case Qt::Key_Home:
cancelSelection();
if (shift) { //scroll namelist
@@ -1559,12 +1577,6 @@ void MSAEditorSequenceArea::keyPressEvent(QKeyEvent *e) {
setCursorPos(QPoint(cp, cursorPos.y()));
}
break;
- case Qt::Key_Delete:
- if (!isAlignmentLocked() && !shift) {
- emit si_startMsaChanging();
- deleteCurrentSelection();
- }
- break;
case Qt::Key_Backspace:
removeGapsPrecedingSelection(genuineCtrl ? 1 : -1);
break;
@@ -1937,11 +1949,11 @@ void MSAEditorSequenceArea::sl_buildContextMenu(GObjectView*, QMenu* m) {
SAFE_POINT(editMenu != NULL, "editMenu", );
QList<QAction*> actions;
- actions << delSelectionAction << insSymAction << replaceCharacterAction << reverseComplementAction << reverseAction << complementAction << delColAction << removeAllGapsAction;
+ actions << insSymAction << replaceCharacterAction << reverseComplementAction << reverseAction << complementAction << delColAction << removeAllGapsAction;
QMenu* copyMenu = GUIUtils::findSubMenu(m, MSAE_MENU_COPY);
SAFE_POINT(copyMenu != NULL, "copyMenu", );
-
+ editMenu->insertAction(editMenu->actions().first(), ui->delSelectionAction);
if (rect().contains(mapFromGlobal(QCursor::pos()))) {
editMenu->addActions(actions);
copyMenu->addAction(ui->getCopySelectionAction());
@@ -1982,6 +1994,7 @@ void MSAEditorSequenceArea::buildMenu(QMenu* m) {
copyMenu->addAction(ui->getCopySelectionAction());
ui->getCopyFormattedSelectionAction()->setDisabled(selection.isNull());
copyMenu->addAction(ui->getCopyFormattedSelectionAction());
+ copyMenu->addAction(ui->getPasteAction());
QMenu* viewMenu = GUIUtils::findSubMenu(m, MSAE_MENU_VIEW);
SAFE_POINT(viewMenu != NULL, "viewMenu", );
@@ -2434,6 +2447,37 @@ void MSAEditorSequenceArea::sl_copyFormattedSelection(){
AppContext::getTaskScheduler()->registerTopLevelTask(clipboardTask);
}
+void MSAEditorSequenceArea::sl_paste(){
+ MAlignmentObject* msaObject = editor->getMSAObject();
+ if (msaObject->isStateLocked()) {
+ return;
+ }
+ PasteFactory* pasteFactory = AppContext::getPasteFactory();
+ SAFE_POINT(pasteFactory != NULL, "PasteFactory is null", );
+
+ bool focus = ui->isAncestorOf(QApplication::focusWidget());
+ PasteTask* task = pasteFactory->pasteTask(!focus);
+ if (focus) {
+ connect(new TaskSignalMapper(task), SIGNAL(si_taskFinished(Task *)), SLOT(sl_pasteFinished(Task*)));
+ }
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+}
+
+void MSAEditorSequenceArea::sl_pasteFinished(Task* _pasteTask){
+ MAlignmentObject* msaObject = editor->getMSAObject();
+ if (msaObject->isStateLocked()) {
+ return;
+ }
+
+ PasteTask* pasteTask = qobject_cast<PasteTask*>(_pasteTask);
+ if(NULL == pasteTask || pasteTask->isCanceled()) {
+ return;
+ }
+ const QList<Document*>& docs = pasteTask->getDocuments();
+
+ AddSequencesFromDocumentsToAlignmentTask *task = new AddSequencesFromDocumentsToAlignmentTask(msaObject, docs);
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+}
bool MSAEditorSequenceArea::shiftSelectedRegion(int shift) {
if (0 == shift) {
@@ -2597,6 +2641,7 @@ void MSAEditorSequenceArea::sl_addSeqFromFile()
lod.url = urls.first();
cancelSelection();
AddSequencesFromFilesToAlignmentTask *task = new AddSequencesFromFilesToAlignmentTask(msaObject, urls);
+ TaskWatchdog::trackResourceExistence(msaObject, task, tr("A problem occurred during adding sequences. The multiple alignment is no more available."));
AppContext::getTaskScheduler()->registerTopLevelTask(task);
}
@@ -2611,23 +2656,22 @@ void MSAEditorSequenceArea::sl_addSeqFromProject()
ProjectTreeControllerModeSettings settings;
settings.objectTypesToShow.insert(GObjectTypes::SEQUENCE);
- QScopedPointer<U2SequenceObjectConstraints> seqConstraints(new U2SequenceObjectConstraints());
- seqConstraints->alphabetType = msaObject->getAlphabet()->getType();
- settings.objectConstraints.insert(seqConstraints.data());
QList<GObject*> objects = ProjectTreeItemSelectorDialog::selectObjects(settings,this);
-
+ QList<DNASequence> objectsToAdd;
+ U2OpStatus2Log os;
foreach(GObject* obj, objects) {
- if (obj->isUnloaded()) {
- continue;
- }
U2SequenceObject *seqObj = qobject_cast<U2SequenceObject*>(obj);
if (seqObj) {
- U2OpStatus2Log os;
- editor->copyRowFromSequence(seqObj, os);
- cancelSelection();
+ objectsToAdd.append(seqObj->getWholeSequence(os));
+ SAFE_POINT_OP(os, );
}
}
+ if (objectsToAdd.size() > 0) {
+ AddSequenceObjectsToAlignmentTask *addSeqObjTask = new AddSequenceObjectsToAlignmentTask(editor->getMSAObject(), objectsToAdd);
+ AppContext::getTaskScheduler()->registerTopLevelTask(addSeqObjTask);
+ cancelSelection();
+ }
}
void MSAEditorSequenceArea::sl_sortByName() {
@@ -2919,7 +2963,7 @@ void MSAEditorSequenceArea::sl_setCollapsingRegions(const QList<QStringList>& co
void MSAEditorSequenceArea::sl_changeSelectionColor() {
QColor black(Qt::black);
selectionColor = (black == selectionColor) ? Qt::darkGray : Qt::black;
- update();
+ update();
}
int MSAEditorSequenceArea::getHeight(){
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
index 22d6a68..6f22b77 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -366,6 +366,8 @@ private slots:
void sl_replaceSelectedCharacter();
void sl_copyCurrentSelection();
void sl_copyFormattedSelection();
+ void sl_paste();
+ void sl_pasteFinished(Task* pasteTask);
void sl_fillCurrentSelectionWithGaps();
void sl_delCol();
void sl_goto();
@@ -496,7 +498,6 @@ private:
int msaVersionBeforeShifting;
QAction* copySelectionAction;
- QAction* delSelectionAction;
QAction* delColAction;
QAction* insSymAction;
QAction* removeAllGapsAction;
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
index f373ff8..56ec2cd 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorState.h b/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
index 43e853a..c8781c8 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
index afba747..178b829 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
index d703ca9..f4a371c 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
index 0d4e79c..b7fe372 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -282,16 +282,20 @@ void ExtractConsensusTask::run() {
CHECK(msa->getUI()->getConsensusArea(), );
CHECK(msa->getUI()->getConsensusArea()->getConsensusCache(),);
- QSharedPointer <MSAEditorConsensusCache> cache(msa->getUI()->getConsensusArea()->getConsensusCache());
- if(!cache->getConsensusAlgorithm()->getFactory()->isSequenceLikeResult()){
- keepGaps = true;
- }
- QByteArray consensusLine = cache->getConsensusLine(true);
- foreach(QChar c, consensusLine){
- if(c == '-' && !keepGaps){
- continue;
+ MSAConsensusAlgorithm *algorithm = msa->getUI()->getConsensusArea()->getConsensusAlgorithm();
+ MAlignment ma = msa->getMSAObject()->getMAlignment();
+ for (int i = 0, n = ma.getLength(); i < n; i++) {
+ if (stateInfo.isCoR()) {
+ return;
+ }
+ int count = 0;
+ int nSeq = ma.getNumRows();
+ SAFE_POINT(0 != nSeq, tr("No sequences in alignment"), );
+
+ QChar c = algorithm->getConsensusCharAndScore(ma, i, count);
+ if (c != MAlignment_GapChar || keepGaps) {
+ filteredConsensus.append(c);
}
- filteredConsensus.append(c);
}
}
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
index a2e75d4..bc1a184 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
index 32c39ee..87e8627 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
index b4b4886..e875652 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
index 02c2163..cb044e8 100644
--- a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -120,7 +120,7 @@ void SelectSubalignmentDialog::init() {
SAFE_POINT(ui->getEditor() != NULL, tr("MSA Editor is NULL"), );
setupUi(this);
- new HelpButton(this, buttonBox, "17466105");
+ new HelpButton(this, buttonBox, "17467652");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Select"));
connect(allButton, SIGNAL(clicked()), SLOT(sl_allButtonClicked()));
diff --git a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h
index eb99e34..3e0581b 100644
--- a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h
+++ b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
index 63af6a8..f5e1f65 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
index 9d59dea..61a5d18 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
index 519c62c..2c611d4 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
index c607758..bee6679 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
index 31b6d0b..4a01f3b 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
index e3447b1..798b3a6 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h b/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
index 004c629..62b8b1e 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
index a72b4d1..5adcdd0 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
index fda950c..f39d820 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
index 7d342d7..0e28720 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
index 01ab631..d857140 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
index b0d368e..cc8571f 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
index d53a695..2346931 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
index 93877b7..36a347d 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
index 6b5225f..72aa82d 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
index d45e8de..acd6d3f 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
index 44c3eec..bf6055e 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
index fd33c93..b192fbf 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
index e0ee503..11571b3 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
index 12dd3d4..471025e 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
index 040c0ed..84e1a80 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
index db34a6f..ee005ea 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ namespace U2 {
const QString PairAlignFactory::GROUP_ID = "OP_PAIRALIGN";
const QString PairAlignFactory::GROUP_ICON_STR = ":core/images/pairwise.png";
const QString PairAlignFactory::GROUP_TITLE = QString(QObject::tr("Pairwise Alignment"));
-const QString PairAlignFactory::GROUP_DOC_PAGE = "17466108";
+const QString PairAlignFactory::GROUP_DOC_PAGE = "17467655";
PairAlignFactory::PairAlignFactory() {
diff --git a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h
index 59418b0..1d50d5f 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
index 2d15f0b..8b34682 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
index 0610c91..687a20b 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
index f200362..5957b76 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
index 4a193eb..c136107 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
index 1193e01..438b174 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
index 9fe7ef4..b64510c 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.cpp
index a107fd1..be26a61 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2012 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.h
index 97bcb69..2d48d9b 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewerTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2012 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
index 6815088..71a1a7c 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
index 1a6badc..e0fa97c 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
index f106835..5e0b7f5 100644
--- a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ namespace U2 {
SaveSelectedSequenceFromMSADialogController::SaveSelectedSequenceFromMSADialogController(QWidget* p): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466106");
+ new HelpButton(this, buttonBox, "17467653");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h
index ceb22da..567c814 100644
--- a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
index c3e909f..df98ee9 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
index 3814971..8cb7ca0 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
index 21d5705..a0a5802 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString SeqStatisticsWidgetFactory::GROUP_ID = "OP_SEQ_STATISTICS_WIDGET";
const QString SeqStatisticsWidgetFactory::GROUP_ICON_STR = ":core/images/chart_bar.png";
const QString SeqStatisticsWidgetFactory::GROUP_TITLE = QString(QObject::tr("Statistics"));
-const QString SeqStatisticsWidgetFactory::GROUP_DOC_PAGE = "17466117";
+const QString SeqStatisticsWidgetFactory::GROUP_DOC_PAGE = "17467664";
SeqStatisticsWidgetFactory::SeqStatisticsWidgetFactory() {
diff --git a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h
index c8fb030..7ff77f4 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
index ee6576a..ef24c2c 100644
--- a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
index bf4a554..826ee21 100644
--- a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
+++ b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
index b53cd7a..58b1967 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
index b1bb53d..cf6abb2 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
index 8afac6e..23ae576 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString MSATreeOptionsWidgetFactory::GROUP_ID = "OP_MSA_TREES_WIDGET";
const QString MSATreeOptionsWidgetFactory::GROUP_ICON_STR = ":core/images/tree.png";
const QString MSATreeOptionsWidgetFactory::GROUP_TITLE = QString(QObject::tr("Tree Settings"));
-const QString MSATreeOptionsWidgetFactory::GROUP_DOC_PAGE = "17466154";
+const QString MSATreeOptionsWidgetFactory::GROUP_DOC_PAGE = "17467701";
MSATreeOptionsWidgetFactory::MSATreeOptionsWidgetFactory()
@@ -75,7 +75,7 @@ void MSATreeOptionsWidgetFactory::sl_onWidgetViewSaved(const TreeOpWidgetViewSet
const QString TreeOptionsWidgetFactory::GROUP_ID = "OP_TREES_WIDGET";
const QString TreeOptionsWidgetFactory::GROUP_ICON_STR = ":core/images/tree.png";
const QString TreeOptionsWidgetFactory::GROUP_TITLE = QString(QObject::tr("Tree Settings"));
-const QString TreeOptionsWidgetFactory::GROUP_DOC_PAGE = "17466154";
+const QString TreeOptionsWidgetFactory::GROUP_DOC_PAGE = "17467701";
TreeOptionsWidgetFactory::TreeOptionsWidgetFactory()
: viewSettings(new TreeOpWidgetViewSettings)
@@ -117,7 +117,7 @@ void TreeOptionsWidgetFactory::sl_onWidgetViewSaved(const TreeOpWidgetViewSettin
const QString AddTreeWidgetFactory::GROUP_ID = "OP_MSA_ADD_TREE_WIDGET";
const QString AddTreeWidgetFactory::GROUP_ICON_STR = ":core/images/tree.png";
const QString AddTreeWidgetFactory::GROUP_TITLE = QString(QObject::tr("Tree Settings"));
-const QString AddTreeWidgetFactory::GROUP_DOC_PAGE = "17466154";
+const QString AddTreeWidgetFactory::GROUP_DOC_PAGE = "17467701";
AddTreeWidgetFactory::AddTreeWidgetFactory() {
objectViewOfWidget = ObjViewType_AlignmentEditor;
diff --git a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h
index a3b86c0..d7d630c 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
index 10da97b..9039678 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
index 7ea3000..71f244b 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
index 913f672..04d8a23 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
index f3752e2..2dcdf38 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
index a455d3e..5ad184f 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
index c9707e7..8c87f11 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
index a724124..b32f337 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
index 26e25c2..a49fc01 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
index da8ea24..af9e66f 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
index a55d07c..4699ee5 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
index 2a865c0..ed2f750 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
index 0838a69..825b48e 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
index abc5c6e..26792d5 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
index 52a3111..7d2b568 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
index f0beba4..2a2bbaa 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
index 300442e..1f6247f 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
index 118792f..95ba7e2 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h b/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
index 19766c2..a3c3dea 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
index b87cba9..dbdad26 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
index 94c7ce4..fe8720c 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
index 4ff2b73..a6e68fa 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
index 2e85229..b918d05 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
index 0cd1ef0..91c3b31 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
index 094b850..1af7e20 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
index c39bd6e..9f6b9ba 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
index 3bbf3c6..a2fa9bb 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
index 6257b0b..f58de57 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
index 5f88831..9fe8e1e 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
index 36f5145..c30da60 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
index d8cfe0b..8e16517 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
index fc811e7..141e3bf 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -87,6 +87,8 @@ ADVClipboard::ADVClipboard(AnnotatedDNAView* c) : QObject(c) {
copyAnnotationSequenceTranslationAction = new QAction(QIcon(":/core/images/copy_annotation_translation.png"), tr("Copy annotation sequence translation"), this);
copyAnnotationSequenceTranslationAction->setObjectName("Copy annotation sequence translation");
+ pasteSequenceAction = createPasteSequenceAction(this);
+
connect(copySequenceAction, SIGNAL(triggered()), SLOT(sl_copySequence()));
connect(copyTranslationAction, SIGNAL(triggered()), SLOT(sl_copyTranslation()));
connect(copyComplementSequenceAction, SIGNAL(triggered()), SLOT(sl_copyComplementSequence()));
@@ -299,7 +301,7 @@ void ADVClipboard::updateActions() {
void ADVClipboard::addCopyMenu(QMenu* m) {
- QMenu* copyMenu = new QMenu(tr("Copy"), m);
+ QMenu* copyMenu = new QMenu(tr("Copy/Paste"), m);
copyMenu->menuAction()->setObjectName(ADV_MENU_COPY);
copyMenu->addAction(copySequenceAction);
@@ -308,10 +310,18 @@ void ADVClipboard::addCopyMenu(QMenu* m) {
copyMenu->addAction(copyComplementTranslationAction);
copyMenu->addAction(copyAnnotationSequenceAction);
copyMenu->addAction(copyAnnotationSequenceTranslationAction);
+ copyMenu->addAction(pasteSequenceAction);
m->addMenu(copyMenu);
}
+QAction * ADVClipboard::createPasteSequenceAction(QObject *parent) {
+ QAction *action = new QAction(QIcon(":/core/images/paste.png"), tr("Paste sequence"), parent);
+ action->setObjectName("Paste sequence");
+ action->setShortcuts(QKeySequence::Paste);
+ action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+ return action;
+}
ADVSequenceObjectContext* ADVClipboard::getSequenceContext() const {
return ctx->getSequenceInFocus();
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
index cfeb4ff..14e9b19 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,8 +48,12 @@ public:
QAction* getCopyAnnotationSequenceAction() const {return copyAnnotationSequenceAction;}
QAction* getCopyAnnotationSequenceTranslationAction() const {return copyAnnotationSequenceTranslationAction;}
+ QAction* getPasteSequenceAction() const {return pasteSequenceAction;}
+
void addCopyMenu(QMenu* m);
+ static QAction* createPasteSequenceAction(QObject *parent);
+
public slots:
void sl_onDNASelectionChanged(LRegionsSelection* s, const QVector<U2Region>& added, const QVector<U2Region>& removed);
@@ -78,6 +82,7 @@ private:
QAction* copyComplementTranslationAction;
QAction* copyAnnotationSequenceAction;
QAction* copyAnnotationSequenceTranslationAction;
+ QAction* pasteSequenceAction;
static const QString COPY_FAILED_MESSAGE;
static const qint64 MAX_COPY_SIZE_FOR_X86;
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
index 7b4b64c..185aa95 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
index 1a8b169..462a8f0 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
index a95548d..2698bcc 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
index 4e7043b..d4d76c9 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
index 11ff128..fda0fe2 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
index c6100f9..38950df 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
index 311b8b1..e3cc969 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -52,8 +52,8 @@
#include "DetView.h"
#include "GSequenceGraphView.h"
#include "Overview.h"
-
#include "image_export/SingleSequenceImageExportController.h"
+#include "ov_sequence/codon_table/CodonTable.h"
namespace U2 {
@@ -198,6 +198,7 @@ void ADVSingleSequenceWidget::init() {
QMenu* ttMenu = seqCtx->createTranslationsMenu();
tbMenues.append(ttMenu);
QToolButton* button = detView->addActionToLocalToolbar(ttMenu->menuAction());
+ detView->addAction(ctx->getShowCodonTableAction());
SAFE_POINT(button, QString("ToolButton for %1 is NULL").arg(ttMenu->menuAction()->objectName()), );
button->setPopupMode(QToolButton::InstantPopup);
button->setObjectName("AminoToolbarButton");
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
index 7c0e06d..8e4e3d6 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
index d323109..66c2d53 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
index ca2c8f8..c1fc347 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
index a3833c6..e64a990 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp b/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
index 3284a98..f2bf066 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVUtils.h b/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
index 0977a8e..ccd4e85 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
index 9379690..5a4f272 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,8 +30,10 @@
#include <U2Core/AnnotationSettings.h>
#include <U2Core/AnnotationTableObject.h>
#include <U2Core/AppContext.h>
+#include <U2Core/AppSettings.h>
#include <U2Core/AutoAnnotationsSupport.h>
#include <U2Core/BaseDocumentFormats.h>
+#include <U2Core/ClipboardController.h>
#include <U2Core/DNASequenceObject.h>
#include <U2Core/DNASequenceSelection.h>
#include <U2Core/DocumentModel.h>
@@ -46,10 +48,15 @@
#include <U2Core/RemoveAnnotationsTask.h>
#include <U2Core/ReverseSequenceTask.h>
#include <U2Core/SelectionUtils.h>
+#include <U2Core/SequenceUtils.h>
#include <U2Core/Task.h>
+#include <U2Core/TaskSignalMapper.h>
#include <U2Core/Timer.h>
+#include <U2Core/U2AlphabetUtils.h>
#include <U2Core/U2OpStatusUtils.h>
#include <U2Core/U2SafePoints.h>
+#include <U2Core/U2SequenceUtils.h>
+#include <U2Core/UserApplicationsSettings.h>
#include <U2Gui/CreateObjectRelationDialogController.h>
#include <U2Gui/DialogUtils.h>
@@ -170,6 +177,12 @@ AnnotatedDNAView::AnnotatedDNAView(const QString& viewName, const QList<U2Sequen
SecStructPredictViewAction::createAction(this);
}
+QAction * AnnotatedDNAView::createPasteAction() {
+ QAction *action = ADVClipboard::createPasteSequenceAction(this);
+ connect(action, SIGNAL(triggered()), this, SLOT(sl_paste()));
+ return action;
+}
+
QWidget* AnnotatedDNAView::createWidget() {
GTIMER(c1,t1,"AnnotatedDNAView::createWidget");
assert(scrollArea == NULL);
@@ -210,6 +223,7 @@ QWidget* AnnotatedDNAView::createWidget() {
connect(block, SIGNAL(si_titleClicked(ADVSequenceWidget*)), SLOT(sl_onSequenceWidgetTitleClicked(ADVSequenceWidget*)));
block->setObjectName("ADV_single_sequence_widget_"+QString::number(i));
addSequenceWidget(block);
+ block->addAction(createPasteAction());
}
mainSplitter->addWidget(annotationsView);
@@ -222,6 +236,7 @@ QWidget* AnnotatedDNAView::createWidget() {
scrollArea->setWidget(scrolledWidget);
clipb = new ADVClipboard(this);
+ connect(clipb->getPasteSequenceAction(), SIGNAL(triggered()), this, SLOT(sl_paste()));
mainSplitter->installEventFilter(this);
mainSplitter->setAcceptDrops(true);
@@ -467,6 +482,7 @@ void AnnotatedDNAView::buildStaticToolbar(QToolBar* tb) {
tb->addAction(clipb->getCopyComplementTranslationAction());
tb->addAction(clipb->getCopyAnnotationSequenceAction());
tb->addAction(clipb->getCopyAnnotationSequenceTranslationAction());
+ tb->addAction(clipb->getPasteSequenceAction());
tb->addSeparator();
if (posSelector == NULL && !seqContexts.isEmpty()) {
@@ -1306,6 +1322,74 @@ void AnnotatedDNAView::sl_sequenceModifyTaskStateChanged() {
}
}
+void AnnotatedDNAView::sl_paste(){
+ PasteFactory* pasteFactory = AppContext::getPasteFactory();
+ SAFE_POINT(pasteFactory != NULL, "adFactory is null", );
+
+ bool focus = false;
+ ADVSingleSequenceWidget *wgt = qobject_cast<ADVSingleSequenceWidget*> (focusedWidget);
+ if (wgt != NULL) {
+ QList<GSequenceLineView*> views = wgt->getLineViews();
+ foreach (GSequenceLineView* v, views) {
+ if (v->hasFocus()) {
+ focus = true;
+ break;
+ }
+ }
+ }
+
+ PasteTask* task = pasteFactory->pasteTask(!focus);
+ if (focus){
+ connect(new TaskSignalMapper(task), SIGNAL(si_taskFinished(Task *)), SLOT(sl_pasteFinished(Task*)));
+ }
+ ADVSequenceObjectContext *seqCtx = getSequenceInFocus();
+ SAFE_POINT(seqCtx != NULL, tr("No sequence in focus"), );
+ pasteQueue.insert(task, seqCtx);
+
+
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+}
+
+void AnnotatedDNAView::sl_pasteFinished(Task* _pasteTask){
+ ADVSequenceObjectContext *seqCtx = pasteQueue.take(_pasteTask);
+ if (seqCtx == NULL){
+ return;
+ }
+
+ U2SequenceObject* obj = seqCtx->getSequenceObject();
+ if (obj->isStateLocked()) {
+ return;
+ }
+
+ PasteTask* pasteTask = qobject_cast<PasteTask*>(_pasteTask);
+ if(NULL == pasteTask || pasteTask->isCanceled()) {
+ return;
+ }
+ const QList<Document*>& docs = pasteTask->getDocuments();
+ if (docs.length() == 0){
+ return;
+ }
+
+ U2OpStatusImpl os;
+ const QList<DNASequence>& sequences = PasteUtils::getSequences(docs, os);
+ DNASequence seq;
+ foreach(const DNASequence& dnaObj, sequences) {
+ if (seq.alphabet == NULL){
+ seq.alphabet = dnaObj.alphabet;
+ }
+ const DNAAlphabet* newAlphabet = U2AlphabetUtils::deriveCommonAlphabet(dnaObj.alphabet, seq.alphabet);
+ if (newAlphabet != NULL) {
+ seq.alphabet = newAlphabet;
+ seq.seq.append(dnaObj.seq);
+ }
+ }
+
+ Task *t = new ModifySequenceContentTask(BaseDocumentFormats::FASTA, obj, U2Region(obj->getSequenceLength(), 0), seq);
+ connect(t, SIGNAL(si_stateChanged()), SLOT(sl_sequenceModifyTaskStateChanged()));
+ AppContext::getTaskScheduler()->registerTopLevelTask(t);
+ seqCtx->getSequenceSelection()->clear();
+}
+
void AnnotatedDNAView::onObjectRenamed(GObject* obj, const QString& oldName) {
// 1. update title
OpenAnnotatedDNAViewTask::updateTitle(this);
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
index aba2c2c..b324107 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -208,6 +208,9 @@ private slots:
void sl_replaceSequencePart();
void sl_sequenceModifyTaskStateChanged();
+ void sl_paste();
+ void sl_pasteFinished(Task* pasteTask);
+
void sl_reverseComplementSequence();
void sl_reverseSequence();
void sl_complementSequence();
@@ -232,6 +235,8 @@ private:
void reverseComplementSequence(bool reverse = true, bool complement = true);
+ QAction * createPasteAction();
+
QSplitter* mainSplitter;
QScrollArea* scrollArea;
QWidget* scrolledWidget;
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
index 53a105f..f26a115 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
index 8dff66c..9128006 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
index 0cfd457..bf02675 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
index d072862..46965f9 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
index 3412cdb..30f9247 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
index 786d9eb..d1f79f9 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
index 6c1036b..2a26b37 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,11 +37,13 @@
#include <U2Core/AnnotationTableObject.h>
#include <U2Core/AppContext.h>
#include <U2Core/AutoAnnotationsSupport.h>
+#include <U2Core/ClipboardController.h>
#include <U2Core/DBXRefRegistry.h>
#include <U2Core/DNASequenceObject.h>
#include <U2Core/DocumentModel.h>
#include <U2Core/GObjectTypes.h>
#include <U2Core/L10n.h>
+#include <U2Core/TaskSignalMapper.h>
#include <U2Core/Settings.h>
#include <U2Core/U1AnnotationUtils.h>
#include <U2Core/U2SafePoints.h>
@@ -161,6 +163,15 @@ AnnotationsTreeView::AnnotationsTreeView(AnnotatedDNAView* _ctx) : ctx(_ctx), dn
addColumnIcon = QIcon(":core/images/add_column.png");
removeColumnIcon = QIcon(":core/images/remove_column.png");
+ /*
+ pasteAction = new QAction(QIcon(":/core/images/paste.png"), tr("Paste annotations"), this);
+ pasteAction->setObjectName("Paste annotations");
+ pasteAction->setShortcut(QKeySequence(Qt::SHIFT| Qt::Key_V | Qt::ControlModifier));
+ pasteAction->setShortcutContext(Qt::WidgetShortcut);
+ connect(pasteAction, SIGNAL(triggered()), SLOT(sl_paste()));
+ tree->addAction(pasteAction);
+ */
+
addAnnotationObjectAction = new QAction(tr("Objects with annotations..."), this);
connect(addAnnotationObjectAction, SIGNAL(triggered()), SLOT(sl_onAddAnnotationObjectToView()));
@@ -872,6 +883,7 @@ void AnnotationsTreeView::sl_onBuildPopupMenu(GObjectView*, QMenu* m) {
m->insertAction(first, searchQualifierAction);
m->insertAction(first, invertAnnotationSelectionAction);
m->insertAction(first, renameAction);
+ //m->insertAction(first, pasteAction);
m->insertSeparator(first);
foreach(QAction* a, contextActions) {
@@ -897,6 +909,39 @@ void AnnotationsTreeView::adjustMenu(QMenu* m) const {
removeMenu->addAction(removeAnnsAndQsAction);
}
+void AnnotationsTreeView::sl_paste(){
+ PasteFactory* pasteFactory = AppContext::getPasteFactory();
+ SAFE_POINT(pasteFactory != NULL, "adFactory is null", );
+
+
+ bool addToProject = !(tree && tree->hasFocus());
+ PasteTask* task = pasteFactory->pasteTask(addToProject);
+ if (!addToProject){
+ connect(new TaskSignalMapper(task), SIGNAL(si_taskFinished(Task *)), SLOT(sl_pasteFinished(Task*)));
+ }
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+}
+
+void AnnotationsTreeView::sl_pasteFinished(Task* _pasteTask){
+ if (!tree || !tree->hasFocus()){
+ return;
+ }
+
+ PasteTask* pasteTask = qobject_cast<PasteTask*>(_pasteTask);
+ if(NULL == pasteTask || pasteTask->isCanceled()) {
+ return;
+ }
+ const QList<Document*>& docs = pasteTask->getDocuments();
+ if (docs.length() == 0){
+ return;
+ }
+ foreach (Document* doc, docs){
+ foreach(GObject *annObj, doc->findGObjectByType(GObjectTypes::ANNOTATION_TABLE)) {
+ ctx->tryAddObject(annObj);
+ }
+ }
+}
+
void AnnotationsTreeView::sl_onAddAnnotationObjectToView() {
ProjectTreeControllerModeSettings s;
s.objectTypesToShow.insert(GObjectTypes::ANNOTATION_TABLE);
@@ -1023,6 +1068,7 @@ void AnnotationsTreeView::sl_removeAnnsAndQs() {
//remove selected annotations now
QList<AVAnnotationItem *> annotationItemsToRemove = selectAnnotationItems(tree->selectedItems(), TriState_No);
+
QMultiMap<AnnotationGroup *, Annotation *> annotationsByGroup;
foreach (AVAnnotationItem *aItem, annotationItemsToRemove) {
SAFE_POINT(!aItem->annotation->getGObject()->isStateLocked(), "Attempting to remove annotations from locked table!", );
@@ -1037,8 +1083,7 @@ void AnnotationsTreeView::sl_removeAnnsAndQs() {
}
//now remove selected groups
- QList<AVGroupItem*> groupItemsToRemove = selectGroupItems(tree->selectedItems(), TriState_No,
- TriState_No);
+ QList<AVGroupItem*> groupItemsToRemove = selectGroupItems(tree->selectedItems(), TriState_No, TriState_No);
qSort(groupItemsToRemove.begin(), groupItemsToRemove.end(), groupDepthInverseComparator);
//now remove all groups
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
index b18b7ee..9b3bdc2 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -94,6 +94,8 @@ public:
static const int COLUMN_VALUE;
private slots:
+ void sl_paste();
+ void sl_pasteFinished(Task* pasteTask);
void sl_onAnnotationObjectAdded(AnnotationTableObject *obj);
void sl_onAnnotationObjectRemoved(AnnotationTableObject *obj);
@@ -175,6 +177,7 @@ private:
AnnotationsTreeWidget* tree;
AnnotatedDNAView* ctx;
+ //QAction* pasteAction;
QAction* addAnnotationObjectAction;
QAction* removeObjectsFromViewAction;
QAction* removeAnnsAndQsAction;
diff --git a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
index ac993a5..9d5e496 100644
--- a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
index 6a05074..2c9c96f 100644
--- a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
+++ b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
index a81d83f..78d099c 100644
--- a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ CreateRulerDialogController::CreateRulerDialogController(const QSet<QString>& na
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17465998");
+ new HelpButton(this, buttonBox, "17467545");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h
index 6e9ee3c..615d89f 100644
--- a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h
+++ b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/DetView.cpp b/src/corelibs/U2View/src/ov_sequence/DetView.cpp
index 372e751..0c9f0ac 100644
--- a/src/corelibs/U2View/src/ov_sequence/DetView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/DetView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/DetView.h b/src/corelibs/U2View/src/ov_sequence/DetView.h
index 0d33fa0..aa52d35 100644
--- a/src/corelibs/U2View/src/ov_sequence/DetView.h
+++ b/src/corelibs/U2View/src/ov_sequence/DetView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.cpp b/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.cpp
index 61eac8e..a1593a6 100644
--- a/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@ EditAnnotationDialogController::EditAnnotationDialogController(const SharedAnnot
: QDialog(p), seqRange(seqRange)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466020");
+ new HelpButton(this, buttonBox, "17467567");
nameEdit->setText(a->name);
locationEdit->setText(U1AnnotationUtils::buildLocationString(a));
diff --git a/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.h b/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.h
index cb97e45..9a956e5 100644
--- a/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.h
+++ b/src/corelibs/U2View/src/ov_sequence/EditAnnotationDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
index e023880..e5d319f 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
index 2757dfb..fb1928e 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
index 3ec9600..b6b4c72 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
index 784c708..08c0a57 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
index bf55a02..43a0b84 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
index c229a94..9bf4a53 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
index ed47463..99f0cb4 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
index 3432e4d..fe83367 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
index 3d2dbae..44794ec 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
index a0b2412..02a8108 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
index ed8ea85..4bba97e 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -71,7 +71,7 @@ GraphLabelsSelectDialog::GraphLabelsSelectDialog(int maxWindowSize, QWidget* par
QPushButton* okButton = buttonBox->button(QDialogButtonBox::Ok);
QPushButton* cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
- new HelpButton(this, buttonBox, "17466055");
+ new HelpButton(this, buttonBox, "17467602");
mainLayout->addLayout(spinLayout);
mainLayout->addWidget(usedIntervalsCheck);
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h
index 5543c07..a26fd08 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp b/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
index eae8b26..825de9c 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphMenu.h b/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
index 69f9b8b..7d604eb 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
index 0dd5102..37c6f27 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -88,7 +88,7 @@ GraphSettingsDialog::GraphSettingsDialog( GSequenceGraphDrawer* d, const U2Regio
QPushButton* okButton = buttonBox->button(QDialogButtonBox::Ok);
QPushButton* cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
- new HelpButton(this, buttonBox, "17466057");
+ new HelpButton(this, buttonBox, "17467604");
connect(cancelButton, SIGNAL(clicked()), SLOT(sl_onCancelClicked()));
connect(okButton, SIGNAL(clicked()), SLOT(sl_onOkClicked()));
diff --git a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h
index c107232..eb23905 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/Overview.cpp b/src/corelibs/U2View/src/ov_sequence/Overview.cpp
index 98a6215..1f309a5 100644
--- a/src/corelibs/U2View/src/ov_sequence/Overview.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/Overview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/Overview.h b/src/corelibs/U2View/src/ov_sequence/Overview.h
index 119dbc5..e21c064 100644
--- a/src/corelibs/U2View/src/ov_sequence/Overview.h
+++ b/src/corelibs/U2View/src/ov_sequence/Overview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/PanView.cpp b/src/corelibs/U2View/src/ov_sequence/PanView.cpp
index f56ba38..e0aeb55 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/PanView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/PanView.h b/src/corelibs/U2View/src/ov_sequence/PanView.h
index 909ab2e..d1bc572 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanView.h
+++ b/src/corelibs/U2View/src/ov_sequence/PanView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp b/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
index f3ba93c..29655e6 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/PanViewRows.h b/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
index d8624d8..99b5eb4 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
+++ b/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
index db46294..1b3457f 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ SaveGraphCutoffsDialogController::SaveGraphCutoffsDialogController(GSequenceGrap
:QDialog(parent), ctx(_ctx), d(_d), gd(_gd)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466058");
+ new HelpButton(this, buttonBox, "17467605");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Save"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h
index 83fb91b..06f6a68 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
index 3a1000f..a0cf89f 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
index aee333b..6bcdcf7 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
index d1b550c..3d73389 100644
--- a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ SearchQualifierDialog::SearchQualifierDialog(QWidget* p, AnnotationsTreeView *tr
indexOfPrevResult(-1)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466032");
+ new HelpButton(this, ui->buttonBox, "17467579");
ui->buttonBox->button(QDialogButtonBox::Yes)->setText(tr("Select all"));
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Next"));
diff --git a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
index 722fe1a..8d1e0a3 100644
--- a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
index b77f081..b2b9cab 100644
--- a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
index 66cab09..a95fcd2 100644
--- a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
index 5f4fadf..006832e 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
index ee90d72..7e106b8 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
index 93299fc..29e0ac2 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -139,6 +139,7 @@ QString AnnotHighlightTree::getCurrentItemAnnotName()
void AnnotHighlightTree::setItemSelectedWithAnnotName(QString annotName)
{
+ CHECK(!annotName.isEmpty(), );
QList<QTreeWidgetItem*> items = findItems(annotName, Qt::MatchExactly, COL_NUM_ANNOT_NAME);
SAFE_POINT(1 == items.count(), "Exactly one tree item with the specified annotation name should have been found.",);
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
index 80654e4..9463057 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
index 1d64568..9b9feeb 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
index 871e1df..fb06cc4 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
index c56d5d6..b4fa19a 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -100,6 +100,7 @@ void AnnotHighlightWidget::initLayout() {
annotTree = new AnnotHighlightTree();
showAllLabel = new ShowAllAnnotTypesLabel();
+ showAllLabel->setObjectName("show_all_annotation_types");
treeLayout->addWidget(annotTree);
treeLayout->addWidget(showAllLabel);
@@ -551,31 +552,46 @@ void AnnotHighlightWidget::sl_onAnnotationsAdded(const QList<Annotation *> & /*
}
void AnnotHighlightWidget::sl_onAnnotationsRemoved(const QList<Annotation *> &annotations) {
+ CHECK(!showAllLabel->isShowAllSelected(), );
+
const QString selectedAnnotName = annotTree->getCurrentItemAnnotName();
- QList<QTreeWidgetItem *> removedItems;
- bool isSelectedItemRemoved = false;
+ QMap<QString, int> observedAnnNames;
foreach (Annotation *a, annotations) {
const QString annotName = a->getName();
- if (selectedAnnotName == annotName) {
- isSelectedItemRemoved = true;
+ if (observedAnnNames.contains(annotName)) {
+ observedAnnNames[annotName]++;
+ continue;
}
- removedItems << annotTree->findItems(annotName, Qt::MatchExactly);
+ observedAnnNames.insert(annotName, 1);
}
- updateAnnotationNames();
+ bool isSelectedItemRemoved = false;
+ QList<AnnotationTableObject*> annTables = annotatedDnaView->getAnnotationObjects(true);
+ foreach (const QString& annotName, observedAnnNames.keys()) {
+ int count = 0;
+ foreach (AnnotationTableObject* t, annTables) {
+ count += t->getAnnotationsByName(annotName).size();
+ }
+ if (count == observedAnnNames[annotName]) {
+ QList<QTreeWidgetItem*> itemList = annotTree->findItems(annotName, Qt::MatchExactly);
+ SAFE_POINT(itemList.size() == 1, "Annotation Highlight tree should contain only one item per annotation type", );
+ QTreeWidgetItem* item = itemList.first();
+ delete annotTree->takeTopLevelItem(annotTree->indexOfTopLevelItem(item));
+ annotNamesWithAminoInfo.remove(annotName);
+ if (selectedAnnotName == annotName) {
+ isSelectedItemRemoved = true;
+ }
+ }
+ }
- if (annotNamesWithAminoInfo.count() == removedItems.count()) { // all annotations were removed
+ if (annotNamesWithAminoInfo.count() == 0) {
annotTree->clear();
setNoAnnotsLayout();
nextAnnotationButton->setDisabled(true);
} else {
setLayoutWithAnnotsSelection();
- foreach (QTreeWidgetItem *item, removedItems) {
- delete annotTree->takeTopLevelItem(annotTree->indexOfTopLevelItem(item));
- }
-
- if (isSelectedItemRemoved) {
+ if (isSelectedItemRemoved || selectedAnnotName.isEmpty()) {
annotTree->setFirstItemSelected();
} else {
annotTree->setItemSelectedWithAnnotName(selectedAnnotName);
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
index c9e6472..688af8b 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
index f05de64..b1569af 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString AnnotHighlightWidgetFactory::GROUP_ID = "OP_ANNOT_HIGHLIGHT";
const QString AnnotHighlightWidgetFactory::GROUP_ICON_STR = ":core/images/annotation_settings.png";
const QString AnnotHighlightWidgetFactory::GROUP_TITLE = QObject::tr("Annotations Highlighting");
-const QString AnnotHighlightWidgetFactory::GROUP_DOC_PAGE = "17466021";
+const QString AnnotHighlightWidgetFactory::GROUP_DOC_PAGE = "17467568";
AnnotHighlightWidgetFactory::AnnotHighlightWidgetFactory() {
objectViewOfWidget = ObjViewType_SequenceView;
diff --git a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h
index 3555fcb..877a879 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
index 71366c1..03ddcb6 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
index a6ab109..78fd001 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
index 7cc296c..4686042 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -223,6 +223,7 @@ FindPatternWidget::FindPatternWidget(AnnotatedDNAView* _annotatedDnaView) :
annotatedDnaView(_annotatedDnaView),
iterPos(1),
searchTask(NULL),
+ previousMaxResult(-1),
usePatternNames(false),
savableWidget(this, GObjectViewUtils::findViewByName(_annotatedDnaView->getName()))
{
@@ -284,6 +285,7 @@ FindPatternWidget::FindPatternWidget(AnnotatedDNAView* _annotatedDnaView) :
getAnnotationsPushButton->setDisabled(true);
showCurrentResultAndStopProgress(0, 0);
setUpTabOrder();
+ previousMaxResult = boxMaxResult->value();
U2WidgetStateStorage::restoreWidgetState(savableWidget);
}
@@ -462,12 +464,12 @@ void FindPatternWidget::connectSlots()
connect(editStart, SIGNAL(textChanged(QString)), SLOT(sl_onRegionValueEdited()));
connect(editEnd, SIGNAL(textChanged(QString)), SLOT(sl_onRegionValueEdited()));
connect(boxSeqTransl, SIGNAL(currentIndexChanged(int)), SLOT(sl_onSequenceTranslationChanged(int)));
+ connect(boxMaxResult, SIGNAL(valueChanged(int)), SLOT(sl_onMaxResultChanged(int)));
connect(boxStrand, SIGNAL(currentIndexChanged(int)), SLOT(sl_activateNewSearch()));
connect(boxSeqTransl, SIGNAL(currentIndexChanged(int)), SLOT(sl_activateNewSearch()));
connect(removeOverlapsBox, SIGNAL(stateChanged(int)), SLOT(sl_activateNewSearch()));
- connect(boxMaxResult, SIGNAL(valueChanged(int)), SLOT(sl_activateNewSearch()));
// A sequence has been selected in the Sequence View
connect(annotatedDnaView, SIGNAL(si_focusChanged(ADVSequenceWidget*, ADVSequenceWidget*)),
@@ -845,6 +847,15 @@ void FindPatternWidget::sl_onSearchPatternChanged()
}
}
+void FindPatternWidget::sl_onMaxResultChanged(int newMaxResult) {
+ bool limitResult = !findPatternResults.isEmpty() && newMaxResult < findPatternResults.size();
+ bool widenResult = newMaxResult > previousMaxResult && findPatternResults.size() == previousMaxResult;
+ bool prevSearchIsNotComplete = findPatternResults.isEmpty() && searchTask != NULL;
+ if (limitResult || widenResult || prevSearchIsNotComplete) {
+ sl_activateNewSearch();
+ }
+}
+
void FindPatternWidget::setCorrectPatternsString() {
QTextCursor cursorInTextEdit = textPattern->textCursor();
@@ -1178,6 +1189,7 @@ void FindPatternWidget::initFindPatternTask(const QList<NamePattern> &patterns)
// Limit results number to the specified value
settings.maxResult2Find = boxMaxResult->value();
+ previousMaxResult = settings.maxResult2Find;
// Region
bool regionIsCorrectRef = false;
@@ -1247,7 +1259,6 @@ void FindPatternWidget::sl_findPatrernTaskStateChanged() {
getAnnotationsPushButton->setDisabled(true);
} else {
iterPos = 1;
- qSort(findPatternResults.begin(), findPatternResults.end());
showCurrentResultAndStopProgress(iterPos, findPatternResults.size());
nextPushButton->setEnabled(true);
prevPushButton->setEnabled(true);
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
index d7a09af..f3effe0 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -97,6 +97,7 @@ private slots:
void sl_onRegionValueEdited();
void sl_onSequenceTranslationChanged(int);
void sl_onSearchPatternChanged();
+ void sl_onMaxResultChanged(int);
void sl_onFileSelectorClicked();
void sl_onFileSelectorToggled(bool on);
@@ -227,6 +228,7 @@ private:
int iterPos;
Task *searchTask;
QString previousPatternString;
+ int previousMaxResult;
QStringList patternList;
QStringList nameList;
bool usePatternNames;
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
index 4ec7cc7..740b3f8 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString FindPatternWidgetFactory::GROUP_ID = "OP_FIND_PATTERN";
const QString FindPatternWidgetFactory::GROUP_ICON_STR = ":core/images/find_dialog.png";
const QString FindPatternWidgetFactory::GROUP_TITLE = QString(QObject::tr("Search in Sequence"));
-const QString FindPatternWidgetFactory::GROUP_DOC_PAGE = "17466003";
+const QString FindPatternWidgetFactory::GROUP_DOC_PAGE = "17467550";
FindPatternWidgetFactory::FindPatternWidgetFactory() {
objectViewOfWidget = ObjViewType_SequenceView;
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h
index 26932e9..8382605 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
index b817678..600f313 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
index 5823da4..f250600 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h b/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
index 2e39f13..b8f174f 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
index 14fcb1d..ffae0e5 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
index 981fc41..77bd9bb 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
index 1d41d51..c56fa70 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
index 53844f1..21e438c 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
index 7aa8ae4..eeab059 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
index 51e88ef..3e34a11 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
index b0d8d04..8669500 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
index 7ed240d..1b99d92 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
index 899d5fd..bdbfa5b 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
index 293f8bc..00d4d04 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
index 8907099..18151ca 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
index b3e57f7..d3a03dc 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
index 0fbc4f2..4786036 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
index b90c5b2..e01384c 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
index 081a44a..9d5e0f4 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
index 4132d6e..92187a5 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
index 9116df9..14cb416 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace U2 {
const QString SequenceInfoFactory::GROUP_ID = "OP_SEQ_INFO";
const QString SequenceInfoFactory::GROUP_ICON_STR = ":core/images/chart_bar.png";
const QString SequenceInfoFactory::GROUP_TITLE = QObject::tr("Statistics");
-const QString SequenceInfoFactory::GROUP_DOC_PAGE = "17465992";
+const QString SequenceInfoFactory::GROUP_DOC_PAGE = "17467539";
SequenceInfoFactory::SequenceInfoFactory() {
objectViewOfWidget = ObjViewType_SequenceView;
diff --git a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h
index aed0a99..3c8425d 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
index 4d81fb2..d765ee8 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
index faf57cb..a9f4289 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
index 89a8f83..13b359d 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
index 50e97be..31a3c3a 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
index 81ff735..99f62c0 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
index 2953d2b..4e09274 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
index 178e8cb..a7b8d6c 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
index 483db8e..ae5e288 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
index 5e4fde8..f3f6f4a 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -87,9 +87,6 @@ SequenceViewAnnotatedRenderer::SequenceViewAnnotatedRenderer(ADVSequenceObjectCo
void SequenceViewAnnotatedRenderer::drawAnnotations(QPainter &p, const QSize &canvasSize, const U2Region &visibleRange, const AnnotationDisplaySettings& displaySettings) {
foreach (const AnnotationTableObject *ao, ctx->getAnnotationObjects(true)) {
foreach (Annotation *a, ao->getAnnotationsByRegion(visibleRange)) {
- AnnotationSettingsRegistry *asr = AppContext::getAnnotationsSettingsRegistry();
- AnnotationSettings *as = asr->getAnnotationSettings(a->getData());
-
drawAnnotation(p, canvasSize, visibleRange, a, displaySettings);
}
}
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
index f0f68ae..f5cb22d 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
index 4e437f6..a0a1f8f 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
index 8115b0d..5671841 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
index 02aad60..7363c79 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
index d578ffd..c82f681 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
index 9ee52b6..463399e 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
index 600efa5..4994d17 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
index a81a01d..58f3ad1 100644
--- a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
index 31aed7a..1f0173e 100644
--- a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
index a0f57b0..cf20f9b 100644
--- a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ BranchSettingsDialog::BranchSettingsDialog(QWidget *parent, const OptionsMap& se
changedSettings[BRANCH_COLOR] = settings[BRANCH_COLOR];
changedSettings[BRANCH_THICKNESS] = settings[BRANCH_THICKNESS];
setupUi(this);
- new HelpButton(this, buttonBox, "17466155");
+ new HelpButton(this, buttonBox, "17467702");
thicknessSpinBox->setValue(changedSettings[BRANCH_THICKNESS].toInt());
diff --git a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
index 54ec6c4..f6e71e3 100644
--- a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
index 8e81bc2..2316dd9 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -61,9 +61,9 @@ CreatePhyTreeDialogController::CreatePhyTreeDialogController(QWidget* parent, co
ui->setupUi(this);
QMap<QString, QString> helpPagesMap;
- helpPagesMap.insert("PHYLIP Neighbor Joining","17466114");
- helpPagesMap.insert("MrBayes","17466115");
- helpPagesMap.insert("PhyML Maximum Likelihood","17466113");
+ helpPagesMap.insert("PHYLIP Neighbor Joining","17467661");
+ helpPagesMap.insert("MrBayes","17467662");
+ helpPagesMap.insert("PhyML Maximum Likelihood","17467660");
new ComboboxDependentHelpButton(this, ui->buttonBox, ui->algorithmBox, helpPagesMap);
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
@@ -81,7 +81,12 @@ CreatePhyTreeDialogController::CreatePhyTreeDialogController(QWidget* parent, co
ui->fileNameEdit->setText(url);
const QString defaultAlgorithm = "PHYLIP Neighbor Joining";
- ui->algorithmBox->setCurrentIndex(ui->algorithmBox->findText(defaultAlgorithm));
+ int defaultIndex = ui->algorithmBox->findText(defaultAlgorithm);
+ if (defaultIndex == -1) {
+ defaultIndex = 0;
+ }
+ ui->algorithmBox->setCurrentIndex(defaultIndex);
+ sl_comboIndexChaged(defaultIndex);
}
void CreatePhyTreeDialogController::accept() {
@@ -89,6 +94,7 @@ void CreatePhyTreeDialogController::accept() {
CHECK(checkLicense(), );
CHECK(checkFileName(), );
+ SAFE_POINT(NULL != settingsWidget, "Settings widget is NULL", );
settingsWidget->fillSettings(settings);
CHECK(checkSettings(), );
CHECK(checkMemory(), );
diff --git a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
index 2f90c58..e69e683 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
index 529c446..5641b73 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -21,9 +21,13 @@
#include "CreatePhyTreeWidget.h"
+#define PHY_TREE_SETTINGS "phytree_dialog_settings"
+
namespace U2 {
-const QString CreatePhyTreeWidget::settingsPath = "phytree_dialog_settings";
+QString CreatePhyTreeWidget::settingsPath(){
+ return QString(PHY_TREE_SETTINGS);
+}
CreatePhyTreeWidget::CreatePhyTreeWidget(QWidget *parent) :
QWidget(parent)
diff --git a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
index b85cebc..f6925ac 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ public:
virtual bool checkMemoryEstimation(QString &message, const MAlignment &ma, const CreatePhyTreeSettings &settings);
virtual bool insertOutputOptionWidget(PhyTreeDisplayOptionsWidget *outputOptionsWidget);
- static const QString settingsPath;
+ static QString settingsPath();
};
} // namespace U2
diff --git a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
index 2df744f..f3fcea0 100644
--- a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
+++ b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -27,8 +27,8 @@
namespace U2 {
-const QString PhyTreeDisplayOptionsWidget::displayWithMsaEditor = CreatePhyTreeWidget::settingsPath + "/display_with_msa_editor";
-const QString PhyTreeDisplayOptionsWidget::synchronizeWithMsa = CreatePhyTreeWidget::settingsPath + "/synchronize_with_msa";
+const QString PhyTreeDisplayOptionsWidget::displayWithMsaEditor = CreatePhyTreeWidget::settingsPath() + "/display_with_msa_editor";
+const QString PhyTreeDisplayOptionsWidget::synchronizeWithMsa = CreatePhyTreeWidget::settingsPath() + "/synchronize_with_msa";
PhyTreeDisplayOptionsWidget::PhyTreeDisplayOptionsWidget(QWidget *parent) :
CreatePhyTreeWidget(parent),
diff --git a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
index 891bcfb..d013407 100644
--- a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
+++ b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
index fabeea7..9a48ccd 100644
--- a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ TextSettingsDialog::TextSettingsDialog(QWidget *parent, const OptionsMap& settin
: BaseSettingsDialog(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466160");
+ new HelpButton(this, buttonBox, "17467707");
curColor = qvariant_cast<QColor>(settings[LABEL_COLOR]);
diff --git a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h
index 4ad0627..25ef394 100644
--- a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
index a578ffd..c6da5e1 100644
--- a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ namespace U2 {
TreeSettingsDialog::TreeSettingsDialog(QWidget *parent, const OptionsMap &settings, bool isRectLayout)
: BaseSettingsDialog(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466154");
+ new HelpButton(this, buttonBox, "17467701");
heightSlider->setValue(settings[HEIGHT_COEF].toUInt());
widthlSlider->setValue(settings[WIDTH_COEF].toUInt());
diff --git a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h
index 535e4b7..bfa58de 100644
--- a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
index 5149202..015f3d6 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,12 +48,12 @@ BuildIndexDialog::BuildIndexDialog(const DnaAssemblyAlgRegistry* registry, QWidg
{
setupUi(this);
QMap<QString,QString> helpPagesMap;
- helpPagesMap.insert("BWA","17466231");
- helpPagesMap.insert("BWA-MEM","17466273");
- helpPagesMap.insert("BWA-SW","17466259");
- helpPagesMap.insert("Bowtie","17466228");
- helpPagesMap.insert("Bowtie2","17466256");
- helpPagesMap.insert("UGENE Genome Aligner","17466234");
+ helpPagesMap.insert("BWA","17467778");
+ helpPagesMap.insert("BWA-MEM","17467819");
+ helpPagesMap.insert("BWA-SW","17467806");
+ helpPagesMap.insert("Bowtie","17467775");
+ helpPagesMap.insert("Bowtie2","17467803");
+ helpPagesMap.insert("UGENE Genome Aligner","17467781");
new ComboboxDependentHelpButton(this, buttonBox, methodNamesBox, helpPagesMap);
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h
index 04a6f19..ad62955 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
index bae2992..d575596 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ ConvertAssemblyToSamDialog::ConvertAssemblyToSamDialog(QWidget* parent, QString
{
ui = new Ui_AssemblyToSamDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "17466235");
+ new HelpButton(this, ui->buttonBox, "17467782");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Convert"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h
index d3837de..c5afb42 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
index 2d97381..6f8bed9 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -65,12 +65,12 @@ DnaAssemblyDialog::DnaAssemblyDialog(QWidget* p, const QStringList& shortReadsUr
{
setupUi(this);
QMap<QString,QString> helpPagesMap;
- helpPagesMap.insert("BWA","17466230");
- helpPagesMap.insert("BWA-MEM","17466272");
- helpPagesMap.insert("BWA-SW","17466258");
- helpPagesMap.insert("Bowtie","17466227");
- helpPagesMap.insert("Bowtie2","17466255");
- helpPagesMap.insert("UGENE Genome Aligner","17466233");
+ helpPagesMap.insert("BWA","17467777");
+ helpPagesMap.insert("BWA-MEM","17467818");
+ helpPagesMap.insert("BWA-SW","17467805");
+ helpPagesMap.insert("Bowtie","17467774");
+ helpPagesMap.insert("Bowtie2","17467802");
+ helpPagesMap.insert("UGENE Genome Aligner","17467780");
new ComboboxDependentHelpButton(this, buttonBox, methodNamesBox, helpPagesMap);
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h
index d4d2d1e..257529d 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
index d85507f..d3b911b 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
index b4dbf32..19e700e 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
index 4c7c3c5..b22f4e3 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
index b1fd02f..8b825f0 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
index ba31c6b..307bbcd 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
index 904a760..1191602 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
index c21a69f..77f5a04 100644
--- a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
+++ b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
index cb891e7..b391df2 100644
--- a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
+++ b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
index 0022d57..065fafd 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ namespace U2 {
SecStructDialog::SecStructDialog( ADVSequenceObjectContext* _ctx, QWidget *p ) : QDialog(p), rangeStart(0), rangeEnd(0), ctx(_ctx), task(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466206");
+ new HelpButton(this, buttonBox, "17467753");
sspr = AppContext::getSecStructPredictAlgRegistry();
algorithmComboBox->addItems(sspr->getAlgNameList());
diff --git a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h
index 1782805..996ce9c 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
index 8f36059..05beaa7 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
index 33506b3..4f0f9c4 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
index 9dea225..5f3c562 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -74,7 +74,7 @@ SmithWatermanDialog::SmithWatermanDialog(QWidget* w, ADVSequenceObjectContext* c
dialogConfig = _dialogConfig;
setupUi(this);
- new HelpButton(this, buttonBox, "17466213");
+ new HelpButton(this, buttonBox, "17467760");
buttonBox->button(QDialogButtonBox::Yes)->setText(tr("Remote run"));
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h
index 90e12ac..cdc8e7a 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
index b6dbbe7..809132d 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
index 9f278ab..a8b5ac8 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
+++ b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
index 7389cf1..da301ed 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2View/transl/english.ts b/src/corelibs/U2View/transl/english.ts
index 4c5a302..22b6003 100644
--- a/src/corelibs/U2View/transl/english.ts
+++ b/src/corelibs/U2View/transl/english.ts
@@ -410,172 +410,139 @@ Probably the data is too big.</translation>
<context>
<name>DasBlastSettingsWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="20"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation type="vanished">Form</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="41"/>
<source>Threshold:</source>
- <translation>Threshold:</translation>
+ <translation type="vanished">Threshold:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="60"/>
<source>Number of expected matches in a random database. The lower the value, the more likely the match is to be significant</source>
- <translation>Number of expected matches in a random database. The lower the value, the more likely the match is to be significant</translation>
+ <translation type="vanished">Number of expected matches in a random database. The lower the value, the more likely the match is to be significant</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="70"/>
<source>Matrix:</source>
- <translation>Matrix:</translation>
+ <translation type="vanished">Matrix:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="89"/>
<source>Assigns a probability score for each position in an alignment</source>
- <translation>Assigns a probability score for each position in an alignment</translation>
+ <translation type="vanished">Assigns a probability score for each position in an alignment</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="102"/>
<source>Filtering:</source>
- <translation>Filtering:</translation>
+ <translation type="vanished">Filtering:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="121"/>
<source>Filtering low-complexity regions replaces the regions with X's during the search to filter biologically unrelated results</source>
- <translation>Filtering low-complexity regions replaces the regions with X's during the search to filter biologically unrelated results</translation>
+ <translation type="vanished">Filtering low-complexity regions replaces the regions with X's during the search to filter biologically unrelated results</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="131"/>
<source>Gapped:</source>
- <translation>Gapped:</translation>
+ <translation type="vanished">Gapped:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="150"/>
<source>Allows gaps to be introduced in the sequences when the comparison is done</source>
- <translation>Allows gaps to be introduced in the sequences when the comparison is done</translation>
+ <translation type="vanished">Allows gaps to be introduced in the sequences when the comparison is done</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="160"/>
<source>Maximum results:</source>
- <translation>Maximum results:</translation>
+ <translation type="vanished">Maximum results:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="179"/>
<source>Limits the number of returned results</source>
- <translation>Limits the number of returned results</translation>
+ <translation type="vanished">Limits the number of returned results</translation>
</message>
</context>
<context>
<name>DasOptionsPanelWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="20"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation type="vanished">Form</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="73"/>
<source>Database:</source>
- <translation>Database:</translation>
+ <translation type="vanished">Database:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="86"/>
<source>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity</source>
- <translation>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity</translation>
+ <translation type="vanished">Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="109"/>
<source>Minimum Identity:</source>
- <translation>Minimum Identity:</translation>
+ <translation type="vanished">Minimum Identity:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="125"/>
<source>Minimum percent identity between the input sequence region and BLAST results</source>
- <translation>Minimum percent identity between the input sequence region and BLAST results</translation>
+ <translation type="vanished">Minimum percent identity between the input sequence region and BLAST results</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="131"/>
<source>%</source>
- <translation>%</translation>
+ <translation type="vanished">%</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="141"/>
<source>Show more option...</source>
- <translation>Show more option...</translation>
+ <translation type="vanished">Show more option...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="241"/>
<source>IDs of similar sequences:</source>
- <translation>IDs of similar sequences:</translation>
+ <translation type="vanished">IDs of similar sequences:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="269"/>
<source>Select ID(s) to fetch annotations from DAS</source>
- <translation>Select ID(s) to fetch annotations from DAS</translation>
+ <translation type="vanished">Select ID(s) to fetch annotations from DAS</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="294"/>
<source>ID</source>
- <translation>ID</translation>
+ <translation type="vanished">ID</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="299"/>
<source>Identity</source>
- <translation>Identity</translation>
+ <translation type="vanished">Identity</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="345"/>
<source>Fetch annotations</source>
- <translation>Fetch annotations</translation>
+ <translation type="vanished">Fetch annotations</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="218"/>
<source>Send request to Uniprot BLAST to get IDs of similar sequences</source>
- <translation>Send request to Uniprot BLAST to get IDs of similar sequences</translation>
+ <translation type="vanished">Send request to Uniprot BLAST to get IDs of similar sequences</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="221"/>
<source>Fetch IDs</source>
- <translation>Fetch IDs</translation>
+ <translation type="vanished">Fetch IDs</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="362"/>
<source>Info: Searching for annotations with DAS is available for amino acid sequences only</source>
- <translation>Info: Searching for annotations with DAS is available for amino acid sequences only</translation>
+ <translation type="vanished">Info: Searching for annotations with DAS is available for amino acid sequences only</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="60"/>
<source>BLAST</source>
- <translation>BLAST</translation>
+ <translation type="vanished">BLAST</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="61"/>
<source>Algorithm settings</source>
- <translation>Algorithm settings</translation>
+ <translation type="vanished">Algorithm settings</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="62"/>
<source>Annotations settings</source>
- <translation>Annotations settings</translation>
+ <translation type="vanished">Annotations settings</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="63"/>
<source>DAS features sources</source>
- <translation>DAS features sources</translation>
+ <translation type="vanished">DAS features sources</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="64"/>
<source>Whole sequence</source>
- <translation>Whole sequence</translation>
+ <translation type="vanished">Whole sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="65"/>
<source>Selected region</source>
- <translation>Selected region</translation>
+ <translation type="vanished">Selected region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="66"/>
<source>Custom region</source>
- <translation>Custom region</translation>
+ <translation type="vanished">Custom region</translation>
</message>
</context>
<context>
@@ -859,12 +826,12 @@ Probably the data is too big.</translation>
<translation>Search for:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="415"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="433"/>
<source>Search in</source>
<translation>Search in</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="524"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="526"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -889,27 +856,27 @@ Probably the data is too big.</translation>
<translation>Return</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="428"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="446"/>
<source>Strand</source>
<translation>Strand</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="441"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="459"/>
<source>Region</source>
<translation>Region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="585"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="596"/>
<source>Remove overlapped results</source>
<translation>Remove overlapped results</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="602"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="613"/>
<source>Limit results number to:</source>
<translation>Limit results number to:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="657"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="668"/>
<source>Create annotations</source>
<translation>Create annotations</translation>
</message>
@@ -934,7 +901,7 @@ Probably the data is too big.</translation>
<translation>Path:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="286"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="295"/>
<source>Algorithm</source>
<translation>Algorithm</translation>
</message>
@@ -1617,9 +1584,8 @@ Double-click to collapse the branch</translation>
<translation>Annotations Highlighting</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasWidgetFactory.cpp" line="36"/>
<source>DAS Annotations</source>
- <translation>DAS Annotations</translation>
+ <translation type="vanished">DAS Annotations</translation>
</message>
<message>
<location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="218"/>
@@ -2274,14 +2240,23 @@ Double-click to collapse the branch</translation>
<translation>Copy annotation sequence translation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVClipboard.cpp" line="145"/>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="90"/>
+ <source>Paste sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="150"/>
<source>An error occurred during getting sequence data: %1</source>
<translation>An error occurred during getting sequence data: %1</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVClipboard.cpp" line="302"/>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="307"/>
+ <source>Copy/Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy</source>
- <translation>Copy</translation>
+ <translation type="vanished">Copy</translation>
</message>
</context>
<context>
@@ -2295,17 +2270,17 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::ADVSequenceObjectContext</name>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="202"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="206"/>
<source>Incorrect signal sender!</source>
<translation>Incorrect signal sender!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="213"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="217"/>
<source>Amino translation</source>
<translation>Amino translation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="214"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="218"/>
<source>Translation frames</source>
<translation>Translation frames</translation>
</message>
@@ -2313,52 +2288,52 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::ADVSingleSequenceHeaderWidget</name>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="966"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="967"/>
<source>Alphabet: <b>%1</b></source>
<translation>Alphabet: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="967"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="968"/>
<source> Sequence size: <b>%1</b></source>
<translation> Sequence size: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="968"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="969"/>
<source> File: <b>%1</b></source>
<translation>File: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1053"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1054"/>
<source>raw</source>
<translation>raw</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1057"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1058"/>
<source>amino ext</source>
<translation>amino ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1059"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1060"/>
<source>amino</source>
<translation>amino</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1064"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1065"/>
<source>dna</source>
<translation>dna</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1066"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1067"/>
<source>dna ext</source>
<translation>dna ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1070"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1071"/>
<source>rna ext</source>
<translation>rna ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1068"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1069"/>
<source>rna</source>
<translation>rna</translation>
</message>
@@ -2396,83 +2371,83 @@ Double-click to collapse the branch</translation>
<translation>Create new ruler...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="208"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="209"/>
<source>Export image</source>
<translation>Export image</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="224"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="225"/>
<source>Remove sequence</source>
<translation>Remove sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="448"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="449"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="525"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="526"/>
<source>Select</source>
<translation>Select</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="540"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="541"/>
<source>Rulers...</source>
<translation>Rulers...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="551"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="552"/>
<source>Remove '%1'</source>
<translation>Remove '%1'</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="702"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="703"/>
<source>Zoom to range</source>
<translation>Zoom to range</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="314"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="315"/>
<source>Show all views</source>
<translation>Show all views</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="314"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="315"/>
<source>Hide all views</source>
<translation>Hide all views</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="242"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="920"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="921"/>
<source>Show zoom view</source>
<translation>Show zoom view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="242"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="920"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="921"/>
<source>Hide zoom view</source>
<translation>Hide zoom view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="925"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="926"/>
<source>Show details view</source>
<translation>Show details view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="925"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="926"/>
<source>Hide details view</source>
<translation>Hide details view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="930"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="245"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="931"/>
<source>Show overview</source>
<translation>Show overview</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="930"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="245"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="931"/>
<source>Hide overview</source>
<translation>Hide overview</translation>
</message>
@@ -2632,32 +2607,32 @@ Double-click to collapse the branch</translation>
<translation>Select an annotation name:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="113"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="114"/>
<source>Configure the annotations:</source>
<translation>Configure the annotations:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="125"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="126"/>
<source>Previous annotation</source>
<translation>Previous annotation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="133"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="134"/>
<source>Next annotation</source>
<translation>Next annotation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="211"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="212"/>
<source>Sequence context is NULL</source>
<translation>Sequence context is NULL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="322"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="323"/>
<source>The sequence doesn't have any annotations.</source>
<translation>The sequence doesn't have any annotations.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="325"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="326"/>
<source>The sequences do not have any annotations.</source>
<translation>The sequences do not have any annotations.</translation>
</message>
@@ -2665,112 +2640,117 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::AnnotatedDNAView</name>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="113"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="120"/>
<source>Go to position...</source>
<translation>Go to position...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="126"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="133"/>
<source>Rename item</source>
<translation>Rename item</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="135"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="142"/>
<source>Find pattern...</source>
<translation>Find pattern...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="140"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="147"/>
<source>Insert subsequence...</source>
<translation>Insert subsequence...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="145"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="152"/>
<source>Remove subsequence...</source>
<translation>Remove subsequence...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="149"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="156"/>
<source>Replace subsequence...</source>
<translation>Replace subsequence...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="154"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="161"/>
<source>Selected sequence from view</source>
<translation>Selected sequence from view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="158"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="165"/>
<source>Reverse-complement sequence</source>
<translation>Reverse-complement sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="166"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="173"/>
<source>Complement sequence</source>
<translation>Complement sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="350"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="358"/>
<source>Error!</source>
<translation>Error!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="530"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="539"/>
<source>Analyze</source>
<translation>Analyze</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="540"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="549"/>
<source>Add</source>
<translation>Add</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="546"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="555"/>
<source>Export</source>
<translation>Export</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="552"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="561"/>
<source>Align</source>
<translation>Align</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="558"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="567"/>
<source>Remove</source>
<translation>Remove</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="571"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="580"/>
<source>Edit</source>
<translation>Edit</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="162"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="1339"/>
+ <source>No sequence in focus</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="169"/>
<source>Reverse sequence</source>
<translation>Reverse sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="754"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="763"/>
<source>Disable '%1' highlighting</source>
<translation>Disable '%1' highlighting</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="756"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="765"/>
<source>Enable '%1' highlighting</source>
<translation>Enable '%1' highlighting</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="809"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="818"/>
<source>Select sequence to associate annotations with:</source>
<translation>Select sequence to associate annotations with:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="827"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="836"/>
<source>No sequence object found for annotations</source>
<translation>No sequence object found for annotations</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="896"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="905"/>
<source>Go To</source>
<translation>Go To</translation>
</message>
@@ -2786,159 +2766,164 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::AnnotationsTreeView</name>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="266"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="275"/>
<source>Value</source>
<translation>Value</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="164"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="166"/>
+ <source>Paste annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="173"/>
<source>Objects with annotations...</source>
<translation>Objects with annotations...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="167"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="176"/>
<source>Selected objects with annotations from view</source>
<translation>Selected objects with annotations from view</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="174"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="183"/>
<source>Selected annotations and qualifiers</source>
<translation>Selected annotations and qualifiers</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="180"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1076"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="189"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1119"/>
<source>Copy qualifier text</source>
<translation>Copy qualifier text</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="183"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1080"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="192"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1123"/>
<source>Copy qualifier URL</source>
<translation>Copy qualifier URL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="186"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1085"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="195"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1128"/>
<source>Toggle column</source>
<translation>Toggle column</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="190"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="199"/>
<source>Hide column</source>
<translation>Hide column</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="194"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="203"/>
<source>Find qualifier...</source>
<translation>Find qualifier...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="199"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="208"/>
<source>Invert annotation selection</source>
<translation>Invert annotation selection</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="203"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="779"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="212"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="788"/>
<source>Copy column text</source>
<translation>Copy column text</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="206"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="793"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="215"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="802"/>
<source>copy column URL</source>
<translation>copy column URL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="209"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="218"/>
<source>Rename item</source>
<translation>Rename item</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="550"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="559"/>
<source>At least one dragged annotation is out of the sequence range!</source>
<translation>At least one dragged annotation is out of the sequence range!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1805"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1848"/>
<source>Rename Group</source>
<translation>Rename Group</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1846"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1889"/>
<source>Rename Qualifier</source>
<translation>Rename Qualifier</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1905"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1948"/>
<source>Create Permanent Annotation</source>
<translation>Create Permanent Annotation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="216"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="225"/>
<source>Edit qualifier</source>
<translation>Edit qualifier</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="223"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="232"/>
<source>View qualifier</source>
<translation>View qualifier</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="229"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="238"/>
<source>Qualifier...</source>
<translation>Qualifier...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="236"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="245"/>
<source>Make auto-annotations persistent</source>
<translation>Make auto-annotations persistent</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="785"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="794"/>
<source>Copy column '%1' text</source>
<translation>Copy column '%1' text</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="788"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="797"/>
<source>Copy '%1' annotation location</source>
<translation>Copy '%1' annotation location</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="797"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="806"/>
<source>Copy column '%1' URL</source>
<translation>Copy column '%1' URL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="819"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1086"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="828"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1129"/>
<source>Hide '%1' column</source>
<translation>Hide '%1' column</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1076"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1119"/>
<source>Copy qualifier '%1' value</source>
<translation>Copy qualifier '%1' value</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1080"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1123"/>
<source>Copy qualifier '%1' URL</source>
<translation>Copy qualifier '%1' URL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1086"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1129"/>
<source>Add '%1' column</source>
<translation>Add '%1' column</translation>
</message>
@@ -4036,7 +4021,7 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::CurrentViewPainter</name>
<message>
- <location filename="../src/ov_sequence/image_export/SequencePainter.cpp" line="77"/>
+ <location filename="../src/ov_sequence/image_export/SequencePainter.cpp" line="79"/>
<source>Warning: SVG is not supported for the currently viewed area. Please, choose another export area.</source>
<translation>Warning: SVG is not supported for the currently viewed area. Please, choose another export area.</translation>
</message>
@@ -4063,24 +4048,20 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::DasOptionsPanelWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="561"/>
<source>Show more options</source>
- <translation>Show more options</translation>
+ <translation type="vanished">Show more options</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="561"/>
<source>Show less options</source>
- <translation>Show less options</translation>
+ <translation type="vanished">Show less options</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="619"/>
<source>Warning: Selected region is too short. It should be from 4 to 1900 amino acids.</source>
- <translation>Warning: Selected region is too short. It should be from 4 to 1900 amino acids.</translation>
+ <translation type="vanished">Warning: Selected region is too short. It should be from 4 to 1900 amino acids.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="622"/>
<source>Warning: Selected region is too long. It should be from 4 to 1900 amino acids.</source>
- <translation>Warning: Selected region is too long. It should be from 4 to 1900 amino acids.</translation>
+ <translation type="vanished">Warning: Selected region is too long. It should be from 4 to 1900 amino acids.</translation>
</message>
</context>
<context>
@@ -4099,15 +4080,20 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::DetView</name>
<message>
- <location filename="../src/ov_sequence/DetView.cpp" line="55"/>
+ <location filename="../src/ov_sequence/DetView.cpp" line="62"/>
<source>Show complement strand</source>
<translation>Show complement strand</translation>
</message>
<message>
- <location filename="../src/ov_sequence/DetView.cpp" line="60"/>
+ <location filename="../src/ov_sequence/DetView.cpp" line="67"/>
<source>Show amino translations</source>
<translation>Show amino translations</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/DetView.cpp" line="72"/>
+ <source>Wrap sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::DnaAssemblyAlgorithmMainWidget</name>
@@ -4595,17 +4581,17 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::ExportHighligtningTask</name>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3029"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3069"/>
<source>Export highlighting</source>
<translation>Export highlighting</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3057"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3097"/>
<source>Export highligtning finished successfully</source>
<translation>Export highligtning finished successfully</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3057"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3097"/>
<source>Result file:</source>
<translation>Result file:</translation>
</message>
@@ -4683,181 +4669,181 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::FindPatternWidget</name>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="326"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
<source>Exact</source>
<translation>Exact</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="330"/>
<source>InsDel</source>
<translation>InsDel</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="329"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
<source>Substitute</source>
<translation>Substitute</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="333"/>
<source>Regular expression</source>
<translation>Regular expression</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="335"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="337"/>
<source>Should match</source>
<translation>Should match</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="412"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="414"/>
<source>Search with ambiguous bases</source>
<translation>Search with ambiguous bases</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="360"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
<source>Both</source>
<translation>Both</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="361"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="363"/>
<source>Direct</source>
<translation>Direct</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="364"/>
<source>Reverse-coml.</source>
<translation>Reverse-coml.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="368"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="370"/>
<source>Sequence</source>
<translation>Sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="369"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="371"/>
<source>Translation</source>
<translation>Translation</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="375"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
<source>Whole sequence</source>
<translation>Whole sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="376"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="378"/>
<source>Custom region</source>
<translation>Custom region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="379"/>
<source>Selected region</source>
<translation>Selected region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="435"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="437"/>
<source>Results no longer than:</source>
<translation>Results no longer than:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="710"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
<source>The value is longer than the search region. Please input a shorter value or select another region!</source>
<translation>The value is longer than the search region. Please input a shorter value or select another region!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="717"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="719"/>
<source>Warning: input value contains characters that do not match the active alphabet!</source>
<translation>Warning: input value contains characters that do not match the active alphabet!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="725"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="727"/>
<source>Warning: file contains patterns that do not match the active alphabet! Those patterns were ignored </source>
<translation>Warning: file contains patterns that do not match the active alphabet! Those patterns were ignored </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="732"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="734"/>
<source>Warning: file contains patterns that longer than the search region! Those patterns were ignored. Please input a shorter value or select another region! </source>
<translation>Warning: file contains patterns that longer than the search region! Those patterns were ignored. Please input a shorter value or select another region! </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="787"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="789"/>
<source>Warning: current sequence is too long to search in.</source>
<translation>Warning: current sequence is too long to search in.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1458"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1469"/>
<source>Warning: can not get valid pattern name, annotation will be named 'misc_feature'</source>
<translation>Warning: can not get valid pattern name, annotation will be named 'misc_feature'</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1596"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1607"/>
<source>Results:</source>
<translation>Results:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="759"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="750"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
<source>Reason: </source>
<translation>Reason: </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="739"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
<source>Info: please input at least one sequence pattern to search for. Use %1 to input multiple patterns. Alternatively, load patterns from a FASTA file.</source>
<translation>Info: please input at least one sequence pattern to search for. Use %1 to input multiple patterns. Alternatively, load patterns from a FASTA file.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="751"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="753"/>
<source> Please input valid annotation names </source>
<translation> Please input valid annotation names </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="757"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="759"/>
<source>Warning: annotation names are invalid. </source>
<translation>Warning: annotation names are invalid. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="762"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="764"/>
<source> It will be automatically changed to acceptable name if 'Get annotations' button is pressed. </source>
<translation> It will be automatically changed to acceptable name if 'Get annotations' button is pressed. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="768"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="775"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="770"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
<source>Warning: there is no pattern to search. </source>
<translation>Warning: there is no pattern to search. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="769"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="776"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="771"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="778"/>
<source> Please input a valid pattern or choose a file with patterns </source>
<translation> Please input a valid pattern or choose a file with patterns </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="782"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="784"/>
<source>Warning: invalid regexp. </source>
<translation>Warning: invalid regexp. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1113"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1124"/>
<source>Select file to open...</source>
<translation>Select file to open...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1165"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1176"/>
<source>Unable to search on the reverse-complement strand, searching on the direct strand only!</source>
<translation>Unable to search on the reverse-complement strand, searching on the direct strand only!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="295"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1510"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="297"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1521"/>
<source>Results: %1/%2</source>
<translation>Results: %1/%2</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="746"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
<source>Warning: annotation name or annotation group name are invalid. </source>
<translation>Warning: annotation name or annotation group name are invalid. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1313"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1324"/>
<source>Sequence in focus is NULL</source>
<translation>Sequence in focus is NULL</translation>
</message>
@@ -4865,7 +4851,7 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::FindQualifierTask</name>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="2266"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="2309"/>
<source>Searching for a qualifier</source>
<translation>Searching for a qualifier</translation>
</message>
@@ -4947,7 +4933,7 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::GSequenceLineViewAnnotated</name>
<message>
- <location filename="../src/ov_sequence/GSequenceLineViewAnnotated.cpp" line="743"/>
+ <location filename="../src/ov_sequence/GSequenceLineViewAnnotated.cpp" line="440"/>
<source>etc ...</source>
<translation></translation>
</message>
@@ -5150,125 +5136,134 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::MSAEditor</name>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="132"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="133"/>
<source>Zoom In</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="136"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="137"/>
<source>Zoom Out</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="140"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="141"/>
<source>Zoom To Selection</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="144"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="145"/>
<source>Reset Zoom</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="148"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="149"/>
<source>Change Font</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="152"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="153"/>
<source>Build Tree</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="504"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="430"/>
+ <source>Copy/Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="505"/>
<source>Export as image</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="366"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="367"/>
<source>Select font for alignment</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="124"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="220"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="125"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="221"/>
<source>Save alignment</source>
<translation>Save alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="128"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="129"/>
<source>Save alignment as</source>
<translation>Save alignment as</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="180"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="181"/>
<source>Export highlighted</source>
<translation>Export highlighted</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="429"/>
<source>Copy</source>
- <translation>Copy</translation>
+ <translation type="vanished">Copy</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="434"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="435"/>
<source>Edit</source>
<translation>Edit</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="439"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="440"/>
<source>Export</source>
<translation>Export</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="452"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="453"/>
<source>View</source>
<translation>View</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="460"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="508"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="461"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="509"/>
<source>Align</source>
<translation>Align</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="466"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="467"/>
<source>Tree</source>
<translation>Tree</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="473"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="474"/>
<source>Advanced</source>
<translation>Advanced</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="478"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="479"/>
<source>Statistics</source>
<translation>Statistics</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="484"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="485"/>
<source>Add</source>
<translation>Add</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="512"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="513"/>
<source>Align sequence to this alignment</source>
<translation>Align sequence to this alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="516"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="517"/>
<source>Set this sequence as reference</source>
<translation>Set this sequence as reference</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="520"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="521"/>
<source>Unset reference sequence</source>
<translation>Unset reference sequence</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="792"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="795"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="711"/>
+ <source>A problem occurred during adding sequences. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="797"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="800"/>
<source>Open file with sequences</source>
<translation>Open file with sequences</translation>
</message>
@@ -5291,17 +5286,17 @@ Please, check external tools in the settings.</translation>
<translation>Consensus mode...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="151"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="152"/>
<source>MSA consensus algorothm is NULL</source>
<translation>MSA consensus algorothm is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="152"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="153"/>
<source>MSA object is NULL</source>
<translation>MSA object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="172"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="173"/>
<source>Percent value is out of [0..100] interval</source>
<translation>Percent value is out of [0..100] interval</translation>
</message>
@@ -5340,34 +5335,40 @@ Please, check external tools in the settings.</translation>
<translation>Copy current sequence</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="116"/>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="145"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="74"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="81"/>
+ <source>Remove sequence</source>
+ <translation type="unfinished">Remove sequence</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="122"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="151"/>
<source>MSA Editor UI is NULL</source>
<translation>MSA Editor UI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="118"/>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="147"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="124"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="153"/>
<source>MSA Editor sequence area is NULL</source>
<translation>MSA Editor sequence area is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="133"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="139"/>
<source>MSA Object is NULL</source>
<translation>MSA Object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="138"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="144"/>
<source>Invalid sequence index</source>
<translation>Invalid sequence index</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="866"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="868"/>
<source>Rename</source>
<translation>Rename</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="867"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="869"/>
<source>New sequence name:</source>
<translation>New sequence name:</translation>
</message>
@@ -5383,296 +5384,301 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::MSAEditorSequenceArea</name>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="117"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="120"/>
<source>Remove selection</source>
<translation>Remove selection</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="128"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="133"/>
<source>Remove columns of gaps...</source>
<translation>Remove columns of gaps...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="134"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="140"/>
<source>Fill selection with gaps</source>
<translation>Fill selection with gaps</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="141"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="146"/>
<source>Save subalignment</source>
<translation>Save subalignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="146"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="150"/>
<source>Save sequence</source>
<translation>Save sequence</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="151"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="154"/>
<source>Go to position...</source>
<translation>Go to position...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="158"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="161"/>
<source>Remove all gaps</source>
<translation>Remove all gaps</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="162"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="165"/>
<source>Sequence from file...</source>
<translation>Sequence from file...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="166"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="169"/>
<source>Sequence from current project...</source>
<translation>Sequence from current project...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="170"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="173"/>
<source>Sort sequences by name</source>
<translation>Sort sequences by name</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="174"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="177"/>
<source>Switch on/off collapsing</source>
<translation>Switch on/off collapsing</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="179"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="182"/>
<source>Update collapsed groups</source>
<translation>Update collapsed groups</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="184"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="187"/>
<source>Replace selected rows with reverse-complement</source>
<translation>Replace selected rows with reverse-complement</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="188"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="191"/>
<source>Replace selected character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="194"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="198"/>
<source>Replace selected rows with reverse</source>
<translation>Replace selected rows with reverse</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="198"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="202"/>
<source>Replace selected rows with complement</source>
<translation>Replace selected rows with complement</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="230"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="348"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="234"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="352"/>
<source>Use dots</source>
<translation>Use dots</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="294"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="565"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="621"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="298"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="577"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="633"/>
<source>Unknown alphabet</source>
<translation>Unknown alphabet</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="440"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="444"/>
<source>MAlignmentObject is null in MSAEditorSequenceArea::hasAminoAlphabet()</source>
<translation>MAlignmentObject is null in MSAEditorSequenceArea::hasAminoAlphabet()</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="442"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="446"/>
<source>DNAAlphabet is null in MSAEditorSequenceArea::hasAminoAlphabet()</source>
<translation>DNAAlphabet is null in MSAEditorSequenceArea::hasAminoAlphabet()</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="603"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="615"/>
<source>No reference sequence selected</source>
<translation>No reference sequence selected</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="604"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="616"/>
<source>Reference sequence for current highlighting scheme is not selected. Use context menu or Highlighting tab on Options panel to select it</source>
<translation>Reference sequence for current highlighting scheme is not selected. Use context menu or Highlighting tab on Options panel to select it</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="726"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="739"/>
<source>Alignment object is NULL</source>
<translation>Alignment object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="865"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="960"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="878"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="973"/>
<source>Position is out of range: %1</source>
<translation>Position is out of range: %1</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="891"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="969"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="904"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="982"/>
<source>Sequence is out of range: %1</source>
<translation>Sequence is out of range: %1</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="928"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="941"/>
<source>Negative startPos with non-empty alignment</source>
<translation>Negative startPos with non-empty alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="929"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="942"/>
<source>startPos is too big</source>
<translation>startPos is too big</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="950"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="963"/>
<source>Negative startSeq with non-empty alignment</source>
<translation>Negative startSeq with non-empty alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="951"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="964"/>
<source>startSeq is too big</source>
<translation>startSeq is too big</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="983"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="996"/>
<source>Horizontal scrollbar appears unexpectedly: numVisibleBases is too small</source>
<translation>Horizontal scrollbar appears unexpectedly: numVisibleBases is too small</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1008"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1021"/>
<source>Vertical scrollbar appears unexpectedly: numVisibleSequences is too small</source>
<translation>Vertical scrollbar appears unexpectedly: numVisibleSequences is too small</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1055"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1068"/>
<source>Alignment object is not available</source>
<translation>Alignment object is not available</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1086"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1099"/>
<source>Last visible base is less than startPos</source>
<translation>Last visible base is less than startPos</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1087"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1100"/>
<source>Last visible base is out of range</source>
<translation>Last visible base is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1120"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1133"/>
<source>Last visible sequence is less than startSeq</source>
<translation>Last visible sequence is less than startSeq</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1121"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1134"/>
<source>Last visible sequence is out of range</source>
<translation>Last visible sequence is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1144"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1157"/>
<source>Invalid collapsible item model!</source>
<translation>Invalid collapsible item model!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1781"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1792"/>
<source>Cursor position is out of range</source>
<translation>Cursor position is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1994"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2006"/>
<source>Colors</source>
<translation>Colors</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2001"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2013"/>
<source>Custom schemes</source>
<translation>Custom schemes</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2012"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2024"/>
<source>Create new color scheme</source>
<translation>Create new color scheme</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2020"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2032"/>
<source>Highlighting</source>
<translation>Highlighting</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2043"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2055"/>
<source>The alignment has been modified, so that its alphabet has been switched from "%1" to "%2". Use "Undo", if you'd like to restore the original alignment.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2062"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2161"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2222"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2677"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2074"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2173"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2234"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2717"/>
<source>NULL collapsible model!</source>
<translation>NULL collapsible model!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2116"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2128"/>
<source>Go To</source>
<translation>Go To</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2157"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2169"/>
<source>NULL msa object!</source>
<translation>NULL msa object!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2270"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2282"/>
<source>Warning!</source>
<translation>Warning!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2270"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2282"/>
<source>You must select only one sequence for export.</source>
<translation>You must select only one sequence for export.</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2312"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2324"/>
<source>warning</source>
<translation>warning</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2312"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2324"/>
<source>The document already in the project</source>
<translation>The document already in the project</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2539"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2579"/>
<source>It is not possible to insert the character into the alignment.Please use a character from set A-Z (upper-case or lower-case) or the gap character ('Space', '-' or '%1').</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2595"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2598"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2635"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2638"/>
<source>Open file with sequences</source>
<translation>Open file with sequences</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2694"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2644"/>
+ <source>A problem occurred during adding sequences. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2734"/>
<source>NULL Msa Object!</source>
<translation>NULL Msa Object!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2699"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2739"/>
<source>NULL document!</source>
<translation>NULL document!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2722"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2762"/>
<source>Top left corner of the selection has incorrect coords</source>
<translation>Top left corner of the selection has incorrect coords</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2724"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2764"/>
<source>Bottom right corner of the selection has incorrect coords</source>
<translation>Bottom right corner of the selection has incorrect coords</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2883"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2923"/>
<source>Incorrect pointer to MSACollapsibleItemModel</source>
<translation>Incorrect pointer to MSACollapsibleItemModel</translation>
</message>
@@ -5843,22 +5849,27 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAEditorUI</name>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="909"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="914"/>
<source>Copy selection</source>
<translation>Copy selection</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="918"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="923"/>
<source>Copy formatted</source>
<translation>Copy formatted</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="977"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="932"/>
+ <source>Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="991"/>
<source>Consensus</source>
<translation>Consensus</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="1052"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="1066"/>
<source>Tree view</source>
<translation>Tree view</translation>
</message>
@@ -5873,10 +5884,15 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAExportConsensusTab</name>
<message>
- <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="77"/>
+ <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="78"/>
<source>Save file</source>
<translation>Save file</translation>
</message>
+ <message>
+ <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="94"/>
+ <source>A problem occurred during export consensus. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::MSAGapOverviewCalculationTask</name>
@@ -5928,17 +5944,17 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAGraphOverview</name>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="100"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="102"/>
<source>Multiple sequence alignment is too big. Overview is unavailable.</source>
<translation>Multiple sequence alignment is too big. Overview is unavailable.</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="105"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="107"/>
<source>Waiting...</source>
<translation>Waiting...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="114"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="116"/>
<source>Overview is rendering...</source>
<translation>Overview is rendering...</translation>
</message>
@@ -6029,12 +6045,18 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<translation>MSA sequence area is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="268"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="245"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="329"/>
+ <source>MSA Collapsible Model is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="278"/>
<source>Warning: selected region is too big to be exported. You can try to zoom out the alignment or select another region.</source>
<translation>Warning: selected region is too big to be exported. You can try to zoom out the alignment or select another region.</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="271"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="281"/>
<source>Warning: selected region is too big to be exported. You can try to select another region.</source>
<translation>Warning: selected region is too big to be exported. You can try to select another region.</translation>
</message>
@@ -6048,12 +6070,11 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
</message>
<message>
<location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="88"/>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="116"/>
<source>MSA Editor is NULL</source>
<translation>MSA Editor is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="103"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="97"/>
<source>MSA Consensus area is NULL</source>
<translation>MSA Consensus area is NULL</translation>
</message>
@@ -6339,7 +6360,7 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::OpenAssemblyBrowserTask</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="79"/>
+ <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="87"/>
<source>Assembly object not found</source>
<translation>Assembly object not found</translation>
</message>
@@ -6373,7 +6394,7 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::OpenSavedAssemblyBrowserTask</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="155"/>
+ <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="170"/>
<source>Assembly object not found: %1</source>
<translation>Assembly object not found: %1</translation>
</message>
@@ -6447,12 +6468,12 @@ Simple overview is unavailable.</translation>
<translation>Toggle annotation density graph</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="359"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="354"/>
<source>Position </source>
<translation>Position </translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="369"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="364"/>
<source>Annotation density </source>
<translation>Annotation density </translation>
</message>
@@ -6460,12 +6481,12 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::OverviewRenderArea</name>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="483"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="478"/>
<source>Overview is NULL</source>
<translation>Overview is NULL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="485"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="480"/>
<source>ADVSingleSequenceWidget is NULL</source>
<translation>ADVSingleSequenceWidget is NULL</translation>
</message>
@@ -6530,42 +6551,42 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::PanView</name>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="120"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="161"/>
<source>Zoom In</source>
<translation>Zoom In</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="124"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="165"/>
<source>Zoom Out</source>
<translation>Zoom Out</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="128"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="169"/>
<source>Zoom to Selection</source>
<translation>Zoom to Selection</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="132"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="173"/>
<source>Zoom to Whole Sequence</source>
<translation>Zoom to Whole Sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="136"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="177"/>
<source>Show Main Ruler</source>
<translation>Show Main Ruler</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="142"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="183"/>
<source>Show Custom Rulers</source>
<translation>Show Custom Rulers</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="439"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="485"/>
<source>range change request: [%1, %2]</source>
<translation>range change request: [%1, %2]</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="916"/>
+ <location filename="../src/ov_sequence/view_rendering/PanViewRenderer.cpp" line="421"/>
<source>empty</source>
<translation>empty</translation>
</message>
@@ -6573,9 +6594,16 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::PanViewRenderArea</name>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="966"/>
<source>[%1 %2]</source>
- <translation>[%1 %2]</translation>
+ <translation type="vanished">[%1 %2]</translation>
+ </message>
+</context>
+<context>
+ <name>U2::PanViewRenderer</name>
+ <message>
+ <location filename="../src/ov_sequence/view_rendering/PanViewRenderer.cpp" line="266"/>
+ <source>[%1 %2]</source>
+ <translation type="unfinished">[%1 %2]</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2View/transl/russian.ts b/src/corelibs/U2View/transl/russian.ts
index d55efb5..34060d9 100644
--- a/src/corelibs/U2View/transl/russian.ts
+++ b/src/corelibs/U2View/transl/russian.ts
@@ -410,172 +410,139 @@ Probably the data is too big.</source>
<context>
<name>DasBlastSettingsWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="20"/>
<source>Form</source>
- <translation>Форма</translation>
+ <translation type="vanished">Форма</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="41"/>
<source>Threshold:</source>
- <translation>Порог:</translation>
+ <translation type="vanished">Порог:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="60"/>
<source>Number of expected matches in a random database. The lower the value, the more likely the match is to be significant</source>
- <translation>Количество ожидаемых совпадений в случайной базе данных. Чем ниже значение, тем больше вероятность совпадения будет значимой</translation>
+ <translation type="vanished">Количество ожидаемых совпадений в случайной базе данных. Чем ниже значение, тем больше вероятность совпадения будет значимой</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="70"/>
<source>Matrix:</source>
- <translation>Матрица:</translation>
+ <translation type="vanished">Матрица:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="89"/>
<source>Assigns a probability score for each position in an alignment</source>
- <translation>Назначает вероятностный счет для каждой позиции в выравнивании</translation>
+ <translation type="vanished">Назначает вероятностный счет для каждой позиции в выравнивании</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="102"/>
<source>Filtering:</source>
- <translation>Фильтрация:</translation>
+ <translation type="vanished">Фильтрация:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="121"/>
<source>Filtering low-complexity regions replaces the regions with X's during the search to filter biologically unrelated results</source>
- <translation>Фильтрация простых регионов заменяет регионы с Х символами во время поиска для фильтрации биологически несвязанных результатов</translation>
+ <translation type="vanished">Фильтрация простых регионов заменяет регионы с Х символами во время поиска для фильтрации биологически несвязанных результатов</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="131"/>
<source>Gapped:</source>
- <translation>Промежуток:</translation>
+ <translation type="vanished">Пробел:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="150"/>
<source>Allows gaps to be introduced in the sequences when the comparison is done</source>
- <translation>Позволяет вставлять пробелы в последовательностях в процессе сравнения</translation>
+ <translation type="vanished">Позволяет вставлять пробелы в последовательностях в процессе сравнения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="160"/>
<source>Maximum results:</source>
- <translation>Максимальное число результатов:</translation>
+ <translation type="vanished">Максимальное число результатов:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasBlastSettingsWidget.ui" line="179"/>
<source>Limits the number of returned results</source>
- <translation>Предел на число возвращаемых результатов</translation>
+ <translation type="vanished">Предел на число возвращаемых результатов</translation>
</message>
</context>
<context>
<name>DasOptionsPanelWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="20"/>
<source>Form</source>
- <translation>Форма</translation>
+ <translation type="vanished">Форма</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="73"/>
<source>Database:</source>
- <translation>База данных:</translation>
+ <translation type="vanished">База данных:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="86"/>
<source>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity</source>
- <translation>База данных, по которой производится поиск: UniProtKB или кластеры последовательностей со 100%, 90% или 50% степенью совпадения</translation>
+ <translation type="vanished">База данных, по которой производится поиск: UniProtKB или кластеры последовательностей со 100%, 90% или 50% степенью совпадения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="109"/>
<source>Minimum Identity:</source>
- <translation>Минимальная степень совпадения:</translation>
+ <translation type="vanished">Минимальная степень совпадения:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="125"/>
<source>Minimum percent identity between the input sequence region and BLAST results</source>
- <translation>Минимальная степень совпадения между регионом входной последовательности и результатами BLAST</translation>
+ <translation type="vanished">Минимальная степень совпадения между регионом входной последовательности и результатами BLAST</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="131"/>
<source>%</source>
- <translation>%</translation>
+ <translation type="vanished">%</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="141"/>
<source>Show more option...</source>
- <translation>Показать дополнительные настройки...</translation>
+ <translation type="vanished">Показать дополнительные настройки...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="241"/>
<source>IDs of similar sequences:</source>
- <translation>Идентификаторы схожих последовательностей:</translation>
+ <translation type="vanished">Идентификаторы схожих последовательностей:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="269"/>
<source>Select ID(s) to fetch annotations from DAS</source>
- <translation>Выберите идентификатор(ы) для извлечения аннотаций из DAS</translation>
+ <translation type="vanished">Выберите идентификатор(ы) для извлечения аннотаций из DAS</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="294"/>
<source>ID</source>
- <translation>Идентификатор</translation>
+ <translation type="vanished">Идентификатор</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="299"/>
<source>Identity</source>
- <translation>Схожесть</translation>
+ <translation type="vanished">Схожесть</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="345"/>
<source>Fetch annotations</source>
- <translation>Извлечь аннотации</translation>
+ <translation type="vanished">Извлечь аннотации</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="218"/>
<source>Send request to Uniprot BLAST to get IDs of similar sequences</source>
- <translation>Отправить запрос в Uniprot BLAST для получения ID схожих последовательностей</translation>
+ <translation type="vanished">Отправить запрос в Uniprot BLAST для получения ID схожих последовательностей</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="221"/>
<source>Fetch IDs</source>
- <translation>Получить идентификаторы</translation>
+ <translation type="vanished">Получить идентификаторы</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/ui/DasOptionsPanelWidget.ui" line="362"/>
<source>Info: Searching for annotations with DAS is available for amino acid sequences only</source>
- <translation>Информация: Поиск для аннотаций в DAS доступен только для аминных последовательностей</translation>
+ <translation type="vanished">Информация: Поиск для аннотаций в DAS доступен только для аминных последовательностей</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="60"/>
<source>BLAST</source>
- <translation>BLAST</translation>
+ <translation type="vanished">BLAST</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="61"/>
<source>Algorithm settings</source>
- <translation>Настройки алгоритма</translation>
+ <translation type="vanished">Настройки алгоритма</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="62"/>
<source>Annotations settings</source>
- <translation>Настройки аннотаций</translation>
+ <translation type="vanished">Настройки аннотаций</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="63"/>
<source>DAS features sources</source>
- <translation>Источники аннотаций DAS</translation>
+ <translation type="vanished">Источники аннотаций DAS</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="64"/>
<source>Whole sequence</source>
- <translation>Вся последовательность</translation>
+ <translation type="vanished">Вся последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="65"/>
<source>Selected region</source>
- <translation>Выделенный регион</translation>
+ <translation type="vanished">Выделенный регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="66"/>
<source>Custom region</source>
- <translation>Указанный регион</translation>
+ <translation type="vanished">Указанный регион</translation>
</message>
</context>
<context>
@@ -859,12 +826,12 @@ Probably the data is too big.</source>
<translation>Искать:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="415"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="433"/>
<source>Search in</source>
<translation>Искать в</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="524"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="526"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -889,27 +856,27 @@ Probably the data is too big.</source>
<translation>Возврат</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="428"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="446"/>
<source>Strand</source>
<translation>Прямая</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="441"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="459"/>
<source>Region</source>
<translation>Регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="657"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="668"/>
<source>Create annotations</source>
<translation>Создать аннотации</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="585"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="596"/>
<source>Remove overlapped results</source>
<translation>Удалить перекрывающиеся результаты</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="602"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="613"/>
<source>Limit results number to:</source>
<translation>Ограничить число результатов:</translation>
</message>
@@ -934,7 +901,7 @@ Probably the data is too big.</source>
<translation>Путь:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="286"/>
+ <location filename="../src/ov_sequence/find_pattern/ui/FindPatternForm.ui" line="295"/>
<source>Algorithm</source>
<translation>Алгоритм</translation>
</message>
@@ -1615,9 +1582,8 @@ Double-click to collapse the branch</source>
<translation>Выделение аннотаций</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasWidgetFactory.cpp" line="36"/>
<source>DAS Annotations</source>
- <translation>Аннотации DAS</translation>
+ <translation type="vanished">Аннотации DAS</translation>
</message>
<message>
<location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="218"/>
@@ -1933,12 +1899,12 @@ Double-click to collapse the branch</source>
<message>
<location filename="../src/util_smith_waterman/ui/SmithWatermanDialogBase.ui" line="358"/>
<source>Gap open</source>
- <translation>Открытие</translation>
+ <translation>Открытие пробела</translation>
</message>
<message>
<location filename="../src/util_smith_waterman/ui/SmithWatermanDialogBase.ui" line="365"/>
<source>Gap extension </source>
- <translation>Продление</translation>
+ <translation>Продление пробела</translation>
</message>
<message>
<location filename="../src/util_smith_waterman/ui/SmithWatermanDialogBase.ui" line="398"/>
@@ -2257,14 +2223,23 @@ Double-click to collapse the branch</source>
<translation>Копировать транслированную обратно-комплементарную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVClipboard.cpp" line="145"/>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="90"/>
+ <source>Paste sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="150"/>
<source>An error occurred during getting sequence data: %1</source>
<translation>В процессе получения данных последовательности произошла ошибка: %1</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVClipboard.cpp" line="302"/>
+ <location filename="../src/ov_sequence/ADVClipboard.cpp" line="307"/>
+ <source>Copy/Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy</source>
- <translation>Копирование</translation>
+ <translation type="vanished">Копирование</translation>
</message>
<message>
<location filename="../src/ov_sequence/ADVClipboard.cpp" line="85"/>
@@ -2293,17 +2268,17 @@ Double-click to collapse the branch</source>
<context>
<name>U2::ADVSequenceObjectContext</name>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="202"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="206"/>
<source>Incorrect signal sender!</source>
<translation>Incorrect signal sender!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="213"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="217"/>
<source>Amino translation</source>
<translation>Таблицы трансляции</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="214"/>
+ <location filename="../src/ov_sequence/ADVSequenceObjectContext.cpp" line="218"/>
<source>Translation frames</source>
<translation>Рамки трансляций</translation>
</message>
@@ -2311,52 +2286,52 @@ Double-click to collapse the branch</source>
<context>
<name>U2::ADVSingleSequenceHeaderWidget</name>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="966"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="967"/>
<source>Alphabet: <b>%1</b></source>
<translation>Алфавит: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="967"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="968"/>
<source> Sequence size: <b>%1</b></source>
<translation>Размер последовательности: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="968"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="969"/>
<source> File: <b>%1</b></source>
<translation>Файл: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1053"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1054"/>
<source>raw</source>
<translation>raw</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1057"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1058"/>
<source>amino ext</source>
<translation>amino ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1059"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1060"/>
<source>amino</source>
<translation>амино</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1064"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1065"/>
<source>dna</source>
<translation>днк</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1066"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1067"/>
<source>dna ext</source>
<translation>dna ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1070"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1071"/>
<source>rna ext</source>
<translation>rna ext</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1068"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="1069"/>
<source>rna</source>
<translation>rna</translation>
</message>
@@ -2364,12 +2339,12 @@ Double-click to collapse the branch</source>
<context>
<name>U2::ADVSingleSequenceWidget</name>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="448"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="449"/>
<source>Zoom</source>
<translation>Масштаб</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="702"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="703"/>
<source>Zoom to range</source>
<translation>Выбор масштаба</translation>
</message>
@@ -2379,12 +2354,12 @@ Double-click to collapse the branch</source>
<translation>Создать новую шкалу...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="540"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="541"/>
<source>Rulers...</source>
<translation>Шкала обзора...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="551"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="552"/>
<source>Remove '%1'</source>
<translation>Удалить "%1"</translation>
</message>
@@ -2414,63 +2389,63 @@ Double-click to collapse the branch</source>
<translation>Выбрать масштаб...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="208"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="209"/>
<source>Export image</source>
<translation>Экспорт изображения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="224"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="225"/>
<source>Remove sequence</source>
<translation>Удалить последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="525"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="526"/>
<source>Select</source>
<translation>Выделить</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="314"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="315"/>
<source>Show all views</source>
<translation>Показать всё</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="314"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="315"/>
<source>Hide all views</source>
<translation>Скрыть всё</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="242"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="920"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="921"/>
<source>Show zoom view</source>
<translation>Показать масштабируемое представление</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="242"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="920"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="921"/>
<source>Hide zoom view</source>
<translation>Скрыть масштабируемое представление</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="925"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="926"/>
<source>Show details view</source>
<translation>Показать детали</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="243"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="925"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="926"/>
<source>Hide details view</source>
<translation>Скрыть детали</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="930"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="245"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="931"/>
<source>Show overview</source>
<translation>Показать панораму</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="244"/>
- <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="930"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="245"/>
+ <location filename="../src/ov_sequence/ADVSingleSequenceWidget.cpp" line="931"/>
<source>Hide overview</source>
<translation>Скрыть панораму</translation>
</message>
@@ -2630,32 +2605,32 @@ Double-click to collapse the branch</source>
<translation>Выбрать имя аннотации:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="113"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="114"/>
<source>Configure the annotations:</source>
<translation>Задать аннотации:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="125"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="126"/>
<source>Previous annotation</source>
<translation>Предыдущая аннотация</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="133"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="134"/>
<source>Next annotation</source>
<translation>Следующая аннотация</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="211"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="212"/>
<source>Sequence context is NULL</source>
<translation>Sequence context is NULL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="322"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="323"/>
<source>The sequence doesn't have any annotations.</source>
<translation>Последовательность не имеет аннотаций.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="325"/>
+ <location filename="../src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp" line="326"/>
<source>The sequences do not have any annotations.</source>
<translation>Последовательности не имеют аннотаций.</translation>
</message>
@@ -2663,112 +2638,117 @@ Double-click to collapse the branch</source>
<context>
<name>U2::AnnotatedDNAView</name>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="135"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="142"/>
<source>Find pattern...</source>
<translation>Поиск подстроки...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="113"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="120"/>
<source>Go to position...</source>
<translation>Перейти...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="126"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="133"/>
<source>Rename item</source>
<translation>Переименовать элемент</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="140"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="147"/>
<source>Insert subsequence...</source>
<translation>Вставить подпоследовательность...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="145"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="152"/>
<source>Remove subsequence...</source>
<translation>Удалить подпоследовательность...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="149"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="156"/>
<source>Replace subsequence...</source>
<translation>Заменить подпоследовательность...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="154"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="161"/>
<source>Selected sequence from view</source>
<translation>Удалить выделенную последовательность из отображения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="158"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="165"/>
<source>Reverse-complement sequence</source>
<translation>Заменить на обратно-комплементарную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="166"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="173"/>
<source>Complement sequence</source>
<translation>Заменить на комплементарную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="350"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="358"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="530"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="539"/>
<source>Analyze</source>
<translation>Анализ</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="540"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="549"/>
<source>Add</source>
<translation>Аннотация</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="546"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="555"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="552"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="561"/>
<source>Align</source>
<translation>Выравнивание</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="558"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="567"/>
<source>Remove</source>
<translation>Удаление</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="571"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="580"/>
<source>Edit</source>
<translation>Редактирование</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="162"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="1339"/>
+ <source>No sequence in focus</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="169"/>
<source>Reverse sequence</source>
<translation>Заменить на обратную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="809"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="818"/>
<source>Select sequence to associate annotations with:</source>
<translation>Установить связь аннотаций с последовательностью:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="827"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="836"/>
<source>No sequence object found for annotations</source>
<translation>Не найдена связанная с аннотациями последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="754"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="763"/>
<source>Disable '%1' highlighting</source>
<translation>Не использовать подсветку для '%1'</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="756"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="765"/>
<source>Enable '%1' highlighting</source>
<translation>Задействовать подсветку для '%1'</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="896"/>
+ <location filename="../src/ov_sequence/AnnotatedDNAView.cpp" line="905"/>
<source>Go To</source>
<translation>Выбор позиции</translation>
</message>
@@ -2784,159 +2764,164 @@ Double-click to collapse the branch</source>
<context>
<name>U2::AnnotationsTreeView</name>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="266"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="275"/>
<source>Value</source>
<translation>Значение</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="167"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="176"/>
<source>Selected objects with annotations from view</source>
<translation>Удалить выбранные объекты с аннотациями</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="180"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1076"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="189"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1119"/>
<source>Copy qualifier text</source>
<translation>Копировать значение квалификатора</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="183"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1080"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="192"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1123"/>
<source>Copy qualifier URL</source>
<translation>Копировать ссылку</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="186"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1085"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="195"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1128"/>
<source>Toggle column</source>
<translation>Переключить столбец</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="190"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="199"/>
<source>Hide column</source>
<translation>Убрать столбец</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="194"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="203"/>
<source>Find qualifier...</source>
<translation>Поиск квалификатора...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="199"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="208"/>
<source>Invert annotation selection</source>
<translation>Инвертировать выделенную аннотацию</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="203"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="779"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="212"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="788"/>
<source>Copy column text</source>
<translation>Копировать значение</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="206"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="793"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="215"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="802"/>
<source>copy column URL</source>
<translation>Копировать ссылку</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="164"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="173"/>
<source>Objects with annotations...</source>
<translation>Добавить объекты с аннотациями...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="121"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="123"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="174"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="166"/>
+ <source>Paste annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="183"/>
<source>Selected annotations and qualifiers</source>
<translation>Удалить выбранные аннотации и квалификаторы</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="209"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="218"/>
<source>Rename item</source>
<translation>Переименовать элемент</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="216"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="225"/>
<source>Edit qualifier</source>
<translation>Редактировать квалификатор</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="223"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="232"/>
<source>View qualifier</source>
<translation>Просмотреть квалификатор</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="229"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="238"/>
<source>Qualifier...</source>
<translation>Добавить квалификатор...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="236"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="245"/>
<source>Make auto-annotations persistent</source>
<translation>Сделать автоаннотации постоянными</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="550"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="559"/>
<source>At least one dragged annotation is out of the sequence range!</source>
<translation>Как минимум одна из аннотаций вне диапазона последовательности!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="785"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="794"/>
<source>Copy column '%1' text</source>
<translation>Копировать значение "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="788"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="797"/>
<source>Copy '%1' annotation location</source>
<translation>Копировать позицию аннотации "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="797"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="806"/>
<source>Copy column '%1' URL</source>
<translation>Копировать ссылку "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="819"/>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1086"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="828"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1129"/>
<source>Hide '%1' column</source>
<translation>Скрыть столбец "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1076"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1119"/>
<source>Copy qualifier '%1' value</source>
<translation>Копировать значение "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1080"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1123"/>
<source>Copy qualifier '%1' URL</source>
<translation>Копировать ссылку "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1086"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1129"/>
<source>Add '%1' column</source>
<translation>Добавить столбец "%1"</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1805"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1848"/>
<source>Rename Group</source>
<translation>Переименовать группу</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1846"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1889"/>
<source>Rename Qualifier</source>
<translation>Переименовать квалификатор</translation>
</message>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1905"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="1948"/>
<source>Create Permanent Annotation</source>
<translation>Создать постоянную аннотацию</translation>
</message>
@@ -4032,7 +4017,7 @@ You don't have enough rights to change file</source>
<context>
<name>U2::CurrentViewPainter</name>
<message>
- <location filename="../src/ov_sequence/image_export/SequencePainter.cpp" line="77"/>
+ <location filename="../src/ov_sequence/image_export/SequencePainter.cpp" line="79"/>
<source>Warning: SVG is not supported for the currently viewed area. Please, choose another export area.</source>
<translation>Warning: SVG is not supported for the currently viewed area. Please, choose another export area.</translation>
</message>
@@ -4059,24 +4044,20 @@ You don't have enough rights to change file</source>
<context>
<name>U2::DasOptionsPanelWidget</name>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="561"/>
<source>Show more options</source>
- <translation>Показать дополнительные настройки</translation>
+ <translation type="vanished">Показать дополнительные настройки</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="561"/>
<source>Show less options</source>
- <translation>Скрыть дополнительные настройки</translation>
+ <translation type="vanished">Скрыть дополнительные настройки</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="619"/>
<source>Warning: Selected region is too short. It should be from 4 to 1900 amino acids.</source>
- <translation>Предупреждение: Выделенный регион слишком короткий. Он должен быть от 4 до 1900 аминокислот.</translation>
+ <translation type="vanished">Предупреждение: Выделенный регион слишком короткий. Он должен быть от 4 до 1900 аминокислот.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Das/DasOptionsPanelWidget.cpp" line="622"/>
<source>Warning: Selected region is too long. It should be from 4 to 1900 amino acids.</source>
- <translation>Предупреждение: Выделенный регион слишком длинный. Он должен быть от 4 до 1900 аминокислот.</translation>
+ <translation type="vanished">Предупреждение: Выделенный регион слишком длинный. Он должен быть от 4 до 1900 аминокислот.</translation>
</message>
</context>
<context>
@@ -4095,15 +4076,20 @@ You don't have enough rights to change file</source>
<context>
<name>U2::DetView</name>
<message>
- <location filename="../src/ov_sequence/DetView.cpp" line="55"/>
+ <location filename="../src/ov_sequence/DetView.cpp" line="62"/>
<source>Show complement strand</source>
<translation>Показывать комплeментарную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/DetView.cpp" line="60"/>
+ <location filename="../src/ov_sequence/DetView.cpp" line="67"/>
<source>Show amino translations</source>
<translation>Показывать транслированную последовательность</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/DetView.cpp" line="72"/>
+ <source>Wrap sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::DnaAssemblyAlgorithmMainWidget</name>
@@ -4589,17 +4575,17 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::ExportHighligtningTask</name>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3029"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3069"/>
<source>Export highlighting</source>
<translation>Экспорт подсвеченного</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3057"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3097"/>
<source>Export highligtning finished successfully</source>
<translation>Export highligtning finished successfully</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3057"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="3097"/>
<source>Result file:</source>
<translation>Выходной файл:</translation>
</message>
@@ -4677,182 +4663,182 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::FindPatternWidget</name>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="326"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
<source>Exact</source>
<translation>Точный</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="330"/>
<source>InsDel</source>
<translation>Инсерции/делеции</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="329"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
<source>Substitute</source>
<translation>Замены</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="333"/>
<source>Regular expression</source>
<translation>Регулярные выражения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="335"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="337"/>
<source>Should match</source>
<translation>Точное совпадение</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="412"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="414"/>
<source>Search with ambiguous bases</source>
<translation>Поиск с неоднозначными базами</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="360"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
<source>Both</source>
<translation>Оба</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="361"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="363"/>
<source>Direct</source>
<translation>Прямое</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="364"/>
<source>Reverse-coml.</source>
<translation>Обратно-компл.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="368"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="370"/>
<source>Sequence</source>
<translation>Последовательности</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="369"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="371"/>
<source>Translation</source>
<translation>Трансляции</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="375"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
<source>Whole sequence</source>
<translation>Вся последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="376"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="378"/>
<source>Custom region</source>
<translation>Указанный регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="379"/>
<source>Selected region</source>
<translation>Выделенный регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="435"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="437"/>
<source>Results no longer than:</source>
<translation>Результаты не длиннее чем:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="710"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
<source>The value is longer than the search region. Please input a shorter value or select another region!</source>
<translation>Значение длинее чем регион поиска. Ввведите более короткое значение или выберите другой регион!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="717"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="719"/>
<source>Warning: input value contains characters that do not match the active alphabet!</source>
<translation>Предупреждение: входное значение содержит символы, которые не входят в текущий алфавит!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="725"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="727"/>
<source>Warning: file contains patterns that do not match the active alphabet! Those patterns were ignored </source>
<translation>Предупреждение: файл содержит паттерны, которые не совпадают с текущим алфавитом! Эти паттерны были проигнорированы </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="732"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="734"/>
<source>Warning: file contains patterns that longer than the search region! Those patterns were ignored. Please input a shorter value or select another region! </source>
<translation>Предупреждение: файл содержит паттерны, которые длиннее чем регион поиска! Эти паттерны были проигнорированы. Введите более короткое значение или выберите другой регион! </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="787"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="789"/>
<source>Warning: current sequence is too long to search in.</source>
<translation>Предупреждение: текущая последовательность слишком длинная для поиска.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1458"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1469"/>
<source>Warning: can not get valid pattern name, annotation will be named 'misc_feature'</source>
<translation>Warning: can not get valid pattern name, annotation will be named 'misc_feature'</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1596"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1607"/>
<source>Results:</source>
<translation>Результаты:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="759"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="750"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
<source>Reason: </source>
<translation>Причина: </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="739"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
<source>Info: please input at least one sequence pattern to search for. Use %1 to input multiple patterns. Alternatively, load patterns from a FASTA file.</source>
<translation>Инфрмация: добавьте как минимум одну подстроку для поиска. Используйте %1, чтобы ввести несколько подстрок. Также вы можете загрузить подстроки из FASTA файла.
</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="751"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="753"/>
<source> Please input valid annotation names </source>
<translation>Введите корректные имена аннотаций </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="757"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="759"/>
<source>Warning: annotation names are invalid. </source>
<translation>Внимание: имена аннотаций некорректны. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="762"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="764"/>
<source> It will be automatically changed to acceptable name if 'Get annotations' button is pressed. </source>
<translation> Они будут автоматически изменены на доступные имена после того как кнопка 'Получить аннотации' будет нажата. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="768"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="775"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="770"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
<source>Warning: there is no pattern to search. </source>
<translation>Предупреждение: нет паттернов для поиска. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="769"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="776"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="771"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="778"/>
<source> Please input a valid pattern or choose a file with patterns </source>
<translation>Введите паттерн или выберите файл с паттернами </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="782"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="784"/>
<source>Warning: invalid regexp. </source>
<translation>Предупреждение: некорректное регулярное выражение. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1113"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1124"/>
<source>Select file to open...</source>
<translation>Выберите файл...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1165"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1176"/>
<source>Unable to search on the reverse-complement strand, searching on the direct strand only!</source>
<translation>Невозможно выполнить поиск в обратно-комплементарной цепи, поиск только в прямой цепи!</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="295"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1510"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="297"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1521"/>
<source>Results: %1/%2</source>
<translation>Результаты: %1/%2</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="746"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
<source>Warning: annotation name or annotation group name are invalid. </source>
<translation>Внимание: имя аннотации или имя группы аннотаций некорректно. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1313"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1324"/>
<source>Sequence in focus is NULL</source>
<translation>Sequence in focus is NULL</translation>
</message>
@@ -4860,7 +4846,7 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::FindQualifierTask</name>
<message>
- <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="2266"/>
+ <location filename="../src/ov_sequence/AnnotationsTreeView.cpp" line="2309"/>
<source>Searching for a qualifier</source>
<translation>Поиск квалификатора</translation>
</message>
@@ -4942,7 +4928,7 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::GSequenceLineViewAnnotated</name>
<message>
- <location filename="../src/ov_sequence/GSequenceLineViewAnnotated.cpp" line="743"/>
+ <location filename="../src/ov_sequence/GSequenceLineViewAnnotated.cpp" line="440"/>
<source>etc ...</source>
<translation>Прочие ...</translation>
</message>
@@ -5145,125 +5131,134 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::MSAEditor</name>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="132"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="133"/>
<source>Zoom In</source>
<translation>Приблизить</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="136"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="137"/>
<source>Zoom Out</source>
<translation>Отдалить</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="140"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="141"/>
<source>Zoom To Selection</source>
<translation>Приблизить выбранный регион</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="144"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="145"/>
<source>Reset Zoom</source>
<translation>Вернуться к приближению "по умолчанию"</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="504"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="505"/>
<source>Export as image</source>
<translation>Экспортировать выравнивание в изображение</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="429"/>
<source>Copy</source>
- <translation>Копирование</translation>
+ <translation type="vanished">Копирование</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="124"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="220"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="125"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="221"/>
<source>Save alignment</source>
<translation>Сохранить выравнивание</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="128"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="129"/>
<source>Save alignment as</source>
<translation>Сохранить выравнивание как</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="180"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="181"/>
<source>Export highlighted</source>
<translation>Экспортировать выравнивание с выделенными нуклеотидами</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="434"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="430"/>
+ <source>Copy/Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="435"/>
<source>Edit</source>
<translation>Редактирование</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="439"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="440"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="460"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="508"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="461"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="509"/>
<source>Align</source>
<translation>Выравнивание</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="466"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="467"/>
<source>Tree</source>
<translation>Дерево</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="473"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="474"/>
<source>Advanced</source>
<translation>Дополнительные операции</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="484"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="485"/>
<source>Add</source>
<translation>Добавление</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="512"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="513"/>
<source>Align sequence to this alignment</source>
<translation>Выровнять последовательность на это выравнивание</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="516"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="517"/>
<source>Set this sequence as reference</source>
<translation>Сделать референсной</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="520"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="521"/>
<source>Unset reference sequence</source>
<translation>Отменить референсную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="792"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="795"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="711"/>
+ <source>A problem occurred during adding sequences. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="797"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="800"/>
<source>Open file with sequences</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="452"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="453"/>
<source>View</source>
<translation>Вид</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="148"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="149"/>
<source>Change Font</source>
<translation>Изменить шрифт</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="152"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="153"/>
<source>Build Tree</source>
<translation>Построить дерево</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="366"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="367"/>
<source>Select font for alignment</source>
<translation>Выбрать шрифт</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="478"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="479"/>
<source>Statistics</source>
<translation>Статистика</translation>
</message>
@@ -5286,17 +5281,17 @@ Please, check external tools in the settings.</source>
<translation>Алгоритм построения консенсуса...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="151"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="152"/>
<source>MSA consensus algorothm is NULL</source>
<translation>MSA consensus algorothm is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="152"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="153"/>
<source>MSA object is NULL</source>
<translation>MSA object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="172"/>
+ <location filename="../src/ov_msa/MSAEditorConsensusArea.cpp" line="173"/>
<source>Percent value is out of [0..100] interval</source>
<translation>Percent value is out of [0..100] interval</translation>
</message>
@@ -5335,34 +5330,40 @@ Please, check external tools in the settings.</source>
<translation>Копировать текущую последовательность</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="116"/>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="145"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="74"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="81"/>
+ <source>Remove sequence</source>
+ <translation type="unfinished">Удалить последовательность</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="122"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="151"/>
<source>MSA Editor UI is NULL</source>
<translation>MSA Editor UI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="118"/>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="147"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="124"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="153"/>
<source>MSA Editor sequence area is NULL</source>
<translation>MSA Editor sequence area is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="133"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="139"/>
<source>MSA Object is NULL</source>
<translation>MSA Object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="138"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="144"/>
<source>Invalid sequence index</source>
<translation>Invalid sequence index</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="866"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="868"/>
<source>Rename</source>
<translation>Переименовать</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="867"/>
+ <location filename="../src/ov_msa/MSAEditorNameList.cpp" line="869"/>
<source>New sequence name:</source>
<translation>Новое имя:</translation>
</message>
@@ -5378,296 +5379,301 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::MSAEditorSequenceArea</name>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="117"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="120"/>
<source>Remove selection</source>
<translation>Удалить выделение</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="128"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="133"/>
<source>Remove columns of gaps...</source>
<translation>Удалить столбцы пробелов...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="151"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="154"/>
<source>Go to position...</source>
<translation>Перейти...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="158"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="161"/>
<source>Remove all gaps</source>
<translation>Удалить все пробелы</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="162"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="165"/>
<source>Sequence from file...</source>
<translation>Добавить последовательность из файла...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="166"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="169"/>
<source>Sequence from current project...</source>
<translation>Добавить последовательность из проекта...</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="170"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="173"/>
<source>Sort sequences by name</source>
<translation>Отсортировать последовательности по имени</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="184"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="187"/>
<source>Replace selected rows with reverse-complement</source>
<translation>Заменить выделенные строки обратно-комплементарными</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="188"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="191"/>
<source>Replace selected character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="194"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="198"/>
<source>Replace selected rows with reverse</source>
<translation>Заменить выделенные строки обратными</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="198"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="202"/>
<source>Replace selected rows with complement</source>
<translation>Заменить выделенные строки комплементарными</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="230"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="348"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="234"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="352"/>
<source>Use dots</source>
<translation>Использовать точки</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="294"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="565"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="621"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="298"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="577"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="633"/>
<source>Unknown alphabet</source>
<translation>Неизвестный алфавит</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="440"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="444"/>
<source>MAlignmentObject is null in MSAEditorSequenceArea::hasAminoAlphabet()</source>
<translation>MAlignmentObject is null in MSAEditorSequenceArea::hasAminoAlphabet()</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="442"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="446"/>
<source>DNAAlphabet is null in MSAEditorSequenceArea::hasAminoAlphabet()</source>
<translation>DNAAlphabet is null in MSAEditorSequenceArea::hasAminoAlphabet()</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="603"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="615"/>
<source>No reference sequence selected</source>
<translation>Не выбрана референсная последовательность</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="726"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="739"/>
<source>Alignment object is NULL</source>
<translation>Alignment object is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="865"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="960"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="878"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="973"/>
<source>Position is out of range: %1</source>
<translation>Позиция выходит за рамки региона: %1</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="891"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="969"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="904"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="982"/>
<source>Sequence is out of range: %1</source>
<translation>Последовательность выходит за рамки региона: %1</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="928"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="941"/>
<source>Negative startPos with non-empty alignment</source>
<translation>Negative startPos with non-empty alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="929"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="942"/>
<source>startPos is too big</source>
<translation>startPos is too big</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="950"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="963"/>
<source>Negative startSeq with non-empty alignment</source>
<translation>Negative startSeq with non-empty alignment</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="951"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="964"/>
<source>startSeq is too big</source>
<translation>startSeq is too big</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="983"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="996"/>
<source>Horizontal scrollbar appears unexpectedly: numVisibleBases is too small</source>
<translation>Horizontal scrollbar appears unexpectedly: numVisibleBases is too small</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1008"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1021"/>
<source>Vertical scrollbar appears unexpectedly: numVisibleSequences is too small</source>
<translation>Vertical scrollbar appears unexpectedly: numVisibleSequences is too small</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1055"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1068"/>
<source>Alignment object is not available</source>
<translation>Alignment object is not available</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1086"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1099"/>
<source>Last visible base is less than startPos</source>
<translation>Last visible base is less than startPos</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1087"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1100"/>
<source>Last visible base is out of range</source>
<translation>Last visible base is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1120"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1133"/>
<source>Last visible sequence is less than startSeq</source>
<translation>Last visible sequence is less than startSeq</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1121"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1134"/>
<source>Last visible sequence is out of range</source>
<translation>Last visible sequence is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1144"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1157"/>
<source>Invalid collapsible item model!</source>
<translation>Invalid collapsible item model!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1781"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1792"/>
<source>Cursor position is out of range</source>
<translation>Cursor position is out of range</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2001"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2013"/>
<source>Custom schemes</source>
<translation>Пользовательские схемы</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2012"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2024"/>
<source>Create new color scheme</source>
<translation>Создать новую цветовую схему</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2020"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2032"/>
<source>Highlighting</source>
<translation>Выделение</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2043"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2055"/>
<source>The alignment has been modified, so that its alphabet has been switched from "%1" to "%2". Use "Undo", if you'd like to restore the original alignment.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2062"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2161"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2222"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2677"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2074"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2173"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2234"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2717"/>
<source>NULL collapsible model!</source>
<translation>NULL collapsible model!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2157"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2169"/>
<source>NULL msa object!</source>
<translation>NULL msa object!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2270"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2282"/>
<source>Warning!</source>
<translation>Внимание!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2270"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2282"/>
<source>You must select only one sequence for export.</source>
<translation>Необходимо выбрать только одну последовательность для экспорта.</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2312"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2324"/>
<source>warning</source>
<translation>Внимание</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2312"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2324"/>
<source>The document already in the project</source>
<translation>Документ уже содержится в проекте</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2539"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2579"/>
<source>It is not possible to insert the character into the alignment.Please use a character from set A-Z (upper-case or lower-case) or the gap character ('Space', '-' or '%1').</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2595"/>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2598"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2635"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2638"/>
<source>Open file with sequences</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2694"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2644"/>
+ <source>A problem occurred during adding sequences. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2734"/>
<source>NULL Msa Object!</source>
<translation>NULL Msa Object!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2699"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2739"/>
<source>NULL document!</source>
<translation>NULL document!</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2722"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2762"/>
<source>Top left corner of the selection has incorrect coords</source>
<translation>Top left corner of the selection has incorrect coords</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2724"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2764"/>
<source>Bottom right corner of the selection has incorrect coords</source>
<translation>Bottom right corner of the selection has incorrect coords</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2883"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2923"/>
<source>Incorrect pointer to MSACollapsibleItemModel</source>
<translation>Incorrect pointer to MSACollapsibleItemModel</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2116"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2128"/>
<source>Go To</source>
<translation>Выбор позиции</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="134"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="140"/>
<source>Fill selection with gaps</source>
<translation>Заполнить пробелами</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="141"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="146"/>
<source>Save subalignment</source>
<translation>Сохранить область выравнивания</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="146"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="150"/>
<source>Save sequence</source>
<translation>Сохранить последовательность</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="174"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="177"/>
<source>Switch on/off collapsing</source>
<translation>Включить/выключить режим схлопывания</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="179"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="182"/>
<source>Update collapsed groups</source>
<translation>Обновить схлопнутые группы</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="604"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="616"/>
<source>Reference sequence for current highlighting scheme is not selected. Use context menu or Highlighting tab on Options panel to select it</source>
<translation>Референсная последовательность для текущей схемы подсветки не задана. Используйте контекстное меню или панель опций, чтобы задать референсную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="1994"/>
+ <location filename="../src/ov_msa/MSAEditorSequenceArea.cpp" line="2006"/>
<source>Colors</source>
<translation>Раскраска</translation>
</message>
@@ -5838,22 +5844,27 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAEditorUI</name>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="909"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="914"/>
<source>Copy selection</source>
<translation>Копировать выделенное</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="918"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="923"/>
<source>Copy formatted</source>
<translation>Копировать выделенное с учетом формата</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="1052"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="932"/>
+ <source>Paste</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="1066"/>
<source>Tree view</source>
<translation>Дерево</translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="977"/>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="991"/>
<source>Consensus</source>
<translation>Консенсус</translation>
</message>
@@ -5868,10 +5879,15 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAExportConsensusTab</name>
<message>
- <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="77"/>
+ <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="78"/>
<source>Save file</source>
<translation>Сохранить файл</translation>
</message>
+ <message>
+ <location filename="../src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp" line="94"/>
+ <source>A problem occurred during export consensus. The multiple alignment is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::MSAGapOverviewCalculationTask</name>
@@ -5923,17 +5939,17 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<context>
<name>U2::MSAGraphOverview</name>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="100"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="102"/>
<source>Multiple sequence alignment is too big. Overview is unavailable.</source>
<translation>Множественное выравнивание слишком большое. Обзорные график недоступен.</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="105"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="107"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="114"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="116"/>
<source>Overview is rendering...</source>
<translation>Панорама рассчитывается...</translation>
</message>
@@ -6024,12 +6040,18 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
<translation>MSA sequence area is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="268"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="245"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="329"/>
+ <source>MSA Collapsible Model is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="278"/>
<source>Warning: selected region is too big to be exported. You can try to zoom out the alignment or select another region.</source>
<translation>Предупреждение: выделенный регион слишком большой для экспорта. Вы можете попробовать приблизить выравнивание или выделить другой регион.</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="271"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.cpp" line="281"/>
<source>Warning: selected region is too big to be exported. You can try to select another region.</source>
<translation>Предупреждение: выделенный регион слишком большой для экспорта. Вы можете попробовать выделить другой регион.</translation>
</message>
@@ -6043,12 +6065,11 @@ If you confirm the modification, all phylogenetic tree(s), opened in the same vi
</message>
<message>
<location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="88"/>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="116"/>
<source>MSA Editor is NULL</source>
<translation>MSA Editor is NULL</translation>
</message>
<message>
- <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="103"/>
+ <location filename="../src/ov_msa/Export/MSAImageExportTask.h" line="97"/>
<source>MSA Consensus area is NULL</source>
<translation>MSA Consensus area is NULL</translation>
</message>
@@ -6334,7 +6355,7 @@ Simple overview is unavailable.</source>
<context>
<name>U2::OpenAssemblyBrowserTask</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="79"/>
+ <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="87"/>
<source>Assembly object not found</source>
<translation>Assembly object not found</translation>
</message>
@@ -6368,7 +6389,7 @@ Simple overview is unavailable.</source>
<context>
<name>U2::OpenSavedAssemblyBrowserTask</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="155"/>
+ <location filename="../src/ov_assembly/AssemblyBrowserTasks.cpp" line="170"/>
<source>Assembly object not found: %1</source>
<translation>Assembly object not found: %1</translation>
</message>
@@ -6442,12 +6463,12 @@ Simple overview is unavailable.</source>
<translation>Показать диаграмму плотности аннотаций</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="359"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="354"/>
<source>Position </source>
<translation>Позиция</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="369"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="364"/>
<source>Annotation density </source>
<translation>Плотность аннотаций</translation>
</message>
@@ -6455,12 +6476,12 @@ Simple overview is unavailable.</source>
<context>
<name>U2::OverviewRenderArea</name>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="483"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="478"/>
<source>Overview is NULL</source>
<translation>Overview is NULL</translation>
</message>
<message>
- <location filename="../src/ov_sequence/Overview.cpp" line="485"/>
+ <location filename="../src/ov_sequence/Overview.cpp" line="480"/>
<source>ADVSingleSequenceWidget is NULL</source>
<translation>ADVSingleSequenceWidget is NULL</translation>
</message>
@@ -6525,42 +6546,42 @@ Simple overview is unavailable.</source>
<context>
<name>U2::PanView</name>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="120"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="161"/>
<source>Zoom In</source>
<translation>Приблизить</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="124"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="165"/>
<source>Zoom Out</source>
<translation>Отдалить</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="128"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="169"/>
<source>Zoom to Selection</source>
<translation>Масштабировать по выделению</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="132"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="173"/>
<source>Zoom to Whole Sequence</source>
<translation>Масштабировать ко всей последовательности</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="136"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="177"/>
<source>Show Main Ruler</source>
<translation>Показывать основную шкалу</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="142"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="183"/>
<source>Show Custom Rulers</source>
<translation>Показывать дополнительные шкалы</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="439"/>
+ <location filename="../src/ov_sequence/PanView.cpp" line="485"/>
<source>range change request: [%1, %2]</source>
<translation>Изменён видимый диапазон: [%1, %2]</translation>
</message>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="916"/>
+ <location filename="../src/ov_sequence/view_rendering/PanViewRenderer.cpp" line="421"/>
<source>empty</source>
<translation><пусто></translation>
</message>
@@ -6568,9 +6589,16 @@ Simple overview is unavailable.</source>
<context>
<name>U2::PanViewRenderArea</name>
<message>
- <location filename="../src/ov_sequence/PanView.cpp" line="966"/>
<source>[%1 %2]</source>
- <translation>[%1 %2]</translation>
+ <translation type="vanished">[%1 %2]</translation>
+ </message>
+</context>
+<context>
+ <name>U2::PanViewRenderer</name>
+ <message>
+ <location filename="../src/ov_sequence/view_rendering/PanViewRenderer.cpp" line="266"/>
+ <source>[%1 %2]</source>
+ <translation type="unfinished">[%1 %2]</translation>
</message>
</context>
<context>
diff --git a/src/include/U2Core/ClipboardController.h b/src/include/U2Core/ClipboardController.h
index e69de29..29cb7ad 100644
--- a/src/include/U2Core/ClipboardController.h
+++ b/src/include/U2Core/ClipboardController.h
@@ -0,0 +1 @@
+#include "../../corelibs/U2Core/src/globals/ClipboardController.h"
diff --git a/src/include/U2Gui/PasteController.h b/src/include/U2Gui/PasteController.h
index e69de29..48612dc 100644
--- a/src/include/U2Gui/PasteController.h
+++ b/src/include/U2Gui/PasteController.h
@@ -0,0 +1 @@
+#include "../../corelibs/U2Gui/src/PasteController.h"
diff --git a/src/include/U2Test/GUITest.h b/src/include/U2Test/GUITest.h
deleted file mode 100644
index e888c26..0000000
--- a/src/include/U2Test/GUITest.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../corelibs/U2Test/src/gui_tests/GUITest.h"
diff --git a/src/include/U2Test/GUITestBase.h b/src/include/U2Test/GUITestBase.h
deleted file mode 100644
index 27cd3e2..0000000
--- a/src/include/U2Test/GUITestBase.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../corelibs/U2Test/src/gui_tests/GUITestBase.h"
diff --git a/src/include/U2Test/UGUITest.h b/src/include/U2Test/UGUITest.h
new file mode 100644
index 0000000..5ed9adf
--- /dev/null
+++ b/src/include/U2Test/UGUITest.h
@@ -0,0 +1 @@
+#include "../../corelibs/U2Test/src/gui_tests/UGUITest.h"
diff --git a/src/include/U2Test/UGUITestBase.h b/src/include/U2Test/UGUITestBase.h
new file mode 100644
index 0000000..21d5c09
--- /dev/null
+++ b/src/include/U2Test/UGUITestBase.h
@@ -0,0 +1 @@
+#include "../../corelibs/U2Test/src/gui_tests/UGUITestBase.h"
diff --git a/src/libs_3rdparty/humimit/Doxyfile b/src/libs_3rdparty/humimit/Doxyfile
deleted file mode 100644
index 7b48487..0000000
--- a/src/libs_3rdparty/humimit/Doxyfile
+++ /dev/null
@@ -1,2384 +0,0 @@
-# Doxyfile 1.8.10
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME = "HumImit"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF =
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY =
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT = ./src
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
-# *.vhdl, *.ucf, *.qsf, *.as and *.js.
-
-FILE_PATTERNS =
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP = YES
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE = humimit.qhp
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP = YES
diff --git a/src/libs_3rdparty/humimit/humimit.pri b/src/libs_3rdparty/humimit/humimit.pri
deleted file mode 100644
index 3e945f7..0000000
--- a/src/libs_3rdparty/humimit/humimit.pri
+++ /dev/null
@@ -1,69 +0,0 @@
-# include (humimit.pri)
-
-include( ../../ugene_globals.pri )
-UGENE_RELATIVE_DESTDIR = ''
-
-TARGET = humimit
-TEMPLATE = lib
-CONFIG += thread debug_and_release warn_off qt dll
-INCLUDEPATH += src _tmp ../../include
-LIBS += -L../../_release
-QT += testlib
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
-
-DEFINES += BUILDING_HUMIMIT_DLL
-DEFINES += QT_DLL
-
-!debug_and_release|build_pass {
-
- CONFIG(debug, debug|release) {
- TARGET = humimitd
- DEFINES += _DEBUG
- CONFIG +=console
- DESTDIR=../../_debug/
- OBJECTS_DIR=_tmp/obj/debug
- LIBS -= -L../../_release
- LIBS += -L../../_debug
- }
-
- CONFIG(release, debug|release) {
- TARGET = humimit
- DEFINES+=NDEBUG
- DESTDIR=../../_release/
- OBJECTS_DIR=_tmp/obj/release
- }
-}
-
-
-unix {
- !macx {
- LIBS += -lXtst
- }
- macx {
- QMAKE_LFLAGS += -framework ApplicationServices
- }
-}
-
-win32 {
- LIBS += User32.lib Gdi32.lib
-}
-
-macx {
- LIBS += -framework AppKit
-}
-
-
-win32 {
- QMAKE_CXXFLAGS_WARN_ON = -W3
- QMAKE_CFLAGS_WARN_ON = -W3
-
- QMAKE_MSVC_PROJECT_NAME=lib_3rd_humimit
-}
-
-
-unix {
- target.path = $$UGENE_INSTALL_DIR/$$UGENE_RELATIVE_DESTDIR
- INSTALLS += target
-}
-
diff --git a/src/libs_3rdparty/humimit/humimit.pro b/src/libs_3rdparty/humimit/humimit.pro
deleted file mode 100644
index 67bec10..0000000
--- a/src/libs_3rdparty/humimit/humimit.pro
+++ /dev/null
@@ -1,110 +0,0 @@
-include (humimit.pri)
-
-# Input
-HEADERS += \
- src/GTGlobals.h \
- src/base_dialogs/ColorDialogFiller.h \
- src/base_dialogs/DefaultDialogFiller.h \
- src/base_dialogs/FontDialogFiller.h \
- src/base_dialogs/GTFileDialog.h \
- src/base_dialogs/MessageBoxFiller.h \
- src/drivers/GTKeyboardDriver.h \
- src/drivers/GTMouseDriver.h \
- src/primitives/GTAction.h \
- src/primitives/GTCheckBox.h \
- src/primitives/GTComboBox.h \
- src/primitives/GTDoubleSpinBox.h \
- src/primitives/GTGroupBox.h \
- src/primitives/GTLineEdit.h \
- src/primitives/GTListWidget.h \
- src/primitives/GTMainWindow.h \
- src/primitives/GTMenu.h \
- src/primitives/GTMenuBar.h \
- src/primitives/GTPlainTextEdit.h \
- src/primitives/GTRadioButton.h \
- src/primitives/GTScrollBar.h \
- src/primitives/GTSlider.h \
- src/primitives/GTSpinBox.h \
- src/primitives/GTTabBar.h \
- src/primitives/GTTableView.h \
- src/primitives/GTTabWidget.h \
- src/primitives/GTTextEdit.h \
- src/primitives/GTToolbar.h \
- src/primitives/GTTreeView.h \
- src/primitives/GTTreeWidget.h \
- src/primitives/GTWebView.h \
- src/primitives/GTWidget.h \
- src/primitives/PopupChooser.h \
- src/primitives/private/GTMenuPrivate.h \
- src/system/GTClipboard.h \
- src/system/GTFile.h \
- src/utils/GTKeyboardUtils.h \
- src/utils/GTThread.h \
- src/utils/GTUtilsApp.h \
- src/utils/GTUtilsDialog.h \
- src/utils/GTUtilsToolTip.h \
- src/utils/GTMouseUtils.h \
- src/core/GUITestOpStatus.h \
- src/core/global.h \
- src/core/CustomScenario.h \
- src/core/GUITest.h \
- src/core/MainThreadRunnable.h \
- src/core/MainThreadTimer.h
-SOURCES += \
- src/GTGlobals.cpp \
- src/base_dialogs/ColorDialogFiller.cpp \
- src/base_dialogs/DefaultDialogFiller.cpp \
- src/base_dialogs/FontDialogFiller.cpp \
- src/base_dialogs/GTFileDialog.cpp \
- src/base_dialogs/MessageBoxFiller.cpp \
- src/drivers/GTKeyboardDriver.cpp \
- src/drivers/GTKeyboardDriverLinux.cpp \
- src/drivers/GTKeyboardDriverMac.cpp \
- src/drivers/GTKeyboardDriverWindows.cpp \
- src/drivers/GTMouseDriver.cpp \
- src/drivers/GTMouseDriverLinux.cpp \
- src/drivers/GTMouseDriverMac.cpp \
- src/drivers/GTMouseDriverWindows.cpp \
- src/primitives/GTAction.cpp \
- src/primitives/GTCheckBox.cpp \
- src/primitives/GTComboBox.cpp \
- src/primitives/GTDoubleSpinBox.cpp \
- src/primitives/GTGroupBox.cpp \
- src/primitives/GTLineEdit.cpp \
- src/primitives/GTListWidget.cpp \
- src/primitives/GTMainWindow.cpp \
- src/primitives/GTMenu.cpp \
- src/primitives/GTMenuBar.cpp \
- src/primitives/GTPlainTextEdit.cpp \
- src/primitives/GTRadioButton.cpp \
- src/primitives/GTScrollBar.cpp \
- src/primitives/GTSlider.cpp \
- src/primitives/GTSpinBox.cpp \
- src/primitives/GTTabBar.cpp \
- src/primitives/GTTableView.cpp \
- src/primitives/GTTabWidget.cpp \
- src/primitives/GTTextEdit.cpp \
- src/primitives/GTToolbar.cpp \
- src/primitives/GTTreeView.cpp \
- src/primitives/GTTreeWidget.cpp \
- src/primitives/GTWebView.cpp \
- src/primitives/GTWidget.cpp \
- src/primitives/PopupChooser.cpp \
- src/primitives/private/GTMenuPrivate.cpp \
- src/system/GTClipboard.cpp \
- src/system/GTFile.cpp \
- src/utils/GTKeyboardUtils.cpp \
- src/utils/GTThread.cpp \
- src/utils/GTUtilsApp.cpp \
- src/utils/GTUtilsDialog.cpp \
- src/utils/GTUtilsToolTip.cpp \
- src/utils/GTMouseUtils.cpp \
- src/core/CustomScenario.cpp \
- src/core/GUITest.cpp \
- src/core/MainThreadRunnable.cpp \
- src/core/MainThreadTimer.cpp
-
-macx {
-OBJECTIVE_HEADERS += src/primitives/private/GTMenuPrivateMac.h
-OBJECTIVE_SOURCES += src/primitives/private/GTMenuPrivateMac.mm
-}
diff --git a/src/libs_3rdparty/humimit/src/GTGlobals.cpp b/src/libs_3rdparty/humimit/src/GTGlobals.cpp
deleted file mode 100644
index 5336e6a..0000000
--- a/src/libs_3rdparty/humimit/src/GTGlobals.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <QtCore/QEventLoop>
-#include <QtCore/QTimer>
-#include <QtTest/QSpontaneKeyEvent>
-#include <QtTest>
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QPixmap>
-#else
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
-#include <QtGui/QScreen>
-#endif
-
-#include "GTGlobals.h"
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-
-namespace HI {
-namespace {
- void sysSleep(int sec) {
-#ifdef Q_OS_WIN
- Sleep(1000*sec);
-#else
- sleep(sec);
-#endif
- }
-}
-
-void GTGlobals::sleep(int msec) {
- QTest::qWait((msec));
-}
-
-void GTGlobals::systemSleep(int sec) {
- sysSleep(sec);
-}
-
-
-void GTGlobals::sendEvent(QObject *obj, QEvent *e) {
- QSpontaneKeyEvent::setSpontaneous(e);
- qApp->notify(obj, e);
-}
-
-void GTGlobals::takeScreenShot(QString path) {
- QPixmap originalPixmap = QGuiApplication::primaryScreen()->grabWindow(QApplication::desktop()->winId());
- originalPixmap.save(path);
-}
-
-GTGlobals::FindOptions::FindOptions(bool fail) :
- depth(INFINITE_DEPTH),
- failIfNull(fail),
- matchPolicy(Qt::MatchExactly)
-{
-}
-
-void GTGlobals::GUITestFail(){
- qCritical("\nGT_DEBUG_MESSAGE !!!FIRST FAIL");
-}
-
-} //namespace
-
diff --git a/src/libs_3rdparty/humimit/src/GTGlobals.h b/src/libs_3rdparty/humimit/src/GTGlobals.h
deleted file mode 100644
index 060be97..0000000
--- a/src/libs_3rdparty/humimit/src/GTGlobals.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_GLOBALS_H_
-#define _HI_GT_GLOBALS_H_
-
-#include <core/global.h>
-#include <core/GUITestOpStatus.h>
-#include <QMessageLogger>
-
-#include <QAction>
-
-namespace HI {
-/*!
- * \brief The class contains the most commonly used methods
- */
-class HI_EXPORT GTGlobals {
-public:
- enum UseMethod {UseMouse, UseKey, UseKeyBoard};
- enum WindowAction {Minimize, Maximize, Close, WindowActionCount};
-
- // if failIfNull is set to true, fails if object wasn't found
- class HI_EXPORT FindOptions {
- public:
- FindOptions(bool fail = true);
-
- int depth;
- bool failIfNull;
- Qt::MatchFlags matchPolicy;
-
- static const int INFINITE_DEPTH = 0;
- };
-
- static void sleep(int msec = 2000);
- static void systemSleep(int sec = 2);
- static void sendEvent(QObject *obj, QEvent *e);
- static void takeScreenShot(QString path);
- static void GUITestFail();
-};
-
-#define GT_DEBUG_MESSAGE(condition, errorMessage, result) \
-{ \
- QString cond = #condition;\
- if (condition) { \
- qDebug("GT_DEBUG_MESSAGE Checking condition (%s). Result: OK", cond.toLocal8Bit().constData()); \
- } \
- else { \
- qWarning("\n------------"); \
- qWarning("GT_DEBUG_MESSAGE Checking condition (%s). Result: FAILED", cond.toLocal8Bit().constData()); \
- qWarning("GT_DEBUG_MESSAGE errorMessage '%s'", QString(errorMessage).toLocal8Bit().constData()); \
- qWarning("------------\n"); \
- } \
- if (os.hasError()) { \
- qCritical("GT_DEBUG_MESSAGE OpStatus already has error"); \
- qCritical("GT_DEBUG_MESSAGE OpStatus error '%s'",os.getError().toLocal8Bit().constData()); \
- } \
-}
-
-/**
- Checks condition is false and returns the result if it is.
- Before the result is returned the 'extraOp' operation is performed (for example logging)
-
- Code style hint: use CHECK macro only to make error processing more compact but not all if {return;} patterns !
-*/
-#define CHECK_EXT(condition, extraOp, result) \
- if (!(condition)) { \
- extraOp; \
- return result; \
- }
-
-/** Used in tests */
-#define CHECK_SET_ERR(condition, errorMessage) \
- CHECK_SET_ERR_RESULT(condition, errorMessage, )
-
-#define CHECK_SET_ERR_NO_MESSAGE(condition, errorMessage) \
- if(!condition){ \
- CHECK_SET_ERR(condition, errorMessage) \
-}
-
-#define CHECK_OP_SET_ERR(os, errorMessage) \
- CHECK_SET_ERR(!os.isCoR(), errorMessage)
-
-#define CHECK_SET_ERR_RESULT(condition, errorMessage, result) \
-{ \
- GT_DEBUG_MESSAGE(condition, errorMessage, result); \
- if (os.hasError()) { HI::GTGlobals::GUITestFail(); os.setError(os.getError()); return result; } \
- CHECK_EXT(condition, if (!os.hasError()) { HI::GTGlobals::GUITestFail(); os.setError(errorMessage);}, result) \
-}
-
-#define CHECK_OP_SET_ERR_RESULT(os, errorMessage, result) \
- CHECK_SET_ERR_RESULT(!os.isCoR(), errorMessage, result)
-
-/** Used in util methods */
-#define GT_CHECK(condition, errorMessage) \
- GT_CHECK_RESULT(condition, errorMessage, )
-
-#define GT_CHECK_NO_MESSAGE(condition, errorMessage) \
- if (!(condition)) { \
- GT_CHECK(condition, errorMessage) \
-}
-
-#define GT_CHECK_RESULT(condition, errorMessage, result) \
- CHECK_SET_ERR_RESULT(condition, GT_CLASS_NAME " __ " GT_METHOD_NAME " _ " + QString(errorMessage), result)
-
-#define GT_CHECK_OP(os, errorMessage) \
- GT_CHECK(!os.isCoR(), errorMessage)
-
-#define GT_CHECK_OP_RESULT(os, errorMessage, result) \
- GT_CHECK_RESULT(!os.isCoR(), errorMessage, result)
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.cpp b/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.cpp
deleted file mode 100644
index 00bcc54..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "base_dialogs/ColorDialogFiller.h"
-#include <drivers/GTKeyboardDriver.h>
-#include <primitives/GTSpinBox.h>
-#include <primitives/GTWidget.h>
-#include <utils/GTThread.h>
-
-#include <QApplication>
-#include <QColor>
-#include <QColorDialog>
-#include <QSpinBox>
-#include <QWidget>
-
-namespace HI{
-
-#define GT_CLASS_NAME "GTUtilsDialog::ColorDialog filler"
-#define GT_METHOD_NAME "run"
-void ColorDialogFiller::run(){
- GTGlobals::sleep();
-#ifdef Q_OS_LINUX
- setWithQt = true;
-#endif
- QWidget* dialog = QApplication::activeModalWidget();
- GT_CHECK(dialog!=NULL, "dialog is NULL");
-
- if(setWithQt){
- class Scenario : public CustomScenario {
- public:
- Scenario(QColorDialog* _d, QColor _c): d(_d), c(_c) {}
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- d->setCurrentColor(c);
- GTGlobals::sleep();
- d->accept();
- }
- private:
- QColorDialog* d;
- QColor c;
- };
-
- QColorDialog* d = qobject_cast<QColorDialog*>(dialog);
- GTThread::runInMainThread(os, new Scenario(d, QColor(r, g, b)));
- GTThread::waitForMainThread(os);
- GTGlobals::sleep(500);
- return;
- }
-
- QList<QSpinBox*> spinList = dialog->findChildren<QSpinBox*>();
- GTSpinBox::setValue(os,spinList.at(3),r,GTGlobals::UseKeyBoard);
- GTSpinBox::setValue(os,spinList.at(4),g,GTGlobals::UseKeyBoard);
- GTSpinBox::setValue(os,spinList.at(5),b,GTGlobals::UseKeyBoard);
-
- GTGlobals::sleep();
-#ifdef Q_OS_MAC
- GTWidget::click(os, GTWidget::findButtonByText(os, "OK",dialog));
-#else
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
-#endif
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-}
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.h b/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.h
deleted file mode 100644
index 9334d67..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/ColorDialogFiller.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef COLORDIALOGFILLER_H
-#define COLORDIALOGFILLER_H
-
-#include "utils/GTUtilsDialog.h"
-namespace HI{
-
-class HI_EXPORT ColorDialogFiller : public Filler
-{
-public:
- ColorDialogFiller(GUITestOpStatus &os,int _r, int _g, int _b, bool _setWithQt = false) : Filler(os, ""),
- r(_r),g(_g),b(_b),setWithQt(_setWithQt){}
- virtual void run();
-private:
- int r,g,b;
- bool setWithQt;
-};
-
-}
-#endif // COLORDIALOGFILLER_H
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.cpp b/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.cpp
deleted file mode 100644
index e5e99c0..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#include "DefaultDialogFiller.h"
-
-namespace HI {
-
-DefaultDialogFiller::DefaultDialogFiller(GUITestOpStatus &os, const QString &name, QDialogButtonBox::StandardButton _b, CustomScenario *scenario):
- Filler(os, name, scenario),b(_b) {}
-void DefaultDialogFiller::commonScenario(){
- GTUtilsDialog::clickButtonBox(os, b);
-}
-}
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.h b/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.h
deleted file mode 100644
index 56dfadc..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/DefaultDialogFiller.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_DEFAULT_DIALOG_FILLER_H_
-#define _HI_DEFAULT_DIALOG_FILLER_H_
-
-#include "utils/GTUtilsDialog.h"
-
-namespace HI {
-
-class HI_EXPORT DefaultDialogFiller: public Filler
-{
-public:
- DefaultDialogFiller(GUITestOpStatus &os, const QString &name = "", QDialogButtonBox::StandardButton _b =
- QDialogButtonBox::Ok, CustomScenario *scenario = NULL);
- void commonScenario();
-private:
- QDialogButtonBox::StandardButton b;
-};
-
-}
-
-#endif // _HI_DEFAULT_DIALOG_FILLER_H_
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.cpp b/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.cpp
deleted file mode 100644
index 1b8fee0..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "FontDialogFiller.h"
-#include <primitives/GTWidget.h>
-#include <drivers/GTKeyboardDriver.h>
-
-#include <QApplication>
-#include <QAbstractButton>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTUtilsDialog::FontDialogFiller"
-#define GT_METHOD_NAME "run"
-void FontDialogFiller::run() {
-
- QWidget* dialog = QApplication::activeModalWidget();
- GT_CHECK(dialog != NULL, "dialog is NULL");
- GTGlobals::sleep();
-
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-}
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.h b/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.h
deleted file mode 100644
index 024a6cb..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/FontDialogFiller.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_FONT_DIALOG_FILLER_H_
-#define _HI_GT_FONT_DIALOG_FILLER_H_
-
-#include "utils/GTUtilsDialog.h"
-
-namespace HI {
-
-class HI_EXPORT FontDialogFiller : public Filler {
- public:
- FontDialogFiller(GUITestOpStatus &_os)
- :Filler(_os, ""){}
- virtual void run();
- };
-}
-#endif //_HI_GT_FONT_DIALOG_FILLER_H_
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.cpp b/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.cpp
deleted file mode 100644
index 49a6e69..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "base_dialogs/GTFileDialog.h"
-#include <drivers/GTKeyboardDriver.h>
-#include <drivers/GTMouseDriver.h>
-#include "GTGlobals.h"
-#include <primitives/GTComboBox.h>
-#include <primitives/GTLineEdit.h>
-#include "primitives/GTMenu.h"
-#include <primitives/GTWidget.h>
-#include <utils/GTThread.h>
-
-#include <QApplication>
-#include <QComboBox>
-#include <QFileSystemModel>
-#include <QHeaderView>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTreeView>
-
-#define FILE_NAME_LINE_EDIT "fileNameEdit"
-#define CURRENT_FODLER_COMBO_BOX "lookInCombo"
-
-namespace HI {
-#define GT_CLASS_NAME "GTFileDialogUtils"
-
-GTFileDialogUtils::GTFileDialogUtils(GUITestOpStatus &_os, const QString &_path, const QString &_fileName,
- Button _button, GTGlobals::UseMethod _method) :
- Filler(_os, "QFileDialog"),
- fileName(_fileName),
- button(_button),
- method(_method)
-
-{ path = QDir::cleanPath(QDir::currentPath() + "/" + _path);
- if (path.at(path.count() - 1) != '/') {
- path += '/';
- }
-}
-
-GTFileDialogUtils::GTFileDialogUtils(GUITestOpStatus &os, const QString &filePath, GTGlobals::UseMethod method, Button b) :
- Filler(os, "QFileDialog"),
- button(b),
- method(method)
-
-{
- QFileInfo fileInfo(filePath);
- path = fileInfo.absoluteDir().absolutePath();
- fileName = fileInfo.fileName();
- if (path.at(path.count() - 1) != '/') {
- path += '/';
- }
-}
-
-GTFileDialogUtils::GTFileDialogUtils(GUITestOpStatus &os, CustomScenario *customScenario)
- : Filler(os, "QFileDialog", customScenario),
- fileDialog(NULL),
- button(Open),
- method(GTGlobals::UseMouse)
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void GTFileDialogUtils::commonScenario()
-{
- QWidget *dialog = QApplication::activeModalWidget();
- GT_CHECK(dialog != NULL && QString(dialog->metaObject()->className()) == "QFileDialog",
- "file dialog not found");
-
- fileDialog = dialog;
- GTGlobals::sleep(300);
- const bool dirWasChanged = setPath();
- GTGlobals::sleep(300);
- if(button == Choose){
- clickButton(button);
- return;
- }
-
- if (dirWasChanged) {
- clickButton(Open);
- GTGlobals::sleep(300);
- }
-
- if(button == Save){//saving file
- setName();
- clickButton(button);
- return;
- }
-
- //opening file or getting size
- GTGlobals::sleep(300);
- setViewMode(Detail);
- GTGlobals::sleep(300);
- selectFile();
- GTGlobals::sleep(300);
- if(method == GTGlobals::UseKey){
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
- }else{
- clickButton(button);
- }
- GTGlobals::sleep(500);
-}
-#undef GT_METHOD_NAME
-
-GTFileDialogUtils_list::GTFileDialogUtils_list(GUITestOpStatus &_os, const QString &_path, const QStringList &fileNames) :
- GTFileDialogUtils(_os,_path, "", Open, GTGlobals::UseMouse),
- fileNamesList(fileNames)
-{
-// path = QDir::cleanPath(QDir::currentPath() + "/" + _path);
-// if (path.at(path.count() - 1) != '/') {
-// path += '/';
-// }
- foreach (const QString &name, fileNames) {
- filePaths << _path + "/" + name;
- }
-}
-
-GTFileDialogUtils_list::GTFileDialogUtils_list(GUITestOpStatus &os, const QStringList &filePaths) :
- GTFileDialogUtils(os, "", "", Open, GTGlobals::UseMouse),
- filePaths(filePaths)
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void GTFileDialogUtils_list::commonScenario() {
- QWidget *dialog = QApplication::activeModalWidget();
- GT_CHECK(NULL != dialog && QString(dialog->metaObject()->className()) == "QFileDialog", "file dialog not found");
-
- setNameList(os, filePaths);
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setNameList"
-void GTFileDialogUtils_list::setNameList(GUITestOpStatus &os, const QStringList &nameList) {
- QString str;
- foreach (QString name, nameList){
- if (QFileInfo(name).isRelative()) {
- name = QApplication::applicationDirPath() + "/" + name;
- }
- str.append('\"' + name + "\" ");
- }
- QLineEdit* fileEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os,FILE_NAME_LINE_EDIT));
- GTLineEdit::setText(os, fileEdit, str, false, true);
-}
-#undef GT_METHOD_NAME
-
-void GTFileDialogUtils_list::selectFile(){
- GTKeyboardDriver::keyPress(os, GTKeyboardDriver::key["ctrl"]);
- foreach(QString name, fileNamesList){
- GTFileDialogUtils::fileName = name;
- GTFileDialogUtils::selectFile();
- }
- GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["ctrl"]);
-}
-
-void GTFileDialogUtils::openFileDialog() {
- switch(method) {
- case GTGlobals::UseMouse:
- GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Open...");
- break;
- case GTGlobals::UseKey:
- GTKeyboardDriver::keyClick(os, 'O', GTKeyboardDriver::key["ctrl"]);
- break;
- default:
- break;
- }
- GTGlobals::sleep(500);
-}
-
-#define GT_METHOD_NAME "setPath"
-bool GTFileDialogUtils::setPath()
-{
- QComboBox* comboBox = fileDialog->findChild<QComboBox*>(CURRENT_FODLER_COMBO_BOX);
- if (NULL != comboBox && comboBox->currentText() + QDir::separator() == path) {
- // already there
- return false;
- }
-
- QLineEdit* lineEdit = fileDialog->findChild<QLineEdit*>(FILE_NAME_LINE_EDIT);
- GT_CHECK_RESULT(lineEdit != 0, QString("line edit \"%1\" not found").arg(FILE_NAME_LINE_EDIT), false);
- lineEdit->setCompleter(NULL);
- GTLineEdit::setText(os,lineEdit,path);
-
- GT_CHECK_RESULT(lineEdit->text() == path, "Can't open file \"" + lineEdit->text() + "\"", false);
- return true;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setName"
-void GTFileDialogUtils::setName()
-{
- QLineEdit* lineEdit = fileDialog->findChild<QLineEdit*>(FILE_NAME_LINE_EDIT);
- GT_CHECK(lineEdit != 0, QString("line edit \"%1\" not found").arg(FILE_NAME_LINE_EDIT));
- lineEdit->setCompleter(NULL);
-
- GTLineEdit::setText(os, lineEdit,fileName);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "selectFile"
-void GTFileDialogUtils::selectFile()
-{
- QTreeView *w = fileDialog->findChild<QTreeView*>("treeView");
- GT_CHECK(w != NULL, "widget, which contains list of file, not found");
-
- QFileSystemModel *model = qobject_cast<QFileSystemModel*>(w->model());
- QModelIndex index = model->index(path + fileName);
- GT_CHECK(index.isValid(), "File <" + path + fileName + "> not found");
-
- QPoint indexCenter;
-
- switch(method) {
- case GTGlobals::UseKey:{
- QLineEdit* lineEdit = fileDialog->findChild<QLineEdit*>(FILE_NAME_LINE_EDIT);
- GT_CHECK(lineEdit != 0, QString("line edit \"1\" not found").arg(FILE_NAME_LINE_EDIT));
- GTLineEdit::setText(os,lineEdit,fileName);
-
- GTWidget::click(os,lineEdit);
- break;
- }
-
- case GTGlobals::UseMouse:
- w->scrollTo(index);
- indexCenter = w->visualRect(index).center();
- indexCenter.setY(indexCenter.y() + w->header()->rect().height());
- indexCenter.setX(indexCenter.x()+1);
- GTMouseDriver::moveTo(os, w->mapToGlobal(indexCenter));
- GTMouseDriver::click(os);
- break;
- default:
- break;
- }
-
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickButton"
-void GTFileDialogUtils::clickButton(Button btn)
-{
- QMap<Button, QString> button;
- button[Open] = "Open";
- button[Cancel] = "Cancel";
- button[Save] = "Save";
- button[Choose] = "Choose";
-
- QAbstractButton *button_to_click = GTWidget::findButtonByText(os, button[btn],fileDialog);
- GT_CHECK(button_to_click != NULL, "button not found");
-
- while (! button_to_click->isEnabled()) {
- GTGlobals::sleep(100);
- }
-
- GTGlobals::sleep(500);
-
- switch(method) {
- case GTGlobals::UseKey:
- while (! button_to_click->hasFocus()) {
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["tab"]);
- GTGlobals::sleep(100);
- }
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
- break;
-
- case GTGlobals::UseMouse:
- GTGlobals::sleep(100);
- GTWidget::click(os, button_to_click);
- break;
- default:
- break;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setViewMode"
-void GTFileDialogUtils::setViewMode(ViewMode v)
-{
- QMap<ViewMode, QString> button;
- button[List] = "listModeButton";
- button[Detail] = "detailModeButton";
- QAbstractButton *w = qobject_cast<QAbstractButton *>(fileDialog->findChild<QWidget*>(button[v]));
-
- GT_CHECK(w != NULL, "view mode button not found");
- GT_CHECK(!w->isChecked(), );
-
- switch(method) {
- case GTGlobals::UseMouse:
- GTWidget::click(os, w);
- break;
-
- case GTGlobals::UseKey:
- while (! w->hasFocus()) {
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["tab"]);
- GTGlobals::sleep(100);
- }
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["space"]);
- break;
-
- default:
- break;
- }
-
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "openFile"
-void GTFileDialog::openFile(GUITestOpStatus &os, const QString &path, const QString &fileName,
- Button button, GTGlobals::UseMethod m)
-{
- GTFileDialogUtils *ob = new GTFileDialogUtils(os, path, fileName, (GTFileDialogUtils::Button)button, m);
- GTUtilsDialog::waitForDialog(os, ob);
-
- ob->openFileDialog();
- GTThread::waitForMainThread(os);
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "openFile"
-void GTFileDialog::openFile(GUITestOpStatus &os, const QString &filePath, Button button, GTGlobals::UseMethod m){
- int num = filePath.lastIndexOf('/');
- if (num == -1){
- num = filePath.lastIndexOf('\\');
- GT_CHECK(num != -1, QString("String %1 does not look like file path").arg(filePath));
- }
- QString path = filePath.left(num);
- QString name = filePath.right(filePath.length() - num - 1);
-
- openFile(os, path, name, button, m);
-}
-#undef GT_METHOD_NAME
-
-void GTFileDialog::openFileList(GUITestOpStatus &os, const QString &path, const QStringList &fileNameList)
-{
- GTFileDialogUtils_list *ob = new GTFileDialogUtils_list(os, path, fileNameList);
- GTUtilsDialog::waitForDialog(os, ob);
-
- ob->openFileDialog();
-
- GTGlobals::sleep();
-}
-
-void GTFileDialog::openFileList(GUITestOpStatus &os, const QStringList &filePaths) {
- GTFileDialogUtils_list *openFileDialogFiller = new GTFileDialogUtils_list(os, filePaths);
- GTUtilsDialog::waitForDialog(os, openFileDialogFiller);
- openFileDialogFiller->openFileDialog();
-}
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.h b/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.h
deleted file mode 100644
index e216316..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/GTFileDialog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef GTFILE_DIALOG_H
-#define GTFILE_DIALOG_H
-
-#include "GTGlobals.h"
-#include "utils/GTUtilsDialog.h"
-
-namespace HI {
-
-class HI_EXPORT GTFileDialogUtils : public Filler {
-friend class GTFileDialogUtils_list;
-public:
- enum Button {Open, Cancel, Save, Choose};
- enum ViewMode {List, Detail};
-
- GTFileDialogUtils(GUITestOpStatus &os, const QString &folderPath, const QString &fileName, Button b = Open, GTGlobals::UseMethod = GTGlobals::UseMouse);
- GTFileDialogUtils(GUITestOpStatus &os, const QString &filePath, GTGlobals::UseMethod method = GTGlobals::UseMouse, Button b = Open);
- GTFileDialogUtils(GUITestOpStatus &os, CustomScenario *customScenario);
- void openFileDialog();
- void commonScenario();
-
-protected:
-
- bool setPath();
- void setName();
- void selectFile();
- void clickButton(Button);
- void setViewMode(ViewMode);
-
- QWidget *fileDialog;
- QString path, fileName;
- Button button;
- GTGlobals::UseMethod method;
-};
-class HI_EXPORT GTFileDialogUtils_list : public GTFileDialogUtils{
-public:
- GTFileDialogUtils_list(GUITestOpStatus &os, const QString &folderPath, const QStringList &fileNames);
- GTFileDialogUtils_list(GUITestOpStatus &os, const QStringList &filePaths);
-
- void setNameList(GUITestOpStatus &os, const QStringList &filePaths);
- void commonScenario();
-
-private:
- void selectFile();
-
- QString path;
- QStringList fileNamesList;
- QStringList filePaths;
-};
-
-class HI_EXPORT GTFileDialog {
-public:
- enum Button {Open, Cancel};
- static void openFile(GUITestOpStatus &os, const QString &path, const QString &fileName, Button button = Open, GTGlobals::UseMethod m = GTGlobals::UseMouse);
- static void openFile(GUITestOpStatus &os, const QString &filePath, Button button = Open, GTGlobals::UseMethod m = GTGlobals::UseMouse);
-
- static void openFileList(GUITestOpStatus &, const QString &, const QStringList &);
- static void openFileList(GUITestOpStatus &os, const QStringList &filePaths);
-};
-
-} // namespace
-
-#endif // GTFILE_DIALOG_H
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.cpp b/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.cpp
deleted file mode 100644
index 00219a1..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#include "base_dialogs/MessageBoxFiller.h"
-#include "drivers/GTKeyboardDriver.h"
-#include "primitives/GTSpinBox.h"
-#include "primitives/GTWidget.h"
-
-#include <QAbstractButton>
-#include <QApplication>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTUtilsDialog::MessageBoxDialogFiller"
-
-MessageBoxDialogFiller::MessageBoxDialogFiller(GUITestOpStatus &os, QMessageBox::StandardButton b, const QString &message, const QString &objectName) :
- Filler(os, objectName),
- b(b),
- message(message)
-{
-
-}
-
-MessageBoxDialogFiller::MessageBoxDialogFiller(GUITestOpStatus &os, const QString &buttonText, const QString &message) :
- Filler(os, ""),
- b(QMessageBox::NoButton),
- buttonText(buttonText),
- message(message)
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void MessageBoxDialogFiller::commonScenario() {
- QWidget* activeModal = QApplication::activeModalWidget();
- QMessageBox *messageBox = qobject_cast<QMessageBox*>(activeModal);
- GT_CHECK(messageBox != NULL, "messageBox is NULL");
-
- if(message!=""){
- QString actualText = messageBox->text();
- GT_CHECK(messageBox->text().contains(message,Qt::CaseInsensitive),
- QString("Expected: %1, found: %2").arg(message).arg(actualText));
- }
-
- if (buttonText!="") {
- QList<QAbstractButton*> list = messageBox->buttons();
- foreach(QAbstractButton* but, list){
- QString s = but->text();
- if(but->text().contains(buttonText,Qt::CaseInsensitive)){
- GTWidget::click(os, but);
- return;
- }
- }
- }
-
- QAbstractButton* button = messageBox->button(b);
- GT_CHECK(button != NULL, "There is no such button in messagebox");
-
- GTWidget::click(os, button);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "GTUtilsDialog::AppCloseMessageBoxDialogFiller"
-
-AppCloseMessageBoxDialogFiller::AppCloseMessageBoxDialogFiller(GUITestOpStatus &os) :
- Filler(os, "")
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void AppCloseMessageBoxDialogFiller::commonScenario() {
- QWidget* activeModal = QApplication::activeModalWidget();
- QMessageBox *messageBox = qobject_cast<QMessageBox*>(activeModal);
- GT_CHECK(messageBox != NULL, "messageBox is NULL");
-
- QAbstractButton* noButton = messageBox->button(QMessageBox::No);
- QAbstractButton* noToAllButton = messageBox->button(QMessageBox::NoToAll);
-
- if (NULL != noToAllButton) {
- GTWidget::click(os, noToAllButton);
- } else if (NULL != noButton) {
- GTWidget::click(os, noButton);
- } else {
- GT_CHECK(false, "There are neither \"No\" or \"No to all\" buttons in the message box");
- }
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "GTUtilsDialog::MessageBoxNoToAllOrNo"
-
-MessageBoxNoToAllOrNo::MessageBoxNoToAllOrNo(GUITestOpStatus &os) :
- Filler(os, "")
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void MessageBoxNoToAllOrNo::commonScenario() {
- QWidget* activeModal = QApplication::activeModalWidget();
- QMessageBox *messageBox = qobject_cast<QMessageBox*>(activeModal);
- GT_CHECK(messageBox != NULL, "messageBox is NULL");
-
- QAbstractButton* button = messageBox->button(QMessageBox::NoToAll);
- if (!button) {
- button = messageBox->button(QMessageBox::No);
- }
- GT_CHECK(button != NULL, "There are no No buttons in messagebox");
-
- GTWidget::click(os, button);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "MessageBoxOpenAnotherProject"
-
-MessageBoxOpenAnotherProject::MessageBoxOpenAnotherProject(GUITestOpStatus &os) :
- Filler(os, "")
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void MessageBoxOpenAnotherProject::commonScenario() {
- QWidget* activeModal = QApplication::activeModalWidget();
- QMessageBox *messageBox = qobject_cast<QMessageBox*>(activeModal);
- GT_CHECK(messageBox != NULL, "messageBox is NULL");
-
- QAbstractButton* button = messageBox->findChild<QAbstractButton*>("New Window");
- GT_CHECK(button != NULL, "There are no New Window buttons in messagebox");
-
- button = messageBox->findChild<QAbstractButton*>("This Window");
- GT_CHECK(button != NULL, "There are no This Window buttons in messagebox");
-
- button = messageBox->button(QMessageBox::Abort);
- GT_CHECK(button != NULL, "There are no Abort buttons in messagebox");
-
- GTWidget::click(os, button);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "MessageBoxOpenAnotherProject"
-
-InputIntFiller::InputIntFiller(GUITestOpStatus &os, int value) :
- Filler(os, ""),
- value(value)
-{
-
-}
-
-#define GT_METHOD_NAME "commonScenario"
-void InputIntFiller::commonScenario() {
- QWidget *dialog = QApplication::activeModalWidget();
- QSpinBox *spinBox = dialog->findChild<QSpinBox*>();
- GT_CHECK(NULL != spinBox, "NULL spinBox");
-
- GTSpinBox::setValue(os, spinBox, value);
-
- GTWidget::click(os, GTWidget::findButtonByText(os, "OK", dialog));
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.h b/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.h
deleted file mode 100644
index 7c42129..0000000
--- a/src/libs_3rdparty/humimit/src/base_dialogs/MessageBoxFiller.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_RUNNABLES_MESSAGE_BOX_FILLER_H_
-#define _HI_GT_RUNNABLES_MESSAGE_BOX_FILLER_H_
-
-#include "utils/GTUtilsDialog.h"
-#include <QMessageBox>
-
-namespace HI {
-
-class HI_EXPORT MessageBoxDialogFiller : public Filler {
-public:
- MessageBoxDialogFiller(GUITestOpStatus &os, QMessageBox::StandardButton b, const QString &message = "", const QString &objectName = "");
- MessageBoxDialogFiller(GUITestOpStatus &os, const QString &buttonText, const QString &message = "");
-
- virtual void commonScenario();
-
-protected:
- QMessageBox::StandardButton b;
- QString buttonText;
- QString message;
-};
-
-class HI_EXPORT AppCloseMessageBoxDialogFiller : public Filler {
-public:
- AppCloseMessageBoxDialogFiller(GUITestOpStatus &os);
- void commonScenario();
-};
-
-class HI_EXPORT MessageBoxNoToAllOrNo : public Filler {
-public:
- MessageBoxNoToAllOrNo(GUITestOpStatus &os);
- void commonScenario();
-};
-
-class HI_EXPORT MessageBoxOpenAnotherProject : public Filler {
-public:
- MessageBoxOpenAnotherProject(GUITestOpStatus &os);
- void commonScenario();
-};
-
-class HI_EXPORT InputIntFiller : public Filler {
-public:
- InputIntFiller(GUITestOpStatus &os, int value);
- void commonScenario();
-private:
- int value;
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/core/CustomScenario.cpp b/src/libs_3rdparty/humimit/src/core/CustomScenario.cpp
deleted file mode 100644
index 0cd7f55..0000000
--- a/src/libs_3rdparty/humimit/src/core/CustomScenario.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "CustomScenario.h"
-
-namespace HI {
-
-CustomScenario::~CustomScenario() {
-
-}
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/core/CustomScenario.h b/src/libs_3rdparty/humimit/src/core/CustomScenario.h
deleted file mode 100644
index 9ba920a..0000000
--- a/src/libs_3rdparty/humimit/src/core/CustomScenario.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_CUSTOM_SCENARIO_H_
-#define _HI_CUSTOM_SCENARIO_H_
-
-#include <core/global.h>
-#include <core/GUITestOpStatus.h>
-
-namespace HI {
-
-
-class HI_EXPORT CustomScenario {
-public:
- virtual ~CustomScenario();
- virtual void run(HI::GUITestOpStatus &os) = 0;
-};
-
-} // namespace
-
-#endif // _HI_CUSTOM_SCENARIO_H_
diff --git a/src/libs_3rdparty/humimit/src/core/GUITest.cpp b/src/libs_3rdparty/humimit/src/core/GUITest.cpp
deleted file mode 100644
index 3dcaeef..0000000
--- a/src/libs_3rdparty/humimit/src/core/GUITest.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "GUITest.h"
-#include "core/GUITestOpStatus.h"
-
-#include <QApplication>
-#include <QDate>
-#include <QDesktopWidget>
-#include <QDir>
-#include <QScreen>
-
-namespace HI {
-
-QString getTestDir(){
- bool ok;
- int i = qgetenv("UGENE_GUI_TEST_SUITE_NUMBER").toInt(&ok);
-#ifdef Q_OS_MAC
- if ( ok && i>1){
- return QString("../../../../../../test%1/").arg(i-1);
- }else{
- return QString("../../../../../../test/");
- }
-#else
- if ( ok && i>1){
- return QString("../../test%1/").arg(i-1);
- }else{
- return QString("../../test/");
- }
-#endif
-}
-
-QString getDataDir(){
- bool ok;
- int i = qgetenv("UGENE_GUI_TEST_SUITE_NUMBER").toInt(&ok);
-#ifdef Q_OS_MAC
- if ( ok && i>1 ){
- return QString("data%1/").arg(i-1);
- }else{
- return QString("data/");
- }
-#else
- if ( ok && i>1){
- return QString("../../data%1/").arg(i-1);
- }else{
- return QString("../../data/");
- }
-#endif
-}
-
-QString getScreenshotDir(){
- QString result;
-#ifdef Q_OS_MAC
- result = "../../../../../../screenshotFol/";
-#else
- QString guiTestOutputDirectory = qgetenv("GUI_TESTING_OUTPUT");
- if(guiTestOutputDirectory.isEmpty()){
- result = QDir::homePath() + "/gui_testing_output/" +
- QDate::currentDate().toString("dd.MM.yyyy") + "/screenshots/";
- }else{
- result = guiTestOutputDirectory + "/gui_testing_output/" +
- QDate::currentDate().toString("dd.MM.yyyy") + "/screenshots/";
- }
-#endif
- return result;
-}
-
-const QString GUITest::testDir = getTestDir();
-const QString GUITest::dataDir = getDataDir();
-const QString GUITest::sandBoxDir = testDir + "_common_data/scenarios/sandbox/";
-const QString GUITest::screenshotDir = getScreenshotDir();
-
-void GUITest::sl_fail(){
-#if (QT_VERSION < 0x050000) // deprecated method
- QPixmap originalPixmap = QPixmap::grabWindow(QApplication::desktop()->winId());
-#else
- QPixmap originalPixmap = QGuiApplication::primaryScreen()->grabWindow(QApplication::desktop()->winId());
-#endif
- originalPixmap.save(GUITest::screenshotDir + name + ".jpg");
- qCritical("GUItest timed out");
- qCritical("\nGT_DEBUG_MESSAGE !!!FIRST FAIL");
- GUITestOpStatus os;// = new GUITestOpStatus();
- os.setError("time out");
-}
-
-
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/core/GUITest.h b/src/libs_3rdparty/humimit/src/core/GUITest.h
deleted file mode 100644
index 587e2b9..0000000
--- a/src/libs_3rdparty/humimit/src/core/GUITest.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef _HI_GUI_TEST_H_
-#define _HI_GUI_TEST_H_
-
-#include <QtCore/QTimer>
-#include "GTGlobals.h"
-#include <core/GUITestOpStatus.h>
-
-namespace HI {
-
-class GUITestIgnorable {
-public:
- // not ignored test, ignored by all, ignored on windows platforms, ignored on linux platforms
- enum IgnoreStatus {NotIgnored=0x0, Ignored=0x1, IgnoredWindows=0x2, IgnoredLinux=0x4, IgnoredMac=0x8};
- enum IgnoreReason {Bug, System};
-
- GUITestIgnorable() : ignoreStatus(NotIgnored), ignoreMessage(""), ignoreReason(Bug) {}
-
- void setIgnored(int status, const QString& message = "") { ignoreStatus = status; ignoreMessage = message; ignoreReason = Bug;}
- void setReason(IgnoreReason _reason){ ignoreReason = _reason; }
- int getIgnoreStatus() const {return ignoreStatus; }
- QString getIgnoreMessage() const {return ignoreMessage; }
-
- bool isIgnored() const {
- bool ignored = ignoreStatus & Ignored;
- bool platformIgnore = false;
-
-#ifdef _WIN32
- platformIgnore = (ignoreStatus & IgnoredWindows);
-#endif
-
-#ifdef __linux__
- platformIgnore = (ignoreStatus & IgnoredLinux);
-#endif
-
-#ifdef Q_OS_MAC
- platformIgnore = (ignoreStatus & IgnoredMac);
-#endif
-
- return ignored || platformIgnore;
- }
- IgnoreReason getReason(){return ignoreReason;}
-
-private:
- int ignoreStatus;
- QString ignoreMessage;
- IgnoreReason ignoreReason;
-};
-
-class HI_EXPORT GUITest: public QObject, public GUITestIgnorable {
- Q_OBJECT
-public:
- GUITest(const QString &_name = "", const QString &_suite = "", int _timeout=240000) : name(_name), suite(_suite), timeout(_timeout) {}
- virtual ~GUITest(){}
-
- QString getName() const { return name; }
- QString getSuite() const { return suite; }
- QString getFullName() const { return suite + ":" + name; }
- int getTimeout() const { return timeout; }
- void setName(const QString &n) { name = n; }
- void setTimeout(int _timeout) { timeout = _timeout; }
-
- static const QString testDir;
- static const QString dataDir;
- static const QString screenshotDir;
- static const QString sandBoxDir;
-
- virtual void run(GUITestOpStatus &os) = 0;
-private:
- GUITest(const GUITest&);
- GUITest& operator=(const GUITest&);
-
- QString name;
- QString suite;
- int timeout;
-public slots:
- void sl_fail();
-};
-
-typedef QList<GUITest*> GUITests;
-
-} //HI
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/core/GUITestOpStatus.h b/src/libs_3rdparty/humimit/src/core/GUITestOpStatus.h
deleted file mode 100644
index 4d94f49..0000000
--- a/src/libs_3rdparty/humimit/src/core/GUITestOpStatus.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#ifndef _HI_GUI_TEST_OP_STATUS_H_
-#define _HI_GUI_TEST_OP_STATUS_H_
-
-#include "core/global.h"
-
-#include <QString>
-
-namespace HI {
-
-class HI_EXPORT GUITestOpStatus
-{
-public:
- GUITestOpStatus(){}
-
- virtual void setError(const QString & err){error = err; throw this;}
- virtual QString getError() const {return error;}
- virtual bool hasError() const {return !error.isEmpty();}
-
- //TODO:Remove this methods
- virtual bool isCanceled() const {return false;}
- virtual bool isCoR() const {return isCanceled() || hasError();}
-
-private:
- QString error;
-};
-}
-#endif // GUITESTOPSTATUS_H
diff --git a/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.cpp b/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.cpp
deleted file mode 100644
index 2dcebf2..0000000
--- a/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <QApplication>
-#include <QThread>
-
-#include "MainThreadRunnable.h"
-
-namespace HI {
-
-MainThreadRunnable::MainThreadRunnable(GUITestOpStatus &os, CustomScenario *scenario) :
- QObject(NULL),
- os(os),
- scenario(scenario)
-{
- if (Q_UNLIKELY(NULL == scenario)) {
- os.setError("Scenario is NULL");
- return;
- }
-}
-
-MainThreadRunnable::~MainThreadRunnable() {
- delete scenario;
-}
-
-void MainThreadRunnable::doRequest() {
- if (QThread::currentThread() == QApplication::instance()->thread()) {
- run();
- return;
- }
-
- MainThreadRunnableObject obj;
-
- obj.moveToThread(QApplication::instance()->thread());
-
- QMetaObject::Connection connection = connect(this,
- SIGNAL(si_request(MainThreadRunnable *)),
- &obj,
- SLOT(sl_requestAsked(MainThreadRunnable *)),
- Qt::BlockingQueuedConnection);
-
- emit si_request(this);
- disconnect(connection);
-
-}
-
-void MainThreadRunnable::run() {
- if (Q_UNLIKELY(NULL == scenario)) {
- os.setError("Scenario is NULL");
- return;
- }
- scenario->run(os);
-}
-
-void MainThreadRunnable::runInMainThread(GUITestOpStatus &os, CustomScenario *scenario) {
- if (Q_UNLIKELY(NULL == scenario)) {
- os.setError("Custom scenario is NULL");
- return;
- }
- MainThreadRunnable mainThreadRunnable(os, scenario);
- mainThreadRunnable.doRequest();
-}
-
-MainThreadRunnableObject::MainThreadRunnableObject() :
- QObject(NULL)
-{
-}
-
-void MainThreadRunnableObject::sl_requestAsked(MainThreadRunnable *runnable){
- runnable->run();
-}
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.h b/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.h
deleted file mode 100644
index 27e07cd..0000000
--- a/src/libs_3rdparty/humimit/src/core/MainThreadRunnable.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_MAIN_THREAD_RUNNABLE_H_
-#define _HI_MAIN_THREAD_RUNNABLE_H_
-
-#include "GTGlobals.h"
-
-#include <core/CustomScenario.h>
-
-namespace HI {
-
-/**
- * Class takes ownership over the scenario.
- */
-class HI_EXPORT MainThreadRunnable : public QObject {
- Q_OBJECT
-public:
- MainThreadRunnable(GUITestOpStatus &os, CustomScenario *scenario);
- ~MainThreadRunnable();
-
- void doRequest();
- void run();
-
- static void runInMainThread(GUITestOpStatus &os, CustomScenario *scenario);
-
-signals:
- void si_request(MainThreadRunnable *mainThreadRunnable);
-
-private:
- GUITestOpStatus &os;
- CustomScenario *scenario;
-};
-
-class MainThreadRunnableObject : public QObject {
- Q_OBJECT
-public:
- MainThreadRunnableObject();
-
-public slots:
- void sl_requestAsked(MainThreadRunnable *mainThreadRunnable);
-
-};
-
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/core/MainThreadTimer.cpp b/src/libs_3rdparty/humimit/src/core/MainThreadTimer.cpp
deleted file mode 100644
index 4cbc7e2..0000000
--- a/src/libs_3rdparty/humimit/src/core/MainThreadTimer.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "MainThreadTimer.h"
-#include <QApplication>
-
-namespace HI {
-
-MainThreadTimer::MainThreadTimer(int interval) :
- QObject(NULL),
- counter(0)
-{
- timer.setInterval(interval);
- connect(&timer, SIGNAL(timeout()), SLOT(sl_timerTick()));
- timer.start();
- moveToThread(QApplication::instance()->thread());
-}
-
-qint64 MainThreadTimer::getCounter() const {
- QMutexLocker locker(&guard);
- Q_UNUSED(locker);
- return counter;
-}
-
-void MainThreadTimer::sl_timerTick() {
- QMutexLocker locker(&guard);
- Q_UNUSED(locker);
- counter++;
-}
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/core/MainThreadTimer.h b/src/libs_3rdparty/humimit/src/core/MainThreadTimer.h
deleted file mode 100644
index acdd7a4..0000000
--- a/src/libs_3rdparty/humimit/src/core/MainThreadTimer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_MAIN_THREAD_TIMER_H_
-#define _HI_MAIN_THREAD_TIMER_H_
-
-#include <QTimer>
-#include <QMutex>
-
-namespace HI {
-
-class MainThreadTimer : public QObject {
- Q_OBJECT
-public:
- MainThreadTimer(int interval);
-
- qint64 getCounter() const;
-
-private slots:
- void sl_timerTick();
-
-private:
- QTimer timer;
- mutable QMutex guard;
- qint64 counter;
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/core/global.h b/src/libs_3rdparty/humimit/src/core/global.h
deleted file mode 100644
index a0878c8..0000000
--- a/src/libs_3rdparty/humimit/src/core/global.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GLOBAL_H
-#define GLOBAL_H
-
-#include <qglobal.h>
-
-#ifdef BUILDING_HUMIMIT_DLL
-# define HI_EXPORT Q_DECL_EXPORT
-#else
-# define HI_EXPORT Q_DECL_IMPORT
-#endif
-
-
-#endif // GLOBAL_H
-
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.cpp b/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.cpp
deleted file mode 100644
index c470705..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <cctype>
-#include "GTKeyboardDriver.h"
-#include <utils/GTThread.h>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTKeyboardDriver"
-
-#define GT_METHOD_NAME "keyClick"
-
-void GTKeyboardDriver::keyClick(GUITestOpStatus &os, int key, int modifiers)
-{
- GT_CHECK(key != 0, "key = 0");
-#ifdef Q_OS_MAC
- if (modifiers==GTKeyboardDriver::key["ctrl"]){
- modifiers=GTKeyboardDriver::key["cmd"];
- }
-#endif
- keyPress(os, key, modifiers);
- keyRelease(os, key, modifiers);
-}
-#undef GT_METHOD_NAME
-
-void GTKeyboardDriver::keySequence(GUITestOpStatus &os, const QString &str, int modifiers)
-{
- if (modifiers) {
- keyPress(os, modifiers);
- }
-
- foreach(QChar ch, str) {
- char asciiChar = ch.toLatin1();
- if(isalpha(asciiChar) && !islower(asciiChar)) {
- keyClick(os, asciiChar, key["shift"]);
- } else {
- keyClick(os, asciiChar);
- }
-#ifdef Q_OS_MAC
- GTGlobals::sleep(10); // need for MacOS
- GTThread::waitForMainThread(os);
-#endif
- }
-
- if (modifiers) {
- keyRelease(os, modifiers);
- }
-}
-
-/******************************************************************************/
-int GTKeyboardDriver::keys::operator [] (const QString &str) const
-{
- QString lowerStr = str.toLower();
- //backspace alias
- if (lowerStr == "backspace"){
- lowerStr = "back";
- }
- return value(lowerStr);
-}
-
-GTKeyboardDriver::keys GTKeyboardDriver::key;
-
-#undef GT_CLASS_NAME
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.h b/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.h
deleted file mode 100644
index 1d78645..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriver.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTKEYBOARDDRIVER_H_
-#define _HI_GUI_GTKEYBOARDDRIVER_H_
-
-#include <QMap>
-#include "GTGlobals.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#define ADD_KEY(name, code) insert(name, code)
-
-namespace HI {
-/*!
- * \brief The base class for keyboard's actions imitation
- *
- * Example:
- * \code {.cpp}
- * GTKeyboardDriver::keyClick(os, 'A'); // print 'a'
- * GTKeyboardDriver::keyClick(os, 'a'); // print 'a'
- *
- * GTKeyboardDriver::keyClick(os, 'a', GTKeyboardDriver::key["shift"]); // print 'A'
- * GTKeyboardDriver::keyClick(os, 'a', GTKeyboardDriver::key["SHIFT"]); // print 'A'
- * //case in ["..."] does not matter
- *
- * GTKeyboardDriver::keySequence(os, "ThIs Is a TeSt StRiNg"); // print "ThIs Is a TeSt StRiNg"
- * //i.e. case sensitive
- * \endcode
- */
-class HI_EXPORT GTKeyboardDriver {
-public:
- //
-#if defined Q_OS_WIN || defined Q_OS_MAC
- static void keyClick(GUITestOpStatus &os, char key, int modifiers = 0);
-
- static void keyPress(GUITestOpStatus &os, char key, int modifiers = 0);
- static void keyRelease(GUITestOpStatus &os, char key, int modifiers = 0);
-#if defined Q_OS_WIN
- static INPUT getKeyEvent(int key, bool keyUp = false);
-#endif
-#endif
-
- // fails if key == 0
- // Linux: fails if there is an opening X display error
-
- static void keyClick(GUITestOpStatus &os, int key, int modifiers = 0);
- static void keySequence(GUITestOpStatus &os, const QString &str, int modifiers = 0);
-
- static void keyPress(GUITestOpStatus &os, int key, int modifiers = 0);
- static void keyRelease(GUITestOpStatus &os, int key, int modifiers = 0);
-
- class HI_EXPORT keys : private QMap<QString, int> {
- public:
- keys();
- const QStringList mapKeys() const {
- return QMap<QString, int>::keys();
- }
- int operator [] (const QString&) const;
- };
-
- static keys key;
-
-
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverLinux.cpp b/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverLinux.cpp
deleted file mode 100644
index ab6ce47..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverLinux.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <cctype>
-#include "GTKeyboardDriver.h"
-
-#if defined __linux__
- #define XK_LATIN1 // for latin symbol
- #define XK_MISCELLANY // for action keys
- #include <X11/keysymdef.h>
- #include <X11/extensions/XTest.h>
-#endif
-
-namespace HI {
-
-#if defined __linux__
-
-#define GT_CLASS_NAME "GTKeyboardDriverLinux"
-
-#define GT_METHOD_NAME "keyPress"
-void GTKeyboardDriver::keyPress(GUITestOpStatus &os, int key, int modifiers)
-{
- GT_CHECK_NO_MESSAGE(key != 0, "key = 0");
-
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK_NO_MESSAGE(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK_NO_MESSAGE(display != 0, "display is NULL");
-
- if (modifiers) {
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, modifiers), 1, 0);
- }
-
- switch(key) {
- case '\n':
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["enter"]), 1, 0);
- break;
- case '_':
- key = '-';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '<':
- key = ',';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '>':
- key = '.';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '(':
- key = '9';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '$':
- key = '4';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '#':
- key = '3';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case ')':
- key = '0';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case ':':
- key = ';';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '*':
- key = '8';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- case '\"':
- key = '\'';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 1, 0);
- break;
- }
-
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 1, 0);
- XFlush(display);
-
- XCloseDisplay(display);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "keyRelease"
-void GTKeyboardDriver::keyRelease(GUITestOpStatus &os, int key, int modifiers)
-{
- GT_CHECK_NO_MESSAGE(key != 0, "key = ");
-
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK_NO_MESSAGE(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK_NO_MESSAGE(display != 0, "display is NULL");
-
- switch(key) {
- case '\n':
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["enter"]), 0, 0);
- break;
- case '_':
- key = '-';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '<':
- key = ',';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '>':
- key = '.';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '(':
- key = '9';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '$':
- key = '4';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '#':
- key = '3';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case ')':
- key = '0';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case ':':
- key = ';';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '*':
- key = '8';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- case '\"':
- key = '\'';
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, GTKeyboardDriver::key["shift"]), 0, 0);
- break;
-
- default:
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, key), 0, 0);
- }
-
- if (modifiers) {
- XTestFakeKeyEvent(display, XKeysymToKeycode(display, modifiers), 0, 0);
- }
- XFlush(display);
-
- XCloseDisplay(display);
-}
-#undef GT_METHOD_NAME
-
-GTKeyboardDriver::keys::keys()
-{
- ADD_KEY("context_menu", XK_Menu);
- ADD_KEY("back", XK_BackSpace);
- ADD_KEY("tab", XK_Tab);
- ADD_KEY("clear", XK_Clear);
- ADD_KEY("enter", XK_Return);
- ADD_KEY("shift", XK_Shift_L);
- ADD_KEY("rshift", XK_Shift_R);
- ADD_KEY("lshift", XK_Shift_L);
- ADD_KEY("ctrl", XK_Control_L);
- ADD_KEY("rctrl", XK_Control_R);
- ADD_KEY("lctrl", XK_Control_L);
- ADD_KEY("alt", XK_Alt_L);
- ADD_KEY("pause", XK_Pause);
- ADD_KEY("esc", XK_Escape);
- ADD_KEY("space", XK_space);
- ADD_KEY("left", XK_Left);
- ADD_KEY("up", XK_Up);
- ADD_KEY("right", XK_Right);
- ADD_KEY("down", XK_Down);
- ADD_KEY("insert", XK_Insert);
- ADD_KEY("delete", XK_Delete);
- ADD_KEY("help", XK_Help);
- ADD_KEY("f1", XK_F1);
- ADD_KEY("f2", XK_F2);
- ADD_KEY("f3", XK_F3);
- ADD_KEY("f4", XK_F4);
- ADD_KEY("f5", XK_F5);
- ADD_KEY("f6", XK_F6);
- ADD_KEY("f7", XK_F7);
- ADD_KEY("f8", XK_F8);
- ADD_KEY("f9", XK_F9);
- ADD_KEY("f10", XK_F10);
- ADD_KEY("f12", XK_F12);
- ADD_KEY("home", XK_Home);
- ADD_KEY("end", XK_End);
- ADD_KEY("pageup", XK_Page_Up);
- ADD_KEY("pagedown", XK_Page_Down);
-
-// feel free to add other keys
-// macro XK_* defined in X11/keysymdef.h
-}
-
-#undef GT_CLASS_NAME
-
-#endif
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverMac.cpp b/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverMac.cpp
deleted file mode 100644
index 8b1e146..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverMac.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTKeyboardDriver.h"
-#include "GTGlobals.h"
-
-#ifdef Q_OS_MAC
-#include <ApplicationServices/ApplicationServices.h>
-#include <Carbon/Carbon.h>
-#endif
-
-namespace HI {
-
-#ifdef Q_OS_MAC
-
-int asciiToVirtual(int);
-bool extractShiftModifier(char &key);
-
-#define GT_CLASS_NAME "GTKeyboardDriverMac"
-#define GT_METHOD_NAME "keyPress_char"
-void GTKeyboardDriver::keyPress(GUITestOpStatus &os, char key, int modifiers) {
- GT_CHECK(key != 0, "key = 0");
-
- const bool isChanged = extractShiftModifier(key);
- if (isChanged) {
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, GTKeyboardDriver::key["shift"], true);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- } else {
- key = asciiToVirtual(key);
- }
-
- GTGlobals::sleep(1);
- keyPress(os, (int)key, modifiers);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "keyPress_int"
-void GTKeyboardDriver::keyPress(GUITestOpStatus &os, int key, int modifiers)
-{
- if (key==GTKeyboardDriver::key["ctrl"])
- key=GTKeyboardDriver::key["cmd"];
-
- if (modifiers) {
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, modifiers, true);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- GTGlobals::sleep(1);
- }
-
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, key, true);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- GTGlobals::sleep(1);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "keyRelease_char"
-void GTKeyboardDriver::keyRelease(GUITestOpStatus &os, char key, int modifiers) {
- GT_CHECK(key != 0, "key = 0");
-
- const bool isChanged = extractShiftModifier(key);
- if (!isChanged) {
- key = asciiToVirtual(key);
- } else {
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, GTKeyboardDriver::key["shift"], false);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- }
-
- GTGlobals::sleep(1);
- keyRelease(os, (int) key, modifiers);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "keyRelease_int"
-void GTKeyboardDriver::keyRelease(GUITestOpStatus &os, int key, int modifiers)
-{
- if (key==GTKeyboardDriver::key["ctrl"])
- key=GTKeyboardDriver::key["cmd"];
-
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, key, false);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- GTGlobals::sleep(1);
-
- if (modifiers) {
- CGEventRef event = CGEventCreateKeyboardEvent(NULL, modifiers, false);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- }
- GTGlobals::sleep(1);
-}
-#undef GT_METHOD_NAME
-
-GTKeyboardDriver::keys::keys()
-{
- ADD_KEY("cmd", kVK_Command);
- ADD_KEY("tab", kVK_Tab);
- ADD_KEY("enter", kVK_Return);
- ADD_KEY("shift", kVK_Shift);
- ADD_KEY("ctrl", kVK_Control);
- ADD_KEY("alt", kVK_Option);
- ADD_KEY("esc", kVK_Escape);
- ADD_KEY("space", kVK_Space);
- ADD_KEY("left", kVK_LeftArrow);
- ADD_KEY("up", kVK_UpArrow);
- ADD_KEY("right", kVK_RightArrow);
- ADD_KEY("down", kVK_DownArrow);
- ADD_KEY("delete", kVK_ForwardDelete);
- ADD_KEY("back", kVK_Delete);
- ADD_KEY("help", kVK_Help);
- ADD_KEY("f1", kVK_F1);
- ADD_KEY("f2", kVK_F2);
- ADD_KEY("f3", kVK_F3);
- ADD_KEY("f4", kVK_F4);
- ADD_KEY("f5", kVK_F5);
- ADD_KEY("f6", kVK_F6);
- ADD_KEY("f7", kVK_F7);
- ADD_KEY("f8", kVK_F8);
- ADD_KEY("f9", kVK_F9);
- ADD_KEY("f10", kVK_F10);
- ADD_KEY("f12", kVK_F12);
- ADD_KEY("home", kVK_Home);
- ADD_KEY("end", kVK_End);
- ADD_KEY("pageup", kVK_PageUp);
- ADD_KEY("pagedown", kVK_PageDown);
-
-// feel free to add other keys
-// macro kVK_* defined in Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h
-}
-
-#define GT_METHOD_NAME "keyClick"
-void GTKeyboardDriver::keyClick(GUITestOpStatus &os, char key, int modifiers)
-{
- GT_CHECK(key != 0, "key = 0");
- if (modifiers==GTKeyboardDriver::key["ctrl"])
- modifiers=GTKeyboardDriver::key["cmd"];
- keyPress(os, key, modifiers);
- keyRelease(os, key, modifiers);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-int asciiToVirtual(int key)
-{
- if (isalpha(key)) {
- key = tolower(key);
- }
-
- switch(key) {
- case ' ':
- key = kVK_Space;
- break;
- case '0':
- key = kVK_ANSI_0;
- break;
- case '1':
- key = kVK_ANSI_1;
- break;
- case '2':
- key = kVK_ANSI_2;
- break;
- case '3':
- key = kVK_ANSI_3;
- break;
- case '4':
- key = kVK_ANSI_4;
- break;
- case '5':
- key = kVK_ANSI_5;
- break;
- case '6':
- key = kVK_ANSI_6;
- break;
- case '7':
- key = kVK_ANSI_7;
- break;
- case '8':
- key = kVK_ANSI_8;
- break;
- case '9':
- key = kVK_ANSI_9;
- break;
- case 'a':
- key = kVK_ANSI_A;
- break;
- case 'b':
- key = kVK_ANSI_B;
- break;
- case 'c':
- key = kVK_ANSI_C;
- break;
- case 'd':
- key = kVK_ANSI_D;
- break;
- case 'e':
- key = kVK_ANSI_E;
- break;
- case 'f':
- key = kVK_ANSI_F;
- break;
- case 'g':
- key = kVK_ANSI_G;
- break;
- case 'h':
- key = kVK_ANSI_H;
- break;
- case 'i':
- key = kVK_ANSI_I;
- break;
- case 'j':
- key = kVK_ANSI_J;
- break;
- case 'k':
- key = kVK_ANSI_K;
- break;
- case 'l':
- key = kVK_ANSI_L;
- break;
- case 'm':
- key = kVK_ANSI_M;
- break;
- case 'n':
- key = kVK_ANSI_N;
- break;
- case 'o':
- key = kVK_ANSI_O;
- break;
- case 'p':
- key = kVK_ANSI_P;
- break;
- case 'q':
- key = kVK_ANSI_Q;
- break;
- case 'r':
- key = kVK_ANSI_R;
- break;
- case 's':
- key = kVK_ANSI_S;
- break;
- case 't':
- key = kVK_ANSI_T;
- break;
- case 'u':
- key = kVK_ANSI_U;
- break;
- case 'v':
- key = kVK_ANSI_V;
- break;
- case 'w':
- key = kVK_ANSI_W;
- break;
- case 'x':
- key = kVK_ANSI_X;
- break;
- case 'y':
- key = kVK_ANSI_Y;
- break;
- case 'z':
- key = kVK_ANSI_Z;
- break;
- case '=':
- key = kVK_ANSI_Equal;
- break;
- case '-':
- key = kVK_ANSI_Minus;
- break;
- case ']':
- key = kVK_ANSI_RightBracket;
- break;
- case '[':
- key = kVK_ANSI_LeftBracket;
- break;
- case '\'':
- key = kVK_ANSI_Quote;
- break;
- case ';':
- key = kVK_ANSI_Semicolon;
- break;
- case '\\':
- key = kVK_ANSI_Backslash;
- break;
- case ',':
- key = kVK_ANSI_Comma;
- break;
- case '/':
- key = kVK_ANSI_Slash;
- break;
- case '.':
- key = kVK_ANSI_Period;
- break;
- case '\n':
- key = kVK_Return;
- break;
- }
-
- return key;
-}
-
-bool extractShiftModifier(char &key) {
- switch(key) {
- case '_':
- key = asciiToVirtual('-');
- return true;
- case '<':
- key = asciiToVirtual(',');
- return true;
- case '>':
- key = asciiToVirtual('.');
- return true;
- case '(':
- key = asciiToVirtual('9');
- return true;
- case ')':
- key = asciiToVirtual('0');
- return true;
- case '$':
- key = asciiToVirtual('4');
- return true;
- case '#':
- key = asciiToVirtual('3');
- return true;
- case '\"':
- key = asciiToVirtual('\'');
- return true;
- case ':':
- key = asciiToVirtual(';');
- return true;
- case '*':
- key = asciiToVirtual('8');
- return true;
- case '{':
- key = asciiToVirtual('[');
- return true;
- case '}':
- key = asciiToVirtual(']');
- return true;
- }
-
- return false;
-}
-
-#endif
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverWindows.cpp b/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverWindows.cpp
deleted file mode 100644
index 352d8b5..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTKeyboardDriverWindows.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <cctype>
-#include "GTKeyboardDriver.h"
-#include <QtGui/QClipboard>
-
-#ifdef _WIN32
- #include <windows.h>
- #define VIRTUAL_TO_SCAN_CODE 0
-#endif
-
-namespace HI {
-
-#ifdef _WIN32
-
-#define GT_CLASS_NAME "GTKeyboardDriver Windows"
-
-void GTKeyboardDriver::keyPress(GUITestOpStatus &os, char key, int modifiers)
-{
- if (isalpha(key)) {
- key = toupper(key);
- }
-
- switch (key) {
- case '-':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_MINUS);
- break;
-
- case '_':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_MINUS, GTKeyboardDriver::key["shift"]);
- break;
-
- case '=':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_PLUS, modifiers);
- break;
-
- case '.':
- keyPress(os, VK_DECIMAL, modifiers);
- break;
-
- case ',':
- keyPress(os, VK_OEM_COMMA, modifiers);
- break;
-
- case ']':
- keyPress(os, VK_OEM_6, modifiers);
- break;
-
- case '\\':
- keyPress(os, VK_OEM_5, modifiers);
- break;
-
- case '[':
- keyPress(os, VK_OEM_4, modifiers);
- break;
-
- case '/':
- keyPress(os, VK_DIVIDE, modifiers);
- break;
-
- case '\n':
- keyPress(os, GTKeyboardDriver::key["enter"], modifiers);
- break;
-
- case ':':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_1, GTKeyboardDriver::key["shift"]);
- break;
- case ';':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_1);
- break;
- case '<':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_COMMA, GTKeyboardDriver::key["shift"]);
- break;
- case '>':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_PERIOD, GTKeyboardDriver::key["shift"]);
- break;
- case '(':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '9', GTKeyboardDriver::key["shift"]);
- break;
- case ')':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '0', GTKeyboardDriver::key["shift"]);
- break;
- case '"':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_7, GTKeyboardDriver::key["shift"]);
- break;
- case '!':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '1', GTKeyboardDriver::key["shift"]);
- break;
- case '@':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '2', GTKeyboardDriver::key["shift"]);
- break;
- case '#':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '3', GTKeyboardDriver::key["shift"]);
- break;
- case '$':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '4', GTKeyboardDriver::key["shift"]);
- break;
- case '%':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '5', GTKeyboardDriver::key["shift"]);
- break;
- case '^':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '6', GTKeyboardDriver::key["shift"]);
- break;
- case '&':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '7', GTKeyboardDriver::key["shift"]);
- break;
- case '*':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, '8', GTKeyboardDriver::key["shift"]);
- break;
- case '+':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_PLUS, GTKeyboardDriver::key["shift"]);
- break;
- case '?':
- if (modifiers != 0) {
- keyPress(os, modifiers);
- }
- keyPress(os, VK_OEM_2, GTKeyboardDriver::key["shift"]);
- break;
- default:
- keyPress(os, (int)key, modifiers);
- break;
- }
-}
-
-void GTKeyboardDriver::keyRelease(GUITestOpStatus &os, char key, int modifiers)
-{
- if (isalpha(key)) {
- key = toupper(key);
- }
-
- switch (key) {
- case '_':
- keyRelease(os, VK_OEM_MINUS, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
-
- case '=':
- keyRelease(os, VK_OEM_PLUS);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
-
- case '.':
- keyRelease(os, VK_DECIMAL, modifiers);
- break;
-
- case ',':
- keyRelease(os, VK_OEM_COMMA, modifiers);
- break;
-
- case ']':
- keyRelease(os, VK_OEM_6, modifiers);
- break;
-
- case '\\':
- keyRelease(os, VK_OEM_5, modifiers);
- break;
-
- case '[':
- keyRelease(os, VK_OEM_4, modifiers);
- break;
-
- case '/':
- keyRelease(os, VK_DIVIDE, modifiers);
- break;
-
- case '\n':
- keyRelease(os, GTKeyboardDriver::key["enter"], modifiers);
- break;
-
- case ':':
- keyRelease(os, VK_OEM_1, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case ';':
- keyRelease(os, VK_OEM_1);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '<':
- keyRelease(os, VK_OEM_COMMA, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '>':
- keyRelease(os, VK_OEM_PERIOD, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '(':
- keyRelease(os, '9', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case ')':
- keyRelease(os, '0', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '"':
- keyRelease(os, VK_OEM_7, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '!':
- keyRelease(os, '1', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '@':
- keyRelease(os, '2', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '#':
- keyRelease(os, '3', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '$':
- keyRelease(os, '4', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '%':
- keyRelease(os, '5', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '^':
- keyRelease(os, '6', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '&':
- keyRelease(os, '7', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '*':
- keyRelease(os, '8', GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '+':
- keyRelease(os, VK_OEM_PLUS, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- case '?':
- keyRelease(os, VK_OEM_2, GTKeyboardDriver::key["shift"]);
- if (modifiers != 0) {
- keyRelease(os, modifiers);
- }
- break;
- default:
- keyRelease(os, (int)key, modifiers);
- break;
- }
-}
-
-#define GT_METHOD_NAME "keyClick"
-void GTKeyboardDriver::keyClick(GUITestOpStatus &os, char key, int modifiers)
-{
- GT_CHECK(key != 0, "key = 0");
-
- keyPress(os, key, modifiers);
- keyRelease(os, key, modifiers);
- GTGlobals::sleep(10);
-}
-#undef GT_METHOD_NAME
-
-INPUT GTKeyboardDriver::getKeyEvent(int key, bool keyUp) {
-
- INPUT event;
- event.type = INPUT_KEYBOARD;
- event.ki.wVk = key;
- event.ki.wScan = MapVirtualKey(key, VIRTUAL_TO_SCAN_CODE);
- event.ki.dwFlags = keyUp ? KEYEVENTF_KEYUP : 0;
- event.ki.time = 0;
- event.ki.dwExtraInfo = 0;
-
- return event;
-}
-
-#define GT_METHOD_NAME "keyPress"
-void GTKeyboardDriver::keyPress(GUITestOpStatus &os, int key, int modifiers) {
-
- GT_CHECK(key != 0, " Error: key = 0 in GTKeyboardDriver::keyPress()");
-
- if (modifiers) {
- INPUT input = getKeyEvent(modifiers);
- SendInput(1, &input, sizeof(input));
- }
-
- INPUT input = getKeyEvent(key);
- SendInput(1, &input, sizeof(input));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "keyRelease"
-void GTKeyboardDriver::keyRelease(GUITestOpStatus &os, int key, int modifiers)
-{
- GT_CHECK(key != 0, " Error: key = 0 in GTKeyboardDriver::keyRelease()");
-
- if (modifiers) {
- INPUT input = getKeyEvent(modifiers, true);
- SendInput(1, &input, sizeof(input));
- }
-
- INPUT input = getKeyEvent(key, true);
- SendInput(1, &input, sizeof(input));
-}
-#undef GT_METHOD_NAME
-
-GTKeyboardDriver::keys::keys()
-{
- ADD_KEY("context_menu", VK_APPS);
- ADD_KEY("back", VK_BACK);
- ADD_KEY("tab", VK_TAB);
- ADD_KEY("clear", VK_CLEAR);
- ADD_KEY("enter", VK_RETURN);
- ADD_KEY("shift", VK_SHIFT);
- ADD_KEY("rshift", VK_RSHIFT);
- ADD_KEY("lshift", VK_LSHIFT);
- ADD_KEY("ctrl", VK_CONTROL);
- ADD_KEY("rctrl", VK_RCONTROL);
- ADD_KEY("lctrl", VK_LCONTROL);
- ADD_KEY("alt", VK_MENU);
- ADD_KEY("pause", VK_PAUSE);
- ADD_KEY("esc", VK_ESCAPE);
- ADD_KEY("space", VK_SPACE);
- ADD_KEY("left", VK_LEFT);
- ADD_KEY("up", VK_UP);
- ADD_KEY("right", VK_RIGHT);
- ADD_KEY("down", VK_DOWN);
- ADD_KEY("insert", VK_INSERT);
- ADD_KEY("delete", VK_DELETE);
- ADD_KEY("pageup", VK_PRIOR);
- ADD_KEY("pagedown", VK_NEXT);
- ADD_KEY("help", VK_HELP);
- ADD_KEY("f1", VK_F1);
- ADD_KEY("f2", VK_F2);
- ADD_KEY("f3", VK_F3);
- ADD_KEY("f4", VK_F4);
- ADD_KEY("f5", VK_F5);
- ADD_KEY("f6", VK_F6);
- ADD_KEY("f7", VK_F7);
- ADD_KEY("f8", VK_F8);
- ADD_KEY("f9", VK_F9);
- ADD_KEY("f10", VK_F10);
- ADD_KEY("f12", VK_F12);
- ADD_KEY("home", VK_HOME);
- ADD_KEY("end", VK_END);
-
-// feel free to add other keys
-// macro VK_* defined in WinUser.h
-}
-
-#undef GT_CLASS_NAME
-
-#endif
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.cpp b/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.cpp
deleted file mode 100644
index 6ad0bb7..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <QApplication>
-#include <QTimer>
-#include <utils/GTThread.h>
-
-#include "GTMouseDriver.h"
-
-namespace HI {
-
-void GTMouseDriver::click(GUITestOpStatus &os, Qt::MouseButton button)
-{
- press(os, button);
- release(os, button);
-
- GTGlobals::sleep(500);
-}
-
-namespace {
-
-bool isFarEnoughToStartDnd(const QPoint &start, const QPoint &end) {
- return (end - start).manhattanLength() > 2 * QApplication::startDragDistance();
-}
-
-}
-
-void GTMouseDriver::dragAndDrop(GUITestOpStatus &os, const QPoint& start, const QPoint& end) {
- moveTo(os, start);
- GTDragger d(os, end);
- Q_UNUSED(d);
-
- press(os);
-
- const QPoint farPoint = (isFarEnoughToStartDnd(start, (end + start) / 2) ?
- (end + start) / 2 :
- QPoint(0, 0));
- GTMouseDriver::moveTo(os, farPoint);
-
- GTThread::waitForMainThread(os);
-}
-
-#ifndef Q_OS_MAC
-void GTMouseDriver::doubleClick(GUITestOpStatus &os)
-{
- press(os, Qt::LeftButton);
- release(os, Qt::LeftButton);
- GTGlobals::sleep(100);
-
- press(os, Qt::LeftButton);
- release(os, Qt::LeftButton);
- GTGlobals::sleep(250);
-}
-#endif
-
-GTDragger::GTDragger(GUITestOpStatus &_os, const QPoint& _to) :
- QObject(),
- os(_os),
- to(_to),
- done(false)
-{
- QTimer::singleShot(2000, this, SLOT(sl_execDrag()));
- GTGlobals::sleep(500);
-}
-
-GTDragger::~GTDragger() {
- if (!done) {
- sl_execDrag();
- }
-}
-
-void GTDragger::sl_execDrag(){
- GTMouseDriver::moveTo(os, to);
-#ifndef Q_OS_LINUX
- GTMouseDriver::release(os);
- GTThread::waitForMainThread(os);
-#else
- GTMouseDriver::click(os);
- GTGlobals::sleep();
-#endif
- done = true;
-}
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.h b/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.h
deleted file mode 100644
index f0408fe..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriver.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTMOUSEDRIVER_H_
-#define _HI_GUI_GTMOUSEDRIVER_H_
-
-#include "GTGlobals.h"
-#include <QtCore/QPoint>
-
-namespace HI {
-/*!
- * \brief The base class for mouse's actions imitation
- */
-class HI_EXPORT GTMouseDriver {
-public:
- // fails if given coordinates are not in the screen's rect
- // Linux: fails if there is an opening X display error
- static void moveTo(GUITestOpStatus &os, const QPoint& p) {mousePos = p; moveToP(os, p.x(), p.y()); }
-
- // fails if press or release fails
- // Linux: fails if there is an opening X display error
- static void click(GUITestOpStatus &os, Qt::MouseButton = Qt::LeftButton); //all click methods work with the current position of the cursor
- static void doubleClick(GUITestOpStatus &os);
-
- // fails if the given button is not Qt::LeftButton, Qt::RightButton or Qt::MiddleButton
- // Linux: fails if there is an opening X display error
- static void press(GUITestOpStatus &os, Qt::MouseButton = Qt::LeftButton);
- static void release(GUITestOpStatus &os, Qt::MouseButton = Qt::LeftButton); //release method should check if this key has been already pressed. Do nothing otherwise
-
- static void dragAndDrop(GUITestOpStatus &os, const QPoint& start, const QPoint& end);
-
- // Linux: fails if there is an opening X display error
- static void scroll(GUITestOpStatus &os, int value); //positive values for scrolling up, negative for scrolling down
-
- static QPoint getMousePosition() { return mousePos; }
-private:
- static QPoint mousePos;
- static Qt::MouseButtons bp;
-
- static void moveToP(GUITestOpStatus &os, const int x, const int y); // platform-depended realization of moveTo
- static void selectArea(GUITestOpStatus &os, const int x, const int y);
-};
-
-class HI_EXPORT GTDragger : public QObject{
- Q_OBJECT
-public:
- GTDragger(GUITestOpStatus &_os, const QPoint& _to);
- ~GTDragger();
-
-public slots:
- void sl_execDrag();
-
-private:
- GUITestOpStatus& os;
- QPoint to;
- bool done;
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverLinux.cpp b/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverLinux.cpp
deleted file mode 100644
index 82703b6..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverLinux.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMouseDriver.h"
-#include <QByteArray>
-
-#ifdef __linux__
- #include <X11/extensions/XTest.h>
-#endif
-
-namespace HI {
-
-#ifdef __linux__
-
-#define GT_CLASS_NAME "GTMouseDriver Linux"
-QPoint GTMouseDriver::mousePos = QPoint(-1, -1);
-
-#define GT_METHOD_NAME "moveToP"
-void GTMouseDriver::moveToP(GUITestOpStatus &os, const int x, const int y)
-{
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK(display != 0, "display is NULL");
-
- int horres = XDisplayWidth(display, 0);
- int vertres = XDisplayHeight(display, 0);
-
- QRect screen(0, 0, horres-1, vertres-1);
- GT_CHECK(screen.contains(QPoint(x, y)), "Invalid coordinates");
-
- Window root, child;
- int root_x, root_y, pos_x, pos_y;
- unsigned mask;
- XQueryPointer(display, RootWindow(display, DefaultScreen(display)),
- &root, &child, &root_x, &root_y,
- &pos_x, &pos_y, &mask);
-
- const int delay = 0;// msec
- int x0 = pos_x;
- int y0 = pos_y;
- int x1 = x;
- int y1 = y;
-
- if (x0 == x1) {
- while(y0 != y1) {
- if (y0 < y1) {
- ++y0;
- } else {
- --y0;
- }
-
- XTestFakeMotionEvent(display, -1, x1, y0, delay);
- XFlush(display);
- }
- } else if (y0 == y1) {
- while(x0 != x1) {
- if (x0 < x1) {
- ++x0;
- } else {
- --x0;
- }
- XTestFakeMotionEvent(display, -1, x0, y1, delay);
- XFlush(display);
- }
- } else {
- // moved by the shortest way
- // equation of the line by two points y = (-(x0 * y1 - x1 * y0) - x*(y0 - y1)) / (x1 - x0)
- int diff_x = x1 - x0;
- int diff_y = y0 - y1;
- int diff_xy = -(x0 * y1 - x1 * y0);
- int current_x = x0, current_y;
-
- while (current_x != x1) {
- if (x1 > x0) {
- ++current_x;
- } else {
- -- current_x;
- }
-
- current_y = (diff_xy - current_x * diff_y) / diff_x;
- XTestFakeMotionEvent(display, -1, current_x, current_y, delay);
- XFlush(display);
- }
- }
-
- XCloseDisplay(display);
-#ifdef _DEBUG
- GTGlobals::sleep(500);
-#else
- GTGlobals::sleep(100); //May be not needed
-#endif
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "press"
-void GTMouseDriver::press(GUITestOpStatus &os, Qt::MouseButton button)
-{
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK(display != 0, "display is NULL");
-
- //1 = Left, 2 = Middle, 3 = Right
- unsigned int btn = button == Qt::LeftButton ? 1 :
- button == Qt::RightButton ? 3 :
- button == Qt::MidButton ? 2 : 0;
- GT_CHECK(btn != 0, "button is 0");
-
- XTestFakeButtonEvent(display, btn, True, 0);
- XFlush(display);
-
- XCloseDisplay(display);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "release"
-void GTMouseDriver::release(GUITestOpStatus &os, Qt::MouseButton button)
-{
- // TODO: check if this key has been already pressed
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK(display != 0, "display is NULL");
-
- unsigned int btn = button == Qt::LeftButton ? 1 :
- button == Qt::RightButton ? 3 :
- button == Qt::MidButton ? 2 : 0;
- GT_CHECK(btn != 0, "button is 0");
-
- XTestFakeButtonEvent(display, btn, False, 0);
- XFlush(display);
-
- XCloseDisplay(display);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "scroll"
-void GTMouseDriver::scroll(GUITestOpStatus &os, int value)
-{
- QByteArray display_name = qgetenv("DISPLAY");
- GT_CHECK(!display_name.isEmpty(), "Environment variable \"DISPLAY\" not found");
-
- Display *display = XOpenDisplay(display_name.constData());
- GT_CHECK(display != 0, "display is NULL");
-
- unsigned button = value > 0 ? Button4 : Button5; //Button4 - scroll up, Button5 - scroll down
- value = value > 0 ? value : -value;
-
- for (int i = 0; i < value; i++) {
- XTestFakeButtonEvent(display, button, True, 0);
- XTestFakeButtonEvent(display, button, False, 0);
- }
-
- XFlush(display);
- XCloseDisplay(display);
-}
-#undef GT_METHOD_NAME
-
-
-#undef GT_CLASS_NAME
-
-#endif
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverMac.cpp b/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverMac.cpp
deleted file mode 100644
index c18d5fd..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverMac.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMouseDriver.h"
-
-#include <QCursor>
-
-#ifdef Q_OS_MAC
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-namespace HI {
-
-#ifdef Q_OS_MAC
-#define GT_CLASS_NAME "GTMouseDriverMac"
-QPoint GTMouseDriver::mousePos = QPoint(-1, -1);
-Qt::MouseButtons GTMouseDriver::bp = Qt::NoButton;
-
-namespace {
-
-bool isPointInsideScreen(const QPoint &point) {
- const CGDirectDisplayID displayID = CGMainDisplayID();
- const size_t horres = CGDisplayPixelsWide(displayID);
- const size_t vertres = CGDisplayPixelsHigh(displayID);
-
- const QRect screen(0, 0, horres, vertres);
- return screen.contains(point);
-}
-
-bool isPointInsideScreen(int x, int y) {
- return isPointInsideScreen(QPoint(x, y));
-}
-
-}
-
-#define GT_METHOD_NAME "moveToP"
-void GTMouseDriver::moveToP(GUITestOpStatus &os, const int x, const int y)
-{
- if (bp.testFlag(Qt::LeftButton)) {
- selectArea(os, x, y);
- return;
- }
-
- GT_CHECK(isPointInsideScreen(x, y), "Invalid coordinates");
-
- CGEventRef event = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved, CGPointMake(x, y), 0 /*ignored*/);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "selectArea"
-void GTMouseDriver::selectArea(GUITestOpStatus &os, const int x, const int y) {
- Q_UNUSED(os);
-
- GT_CHECK(isPointInsideScreen(x, y), "Invalid coordinates");
-
- CGEventRef event = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDragged, CGPointMake(x, y), kCGMouseButtonLeft /*ignored*/);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- CFRelease(event);
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "press"
-void GTMouseDriver::press(GUITestOpStatus &os, Qt::MouseButton button)
-{
- bp |= button;
- QPoint mousePos = QCursor::pos();
- CGEventType eventType = button == Qt::LeftButton ? kCGEventLeftMouseDown :
- button == Qt::RightButton ? kCGEventRightMouseDown:
- button == Qt::MidButton ? kCGEventOtherMouseDown : kCGEventNull;
- CGEventRef event = CGEventCreateMouseEvent(NULL, eventType, CGPointMake(mousePos.x(), mousePos.y()), 0 /*ignored*/);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- GTGlobals::sleep(0); // don't touch, it's Mac's magic
- CFRelease(event);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "release"
-void GTMouseDriver::release(GUITestOpStatus &os, Qt::MouseButton button)
-{
- bp &= (Qt::MouseButtonMask^button);
- QPoint mousePos = QCursor::pos();
- CGEventType eventType = button == Qt::LeftButton ? kCGEventLeftMouseUp :
- button == Qt::RightButton ? kCGEventRightMouseUp:
- button == Qt::MidButton ? kCGEventOtherMouseUp : kCGEventNull;
- CGEventRef event = CGEventCreateMouseEvent(NULL, eventType, CGPointMake(mousePos.x(), mousePos.y()), 0 /*ignored*/);
- GT_CHECK(event != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, event);
- GTGlobals::sleep(0); // don't touch, it's Mac's magic
- CFRelease(event);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "doubleClick"
-void GTMouseDriver::doubleClick(GUITestOpStatus &os) {
- Q_UNUSED(os);
-
- QPoint mousePos = QCursor::pos();
- CGEventType eventTypeMouseDown = kCGEventLeftMouseDown ;
- CGEventRef eventPress = CGEventCreateMouseEvent(NULL, eventTypeMouseDown, CGPointMake(mousePos.x(), mousePos.y()), 0 /*ignored*/);
- GT_CHECK(eventPress != NULL, "Can't create event");
-
- CGEventType eventTypeMouseUp = kCGEventLeftMouseUp ;
- CGEventRef eventRelease = CGEventCreateMouseEvent(NULL, eventTypeMouseUp, CGPointMake(mousePos.x(), mousePos.y()), 0 /*ignored*/);
- GT_CHECK(eventRelease != NULL, "Can't create event");
-
- CGEventPost(kCGSessionEventTap, eventPress);
- GTGlobals::sleep(0); // don't touch, it's Mac's magic
- CGEventPost(kCGSessionEventTap, eventRelease);
- GTGlobals::sleep(0);
-
- CGEventSetDoubleValueField(eventPress, kCGMouseEventClickState, 2);
- CGEventSetDoubleValueField(eventRelease, kCGMouseEventClickState, 2);
-
- CGEventPost(kCGSessionEventTap, eventPress);
- GTGlobals::sleep(0); // don't touch, it's Mac's magic
- CGEventPost(kCGSessionEventTap, eventRelease);
- GTGlobals::sleep(0);
-
- GTGlobals::sleep(100);
-
- CFRelease(eventPress);
- CFRelease(eventRelease);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "scroll"
-void GTMouseDriver::scroll(GUITestOpStatus &os, int value)
-{
- CGEventRef event = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, 1, value > 0 ? 10 : -10);
- GT_CHECK(event != NULL, "Can't create event");
- // Scrolling movement is generally represented by small signed integer values, typically in a range from -10 to +10.
- // Large values may have unexpected results, depending on the application that processes the event.
- value = value > 0 ? value : -value;
- for (int i = 0; i < value; i += 10) {
- CGEventPost(kCGSessionEventTap, event);
- GTGlobals::sleep(0); // don't touch, it's Mac's magic
- }
-
- CFRelease(event);
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-
-#endif // Q_OS_MAC
-} //namespace
-
diff --git a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverWindows.cpp b/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverWindows.cpp
deleted file mode 100644
index 4d16845..0000000
--- a/src/libs_3rdparty/humimit/src/drivers/GTMouseDriverWindows.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMouseDriver.h"
-
-#ifdef _WIN32
- #include <windows.h>
-#endif
-
-namespace HI {
-
-#ifdef _WIN32
-
-#define GT_CLASS_NAME "GTMouseDriver Windows"
-QPoint GTMouseDriver::mousePos = QPoint(-1, -1);
-
-#define GT_METHOD_NAME "moveToP"
-void GTMouseDriver::moveToP(GUITestOpStatus &os, const int x, const int y)
-{
- // get screen resolution
- HDC hDCScreen = GetDC(NULL);
- int horres = GetDeviceCaps(hDCScreen, HORZRES);
- int vertres = GetDeviceCaps(hDCScreen, VERTRES);
- ReleaseDC(NULL, hDCScreen);
-
- QRect screen(0, 0, horres-1, vertres-1);
- GT_CHECK(screen.contains(QPoint(x, y)), "Invalid coordinates");
-
- const int points_in_line = 65535;
- const double points_in_x_pixel = points_in_line / static_cast<double>(horres);
- const double points_in_y_pixel = points_in_line / static_cast<double>(vertres);
-
- POINT pos;
- GetCursorPos(&pos);
-
- int x0 = pos.x;
- int y0 = pos.y;
- int x1 = x;
- int y1 = y;
-
- INPUT event;
- event.type = INPUT_MOUSE;
- event.mi.dx = 0;
- event.mi.dy = 0;
- event.mi.mouseData = 0;
- event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
- event.mi.time = 0;
- event.mi.dwExtraInfo = 0;
-
- if (x0 == x1) {
- event.mi.dx = x0 * points_in_x_pixel + 0.5;
- while(y0 != y1) {
- if (y0 < y1) {
- ++y0;
- } else {
- --y0;
- }
- event.mi.dy = y0 * points_in_y_pixel + 0.5;
- SendInput(1, &event, sizeof(event));
- }
- } else if (y0 == y1) {
- event.mi.dy = y0 * points_in_y_pixel + 0.5;
- while(x0 != x1) {
- if (x0 < x1) {
- ++x0;
- } else {
- --x0;
- }
- event.mi.dx = x0 * points_in_x_pixel + 0.5;
- SendInput(1, &event, sizeof(event));
- }
- } else {
- // moved by the shortest way
- // equation of the line by two points y = (-(x0 * y1 - x1 * y0) - x*(y0 - y1)) / (x1 - x0)
- int diff_x = x1 - x0;
- int diff_y = y0 - y1;
- int diff_xy = -(x0 * y1 - x1 * y0);
- int current_x = x0, current_y;
-
- while (current_x != x1) {
- if (x1 > x0) {
- ++current_x;
- } else {
- -- current_x;
- }
-
- current_y = (diff_xy - current_x * diff_y) / diff_x;
- event.mi.dy = current_y * points_in_y_pixel + 0.5;
- event.mi.dx = current_x * points_in_x_pixel + 0.5;
- SendInput(1, &event, sizeof(event));
- }
- }
-
-#ifdef _DEBUG
- GTGlobals::sleep(500);
-#else
- GTGlobals::sleep(100); //May be not needed
-#endif
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "press"
-void GTMouseDriver::press(GUITestOpStatus &os, Qt::MouseButton button)
-{
- unsigned int btn = button == Qt::LeftButton ? MOUSEEVENTF_LEFTDOWN :
- button == Qt::RightButton ? MOUSEEVENTF_RIGHTDOWN :
- button == Qt::MidButton ? MOUSEEVENTF_MIDDLEDOWN : 0;
- GT_CHECK(btn != 0, "button is 0");
-
- INPUT event;
- event.type = INPUT_MOUSE;
- event.mi.dx = 0;
- event.mi.dy = 0;
- event.mi.mouseData = 0;
- event.mi.dwFlags = btn;
- event.mi.time = 0;
- event.mi.dwExtraInfo = 0;
-
- SendInput(1, &event, sizeof(event));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "release"
-void GTMouseDriver::release(GUITestOpStatus &os, Qt::MouseButton button)
-{
- // TODO: check if this key has been already pressed
- unsigned int buttons[3] = {MOUSEEVENTF_LEFTUP, MOUSEEVENTF_RIGHTUP, MOUSEEVENTF_MIDDLEUP};
- unsigned int btn = button == Qt::LeftButton ? MOUSEEVENTF_LEFTUP :
- button == Qt::RightButton ? MOUSEEVENTF_RIGHTUP :
- button == Qt::MidButton ? MOUSEEVENTF_MIDDLEUP : 0;
- GT_CHECK(btn != 0, "button is 0");
-
- INPUT event;
- event.type = INPUT_MOUSE;
- event.mi.dx = 0;
- event.mi.dy = 0;
- event.mi.mouseData = 0;
- event.mi.dwFlags = btn;
- event.mi.time = 0;
- event.mi.dwExtraInfo = 0;
-
- SendInput(1, &event, sizeof(event));
-}
-#undef GT_METHOD_NAME
-
-void GTMouseDriver::scroll(GUITestOpStatus &os, int value)
-{
- INPUT event;
- event.type = INPUT_MOUSE;
- event.mi.dx = 0;
- event.mi.dy = 0;
- event.mi.mouseData = value * WHEEL_DELTA;
- event.mi.dwFlags = MOUSEEVENTF_WHEEL;
- event.mi.time = 0;
- event.mi.dwExtraInfo = 0;
-
- SendInput(1, &event, sizeof(event));
-}
-
-#undef GT_CLASS_NAME
-
-#endif
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTAction.cpp b/src/libs_3rdparty/humimit/src/primitives/GTAction.cpp
deleted file mode 100644
index 078d953..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTAction.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTAction.h"
-#include "primitives/GTMainWindow.h"
-
-#include <QAbstractButton>
-#include <QApplication>
-#include <QMainWindow>
-#include <QToolButton>
-#include <QWidget>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTAction"
-
-#define GT_METHOD_NAME "button"
-QAbstractButton* GTAction::button(GUITestOpStatus &os, const QString &actionName, QObject *parent, const GTGlobals::FindOptions& options) {
-
- QAction* a = findAction(os, actionName, parent);
- if (!a) {
- a = findAction(os, actionName, NULL, GTGlobals::FindOptions(false));
- }
- if (options.failIfNull) {
- GT_CHECK_RESULT(NULL != a, "Action " + actionName + " is NULL!", NULL);
- } else if (NULL == a) {
- return NULL;
- }
-
- QList<QWidget*> associated = a->associatedWidgets();
- foreach(QWidget* w, associated) {
- QAbstractButton *tb = qobject_cast<QAbstractButton*>(w);
- if (tb) {
- if (parent) {
- QList<QToolButton*> childButtons = parent->findChildren<QToolButton*>(); // da. daa.
- if (childButtons.contains(dynamic_cast<QToolButton*>(tb))) {
- return tb;
- }
- }
- else {
- return tb;
- }
- }
- }
-
- return NULL;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "button"
-QAbstractButton* GTAction::button(GUITestOpStatus &os, const QAction* a, QObject *parent) {
-
- GT_CHECK_RESULT(a != NULL, "action is NULL", NULL);
-
- QList<QWidget*> associated = a->associatedWidgets();
- foreach(QWidget* w, associated) {
- QAbstractButton *tb = qobject_cast<QAbstractButton*>(w);
- if (tb) {
- if (parent) {
- QList<QToolButton*> childButtons = parent->findChildren<QToolButton*>(); // da. daa.
- if (childButtons.contains(dynamic_cast<QToolButton*>(tb))) {
- return tb;
- }
- }
- else {
- return tb;
- }
- }
- }
-
- return NULL;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findAction"
-QAction* GTAction::findAction(GUITestOpStatus &os, const QString &actionName, QObject *parent, const GTGlobals::FindOptions& options) {
-
- if (parent == NULL) { // If parent null, then searching for at QMainWindows
- QList<QAction*> list;
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- if(parent->findChild<QAction*>(actionName) != NULL){
- list.append(parent->findChild<QAction*>(actionName));
- }
- }
- GT_CHECK_RESULT(list.count()<2, QString("There are %1 actions with this text").arg(list.count()), NULL);
- if(options.failIfNull){
- GT_CHECK_RESULT(list.count()!=0,"action not found", NULL);
- return list.takeFirst();
- }
- return NULL;
- }
- QAction* a = parent->findChild<QAction*>(actionName);
-
- return a;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findActionByText"
-QAction* GTAction::findActionByText(GUITestOpStatus &os, const QString &text, QWidget *parent) {
-
- if (parent == NULL) { // If parent null, then searching for at QMainWindows
- QList<QAction*> resultList;
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- QList<QAction*> list = parent->findChildren<QAction*>();
- foreach(QAction* act, list){
- if(act->text() == text){
- resultList<<act;
- }
- }
- }
- GT_CHECK_RESULT(resultList.count()!=0,"action not found", NULL);
- GT_CHECK_RESULT(resultList.count()<2, QString("There are %1 actions with this text").arg(resultList.count()), NULL);
- return resultList.takeFirst();
- }
- QList<QAction*> list = parent->findChildren<QAction*>();
- QList<QAction*> resultList;
- foreach(QAction* act, list){
- if(act->text() == text){
- resultList<<act;
- }
- }
-
- GT_CHECK_RESULT(resultList.count()!=0,"action not found", NULL);
- GT_CHECK_RESULT(resultList.count()<2, QString("There are %1 actions with this text").arg(resultList.count()), NULL);
-
- return resultList.takeFirst();
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTAction.h b/src/libs_3rdparty/humimit/src/primitives/GTAction.h
deleted file mode 100644
index 8159dd2..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTACTION_H_
-#define _HI_GUI_GTACTION_H_
-
-#include "GTGlobals.h"
-#include <QAction>
-
-class QAbstractButton;
-namespace HI {
-
-class HI_EXPORT GTAction {
-public:
- // returns first QAbstractButton associated with an action with a given name
- static QAbstractButton* button(GUITestOpStatus &os, const QString &actionName, QObject *parent = NULL, const GTGlobals::FindOptions& = GTGlobals::FindOptions());
-
- static QAbstractButton* button(GUITestOpStatus &os, const QAction* a, QObject *parent = NULL);
-
- static QAction* findAction(GUITestOpStatus &os, const QString &actionName, QObject *parent = NULL, const GTGlobals::FindOptions& options = GTGlobals::FindOptions());
-
- static QAction* findActionByText(GUITestOpStatus &os, const QString &text, QWidget *parent = NULL);
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.cpp b/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.cpp
deleted file mode 100644
index a4e1f8d..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTCheckBox.h"
-#include "primitives/GTWidget.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTCheckBox"
-
-#define GT_METHOD_NAME "setChecked"
-void GTCheckBox::setChecked(GUITestOpStatus& os, QCheckBox *checkBox, bool checked) {
- GT_CHECK(checkBox != NULL, "QCheckBox == NULL");
- if(checkBox->isChecked() == checked){
- return;
- }
- GT_CHECK(checkBox->isEnabled(), "QcheckBox is disabled");
-
- bool checkBoxState = checkBox->isChecked();
- if (checked != checkBoxState) {
- QPoint p = QPoint(5, checkBox->rect().height()/2);
- GTWidget::click(os, checkBox, Qt::LeftButton, p);
- }
- GTGlobals::sleep(500);
-
- GT_CHECK(checked == checkBox->isChecked(), "Can't set checked state");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setChecked"
-void GTCheckBox::setChecked(GUITestOpStatus& os, const QString &checkBoxName, bool checked, QWidget *parent) {
- GTCheckBox::setChecked(os, GTWidget::findExactWidget<QCheckBox *>(os, checkBoxName, parent), checked);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setChecked"
-void GTCheckBox::setChecked(GUITestOpStatus& os, const QString &checkBoxName, QWidget *parent) {
- GTCheckBox::setChecked(os, GTWidget::findExactWidget<QCheckBox *>(os, checkBoxName, parent));
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.h b/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.h
deleted file mode 100644
index 831b1c4..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTCheckBox.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_CHECKBOX_H_
-#define _HI_GT_CHECKBOX_H_
-
-#include "GTGlobals.h"
-#include <QCheckBox>
-
-namespace HI {
-/*!
- * \brief The class for working with QCheckBox primitive
- */
-class HI_EXPORT GTCheckBox {
-public:
- static void setChecked(GUITestOpStatus& os, QCheckBox *checkBox, bool checked = true);
-
- static void setChecked(GUITestOpStatus& os, const QString &checkBoxName, bool checked = true, QWidget *parent = NULL);
- static void setChecked(GUITestOpStatus& os, const QString &checkBoxName, QWidget *parent = NULL);
-};
-
-}
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTComboBox.cpp b/src/libs_3rdparty/humimit/src/primitives/GTComboBox.cpp
deleted file mode 100644
index 1dd3d17..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTComboBox.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTComboBox.h"
-#include "primitives/GTWidget.h"
-
-#include <QListView>
-#include <QStandardItemModel>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTComboBox"
-
-#define GT_METHOD_NAME "setCurrentIndex"
-void GTComboBox::setCurrentIndex(GUITestOpStatus& os, QComboBox *comboBox, int index, bool checkVal, GTGlobals::UseMethod method) {
-
- GT_CHECK(comboBox != NULL, "QComboBox* == NULL");
-
- if(comboBox->currentIndex() == index){
- return;
- }
-
- int comboCount = comboBox->count();
- GT_CHECK(index>=0 && index<comboCount, "invalid index");
-
- if(comboBox->isEditable()){
- QPoint p = QPoint(comboBox->rect().width() - 10, 10);
- GTWidget::click(os, comboBox, Qt::LeftButton, p);
- }else{
- GTWidget::setFocus(os, comboBox);
- }
- GTGlobals::sleep();
-
- switch (method){
- case GTGlobals::UseKeyBoard:
- case GTGlobals::UseKey:{
- int currIndex = comboBox->currentIndex() == -1 ? 0 : comboBox->currentIndex();
- QString directionKey = index > currIndex ? "down" : "up";
-
- int pressCount = qAbs(index-currIndex);
- for (int i=0; i<pressCount; i++) {
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key[directionKey]);
- GTGlobals::sleep(100);
- }
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
- GTGlobals::sleep(500);
-
- if(checkVal){
- currIndex = comboBox->currentIndex();
- GT_CHECK(currIndex == index, "Can't set index");
- }
- break;
- }
- case GTGlobals::UseMouse:{
- QListView* view = comboBox->findChild<QListView*>();
- GT_CHECK(view != NULL, "list view not found");
- QModelIndex modelIndex = view->model()->index(index,0);
- GT_CHECK(modelIndex.isValid(), "invalid model index");
- view->scrollTo(modelIndex);
- GTGlobals::sleep(500);
- qDebug("GT_DEBUG_MESSAGE moving to list item");
- GTMouseDriver::moveTo(os, view->viewport()->mapToGlobal(view->visualRect(modelIndex).center()));
- GTMouseDriver::click(os);
- GTGlobals::sleep(500);
- break;
- }
- }
-
-}
-
-void GTComboBox::setIndexWithText(GUITestOpStatus& os, QComboBox *comboBox, const QString& text, bool checkVal, GTGlobals::UseMethod method) {
- GT_CHECK(comboBox != NULL, "QComboBox* == NULL");
-
- int index = comboBox->findText(text, Qt::MatchContains);
- GT_CHECK(index != -1, "Text " + text + " was not found");
-
- setCurrentIndex(os, comboBox, index, checkVal, method);
- //CHECK_OP(os, );
- if(checkVal){
- QString currentText = comboBox->currentText();
- GT_CHECK(currentText == text, "Can't set text");
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getValues"
-QStringList GTComboBox::getValues(GUITestOpStatus &os, QComboBox *comboBox) {
- QStringList result;
- GT_CHECK_RESULT(NULL != comboBox, "Combobox is NULL", result);
- for (int i = 0; i < comboBox->count(); i++) {
- result << comboBox->itemText(i);
- }
- return result;
-}
-
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkValues"
-void GTComboBox::checkValues(GUITestOpStatus& os, QComboBox *comboBox, const QStringList &values) {
- GT_CHECK(NULL != comboBox, "comboBox is NULL");
-
- GTWidget::setFocus(os, comboBox);
- GTGlobals::sleep();
-
- QListView *view = comboBox->findChild<QListView*>();
- GT_CHECK(NULL != view, "list view is not found");
- QStandardItemModel *model = dynamic_cast<QStandardItemModel*>(view->model());
- GT_CHECK(NULL != model, "model is not found");
- QList<QStandardItem *> items = model->findItems("",Qt::MatchContains);
-
- foreach (QStandardItem *item, items) {
- if (values.contains(item->data().toString())){
- if(item->checkState() != Qt::Checked){
- QModelIndex modelIndex = item->index();
- view->scrollTo(modelIndex);
- GTGlobals::sleep(500);
- QRect itemRect = view->visualRect(modelIndex);
- QPoint checkPoint(itemRect.left() + 10, itemRect.center().y());
- GTMouseDriver::moveTo(os, view->viewport()->mapToGlobal(checkPoint));
- GTMouseDriver::click(os);
- GTGlobals::sleep(500);
- GT_CHECK(item->checkState() == Qt::Checked, "Item is not checked: " + item->data().toString());
- }
- }else{
- if(item->checkState() == Qt::Checked){
- QModelIndex modelIndex = item->index();
- view->scrollTo(modelIndex);
- GTGlobals::sleep(500);
- QRect itemRect = view->visualRect(modelIndex);
- QPoint checkPoint(itemRect.left() + 10, itemRect.center().y());
- GTMouseDriver::moveTo(os, view->viewport()->mapToGlobal(checkPoint));
- GTMouseDriver::click(os);
- GTGlobals::sleep(500);
- GT_CHECK(item->checkState() != Qt::Checked, "Item is checked: " + item->data().toString());
- }
- }
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkValuesPresence"
-void GTComboBox::checkValuesPresence(GUITestOpStatus &os, QComboBox *comboBox, const QStringList &values){
- Q_UNUSED(os)
- GT_CHECK(NULL != comboBox, "ComboBox is NULL");
-
- foreach (const QString &s, values) {
- int index = comboBox->findText(s);
- GT_CHECK(index != -1, "text not found " + s);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkCurrentValue"
-void GTComboBox::checkCurrentValue(GUITestOpStatus &os, QComboBox *comboBox, const QString &expectedValue) {
- Q_UNUSED(os);
- GT_CHECK(NULL != comboBox, "ComboBox is NULL");
- GT_CHECK(expectedValue == comboBox->currentText(), QString("An unexpected value: expect '%1', got '%2'")
- .arg(expectedValue).arg(comboBox->currentText()));
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTComboBox.h b/src/libs_3rdparty/humimit/src/primitives/GTComboBox.h
deleted file mode 100644
index 17e167e..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTComboBox.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_COMBOBOX_H_
-#define _HI_GT_COMBOBOX_H_
-
-#include "GTGlobals.h"
-#include <QComboBox>
-
-namespace HI {
-/*!
- * \brief The class for working with QComboBox primitive
- */
-class HI_EXPORT GTComboBox {
-public:
- // fails if the comboBox is NULL, index is not in a comboBox range
- // or a comboBox's index differs from a given index in the end of method's execution
- static void setCurrentIndex(GUITestOpStatus& os, QComboBox *comboBox, int index, bool checkVal = true, GTGlobals::UseMethod method = GTGlobals::UseKey);
-
- // Fails if the comboBox is NULL, combobox doesn't contain an item with text
- // or a comboBox current item's text differs from a given text in the end of method's execution
- static void setIndexWithText(GUITestOpStatus& os, QComboBox *comboBox, const QString& text, bool checkVal = true, GTGlobals::UseMethod method = GTGlobals::UseKey);
-
- static QStringList getValues(GUITestOpStatus &os, QComboBox *comboBox);
- static void checkValues(GUITestOpStatus& os, QComboBox *comboBox, const QStringList &values);
-
- static void checkValuesPresence(GUITestOpStatus& os, QComboBox *comboBox, const QStringList &values);
- static void checkCurrentValue(GUITestOpStatus &os, QComboBox *comboBox, const QString &expectedValue);
-};
-
-}
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.cpp b/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.cpp
deleted file mode 100644
index ec732ff..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTDoubleSpinBox.h"
-#include "primitives/GTWidget.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTSpinBox"
-
-#define GT_METHOD_NAME "getValue"
-int GTDoubleSpinbox::getValue(GUITestOpStatus &os, QDoubleSpinBox *spinBox) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(spinBox != NULL, "spinBox is NULL", -1);
- return spinBox->value();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getValue"
-int GTDoubleSpinbox::getValue(GUITestOpStatus &os, const QString &spinBoxName, QWidget *parent) {
- return GTDoubleSpinbox::getValue(os, GTWidget::findExactWidget<QDoubleSpinBox *>(os, spinBoxName, parent));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTDoubleSpinbox::setValue(GUITestOpStatus& os, QDoubleSpinBox *spinBox, double v, GTGlobals::UseMethod useMethod) {
- GT_CHECK(spinBox != NULL, "spinBox is NULL");
- if(spinBox->value() == v){
- return;
- }
-
- QPoint arrowPos;
- QRect spinBoxRect;
-
- GT_CHECK(spinBox->isEnabled(), "SpinBox is not enabled");
-
- if (spinBox->value() != v) {
- switch(useMethod) {
- case GTGlobals::UseMouse:
- spinBoxRect = spinBox->rect();
- if (v > spinBox->value()) {
- arrowPos = QPoint(spinBoxRect.right() - 5, spinBoxRect.height() / 4); // -5 it's needed that area under cursor was clickable
- } else {
- arrowPos = QPoint(spinBoxRect.right() - 5, spinBoxRect.height() * 3 / 4);
- }
-
- GTMouseDriver::moveTo(os, spinBox->mapToGlobal(arrowPos));
- while (QString().setNum(spinBox->value()) != QString().setNum(v)) {
- GTMouseDriver::click(os);
- GTGlobals::sleep(100);
- }
- break;
-
- case GTGlobals::UseKey: {
- int key = 0;
- if (v > spinBox->value()) {
- key = GTKeyboardDriver::key["up"];
- } else {
- key = GTKeyboardDriver::key["down"];
- }
-
- GTWidget::setFocus(os, spinBox);
- while (QString().setNum(spinBox->value()) != QString().setNum(v)) {
- GTKeyboardDriver::keyClick(os, key);
- GTGlobals::sleep(100);
- }
- break;
- }
- case GTGlobals::UseKeyBoard:
- QString s = QString::number(v);
- GTWidget::setFocus(os, spinBox);
-
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["up"]);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["down"]);
- GTKeyboardDriver::keySequence(os,s);
-
- }
- }
-
- double currIndex = spinBox->value();
- GT_CHECK(QString().setNum(currIndex) == QString().setNum(v), "Expected: " + QString().setNum(v) + " Found: " + QString().setNum(currIndex));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTDoubleSpinbox::setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, GTGlobals::UseMethod useMethod, QWidget *parent) {
- GTDoubleSpinbox::setValue(os, GTWidget::findExactWidget<QDoubleSpinBox *>(os, spinBoxName, parent), v, useMethod);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTDoubleSpinbox::setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, QWidget *parent) {
- GTDoubleSpinbox::setValue(os, GTWidget::findExactWidget<QDoubleSpinBox *>(os, spinBoxName, parent), v);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkLimits"
-void GTDoubleSpinbox::checkLimits(GUITestOpStatus &os, QDoubleSpinBox *spinBox, double min, double max){
- GT_CHECK(spinBox != NULL, "spinbox is NULL");
- int actualMin = spinBox->minimum();
- int actualMax = spinBox->maximum();
- GT_CHECK(actualMin == min, QString("wrong minimum. Expected: %1, actual: 2").arg(min).arg(actualMin));
- GT_CHECK(actualMax == max, QString("wrong maximum. Expected: %1, actual: 2").arg(max).arg(actualMax));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkLimits"
-void GTDoubleSpinbox::checkLimits(GUITestOpStatus &os, const QString &spinBoxName, int min, int max, QWidget *parent){
- GTDoubleSpinbox::checkLimits(os, GTWidget::findExactWidget<QDoubleSpinBox *>(os, spinBoxName, parent), min, max);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.h b/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.h
deleted file mode 100644
index aa43ad0..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTDoubleSpinBox.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _HI_GT_DOUBLE_SPINBOX_H
-#define _HI_GT_DOUBLE_SPINBOX_H
-
-#include "primitives/GTSpinBox.h"
-#include "GTGlobals.h"
-
-#include <QDoubleSpinBox>
-
-namespace HI {
-/*!
- * \brief The class for working with QDoubleSpinBox primitive
- */
-class HI_EXPORT GTDoubleSpinbox
-{
-public:
- static int getValue(GUITestOpStatus &os, QDoubleSpinBox *spinBox);
- static int getValue(GUITestOpStatus &os, const QString &spinBoxName, QWidget *parent = NULL);
-
- static void setValue(GUITestOpStatus& os, QDoubleSpinBox *spinBox, double v, GTGlobals::UseMethod useMethod = GTGlobals::UseMouse);
- static void setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, GTGlobals::UseMethod useMethod = GTGlobals::UseMouse, QWidget *parent = NULL);
- static void setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, QWidget *parent = NULL);
-
- static void checkLimits(GUITestOpStatus &os, QDoubleSpinBox *spinBox, double min, double max);
- static void checkLimits(GUITestOpStatus &os, const QString &spinBoxName, int min, int max, QWidget *parent = NULL);
-};
-}
-#endif // GTDOUBLESPINBOX_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.cpp b/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.cpp
deleted file mode 100644
index 97ea488..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#include "primitives/GTGroupBox.h"
-#include "primitives/GTWidget.h"
-
-#include <QStyle>
-#include <QStyleOption>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTGroupBox"
-
-#define GT_METHOD_NAME "setChecked"
-void GTGroupBox::setChecked(GUITestOpStatus &os, QGroupBox *groupBox, bool checked) {
- GT_CHECK(groupBox != NULL, "QGroupBox is NULL");
-
- if (groupBox->isChecked() == checked) {
- return;
- }
-
- GT_CHECK(groupBox->isEnabled(), "QGroupBox is disabled");
-
- const QRect checkBoxRect = getCheckBoxRect(groupBox);
- const QPoint offset(5, checkBoxRect.height() / 2);
- GTWidget::click(os, groupBox, Qt::LeftButton, checkBoxRect.center() + offset);
- GTGlobals::sleep(100);
-
- GT_CHECK(checked == groupBox->isChecked(), "Can't set a new state");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setChecked"
-void GTGroupBox::setChecked(GUITestOpStatus& os, const QString &groupBoxName, bool checked, QWidget *parent) {
- GTGroupBox::setChecked(os, GTWidget::findExactWidget<QGroupBox *>(os, groupBoxName, parent), checked);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setChecked"
-void GTGroupBox::setChecked(GUITestOpStatus& os, const QString &groupBoxName, QWidget *parent) {
- GTGroupBox::setChecked(os, GTWidget::findExactWidget<QGroupBox *>(os, groupBoxName, parent));
-}
-#undef GT_METHOD_NAME
-
-QRect GTGroupBox::getCheckBoxRect(QGroupBox *groupBox) {
- QStyleOptionGroupBox options;
- return groupBox->style()->subControlRect(QStyle::CC_GroupBox, &options, QStyle::SC_GroupBoxCheckBox);
-}
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.h b/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.h
deleted file mode 100644
index 13a9c4c..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTGroupBox.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_GROUP_BOX_H_
-#define _HI_GT_GROUP_BOX_H_
-
-#include "GTGlobals.h"
-#include <QGroupBox>
-
-namespace HI {
-/*!
- * \brief The class for working with QGroupBox primitive
- */
-class HI_EXPORT GTGroupBox {
-public:
- static void setChecked(GUITestOpStatus &os, QGroupBox *groupBox, bool checked = true);
- static void setChecked(GUITestOpStatus& os, const QString &groupBoxName, bool checked = true, QWidget *parent = NULL);
- static void setChecked(GUITestOpStatus& os, const QString &groupBoxName, QWidget *parent = NULL);
-
-private:
- static QRect getCheckBoxRect(QGroupBox *groupBox);
-};
-
-}
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.cpp b/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.cpp
deleted file mode 100644
index 5187cf6..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTLineEdit.h"
-#include "primitives/GTWidget.h"
-#include "system/GTClipboard.h"
-#include "utils/GTKeyboardUtils.h"
-
-namespace HI {
-#define GT_CLASS_NAME "GTLineEdit"
-
-#define GT_METHOD_NAME ""
-void GTLineEdit::setText(GUITestOpStatus& os, QLineEdit* lineEdit, const QString &str, bool noCheck /* = false*/, bool useCopyPaste) {
-
- GT_CHECK(lineEdit != NULL, "lineEdit is NULL");
- if(lineEdit->text() == str){
- return;
- }
-
- GTWidget::setFocus(os, lineEdit);
- if (lineEdit->text() == str) {
- return;
- }
- if (!lineEdit->text().isEmpty()) {
- clear(os, lineEdit);
- }
-
- if(useCopyPaste){
- GTClipboard::setText(os, str);
- GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
- }else{
- GTKeyboardDriver::keySequence(os, str);
- }
- GTGlobals::sleep(500);
-
- if(noCheck){
- return;
- }
-
- QString s = lineEdit->text();
- if(s!=str){
- s = lineEdit->text();
- }
- GT_CHECK(s == str, "Can't set text, set text differs from a given string in lineEdit " + lineEdit->objectName() +
- ". Expected: " + str + " Actual: " + s);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getText"
-QString GTLineEdit::getText(GUITestOpStatus &os, QLineEdit *lineEdit) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != lineEdit, "lineEdit is NULL", "");
- return lineEdit->text();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clear"
-void GTLineEdit::clear(GUITestOpStatus& os, QLineEdit* lineEdit) {
-
- GT_CHECK(lineEdit != NULL, "lineEdit is NULL");
-
- GTWidget::setFocus(os, lineEdit);
-
- GTKeyboardUtils::selectAll(os);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
- GTGlobals::sleep(1000);
-
- QString s = lineEdit->text();
- GT_CHECK(s.isEmpty() == true, "Can't clear text, lineEdit is not empty");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "pasteClipboard"
-void GTLineEdit::pasteClipboard(GUITestOpStatus& os, QLineEdit* lineEdit, PasteMethod pasteMethod) {
-
- GT_CHECK(lineEdit != NULL, "lineEdit is NULL");
-
- clear(os, lineEdit);
- switch(pasteMethod) {
- case Mouse:
- os.setError("GTLineEdit::pasteClipboard: Not implemented: Paste by mouse");
- break;
-
- default:
- case Shortcut:
- GTKeyboardUtils::paste(os);
- break;
- }
-
- GTGlobals::sleep(500);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkTextSize"
-void GTLineEdit::checkTextSize(GUITestOpStatus& os, QLineEdit* lineEdit) {
-
- GT_CHECK(lineEdit != NULL, "lineEdit is NULL");
-
- QMargins lineEditMargins = lineEdit->textMargins();
- QFontMetrics fontMetrics = lineEdit->fontMetrics();
- int textWidth = lineEditMargins.left() + lineEditMargins.right() + fontMetrics.width(lineEdit->text());
- int rectWidth = lineEdit->rect().width();
-
- GT_CHECK(textWidth <= rectWidth, "GTLineEdit::checkTextSize: Text is not inside LineEdit's rect");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkText"
-void GTLineEdit::checkText(GUITestOpStatus &os, QLineEdit *lineEdit, const QString &expectedText) {
- Q_UNUSED(os);
- GT_CHECK(NULL != lineEdit, "Line edit is NULL");
- GT_CHECK(expectedText == lineEdit->text(), QString("The text differs: expect '%1', got '%2'").arg(expectedText).arg(lineEdit->text()));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "copyText"
-QString GTLineEdit::copyText(GUITestOpStatus& os, QLineEdit* lineEdit) {
- GT_CHECK_RESULT(lineEdit != NULL, "lineEdit is NULL", QString());
- return lineEdit->text();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "tryToSetText"
-bool GTLineEdit::tryToSetText(GUITestOpStatus &os, QLineEdit *lineEdit, const QString &str) {
- GT_CHECK_RESULT(lineEdit != NULL, "lineEdit is NULL", false);
- GTWidget::setFocus(os, lineEdit);
- if (lineEdit->text() == str) {
- return true;
- }
-
- if (!lineEdit->text().isEmpty()) {
- clear(os, lineEdit);
- }
-
- GTKeyboardDriver::keySequence(os, str);
- GTGlobals::sleep(500);
-
- QString s = lineEdit->text();
- return s == str;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.h b/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.h
deleted file mode 100644
index 70998a4..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTLineEdit.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_LINEEDIT_H_
-#define _HI_GT_LINEEDIT_H_
-
-#include "GTGlobals.h"
-#include <QLineEdit>
-
-namespace HI {
-/*!
- * \brief The class for working with QLineEdit primitive
- */
-class HI_EXPORT GTLineEdit {
-public:
- enum PasteMethod {Shortcut, Mouse};
-
- // fails if lineEdit is NULL, GTLineEdit::clear fails
- // or a set text differs from a given string
-#ifdef Q_OS_MAC
- static void setText(GUITestOpStatus& os, QLineEdit* lineEdit, const QString &str, bool noCheck = false, bool useCopyPaste = true);
-#else
- static void setText(GUITestOpStatus& os, QLineEdit* lineEdit, const QString &str, bool noCheck = false, bool useCopyPaste = false);
-#endif
- static QString getText(GUITestOpStatus &os, QLineEdit *lineEdit);
- // fails if lineEdit is NULL, or lineEdit's text wasn't cleared
- static void clear(GUITestOpStatus& os, QLineEdit* lineEdit);
-
- // fails if GTLineEdit::clear fails
- static void pasteClipboard(GUITestOpStatus& os, QLineEdit* lineEdit, PasteMethod pasteMethod = Shortcut);
-
- // fails if lineEdit is NULL or lineEdit text is not in lineEdit's rect
- // considering lineEdit's fontMetrics and textMargins
- static void checkTextSize(GUITestOpStatus& os, QLineEdit* lineEdit);
- static void checkText(GUITestOpStatus& os, QLineEdit* lineEdit, const QString &expectedText);
-
- static QString copyText(GUITestOpStatus& os, QLineEdit* lineEdit);
-
- // fails if lineEdit is NULL
- // checks if str can be pasted in lineEdit
- static bool tryToSetText(GUITestOpStatus& os, QLineEdit* lineEdit, const QString& str);
-};
-
-} // namespace
-
-#endif // _HI_GT_LINEEDIT_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTListWidget.cpp b/src/libs_3rdparty/humimit/src/primitives/GTListWidget.cpp
deleted file mode 100644
index 66e6c0a..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTListWidget.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTListWidget.h"
-
-namespace HI{
-
-#define GT_CLASS_NAME "GTListWidget"
-
-#define GT_METHOD_NAME "click"
-void GTListWidget::click(GUITestOpStatus &os, QListWidget *listWidget, const QString &text, Qt::MouseButton button){
- QList<QListWidgetItem*> list = listWidget->findItems(text, Qt::MatchExactly);
- GT_CHECK(!list.isEmpty(), QString("item %1 not found").arg(text));
-
- QListWidgetItem* item = list.first();
- listWidget->scrollToItem(item);
-
- QRect r = listWidget->visualItemRect(item);
- QPoint p = QPoint(r.left() + 30, r.center().y());
- QPoint global = listWidget->viewport()->mapToGlobal(p);
- GTMouseDriver::moveTo(os, global);
- GTMouseDriver::click(os, button);
- GTGlobals::sleep();
- GT_CHECK(true, "click method completed");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "isItemChecked"
-bool GTListWidget::isItemChecked(GUITestOpStatus &os, QListWidget *listWidget, const QString &text) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != listWidget, "List widget is NULL", false);
- QList<QListWidgetItem *> list = listWidget->findItems(text, Qt::MatchExactly);
- GT_CHECK_RESULT(!list.isEmpty(), QString("Item '%1' wasn't' not found").arg(text), false);
- QListWidgetItem *item = list.first();
- return Qt::Checked == item->checkState();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkItem"
-void GTListWidget::checkItem(GUITestOpStatus &os, QListWidget *listWidget, const QString &text, bool newState) {
- Q_UNUSED(os);
- GT_CHECK(NULL != listWidget, "List widget is NULL");
- if (newState != isItemChecked(os, listWidget, text)) {
- click(os, listWidget, text);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["space"]);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkAllItems"
-void GTListWidget::checkAllItems(GUITestOpStatus &os, QListWidget *listWidget, bool newState) {
- Q_UNUSED(os);
- GT_CHECK(NULL != listWidget, "List widget is NULL");
-
- const QStringList itemTexts = getItems(os, listWidget);
- foreach (const QString &itemText, itemTexts) {
- checkItem(os, listWidget, itemText, newState);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkOnlyItems"
-void GTListWidget::checkOnlyItems(GUITestOpStatus &os, QListWidget *listWidget, const QStringList &itemTexts, bool newState) {
- Q_UNUSED(os);
- GT_CHECK(NULL != listWidget, "List widget is NULL");
-
- const QStringList allItemTexts = getItems(os, listWidget);
- int checkedItemsCount = 0;
- foreach (const QString &itemText, allItemTexts) {
- if (!itemTexts.contains(itemText)) {
- checkItem(os, listWidget, itemText, !newState);
- } else {
- checkedItemsCount++;
- checkItem(os, listWidget, itemText, newState);
- }
- }
- GT_CHECK(checkedItemsCount == itemTexts.count(), "Some items weren't found");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItems"
-QStringList GTListWidget::getItems(GUITestOpStatus &os, QListWidget *listWidget) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != listWidget, "List widget is NULL", QStringList());
- QStringList itemTexts;
- QList<QListWidgetItem *> items = listWidget->findItems("", Qt::MatchContains);
- foreach (QListWidgetItem *item, items) {
- itemTexts << item->text();
- }
- return itemTexts;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTListWidget.h b/src/libs_3rdparty/humimit/src/primitives/GTListWidget.h
deleted file mode 100644
index da15e61..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTListWidget.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#ifndef _HI_GT_LISTWIDGET_H_
-#define _HI_GT_LISTWIDGET_H_
-
-#include "GTGlobals.h"
-#include <QListWidget>
-
-namespace HI{
-
-class HI_EXPORT GTListWidget
-{
-public:
- static void click(GUITestOpStatus &os, QListWidget *listWidget, const QString &text, Qt::MouseButton button = Qt::LeftButton);
- static bool isItemChecked(GUITestOpStatus &os, QListWidget *listWidget, const QString &text);
- static void checkItem(GUITestOpStatus &os, QListWidget *listWidget, const QString &text, bool newState);
- static void checkAllItems(GUITestOpStatus &os, QListWidget *listWidget, bool newState);
- static void checkOnlyItems(GUITestOpStatus &os, QListWidget *listWidget, const QStringList &itemTexts, bool newState = true);
- static QStringList getItems(GUITestOpStatus &os, QListWidget *listWidget);
-};
-
-}
-
-#endif // _HI_GT_LISTWIDGET_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.cpp b/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.cpp
deleted file mode 100644
index e151e2d..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTMainWindow.h"
-
-#include <QApplication>
-#include <QWindow>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTMainWindow"
-
-#define GT_METHOD_NAME "getMainWindows"
-QList<QMainWindow*> GTMainWindow::getMainWindows(GUITestOpStatus &os) {
- QList<QMainWindow*> list;
- foreach(QWindow *window, qApp->topLevelWindows()){
- if(window->inherits("QMainWindow")){
- list.append(qobject_cast<QMainWindow*>(window));
- }
- }
-
- GT_CHECK_RESULT(!list.isEmpty(),"No one main window found", list);
- return list;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getMainWindowsAsWidget"
-QList<QWidget*> GTMainWindow::getMainWindowsAsWidget(GUITestOpStatus &os) {
- QList<QWidget*> list;
- foreach(QWidget *widget, qApp->topLevelWidgets()){
- if(widget->inherits("QMainWindow")){
- list.append(widget);
- }
- }
-
- GT_CHECK_RESULT(!list.isEmpty(),"No one main window widget found", list);
- return list;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.h b/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.h
deleted file mode 100644
index 61e5c7a..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMainWindow.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_MAIN_WINDOW_H_
-#define _HI_GT_MAIN_WINDOW_H_
-
-#include "GTGlobals.h"
-
-#include <QMainWindow>
-#include <QWidget>
-
-namespace HI {
-
-class HI_EXPORT GTMainWindow {
-public:
- static QList<QMainWindow *> getMainWindows(GUITestOpStatus &os);
- static QList<QWidget *> getMainWindowsAsWidget(GUITestOpStatus &os);
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMenu.cpp b/src/libs_3rdparty/humimit/src/primitives/GTMenu.cpp
deleted file mode 100644
index b332c94..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMenu.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTMainWindow.h"
-#include "primitives/GTMenu.h"
-#include "primitives/GTWidget.h"
-#include "primitives/private/GTMenuPrivate.h"
-
-#include <QApplication>
-#include <QMainWindow>
-#include <QMenuBar>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTMenu"
-
-#define GT_METHOD_NAME "showMainMenu"
-QMenu* GTMenu::showMainMenu(GUITestOpStatus &os, const QString &menuName, GTGlobals::UseMethod m) {
-
- QMainWindow* mainWindow = NULL;
- QList<QAction*> list;
- foreach(QWidget* window, GTMainWindow::getMainWindowsAsWidget(os)){
- if(window->findChild<QAction*>(menuName) != NULL){
- list.append(window->findChild<QAction*>(menuName));
- mainWindow = qobject_cast<QMainWindow*>(window);
- }
- }
- GT_CHECK_RESULT(list.count()!=0,"action not found", NULL);
- GT_CHECK_RESULT(list.count()<2, QString("There are %1 actions with this text").arg(list.count()), NULL);
-
- QAction *menu = list.takeFirst();
-
- GT_CHECK_RESULT(menu != NULL, QString("menu \"%1\" not found").arg(menuName), NULL);
-
- QPoint pos;
- QPoint gPos;
- QString menuText;
- int key = 0, key_pos = 0;
-
- switch(m) {
- case GTGlobals::UseMouse:
- pos = mainWindow->menuBar()->actionGeometry(menu).center();
- gPos = mainWindow->menuBar()->mapToGlobal(pos);
-
- GTMouseDriver::moveTo(os, gPos);
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKeyBoard:
- case GTGlobals::UseKey:
- menuText = menu->text();
- key_pos = menuText.indexOf('&');
- key = (menuText.at(key_pos + 1)).toLatin1();
-
- GTKeyboardDriver::keyClick(os, key, GTKeyboardDriver::key["alt"]);
- break;
-
- default:
- break;
- }
-
- GTGlobals::sleep(1000);
-
- return menu->menu();
-}
-#undef GT_METHOD_NAME
-
-namespace {
-
-QStringList fixMenuItemPath(const QStringList &itemPath) {
- QStringList fixedItemPath = itemPath;
-#ifdef Q_OS_MAC
- // Some actions are moved to the application menu on mac
-#ifdef _DEBUG
- const QString appName = "ugeneuid";
-#else
- const QString appName = "Unipro UGENE";
-#endif
- const QString menuName = "Apple";
-
- static const QStringList appSettingsPath = QStringList() << "Settings" << "Preferences...";
- if (appSettingsPath == itemPath) {
- fixedItemPath = QStringList() << menuName << "Preferences...";
- }
-
- static const QStringList aboutPath = QStringList() << "Help" << "About";
- if (aboutPath == itemPath) {
- fixedItemPath = QStringList() << menuName << "About " + appName;
- }
-#endif
- return fixedItemPath;
-}
-bool compare(QString s1, QString s2, Qt::MatchFlag mathcFlag, bool replaceSpecSymbol = true){
- if(replaceSpecSymbol){
- s1.remove('&');
- s2.remove('&');
- }
- switch (mathcFlag) {
- case Qt::MatchContains:
- return s1.contains(s2);
- case Qt::MatchExactly:
- return s1 == s2;
- default:
- return false;
- }
-}
-
-}
-
-#define GT_METHOD_NAME "clickMainMenuItem"
-void GTMenu::clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, GTGlobals::UseMethod method, Qt::MatchFlag matchFlag) {
- GTMenuPrivate::clickMainMenuItem(os, fixMenuItemPath(itemPath), method, matchFlag);
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkMainMenuItemState"
-void GTMenu::checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState) {
- GTMenuPrivate::checkMainMenuItemState(os, fixMenuItemPath(itemPath), expectedState);
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "showContextMenu"
-QMenu* GTMenu::showContextMenu(GUITestOpStatus &os, QWidget *ground, GTGlobals::UseMethod m)
-{
- GT_CHECK_RESULT(ground != NULL, "ground widget is NULL", NULL);
-
- switch(m) {
- case GTGlobals::UseMouse:
- GTWidget::click(os, ground, Qt::RightButton);
- break;
-
- case GTGlobals::UseKey:
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["context_menu"]);
- break;
- default:
- break;
- }
-
- GTGlobals::sleep(1000);
-
- QMenu *menu = static_cast<QMenu*>(QApplication::activePopupWidget());
- return menu;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getMenuItem"
-QAction* GTMenu::getMenuItem(GUITestOpStatus &os, const QMenu* menu, const QString &itemName, bool byText, Qt::MatchFlag matchFlag) {
-
- GT_CHECK_RESULT(menu != NULL, "menu not found", NULL);
-
- QAction *action = NULL;
- QList<QAction*>actions = menu->actions();
- if(!byText){
- foreach(QAction *act, actions) {
- QString objName = act->objectName();
- qDebug("GT_DEBUG_MESSAGE: Action name: '%s'", objName.toLocal8Bit().constData());
- if (compare(objName, itemName, matchFlag)) {
- qDebug("GT_DEBUG_MESSAGE: Found action");
- action = act;
- break;
- }
- }
- }else{
- foreach(QAction *act, actions) {
- QString text = act->text();
- qDebug("GT_DEBUG_MESSAGE: Action text: '%s'",text.toLocal8Bit().constData());
- if (compare(text, itemName, matchFlag)) {
- qDebug("GT_DEBUG_MESSAGE: Found action");
- action = act;
- break;
- }
- }
- }
-
- if (!action) {
- qDebug("GT_DEBUG_MESSAGE: Not found action");
- }
- return action;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "actionPos"
-QPoint GTMenu::actionPos(GUITestOpStatus &os, const QMenu* menu, QAction* action) {
-
- GT_CHECK_RESULT(menu != NULL, "menu == NULL", QPoint());
- GT_CHECK_RESULT(action != NULL, "action == NULL", QPoint());
-
- QPoint p = menu->actionGeometry(action).center();
- return menu->mapToGlobal(p);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickMenuItem"
-QAction* GTMenu::clickMenuItem(GUITestOpStatus &os, const QMenu *menu, const QString &itemName, GTGlobals::UseMethod m,bool byText, Qt::MatchFlag matchFlag) {
-
- GT_CHECK_RESULT(menu != NULL, "menu not found", NULL);
- GT_CHECK_RESULT(itemName.isEmpty() == false, "itemName is empty", NULL);
-
- QAction *action = getMenuItem(os, menu, itemName, byText, matchFlag);
- GT_CHECK_RESULT(action != NULL, "action not found for item " + itemName, NULL);
- GT_CHECK_RESULT(action->isEnabled() == true, "action <" + itemName + "> is not enabled", NULL);
-
- QMenu* actionMenu = action->menu();
- bool clickingSubMenu = actionMenu ? true : false;
-
- QPoint currentCursorPosition = GTMouseDriver::getMousePosition();
- QPoint menuCorner = menu->mapToGlobal(QPoint(0, 0));
-
- bool verticalMenu = currentCursorPosition.y() < menuCorner.y(); // TODO: assuming here that submenu is always lower then menu
-
- switch(m) {
- case GTGlobals::UseMouse:
- {
- QPoint actionPosition = actionPos(os, menu, action);
-
- QPoint firstMoveTo = QPoint(actionPosition.x(), currentCursorPosition.y()); // move by X first
- if (verticalMenu) {
- firstMoveTo = QPoint(currentCursorPosition.x(), actionPosition.y()); // move by Y first
- }
-
- GTMouseDriver::moveTo(os, firstMoveTo); // move by Y first
- GTGlobals::sleep(100);
-
- GTMouseDriver::moveTo(os, actionPosition); // move cursor to action
- GTGlobals::sleep(200);
-
-#ifdef Q_OS_WIN
- GTMouseDriver::click(os);
-#else
- if (!clickingSubMenu) {
- GTMouseDriver::click(os);
- }
-#endif
- break;
- }
- case GTGlobals::UseKey:
- while(action != menu->activeAction()) {
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["down"]);
- GTGlobals::sleep(200);
- }
-
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
- GTGlobals::sleep(200);
- break;
- default:
- break;
- }
- QMenu* activePopupMenu = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- if(activePopupMenu==NULL)
- action=NULL;
- return action;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickMenuItem"
-void GTMenu::clickMenuItemPrivate(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemPath, GTGlobals::UseMethod useMethod, bool byText, Qt::MatchFlag matchFlag) {
-
- GT_CHECK(menu != NULL, "menu is NULL");
- GT_CHECK(itemPath.isEmpty() == false, "itemPath is empty");
-
- foreach(QString itemName, itemPath) {
- GT_CHECK(menu != NULL, "menu not found for item " + itemName);
-
- GTGlobals::sleep(500);
- QAction *action = clickMenuItem(os, menu, itemName, useMethod, byText, matchFlag);
- menu = action ? action->menu() : NULL;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickMenuItemByName"
-void GTMenu::clickMenuItemByName(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemPath, GTGlobals::UseMethod m, Qt::MatchFlag matchFlag){
- clickMenuItemPrivate(os, menu, itemPath, m, false, matchFlag);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickMenuItemByText"
-void GTMenu::clickMenuItemByText(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemPath, GTGlobals::UseMethod m, Qt::MatchFlag matchFlag){
- clickMenuItemPrivate(os, menu, itemPath, m, true, matchFlag);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMenu.h b/src/libs_3rdparty/humimit/src/primitives/GTMenu.h
deleted file mode 100644
index 1fd49b9..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMenu.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef GTMENU_H
-#define GTMENU_H
-
-#include "GTGlobals.h"
-#include "primitives/PopupChooser.h"
-
-#include <QAction>
-#include <QMenu>
-
-namespace HI {
-
-class HI_EXPORT GTMenu {
-public:
- static QMenu* showMainMenu(GUITestOpStatus &os, const QString &menuName, GTGlobals::UseMethod m = GTGlobals::UseMouse); // should be removed in Qt5, use clickMainMenuItem instead
- static void clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, GTGlobals::UseMethod method = GTGlobals::UseMouse, Qt::MatchFlag matchFlag = Qt::MatchExactly);
- static void checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState);
- static QMenu* showContextMenu(GUITestOpStatus &os, QWidget *ground, GTGlobals::UseMethod m = GTGlobals::UseMouse);
-
- static void clickMenuItemByName(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemPath, GTGlobals::UseMethod m = GTGlobals::UseMouse, Qt::MatchFlag matchFlag = Qt::MatchExactly);
- static void clickMenuItemByText(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemPath, GTGlobals::UseMethod m = GTGlobals::UseMouse, Qt::MatchFlag matchFlag = Qt::MatchExactly);
-
- // moves cursor to menu item, clicks on menu item;
-
- static QAction* clickMenuItem(GUITestOpStatus &os, const QMenu *menu, const QString &itemName, GTGlobals::UseMethod m = GTGlobals::UseMouse, bool byText = false, Qt::MatchFlag matchFlag = Qt::MatchExactly);
-
- static QAction* getMenuItem(GUITestOpStatus &os, const QMenu* menu, const QString &itemName, bool byText = false, Qt::MatchFlag matchFlag = Qt::MatchExactly);
-
- // global position of menu action's center
- static QPoint actionPos(GUITestOpStatus &os, const QMenu* menu, QAction* action);
-
- static const QString FILE;
- static const QString ACTIONS;
- static const QString SETTINGS;
- static const QString TOOLS;
- static const QString WINDOW;
- static const QString HELP;
-
-private:
- static void clickMenuItemPrivate(GUITestOpStatus &os, const QMenu *menu, const QStringList &itemName, GTGlobals::UseMethod m = GTGlobals::UseMouse,
- bool byText = false, Qt::MatchFlag matchFlag = Qt::MatchExactly);
-};
-
-}
-#endif // GTMENU_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.cpp b/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.cpp
deleted file mode 100644
index 66795cb..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTMenuBar.h"
-
-namespace HI {
-#define GT_CLASS_NAME "GTMenuBar"
-
-#define GT_METHOD_NAME "clickCornerMenu"
-void GTMenuBar::clickCornerMenu(GUITestOpStatus &os, QMenuBar* mBar, GTGlobals::WindowAction action) {
-
- GT_CHECK(mBar != NULL, "QMenuBar is NULL");
- QWidget* cWidget = mBar->cornerWidget();
- GT_CHECK(cWidget != NULL, "Corner widget is NULL");
- QRect r = cWidget->rect();
-
- int num = (int)action;
- GT_CHECK(num>=0 && num<(int)GTGlobals::WindowActionCount, "action is not GTGlobals::WindowAction");
-
- GT_CHECK((int)GTGlobals::WindowActionCount != 0, "GTGlobals::WindowActionCount == 0");
- int oneWidth = r.width()/(int)GTGlobals::WindowActionCount;
-
- QPoint need((num+1)*oneWidth - oneWidth/2, r.height()/2);
- QPoint p = cWidget->mapToGlobal(need);
-
- GTMouseDriver::moveTo(os, p);
- GTGlobals::sleep(200);
- GTMouseDriver::click(os);
- GTGlobals::sleep(500);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.h b/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.h
deleted file mode 100644
index 9d18dce..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTMenuBar.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_MENU_BAR_H_
-#define _HI_GT_MENU_BAR_H_
-
-#include "GTGlobals.h"
-#include <QMenuBar>
-
-namespace HI {
-
-class HI_EXPORT GTMenuBar {
-public:
- // clicks cornerMenu of QMenuBar as if it is a standard {Minimize, Maximize, Close} buttons widget
- // fails if menuBar is NULL or action as int value is not one of GTGlobals::WindowAction values
- static void clickCornerMenu(GUITestOpStatus &os, QMenuBar *mBar, GTGlobals::WindowAction action);
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.cpp b/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.cpp
deleted file mode 100644
index 4b087be..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTPlainTextEdit.h"
-#include "primitives/GTWidget.h"
-#include "utils/GTKeyboardUtils.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTPlainTextEdit"
-
-#define GT_METHOD_NAME "setPlainText"
-void GTPlainTextEdit::setPlainText(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit, const QString &text) {
-
- GT_CHECK(plainTextEdit != NULL, "plainTextEdit is NULL");
- if(plainTextEdit->toPlainText() == text){
- return;
- }
-
- GTWidget::setFocus(os, plainTextEdit);
-
- GTKeyboardDriver::keySequence(os, text);
- GTGlobals::sleep(500);
-
-}
-#undef GT_METHOD_NAME
-
-//#define GT_METHOD_NAME "clear"
-//void GTPlainTextEdit::clear(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit) {
-//
-// GT_CHECK(plainTextEdit != NULL, "plainTextEdit is NULL");
-//
-// GTWidget::setFocus(os, plainTextEdit);
-//
-// GTKeyboardUtils::selectAll(os);
-// GTGlobals::sleep(100);
-// GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
-// GTGlobals::sleep(1000);
-//
-// QString s = plainTextEdit->toPlainText();
-// GT_CHECK(s.isEmpty() == true, "Can't clear text, lineEdit is not empty");
-//}
-//#undef GT_METHOD_NAME
-
-
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.h b/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.h
deleted file mode 100644
index d7fb0f7..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTPlainTextEdit.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_PLAINTEXTEDIT_H_
-#define _HI_GT_PLAINTEXTEDIT_H_
-
-#include "GTGlobals.h"
-#include <QPlainTextEdit>
-
-namespace HI {
-
-class HI_EXPORT GTPlainTextEdit {
-public:
- enum PasteMethod {Shortcut, Mouse};
-
- // fails if lineEdit is NULL, GTLineEdit::clear fails
- // or a set text differs from a given string
- static void setPlainText(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit, const QString &text);
-
- // fails if lineEdit is NULL, or lineEdit's text wasn't cleared
- static void clear(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit);
-
- // fails if GTLineEdit::clear fails
- // static void pasteClipboard(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit, PasteMethod pasteMethod = Shortcut);
-
- // fails if lineEdit is NULL or lineEdit text is not in lineEdit's rect
- // considering lineEdit's fontMetrics and textMargins
- //static void checkTextSize(GUITestOpStatus& os, QPlainTextEdit* plainTextEdit);
-};
-
-}
-
-#endif // _HI_GT_PLAINTEXTEDIT_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.cpp b/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.cpp
deleted file mode 100644
index 979e3ed..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTMainWindow.h"
-#include "primitives/GTRadioButton.h"
-#include "primitives/GTWidget.h"
-
-#include <QApplication>
-#include <QMainWindow>
-
-namespace HI {
-#define GT_CLASS_NAME "GTRadioButton"
-
-#define GT_METHOD_NAME "click"
-void GTRadioButton::click(GUITestOpStatus& os, QRadioButton *radioButton) {
- GT_CHECK(radioButton != NULL, "RadioButton is NULL");
- if(radioButton->isChecked() == true){
- return;
- }
-
- QPoint buttonPos = radioButton->mapToGlobal(radioButton->rect().topLeft());
- buttonPos = QPoint(buttonPos.x() + 10, buttonPos.y() + 10); // moved to clickable area
-
- GTMouseDriver::moveTo(os, buttonPos);
- GTMouseDriver::click(os);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getRadioButtonByText"
-QRadioButton* GTRadioButton::getRadioButtonByText(GUITestOpStatus &os, QString text, QWidget *parent){
- QList<QRadioButton*> radioList = getAllButtonsByText(os, text, parent);
- GT_CHECK_RESULT(radioList.size() > 1, "Several radioButtons contain this text", NULL);
- GT_CHECK_RESULT(radioList.size() == 0, "No radioButtons with this text found", NULL);
-
- return radioList[0];
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getAllButtonsByText"
-QList<QRadioButton*> GTRadioButton::getAllButtonsByText(GUITestOpStatus &os, QString text, QWidget *parent){
- Q_UNUSED(os);
- QList<QRadioButton*> result;
- if(parent==NULL){
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- QList<QRadioButton*> list = parent->findChildren<QRadioButton*>();
- foreach(QRadioButton* rb, list){
- if(rb->text() == text){
- result.append(rb);
- }
- }
- }
- return result;
- }
- QList<QRadioButton*> radioList = parent->findChildren<QRadioButton*>();
- foreach(QRadioButton* but, radioList){
- QString s = but->text().toLower();
- if(but->text().toLower().contains(text.toLower())){
- result<<but;
- }
- }
-
- return result;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.h b/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.h
deleted file mode 100644
index 76cbac6..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTRadioButton.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_RADIOBUTTON_H_
-#define _HI_GT_RADIOBUTTON_H_
-
-#include "GTGlobals.h"
-
-#include <QRadioButton>
-
-namespace HI {
-/*!
- * \brief The class for working with QRadioButton primitive
- */
-class HI_EXPORT GTRadioButton {
-public:
- // fails if the radioButton is NULL or can't click
- static void click(GUITestOpStatus& os, QRadioButton *radioButton);
- static QRadioButton* getRadioButtonByText(GUITestOpStatus& os, QString text, QWidget* parent=NULL);
- static QList<QRadioButton*> getAllButtonsByText(GUITestOpStatus &os, QString text, QWidget* parent=NULL);
-};
-
-}
-#endif // _HI_GT_RADIOBUTTON_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.cpp b/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.cpp
deleted file mode 100644
index c99363d..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTScrollBar.h"
-#include "primitives/GTWidget.h"
-
-namespace HI {
-#define GT_CLASS_NAME "GTScrollBar"
-
-#define GT_METHOD_NAME "getScrollBar"
-QScrollBar* GTScrollBar::getScrollBar(GUITestOpStatus &os, const QString &scrollBarSysName) {
- QString scrollBarTypeCheck = "QScrollBar";
- QScrollBar *scrollBar = static_cast<QScrollBar*>(GTWidget::findWidget(os, scrollBarSysName));
- GT_CHECK_RESULT(0 == scrollBarTypeCheck.compare(scrollBar->metaObject()->className()), "No such scrollbar: " + scrollBarSysName, NULL); //the found widget is not a qscrollbar
- return scrollBar;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "pageUp"
-void GTScrollBar::pageUp(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- switch (useMethod) {
- case GTGlobals::UseMouse:
- GTMouseDriver::moveTo(os, GTScrollBar::getAreaOverSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKey:
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["pageUp"]);
- break;
-
- default:
- break;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "pageDown"
-void GTScrollBar::pageDown(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- switch (useMethod) {
- case GTGlobals::UseMouse:
- GTMouseDriver::moveTo(os, GTScrollBar::getAreaUnderSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKey:
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["pageDown"]);
- break;
-
- default:
- break;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "lineUp"
-void GTScrollBar::lineUp(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- switch (useMethod) {
- case GTGlobals::UseMouse:
- GTMouseDriver::moveTo(os, GTScrollBar::getUpArrowPosition(os, scrollbar));
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKey:
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["up"]);
- break;
-
- default:
- break;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "lineDown"
-void GTScrollBar::lineDown(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- switch (useMethod) {
- case GTGlobals::UseMouse:
- GTMouseDriver::moveTo(os, GTScrollBar::getDownArrowPosition(os, scrollbar));
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKey:
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["down"]);
- break;
-
- default:
- break;
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "moveSliderWithMouseUp"
-void GTScrollBar::moveSliderWithMouseUp(GUITestOpStatus &os, QScrollBar *scrollbar, int nPix) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- QPoint newPosition;
- if (Qt::Horizontal == scrollbar->orientation()) {
- newPosition = QPoint(QCursor::pos().x() + nPix, QCursor::pos().y());
- }
- else {
- newPosition = QPoint(QCursor::pos().x(), QCursor::pos().y() + nPix);
- }
- GTMouseDriver::press(os);
- GTMouseDriver::moveTo(os, newPosition);
- GTMouseDriver::release(os);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "moveSliderWithMouseDown"
-void GTScrollBar::moveSliderWithMouseDown(GUITestOpStatus &os, QScrollBar *scrollbar, int nPix) {
- GT_CHECK(scrollbar != NULL, "scrollbar is NULL");
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::press(os);
- QPoint newPosition;
- if (Qt::Horizontal == scrollbar->orientation()) {
- newPosition = QPoint(QCursor::pos().x() - nPix , QCursor::pos().y());
- }
- else {
- newPosition = QPoint(QCursor::pos().x(), QCursor::pos().y() - nPix);
- }
- GTMouseDriver::moveTo(os, newPosition);
- GTMouseDriver::release(os);
-}
-#undef GT_METHOD_NAME
-
-void GTScrollBar::moveSliderWithMouseWheelUp(GUITestOpStatus &os, QScrollBar *scrollbar, int nScrolls) {
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTMouseDriver::scroll(os, nScrolls);
-}
-
-void GTScrollBar::moveSliderWithMouseWheelDown(GUITestOpStatus &os, QScrollBar *scrollbar, int nScrolls) {
- GTMouseDriver::moveTo(os, GTScrollBar::getSliderPosition(os, scrollbar));
- GTMouseDriver::click(os);
- GTMouseDriver::scroll(os, (-1 * nScrolls)); //since scrolling down means negative value for GTMouseDriver::scroll
-}
-
-#define GT_METHOD_NAME "getSliderPosition"
-QPoint GTScrollBar::getSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QPoint());
- QStyleOptionSlider options = initScrollbarOptions(os, scrollbar);
- QRect sliderRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarSlider);
- return scrollbar->mapToGlobal(sliderRect.center());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getUpArrowPosition"
-QPoint GTScrollBar::getUpArrowPosition(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QPoint());
- QStyleOptionSlider options = initScrollbarOptions(os, scrollbar);
- QRect grooveRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarGroove);
- int upArrowWidth;
- int upArrowHeight;
-
- if (Qt::Horizontal == scrollbar->orientation()) {
- upArrowWidth = (scrollbar->rect().width() - grooveRect.width()) / 2;
- upArrowHeight = scrollbar->rect().height();
- }
- else {
- upArrowWidth = scrollbar->rect().width();
- upArrowHeight = scrollbar->rect().height() - grooveRect.height() / 2;
- }
- return scrollbar->mapToGlobal(scrollbar->rect().topLeft() + QPoint(upArrowWidth / 2, upArrowHeight / 2));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getDownArrowPosition"
-QPoint GTScrollBar::getDownArrowPosition(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QPoint());
- QStyleOptionSlider options = initScrollbarOptions(os, scrollbar);
- QRect grooveRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarGroove);
- int downArrowWidth;
- int downArrowHeight;
-
- if (Qt::Horizontal == scrollbar->orientation()) {
- downArrowWidth = (scrollbar->rect().width() - grooveRect.width()) / 2;
- downArrowHeight = scrollbar->rect().height();
- }
- else {
- downArrowWidth = scrollbar->rect().width();
- downArrowHeight = scrollbar->rect().height() - grooveRect.height() / 2;
- }
- return scrollbar->mapToGlobal(scrollbar->rect().bottomRight() - QPoint(downArrowWidth / 2, downArrowHeight / 2));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getAreaUnderSliderPosition"
-QPoint GTScrollBar::getAreaUnderSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QPoint());
- QStyleOptionSlider options = initScrollbarOptions(os, scrollbar);
- QRect grooveRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarGroove);
- QRect sliderRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarSlider);
- QRect underSliderRect;
-
- if (Qt::Horizontal == scrollbar->orientation()) {
- int underSliderRectWidth = grooveRect.right() - sliderRect.right();
- int underSliderRectHeight = grooveRect.height();
- underSliderRect = QRect(sliderRect.topRight() + QPoint(1, 0), QSize(underSliderRectWidth, underSliderRectHeight));
- }
- else {
- int underSliderRectWidth = grooveRect.width();
- int underSliderRectHeight = grooveRect.bottom() - sliderRect.bottom();
- underSliderRect = QRect(sliderRect.topRight() + QPoint(1, 1), QSize(underSliderRectWidth, underSliderRectHeight));
- }
-
- if (underSliderRect.contains(scrollbar->mapFromGlobal(QCursor::pos()))) {
- return QCursor::pos();
- }
- return scrollbar->mapToGlobal(underSliderRect.center());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getAreaOverSliderPosition"
-QPoint GTScrollBar::getAreaOverSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QPoint());
- QStyleOptionSlider options = initScrollbarOptions(os, scrollbar);
- QRect grooveRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarGroove);
- QRect sliderRect = scrollbar->style()->subControlRect(QStyle::CC_ScrollBar, &options, QStyle::SC_ScrollBarSlider);
- QRect overSliderRect;
-
- if (Qt::Horizontal == scrollbar->orientation()) {
- int overSliderRectWidth = sliderRect.left() - grooveRect.left();
- int overSliderRectHeight = grooveRect.height();
- overSliderRect = QRect(grooveRect.topLeft(), QSize(overSliderRectWidth, overSliderRectHeight));
- }
- else {
- int overSliderRectWidth = grooveRect.width();
- int overSliderRectHeight = sliderRect.top() - grooveRect.top();
- overSliderRect = QRect(grooveRect.topLeft(), QSize(overSliderRectWidth, overSliderRectHeight));
- }
-
- if (overSliderRect.contains(scrollbar->mapFromGlobal(QCursor::pos()))) {
- return QCursor::pos();
- }
- return scrollbar->mapToGlobal(overSliderRect.center() + QPoint(1,0));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "initScrollbarOptions"
-QStyleOptionSlider GTScrollBar::initScrollbarOptions(GUITestOpStatus &os, QScrollBar *scrollbar) {
- GT_CHECK_RESULT(scrollbar != NULL, "scrollbar is NULL", QStyleOptionSlider());
- QStyleOptionSlider options;
- options.initFrom(scrollbar);
- options.sliderPosition = scrollbar->sliderPosition();
- options.maximum = scrollbar->maximum();
- options.minimum = scrollbar->minimum();
- options.singleStep = scrollbar->singleStep();
- options.pageStep = scrollbar->pageStep();
- options.orientation = scrollbar->orientation();
- options.sliderValue = options.sliderPosition;
- options.upsideDown = false;
- options.state = QStyle::State_Sunken | QStyle::State_Enabled;
-
- return options;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
-// namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.h b/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.h
deleted file mode 100644
index c74c6ef..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTScrollBar.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTSCROLLBAR_H_
-#define _HI_GUI_GTSCROLLBAR_H_
-
-#include "GTGlobals.h"
-
-#include <QPoint>
-#include <QScrollBar>
-#include <QStyleOptionSlider>
-
-namespace HI {
-
-class HI_EXPORT GTScrollBar {
-public:
- static QScrollBar* getScrollBar(GUITestOpStatus &os, const QString &scrollBarSysName);
-
- static void pageUp(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod);
- static void pageDown(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod);
-
- static void lineUp(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod); //does not necessarily move one line up (for example, moves cursor in text editors)
- static void lineDown(GUITestOpStatus &os, QScrollBar *scrollbar, GTGlobals::UseMethod useMethod); //does not necessarily move one line down (for example, moves cursor in text editors)
-
- static void moveSliderWithMouseUp(GUITestOpStatus &os, QScrollBar *scrollbar, int nPix);
- static void moveSliderWithMouseDown(GUITestOpStatus &os, QScrollBar *scrollbar, int nPix);
-
- static void moveSliderWithMouseWheelUp(GUITestOpStatus &os, QScrollBar *scrollbar, int nScrolls); //first moves the cursor to the slider and clicks it, then starts scrolling
- static void moveSliderWithMouseWheelDown(GUITestOpStatus &os, QScrollBar *scrollbar, int nScrolls); //first moves the cursor to the slider and clicks it, then starts scrolling
-
- static QPoint getSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar);
- static QPoint getUpArrowPosition(GUITestOpStatus &os, QScrollBar *scrollbar);
- static QPoint getDownArrowPosition(GUITestOpStatus &os, QScrollBar *scrollbar);
- static QPoint getAreaUnderSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar);
- static QPoint getAreaOverSliderPosition(GUITestOpStatus &os, QScrollBar *scrollbar);
-
-private:
- static QStyleOptionSlider initScrollbarOptions(GUITestOpStatus &os, QScrollBar *scrollbar);
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTSlider.cpp b/src/libs_3rdparty/humimit/src/primitives/GTSlider.cpp
deleted file mode 100644
index f74c967..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTSlider.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTSlider.h"
-
-namespace HI{
-#define GT_CLASS_NAME "GTSlider"
-
-#define GT_METHOD_NAME "setValue"
-void GTSlider::setValue(GUITestOpStatus &os, QSlider *slider, int value){
- Q_UNUSED(os);
- GT_CHECK(slider != NULL, "slider not found");
- int min = slider->minimum();
- int max = slider->maximum();
- GT_CHECK(slider->isEnabled(), "slider is disabled");
- GT_CHECK(value >= min, QString("can not set value %1, mininum is %2").arg(value).arg(min));
- GT_CHECK(value <= max, QString("can not set value %1, maximum is %2").arg(value).arg(max));
-
- slider->setValue(value);
-
-}
-#undef GT_CLASS_NAME
-
-#undef GT_METHOD_NAME
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTSlider.h b/src/libs_3rdparty/humimit/src/primitives/GTSlider.h
deleted file mode 100644
index cf48b85..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTSlider.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_SLIDER_H_
-#define _HI_GT_SLIDER_H_
-
-#include "GTGlobals.h"
-#include <QSlider>
-
-namespace HI {
-
-class HI_EXPORT GTSlider {
-public:
- static void setValue(GUITestOpStatus &os, QSlider* slider, int value);
-};
-
-}
-
-#endif // _HI_GT_SLIDER_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.cpp b/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.cpp
deleted file mode 100644
index 103522b..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTSpinBox.h"
-#include "primitives/GTWidget.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTSpinBox"
-
-#define GT_METHOD_NAME "getValue"
-int GTSpinBox::getValue(GUITestOpStatus &os, QSpinBox *spinBox) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(spinBox != NULL, "spinBox is NULL", -1);
- return spinBox->value();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getValue"
-int GTSpinBox::getValue(GUITestOpStatus &os, const QString &spinBoxName, QWidget *parent) {
- return GTSpinBox::getValue(os, GTWidget::findExactWidget<QSpinBox *>(os, spinBoxName, parent));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTSpinBox::setValue(GUITestOpStatus& os, QSpinBox *spinBox, int v, GTGlobals::UseMethod useMethod) {
- GT_CHECK(spinBox != NULL, "spinBox is NULL");
- if(spinBox->value() == v){
- return;
- }
-
- GT_CHECK(v <= spinBox->maximum(), QString("value for this spinbox cannot be more then %1").arg(spinBox->maximum()));
- GT_CHECK(v >= spinBox->minimum(), QString("value for this spinbox cannot be less then %1").arg(spinBox->minimum()));
-
- QPoint arrowPos;
- QRect spinBoxRect;
-
- GT_CHECK(spinBox->isEnabled(), "SpinBox is not enabled");
-
- if (spinBox->value() != v) {
- switch(useMethod) {
- case GTGlobals::UseMouse:
- spinBoxRect = spinBox->rect();
- if (v > spinBox->value()) {
- arrowPos = QPoint(spinBoxRect.right() - 5, spinBoxRect.height() / 4); // -5 it's needed that area under cursor was clickable
- } else {
- arrowPos = QPoint(spinBoxRect.right() - 5, spinBoxRect.height() * 3 / 4);
- }
-
- GTMouseDriver::moveTo(os, spinBox->mapToGlobal(arrowPos));
- while (spinBox->value() != v) {
- GTMouseDriver::click(os);
- GTGlobals::sleep(100);
- }
- break;
-
- case GTGlobals::UseKey: {
- int key = 0;
- if (v > spinBox->value()) {
- key = GTKeyboardDriver::key["up"];
- } else {
- key = GTKeyboardDriver::key["down"];
- }
-
- GTWidget::setFocus(os, spinBox);
- while (spinBox->value() != v) {
- GTKeyboardDriver::keyClick(os, key);
- GTGlobals::sleep(100);
- }
- break;
- }
- case GTGlobals::UseKeyBoard:
- QString s = QString::number(v);
- GTWidget::setFocus(os, spinBox);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, 'a', GTKeyboardDriver::key["ctrl"]);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keySequence(os,s);
- GTGlobals::sleep(100);
- }
- }
-
- int currIndex = spinBox->value();
- GT_CHECK(currIndex == v, QString("Can't set index. Expected: %1 actual: %2").arg(v).arg(currIndex));
- GTGlobals::sleep(100);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTSpinBox::setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, GTGlobals::UseMethod useMethod, QWidget *parent) {
- GTSpinBox::setValue(os, GTWidget::findExactWidget<QSpinBox *>(os, spinBoxName, parent), v, useMethod);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setValue"
-void GTSpinBox::setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, QWidget *parent) {
- GTSpinBox::setValue(os, GTWidget::findExactWidget<QSpinBox *>(os, spinBoxName, parent), v);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkLimits"
-void GTSpinBox::checkLimits(GUITestOpStatus &os, QSpinBox *spinBox, int min, int max){
- GT_CHECK(spinBox != NULL, "spinbox is NULL");
- int actualMin = spinBox->minimum();
- int actualMax = spinBox->maximum();
- GT_CHECK(actualMin == min, QString("wrong minimum. Expected: %1, actual: %2").arg(min).arg(actualMin));
- GT_CHECK(actualMax == max, QString("wrong maximum. Expected: %1, actual: %2").arg(max).arg(actualMax));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkLimits"
-void GTSpinBox::checkLimits(GUITestOpStatus &os, const QString &spinBoxName, int min, int max, QWidget *parent){
- GTSpinBox::checkLimits(os, GTWidget::findExactWidget<QSpinBox *>(os, spinBoxName, parent), min, max);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.h b/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.h
deleted file mode 100644
index e0b836a..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTSpinBox.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_SPINBOX_H_
-#define _HI_GT_SPINBOX_H_
-
-#include "GTGlobals.h"
-#include <QSpinBox>
-
-namespace HI {
-/*!
- * \brief The class for working with QSpinBox primitive
- */
-class HI_EXPORT GTSpinBox {
-public:
- static int getValue(GUITestOpStatus &os, QSpinBox *spinBox);
- static int getValue(GUITestOpStatus &os, const QString &spinBoxName, QWidget *parent = NULL);
-
- static void setValue(GUITestOpStatus &os, QSpinBox *spinBox, int v, GTGlobals::UseMethod useMethod = GTGlobals::UseMouse);
- static void setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, GTGlobals::UseMethod useMethod = GTGlobals::UseMouse, QWidget *parent = NULL);
- static void setValue(GUITestOpStatus &os, const QString &spinBoxName, int v, QWidget *parent = NULL);
-
- static void checkLimits(GUITestOpStatus &os, QSpinBox *spinBox, int min, int max);
- static void checkLimits(GUITestOpStatus &os, const QString &spinBoxName, int min, int max, QWidget *parent = NULL);
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTabBar.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTabBar.cpp
deleted file mode 100644
index 0aeb60d..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTabBar.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <drivers/GTKeyboardDriver.h>
-#include <drivers/GTMouseDriver.h>
-#include "primitives/GTTabBar.h"
-#include <primitives/GTWidget.h>
-
-#include <QToolButton>
-
-namespace HI {
-#define GT_CLASS_NAME "GTTabBar"
-
-#define GT_METHOD_NAME "setCurrentIndex"
-void GTTabBar::setCurrentIndex(GUITestOpStatus& os, QTabBar *tabBar, int index) {
-
- GT_CHECK(tabBar != NULL, "QTabWidget* == NULL");
-
- if(tabBar->currentIndex() == index){
- return;
- }
-
- int tabsCount = tabBar->count();
- GT_CHECK(index>=0 && index<tabsCount, "invalid index");
-
- // TODO: set index by mouse/keyboard
- tabBar->setCurrentIndex(index);
- GTGlobals::sleep();
-
- int currIndex = tabBar->currentIndex();
- GT_CHECK(currIndex == index, "Can't set index");
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTabBar.h b/src/libs_3rdparty/humimit/src/primitives/GTTabBar.h
deleted file mode 100644
index 07c6472..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTabBar.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_TABBAR_H_
-#define _HI_GT_TABBAR_H_
-
-#include "GTGlobals.h"
-#include <QTabBar>
-
-namespace HI {
-
-class HI_EXPORT GTTabBar {
-public:
- // fails if the tabbar is NULL, index is not in a tabbar's range
- // or a tabbar's index differs from a given index in the end of method's execution
- static void setCurrentIndex(GUITestOpStatus& os, QTabBar *tabBar, int index);
-};
-
-}
-#endif // _HI_GT_TABBAR_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.cpp
deleted file mode 100644
index e8dc433..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <drivers/GTKeyboardDriver.h>
-#include <drivers/GTMouseDriver.h>
-#include "primitives/GTTabBar.h"
-#include "primitives/GTTabWidget.h"
-#include <primitives/GTWidget.h>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTTabWidget"
-
-#define GT_METHOD_NAME "setCurrentIndex"
-void GTTabWidget::setCurrentIndex(GUITestOpStatus& os, QTabWidget *tabWidget, int index) {
-
- GT_CHECK(tabWidget != NULL, "QTabWidget* == NULL");
-
- int tabsCount = tabWidget->count();
- GT_CHECK(index>=0 && index<tabsCount, "invalid index");
-
- QTabBar* tabBar = tabWidget->findChild<QTabBar*>();
- GTTabBar::setCurrentIndex(os, tabBar, index);
-
- int currIndex = tabWidget->currentIndex();
- GT_CHECK(currIndex == index, "Can't set index");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getTabBar"
-QTabBar* GTTabWidget::getTabBar(GUITestOpStatus &os, QTabWidget* tabWidget){
- Q_UNUSED(os)
- GT_CHECK_RESULT(tabWidget != NULL, "tabWidget is NULL", NULL);
- QList<QTabBar*> tabBars= tabWidget->findChildren<QTabBar*>();
- int numToCheck = tabBars.size();
- GT_CHECK_RESULT(numToCheck < 2, QString("too many tab bars found: ").arg(numToCheck), NULL);
- GT_CHECK_RESULT(numToCheck != 0, "tab bar not found", NULL);
- return tabBars.first();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickTab"
-void GTTabWidget::clickTab(GUITestOpStatus &os, QTabWidget* tabWidget, int idx, Qt::MouseButton button){
- GT_CHECK(tabWidget != NULL, "tabWidget is NULL");
- setCurrentIndex(os, tabWidget, idx);
- QTabBar* tabBar = getTabBar(os, tabWidget);
- QRect r = tabBar->tabRect(idx);
- GTMouseDriver::moveTo(os, tabBar->mapToGlobal(r.center()));
- GTMouseDriver::click(os, button);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickTab"
-void GTTabWidget::clickTab(GUITestOpStatus &os, QTabWidget* tabWidget, QString tabName, Qt::MouseButton button){
- int num = getTabNumByName(os, tabWidget, tabName);
- clickTab(os, tabWidget, num, button);
-}
-#undef GT_METHOD_NAME
-
-QString GTTabWidget::getTabName(GUITestOpStatus &os, QTabWidget *tabWidget, int idx){
- return getTabBar(os, tabWidget)->tabText(idx);
-}
-
-#define GT_METHOD_NAME "getTabNumByName"
-int GTTabWidget::getTabNumByName(GUITestOpStatus &os, QTabWidget *tabWidget, QString tabName){
- GT_CHECK_RESULT(tabWidget != NULL, "tabWidget is NULL", -1);
- QTabBar* tabBar = getTabBar(os, tabWidget);
- int num = -1;
- for(int i=0; i<tabBar->count(); i++){
- QString text = tabBar->tabText(i);
- if(text == tabName){
- num = -1;
- }
- }
- GT_CHECK_RESULT(num != -1, "tab " + tabName + " not found", -1);
- return num;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getTabCornerWidget"
-QWidget* GTTabWidget::getTabCornerWidget(GUITestOpStatus &os, QTabWidget *tabWidget, int idx){
- QWidget* result = GTTabWidget::getTabBar(os, tabWidget)->tabButton(idx, QTabBar::RightSide);
- GT_CHECK_RESULT(result != NULL, "corner widget not found", NULL);
- return result;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getTabCornerWidget"
-QWidget* GTTabWidget::getTabCornerWidget(GUITestOpStatus &os, QTabWidget *tabWidget, QString tabName){
- int idx = getTabNumByName(os, tabWidget, tabName);
- return getTabCornerWidget(os, tabWidget, idx);
-}
-#undef GT_METHOD_NAME
-
-void GTTabWidget::closeTab(GUITestOpStatus &os, QTabWidget *tabWidget, int idx){
- GTWidget::click(os, getTabCornerWidget(os, tabWidget, idx));
-}
-
-void GTTabWidget::closeTab(GUITestOpStatus &os, QTabWidget *tabWidget, QString tabName){
- GTWidget::click(os, getTabCornerWidget(os, tabWidget, tabName));
-}
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.h b/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.h
deleted file mode 100644
index 32c7841..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTabWidget.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_TABWIDGET_H_
-#define _HI_GT_TABWIDGET_H_
-
-#include "GTGlobals.h"
-#include <QTabWidget>
-
-namespace HI {
-
-class HI_EXPORT GTTabWidget {
-public:
- // fails if the tabwidget is NULL, index is not in a tabwidget's range
- // or a tabwidget's index differs from a given index in the end of method's execution
- static void setCurrentIndex(GUITestOpStatus& os, QTabWidget *tabWidget, int index);
- static QTabBar* getTabBar(GUITestOpStatus &os, QTabWidget* tabWidget);
- static void clickTab(GUITestOpStatus &os, QTabWidget* tabWidget, int idx, Qt::MouseButton button = Qt::LeftButton);
- static void clickTab(GUITestOpStatus &os, QTabWidget* tabWidget, QString tabName, Qt::MouseButton button = Qt::LeftButton);
- static QString getTabName(GUITestOpStatus &os, QTabWidget* tabWidget, int idx);
-
- static int getTabNumByName(GUITestOpStatus &os, QTabWidget* tabWidget, QString tabName);
- static QWidget* getTabCornerWidget(GUITestOpStatus &os, QTabWidget* tabWidget, int idx);
- static QWidget* getTabCornerWidget(GUITestOpStatus &os, QTabWidget* tabWidget, QString tabName);
-
- static void closeTab(GUITestOpStatus &os, QTabWidget *tabWidget, int idx);
- static void closeTab(GUITestOpStatus &os, QTabWidget *tabWidget, QString tabName);
-
-
-};
-
-}
-#endif // _HI_GT_TABWIDGET_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTableView.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTableView.cpp
deleted file mode 100644
index ec6673a..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTableView.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTTableView.h"
-#include <primitives/GTWidget.h>
-
-namespace HI{
-
-#define GT_CLASS_NAME "GTSpinBox"
-#define GT_METHOD_NAME "getCellPosition"
-QPoint GTTableView::getCellPosition(GUITestOpStatus &os, QTableView *table, int column, int row){
- GT_CHECK_RESULT(table,"table view is NULL",QPoint());
- QPoint p(table->columnViewportPosition(column)+table->columnWidth(column)/2,
- table->rowViewportPosition(row)+table->rowHeight(row)*1.5);
- QPoint pGlob = table->mapToGlobal(p);
- return pGlob;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getCellPoint"
-QPoint GTTableView::getCellPoint(GUITestOpStatus &os, QTableView *table, int row, int column) {
- QModelIndex idx = table->model()->index(row, column);
- table->scrollTo(idx);
- QRect rect = table->visualRect(idx);
- QWidget *content = GTWidget::findWidget(os, "qt_scrollarea_viewport", table);
- return content->mapToGlobal(rect.center());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "rowCount"
-int GTTableView::rowCount(GUITestOpStatus &os, QTableView *table) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != table, "Table view is NULL", -1);
- GT_CHECK_RESULT(NULL != table->model(), "Table view model is NULL", -1);
- return table->model()->rowCount(QModelIndex());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "data"
-QString GTTableView::data(GUITestOpStatus &os, QTableView *table, int row, int column) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != table, "Table view is NULL", "");
- GT_CHECK_RESULT(NULL != table->model(), "Table view model is NULL", "");
-
- QModelIndex idx = table->model()->index(row, column);
- GT_CHECK_RESULT(idx.isValid(), "Item index is invalid", "");
- return table->model()->data(idx, Qt::DisplayRole).toString();
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTableView.h b/src/libs_3rdparty/humimit/src/primitives/GTTableView.h
deleted file mode 100644
index 2c19f4c..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTableView.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-#ifndef GTTABLEVIEW_H
-#define GTTABLEVIEW_H
-
-#include "GTGlobals.h"
-
-#include <QPoint>
-#include <QTableView>
-
-namespace HI{
-
-class HI_EXPORT GTTableView {
-public:
- static QPoint getCellPosition(GUITestOpStatus &os, QTableView *table, int column, int row);
- static QPoint getCellPoint(GUITestOpStatus &os, QTableView *table, int row, int column);
- static int rowCount(GUITestOpStatus &os, QTableView *table);
- static QString data(GUITestOpStatus &os, QTableView *table, int row, int column);
-};
-
-}
-#endif // GTTABLEVIEW_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.cpp
deleted file mode 100644
index d86a733..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <drivers/GTKeyboardDriver.h>
-#include "primitives/GTTextEdit.h"
-#include <primitives/GTWidget.h>
-#include "utils/GTKeyboardUtils.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTTextEdit"
-
-#define GT_METHOD_NAME ""
-void GTTextEdit::setText(GUITestOpStatus& os, QTextEdit* textEdit, const QString &text) {
-
- GT_CHECK(textEdit != NULL, "plainTextEdit is NULL");
-
- if(textEdit->toPlainText() == text){
- return;
- }
-
- clear(os, textEdit);
- GTWidget::setFocus(os, textEdit);
-
- GTKeyboardDriver::keySequence(os, text);
- GTGlobals::sleep(500);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getText"
-QString GTTextEdit::getText(GUITestOpStatus &os, QTextEdit *textEdit) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != textEdit, "Text edit is NULL", "");
- return textEdit->toPlainText();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "containsString"
-bool GTTextEdit::containsString(GUITestOpStatus &os, QTextEdit *textEdit, const QString &string) {
- const QString text = getText(os, textEdit);
- return text.contains(string);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clear"
-void GTTextEdit::clear(GUITestOpStatus& os, QTextEdit* textEdit) {
-
- GT_CHECK(textEdit != NULL, "textEdit is NULL");
-
- GTWidget::setFocus(os, textEdit);
-
- GTKeyboardUtils::selectAll(os);
- GTGlobals::sleep(100);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
- GTGlobals::sleep(1000);
-
- QString s = textEdit->toPlainText();
- GT_CHECK(s.isEmpty() == true, "Can't clear text, textEdit is not empty");
- }
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.h b/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.h
deleted file mode 100644
index b9f055f..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTextEdit.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_TEXTEDIT_H_
-#define _HI_GT_TEXTEDIT_H_
-
-#include "GTGlobals.h"
-#include <QTextEdit>
-
-namespace HI {
-
-class HI_EXPORT GTTextEdit {
-public:
- // fails if textEdit is NULL
- // or a set text differs from a given text
- static void setText(GUITestOpStatus& os, QTextEdit* textEdit, const QString &text);
- static QString getText(GUITestOpStatus &os, QTextEdit* textEdit);
-
- static bool containsString(GUITestOpStatus &os, QTextEdit *textEdit, const QString &string);
-
- static void clear(GUITestOpStatus& os, QTextEdit* textEdit);
-};
-
-}
-
-#endif // _HI_GT_TEXTEDIT_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTToolbar.cpp b/src/libs_3rdparty/humimit/src/primitives/GTToolbar.cpp
deleted file mode 100644
index a918f78..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTToolbar.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTToolbar.h"
-#include "primitives/GTWidget.h"
-
-#include <QAction>
-
-namespace HI {
-#define GT_CLASS_NAME "GTToolbar"
-
-#define GT_METHOD_NAME "getToolbar"
- QToolBar* GTToolbar::getToolbar(GUITestOpStatus &os, const QString &toolbarSysName) {
- QString toolbarTypeCheck = "QToolBar";
- QToolBar *toolbar = static_cast<QToolBar*>(GTWidget::findWidget(os, toolbarSysName));
- GT_CHECK_RESULT((toolbar != NULL) && 0 == toolbarTypeCheck.compare(toolbar->metaObject()->className()), "No such toolbar: " + toolbarSysName, NULL); //the found widget is not a qtoolbar
- return toolbar;
- }
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getWidgetForAction"
- QWidget* GTToolbar::getWidgetForAction(GUITestOpStatus &os, const QToolBar *toolbar, QAction *action) {
- QString toolbarTypeCheck = "QToolBar";
- GT_CHECK_RESULT((toolbar != NULL) && (0 == toolbarTypeCheck.compare(toolbar->metaObject()->className())), "Toolbar not found", NULL); //the found widget is not a qtoolbar or doesn't exist
- QWidget *widget = toolbar->widgetForAction(action);
- GT_CHECK_RESULT(widget != NULL, "No widget for action", NULL);
- return widget;
- }
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getWidgetForActionName"
- QWidget* GTToolbar::getWidgetForActionName(GUITestOpStatus &os, const QToolBar *toolbar, const QString &actionName) {
- QString toolbarTypeCheck = "QToolBar";
- GT_CHECK_RESULT((toolbar != NULL) && (0 == toolbarTypeCheck.compare(toolbar->metaObject()->className())), "Toolbar not found", NULL); //the found widget is not a qtoolbar or doesn't exist
- QAction *action = GTToolbar::getToolbarAction(os, actionName, toolbar);
- GT_CHECK_RESULT(action != NULL, "No such action:" + actionName, NULL);
- return GTToolbar::getWidgetForAction(os, toolbar, action);
- }
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getWidgetForActionTooltip"
- QWidget* GTToolbar::getWidgetForActionTooltip(GUITestOpStatus &os, const QToolBar *toolbar, const QString &tooltip) {
- QString toolbarTypeCheck = "QToolBar";
- GT_CHECK_RESULT((toolbar != NULL) && (0 == toolbarTypeCheck.compare(toolbar->metaObject()->className())), "Toolbar not found", NULL); //the found widget is not a qtoolbar or doesn't exist
- QAction *action = NULL;
- foreach (QAction* a, toolbar->actions()) {
- if (a->toolTip() == tooltip) {
- action = a;
- break;
- }
- }
- GT_CHECK_RESULT(action != NULL, "No action with such tooltip: " + tooltip, NULL);
- return GTToolbar::getWidgetForAction(os, toolbar, action);
- }
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickButtonByTooltipOnToolbar"
-void GTToolbar::clickButtonByTooltipOnToolbar(GUITestOpStatus &os, const QString &toolbarSysName, const QString &tooltip) {
- GTWidget::click(os, GTToolbar::getWidgetForActionTooltip(os, getToolbar(os, toolbarSysName), tooltip));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getToolbarAction"
- QAction* GTToolbar::getToolbarAction(GUITestOpStatus &os, const QString &actionName, const QToolBar *toolbar) {
- QString toolbarTypeCheck = "QToolBar";
- GT_CHECK_RESULT((toolbar != NULL) && (0 == toolbarTypeCheck.compare(toolbar->metaObject()->className())), "Toolbar not found", NULL); //the found widget is not a qtoolbar or doesn't exist
- QAction *action = NULL;
- foreach(QAction* a, toolbar->actions()) {
- const QString& aname = a->objectName();
- if (aname == actionName) {
- action = a;
- }
- }
- return action;
- }
-#undef GT_METHOD_NAME
-
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTToolbar.h b/src/libs_3rdparty/humimit/src/primitives/GTToolbar.h
deleted file mode 100644
index a0d870f..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTToolbar.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTTOOLBAR_H_
-#define _HI_GUI_GTTOOLBAR_H_
-
-#include "GTGlobals.h"
-#include <QToolBar>
-
-namespace HI {
-
-class HI_EXPORT GTToolbar {
-public:
-
- static QToolBar* getToolbar(GUITestOpStatus &os, const QString &toolbarSysName);
-
- static QWidget* getWidgetForAction(GUITestOpStatus &os, const QToolBar *toolbar, QAction *action);
- static QWidget* getWidgetForActionName(GUITestOpStatus &os, const QToolBar *toolbar, const QString &actionName);
- static QWidget* getWidgetForActionTooltip(GUITestOpStatus &os, const QToolBar *toolbar, const QString &tooltip);
-
- static void clickButtonByTooltipOnToolbar(GUITestOpStatus &os, const QString &toolbarSysName, const QString &tooltip);
-
-private:
-
- static QAction* getToolbarAction(GUITestOpStatus &os, const QString &actionName, const QToolBar *toolbar);
-
-
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTreeView.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTreeView.cpp
deleted file mode 100644
index fda1ff8..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTreeView.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTTreeView.h"
-
-#include <QAbstractItemModel>
-
-
-namespace HI{
-
-#define GT_CLASS_NAME "GTTreeView"
-#define GT_METHOD_NAME "findIndex"
-QModelIndex GTTreeView::findIndex(GUITestOpStatus &os, QTreeView* treeView, QVariant data, Qt::ItemDataRole role,
- const GTGlobals::FindOptions& options){
- return findIndex(os, treeView, data, QModelIndex(), role, options);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findIndex"
-QModelIndex GTTreeView::findIndex(GUITestOpStatus &os, QTreeView* treeView, QVariant data, QModelIndex parent, Qt::ItemDataRole role,
- const GTGlobals::FindOptions& options){
-
- GT_CHECK_RESULT(treeView != NULL, "Tree widget is NULL", QModelIndex());
-
- QModelIndexList foundIndexes = findIndexes(os, treeView, data, role,parent, 0, options);
- if (foundIndexes.isEmpty()) {
- if(options.failIfNull){
- GT_CHECK_RESULT(foundIndexes.size() != 0, QString("Item whith name %1 not found").arg(data.toString()), QModelIndex());
- } else {
- return QModelIndex();
- }
- }
-
- GT_CHECK_RESULT(foundIndexes.size() == 1, QString("there are %1 items with name %2").arg(foundIndexes.size()).arg(data.toString()), QModelIndex());
-
- treeView->scrollTo(foundIndexes.at(0));
- return foundIndexes.at(0);
-
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findIndexes"
-QModelIndexList GTTreeView::findIndexes(GUITestOpStatus &os, QTreeView* treeView, QVariant data, Qt::ItemDataRole role,
- QModelIndex parent, int depth, const GTGlobals::FindOptions& options){
- QModelIndexList foundIndexes;
- if (!(GTGlobals::FindOptions::INFINITE_DEPTH == options.depth || depth < options.depth)) {
- return foundIndexes;
- }
-
- QAbstractItemModel *model = treeView->model();
- CHECK_SET_ERR_RESULT(NULL != model, "Model is NULL", foundIndexes);
-
- int rowcount = model->rowCount(parent);
- for (int i = 0; i < rowcount; i++) {
- const QModelIndex index = model->index(i, 0, parent);
- QVariant indexData = index.data(role);
-
- if (data == indexData) {
- foundIndexes << index;
- } else {
- foundIndexes << findIndexes(os, treeView, data, role, index, depth + 1, options);
- }
- }
-
- return foundIndexes;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItemCenter"
-QPoint GTTreeView::getItemCenter(GUITestOpStatus &, QTreeView *treeView, const QModelIndex &itemIndex) {
- QRect r = treeView->visualRect(itemIndex);
-
- return treeView->mapToGlobal(r.center());
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTreeView.h b/src/libs_3rdparty/humimit/src/primitives/GTTreeView.h
deleted file mode 100644
index 9988924..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTreeView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef GTTREEVIEW_H
-#define GTTREEVIEW_H
-
-#include "GTGlobals.h"
-#include <QTreeView>
-
-namespace HI{
-
-class HI_EXPORT GTTreeView
-{
-public:
- //find index with data and role in the tree view
- static QModelIndex findIndex(GUITestOpStatus &os, QTreeView* treeView, QVariant data, Qt::ItemDataRole role = Qt::DisplayRole,
- const GTGlobals::FindOptions& = GTGlobals::FindOptions());
-
- //find index with data and role for current parent index
- static QModelIndex findIndex(GUITestOpStatus &os, QTreeView* treeView, QVariant data, QModelIndex parent, Qt::ItemDataRole role = Qt::DisplayRole,
- const GTGlobals::FindOptions& = GTGlobals::FindOptions());
-
- static QPoint getItemCenter(GUITestOpStatus &os, QTreeView* treeView, const QModelIndex &itemIndex);
-
-private:
- static QModelIndexList findIndexes(GUITestOpStatus &os, QTreeView* treeView, QVariant data, Qt::ItemDataRole role = Qt::DisplayRole,
- QModelIndex parent = QModelIndex(), int depth = 0, const GTGlobals::FindOptions& = GTGlobals::FindOptions());
-};
-
-}
-
-#endif // GTTREEVIEW_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.cpp b/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.cpp
deleted file mode 100644
index 9a18a98..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#include <drivers/GTKeyboardDriver.h>
-#include <drivers/GTMouseDriver.h>
-#include "primitives/GTTreeWidget.h"
-#include <primitives/GTWidget.h>
-
-#include <QHeaderView>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTUtilsTreeView"
-
-#define GT_METHOD_NAME "expand"
-void GTTreeWidget::expand(GUITestOpStatus &os, QTreeWidgetItem* item) {
- if (item == NULL) {
- return;
- }
- expand(os, item->parent());
- GT_CHECK(item->isHidden() == false, "parent item is hidden");
-
- QTreeWidget *treeWidget = item->treeWidget();
- GT_CHECK(item->isHidden() == false, "parent item is hidden");
-
- treeWidget->scrollToItem(item);
-
- QRect itemRect = treeWidget->visualItemRect(item);
- if (!item->isExpanded()) {
- QPoint p = QPoint(itemRect.left() - 8, itemRect.center().y());
-
- GTMouseDriver::moveTo(os, treeWidget->viewport()->mapToGlobal(p));
- GTMouseDriver::click(os);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkItem"
-void GTTreeWidget::checkItem(GUITestOpStatus &os, QTreeWidgetItem *item, int column, GTGlobals::UseMethod method) {
- Q_UNUSED(os);
- GT_CHECK(NULL != item, "treeWidgetItem is NULL");
- GT_CHECK(0 <= column, "The column number is invalid");
-
- QTreeWidget *tree = item->treeWidget();
- GT_CHECK(NULL != tree, "The tree widget is NULL");
-
- const QRect itemRect = getItemRect(os, item);
- const QPoint indentationOffset(tree->indentation(), 0);
- const QPoint itemStartPos = QPoint(itemRect.left(), itemRect.center().y()) - indentationOffset;
- const QPoint columnOffset(tree->columnViewportPosition(column), 0);
- const QPoint itemLevelOffset(getItemLevel(os, item) * tree->indentation(), 0);
-
- switch (method) {
- case GTGlobals::UseKeyBoard: {
- const QPoint cellCenterOffset(tree->columnWidth(column) / 2, itemRect.height() / 2);
- GTMouseDriver::moveTo(os, itemStartPos + itemLevelOffset + columnOffset + cellCenterOffset);
- GTMouseDriver::click(os);
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["space"]);
- break;
- }
- case GTGlobals::UseMouse: {
- const QPoint magicCheckBoxOffset = QPoint(15, 0);
- GTMouseDriver::moveTo(os, tree->viewport()->mapToGlobal(itemStartPos + itemLevelOffset + columnOffset + magicCheckBoxOffset));
- GTMouseDriver::click(os);
- break;
- }
- default:
- GT_CHECK(false, "Method is not implemented");
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItemRect"
-QRect GTTreeWidget::getItemRect(GUITestOpStatus &os, QTreeWidgetItem* item) {
- GT_CHECK_RESULT(item != NULL, "treeWidgetItem is NULL", QRect());
-
- QTreeWidget *treeWidget = item->treeWidget();
- GT_CHECK_RESULT(treeWidget != NULL, "treeWidget is NULL", QRect());
-
- expand(os, item);
- GT_CHECK_RESULT(item->isHidden() == false, "item is hidden", QRect());
-
- QRect rect = treeWidget->visualItemRect(item);
-
- return rect;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItemCenter"
-QPoint GTTreeWidget::getItemCenter(GUITestOpStatus &os, QTreeWidgetItem* item) {
-
- GT_CHECK_RESULT(item != NULL, "item is NULL", QPoint());
-
- QTreeWidget *treeWidget = item->treeWidget();
- GT_CHECK_RESULT(treeWidget != NULL, "treeWidget is NULL", QPoint());
-
- QPoint p = getItemRect(os, item).center();
-
- return treeWidget->viewport()->mapToGlobal(p);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItems"
-QList<QTreeWidgetItem*> GTTreeWidget::getItems(QTreeWidgetItem* root) {
-
- QList<QTreeWidgetItem*> treeItems;
-
- for (int i=0; i<root->childCount(); i++) {
- treeItems.append(root->child(i));
- treeItems.append(getItems(root->child(i)));
- }
-
- return treeItems;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItems"
-QList<QTreeWidgetItem *> GTTreeWidget::getItems(GUITestOpStatus &os, QTreeWidget *treeWidget) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != treeWidget, "Tree widget is NULL", QList<QTreeWidgetItem *>());
- return getItems(treeWidget->invisibleRootItem());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItemNames"
-QStringList GTTreeWidget::getItemNames(GUITestOpStatus &os, QTreeWidget *treeWidget) {
- QStringList itemNames;
- QList<QTreeWidgetItem *> items = getItems(os, treeWidget);
- foreach (QTreeWidgetItem *item, items) {
- itemNames << item->text(0);
- }
- return itemNames;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findItemPrivate"
-QTreeWidgetItem * GTTreeWidget::findItemPrivate(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent, int column, const GTGlobals::FindOptions &options) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(tree != NULL, "tree widget is NULL", NULL);
-
- if (parent == NULL) {
- parent = tree->invisibleRootItem();
- }
-
- GTGlobals::FindOptions innerOptions(options);
- if (options.depth != GTGlobals::FindOptions::INFINITE_DEPTH) {
- innerOptions.depth--;
- }
-
- const QList<QTreeWidgetItem *> list = getItems(parent);
- foreach (QTreeWidgetItem *item, list){
- const QString itemText = item->text(column);
- if (options.matchPolicy.testFlag(Qt::MatchExactly) && itemText == text) {
- return item;
- } else if (options.matchPolicy.testFlag(Qt::MatchContains) && itemText.contains(text)) {
- return item;
- }
-
- if (options.depth == GTGlobals::FindOptions::INFINITE_DEPTH ||
- innerOptions.depth > 0) {
- QTreeWidgetItem * childItem = findItemPrivate(os, tree, text, item, column, innerOptions);
- if (NULL != childItem) {
- return childItem;
- }
- }
- }
- return NULL;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findItem"
-QTreeWidgetItem * GTTreeWidget::findItem(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent, int column, const GTGlobals::FindOptions &options) {
- QTreeWidgetItem* result = findItemPrivate(os, tree, text, parent, column, options);
- if(options.failIfNull){
- CHECK_SET_ERR_RESULT(result != NULL, QString("Item '%1' not found").arg(text), NULL);
- }
- return result;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findItems"
-QList<QTreeWidgetItem *> GTTreeWidget::findItems(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent, int column, const GTGlobals::FindOptions &options) {
- QList<QTreeWidgetItem *> items;
-
- GT_CHECK_RESULT(tree != NULL, "tree widget is NULL", items);
-
- if (parent == NULL) {
- parent = tree->invisibleRootItem();
- }
-
- GTGlobals::FindOptions innerOptions(options);
- if (options.depth != GTGlobals::FindOptions::INFINITE_DEPTH) {
- innerOptions.depth--;
- }
-
- const QList<QTreeWidgetItem *> list = getItems(parent);
- foreach (QTreeWidgetItem *item, list) {
- const QString itemText = item->text(column);
- if (options.matchPolicy.testFlag(Qt::MatchExactly) && itemText == text) {
- items << item;
- } else if (options.matchPolicy.testFlag(Qt::MatchContains) && itemText.contains(text)) {
- items << item;
- }
-
- if (options.depth == GTGlobals::FindOptions::INFINITE_DEPTH ||
- innerOptions.depth > 0) {
- items << findItems(os, tree, text, item, column, innerOptions);
- }
- }
-
- return items;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "click"
-void GTTreeWidget::click(GUITestOpStatus &os, QTreeWidgetItem *item, int column) {
- GT_CHECK(item != NULL, "item is NULL");
- QTreeWidget* tree = item->treeWidget();
- tree->scrollToItem(item);
-
- QPoint point;
- if (-1 == column) {
- point = getItemCenter(os, item);
- } else {
- const QRect itemRect = getItemRect(os, item);
- point = tree->viewport()->mapToGlobal(itemRect.topLeft());
- point += QPoint(tree->columnViewportPosition(column) + tree->columnWidth(column) / 2, itemRect.height() / 2);
- }
-
- GTMouseDriver::moveTo(os, point);
- GTMouseDriver::click(os);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getItemLevel"
-int GTTreeWidget::getItemLevel(GUITestOpStatus &os, QTreeWidgetItem *item) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(item != NULL, "item is NULL", -1);
-
- int level = 0;
- while (NULL != item->parent()) {
- level++;
- item = item->parent();
- }
-
- return level;
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.h b/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.h
deleted file mode 100644
index 0d2d5ca..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTTreeWidget.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_TREE_WIDGET_H_
-#define _HI_GT_TREE_WIDGET_H_
-
-#include "GTGlobals.h"
-
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-
-namespace HI {
-
-class HI_EXPORT GTTreeWidget {
-public:
- // expands treeWidget to the item and returns item's rect
- static QRect getItemRect(GUITestOpStatus &os, QTreeWidgetItem* item);
-
- static QPoint getItemCenter(GUITestOpStatus &os, QTreeWidgetItem* item);
-
- // recursively expands the tree making the given item visible
- // fails if item is NULL, item is hidden or item wasn't expanded
- static void expand(GUITestOpStatus &os, QTreeWidgetItem* item);
-
- // Checks the tree item or unchecks it if it is already checked
- static void checkItem(GUITestOpStatus &os, QTreeWidgetItem *item, int column = 0, GTGlobals::UseMethod method = GTGlobals::UseMouse);
-
- // gets all items under root recursively and returns a list of them
- static QList<QTreeWidgetItem*> getItems(QTreeWidgetItem* root);
- static QList<QTreeWidgetItem*> getItems(GUITestOpStatus &os, QTreeWidget *treeWidget);
- static QStringList getItemNames(GUITestOpStatus &os, QTreeWidget *treeWidget);
-
- static QTreeWidgetItem * findItem(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent = NULL, int column = 0, const GTGlobals::FindOptions &options = GTGlobals::FindOptions());
-
- static QList<QTreeWidgetItem *> findItems(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent = NULL, int column = 0, const GTGlobals::FindOptions &options = GTGlobals::FindOptions());
-
- static void click(GUITestOpStatus &os, QTreeWidgetItem* item, int column = -1); // column == -1 - item center
-
- // Returns item level, 0 - top level item
- static int getItemLevel(GUITestOpStatus &os, QTreeWidgetItem *item);
-private:
- static QTreeWidgetItem * findItemPrivate(GUITestOpStatus &os, QTreeWidget *tree, const QString &text, QTreeWidgetItem *parent = NULL, int column = 0, const GTGlobals::FindOptions &options = GTGlobals::FindOptions());
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTWebView.cpp b/src/libs_3rdparty/humimit/src/primitives/GTWebView.cpp
deleted file mode 100644
index cde7bdc..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTWebView.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
-* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-* MA 02110-1301, USA.
-*/
-
-
-#include <core/MainThreadRunnable.h>
-
-#include <drivers/GTMouseDriver.h>
-#include "primitives/GTWebView.h"
-
-#include <QWebFrame>
-
-namespace HI {
-namespace {
-bool compare(QString s1, QString s2, bool exactMatch){
- if(exactMatch){
- return s1==s2;
- }else{
- return s1.contains(s2);
- }
-}
-}
-
-#define GT_CLASS_NAME "GTWebView"
-
-#define GT_METHOD_NAME "findElement"
-QWebElement GTWebView::findElement(GUITestOpStatus &os, QWebView *view, const QString &text, const QString &tag, bool exactMatch) {
- class Scenario : public CustomScenario {
- public:
- Scenario(QWebView *view, const QString &text, const QString &tag, bool exactMatch, QWebElement &webElement) :
- view(view),
- text(text),
- tag(tag),
- exactMatch(exactMatch),
- webElement(webElement) {}
-
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- QWebFrame* frame = view->page()->mainFrame();
- foreach (QWebElement el, frame->findAllElements(tag)) {
- QString s = el.toPlainText();
- int width = el.geometry().width();
-
- if (compare(s, text, exactMatch) && width != 0) {
- webElement = el;
- return;
- }
- }
- GT_CHECK(false, QString("element with text '%1' and tag '%2' not found").arg(text).arg(tag));
- }
-
- private:
- QWebView *view;
- const QString text;
- const QString tag;
- bool exactMatch;
- QWebElement &webElement;
- };
-
- QWebElement webElement;
- MainThreadRunnable mainThreadRunnable(os, new Scenario(view, text, tag, exactMatch, webElement));
- mainThreadRunnable.doRequest();
- return webElement;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkElement"
-void GTWebView::checkElement(GUITestOpStatus &os, QWebView *view, QString text, QString tag, bool exists, bool exactMatch){
- const bool found = doesElementExist(os, view, text, tag, exactMatch);
- if (exists) {
- GT_CHECK(found, "element with text " + text + " and tag " + tag + " not found");
- } else {
- GT_CHECK(!found, "element with text " + text + " and tag " + tag + " unexpectedly found");
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "doesElementExist"
-bool GTWebView::doesElementExist(GUITestOpStatus &os, QWebView *view, const QString &text, const QString &tag, bool exactMatch) {
- Q_UNUSED(os)
- QWebFrame* frame = view->page()->mainFrame();
-
- foreach (QWebElement el, frame->findAllElements(tag)) {
- QString s = el.toPlainText();
- int width = el.geometry().width();
-
- if (compare(s, text, exactMatch) && width != 0) {
- return true;
- }
- }
- return false;
-}
-#undef GT_METHOD_NAME
-
-QWebElement GTWebView::findTreeElement(GUITestOpStatus &os, QWebView *view, QString text){
- return findElement(os, view, text, "SPAN");
-}
-
-QWebElement GTWebView::findContextMenuElement(GUITestOpStatus &os, QWebView *view, QString text){
- return findElement(os, view, text, "LI");
-}
-
-void GTWebView::click(GUITestOpStatus &os, QWebView *view, QWebElement el, Qt::MouseButton button){
- GTMouseDriver::moveTo(os, view->mapToGlobal(el.geometry().center()));
- GTMouseDriver::click(os, button);
-}
-
-void GTWebView::selectElementText(GUITestOpStatus &os, QWebView *view, QWebElement el){
- GTMouseDriver::moveTo(os, view->mapToGlobal(el.geometry().topLeft()) + QPoint(5,5));
- GTMouseDriver::press(os);
- GTMouseDriver::moveTo(os, view->mapToGlobal(el.geometry().bottomRight()) - QPoint(5,5));
- GTMouseDriver::release(os);
-}
-
-void GTWebView::traceAllWebElements(GUITestOpStatus &os, QWebView *view){
- Q_UNUSED(os)
- QWebFrame* frame = view->page()->mainFrame();
- QWebElement result;
- foreach (QWebElement el, frame->findAllElements("*")) {
- QString s = el.toPlainText();
- QString tagName = el.tagName();
- QString localName = el.localName();
-
- if(el.geometry().width() != 0){
- qDebug("GT_DEBUG_MESSAGE tag: %s name: %s text: %s width: %d", tagName.toLocal8Bit().constData(), localName.toLocal8Bit().constData(), s.toLocal8Bit().constData(), el.geometry().width());
- }
- if (s == "Input"){
- result = el;
- }
- }
-
-}
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTWebView.h b/src/libs_3rdparty/humimit/src/primitives/GTWebView.h
deleted file mode 100644
index 06574d1..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTWebView.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-* MA 02110-1301, USA.
-*/
-
-#ifndef GTWEBVIEW_H
-#define GTWEBVIEW_H
-
-#include "GTGlobals.h"
-
-#include <QWebView>
-#include <QWebElement>
-
-namespace HI {
-
-class HI_EXPORT GTWebView{
-public:
- static QWebElement findElement(GUITestOpStatus &os, QWebView *view, const QString &text, const QString &tag = "*", bool exactMatch = false);
- static void checkElement(GUITestOpStatus &os, QWebView *view, QString text, QString tag = "*", bool exists = true, bool exactMatch = false);
- static bool doesElementExist(GUITestOpStatus &os, QWebView *view, const QString &text, const QString &tag = "*", bool exactMatch = false);
-
- static void click(GUITestOpStatus &os, QWebView *view, QWebElement el, Qt::MouseButton button = Qt::LeftButton);
- static void selectElementText(GUITestOpStatus &os, QWebView *view, QWebElement el);
- static QWebElement findTreeElement(GUITestOpStatus &os, QWebView *view, QString text);
- static QWebElement findContextMenuElement(GUITestOpStatus &os, QWebView *view, QString text);
-
- static void traceAllWebElements(GUITestOpStatus &os, QWebView *view);
-
-};
-
-}
-
-#endif // GTWEBVIEW_H
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTWidget.cpp b/src/libs_3rdparty/humimit/src/primitives/GTWidget.cpp
deleted file mode 100644
index e7a18b2..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTWidget.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTMainWindow.h"
-#include "primitives/GTWidget.h"
-#include "utils/GTThread.h"
-
-#include <QApplication>
-#include <QComboBox>
-#include <QDesktopWidget>
-#include <QGuiApplication>
-#include <QMainWindow>
-#include <QStyle>
-
-namespace HI {
-#define GT_CLASS_NAME "GTWidget"
-
-#define GT_METHOD_NAME "click"
-void GTWidget::click(GUITestOpStatus &os, QWidget *w, Qt::MouseButton mouseButton, QPoint p, bool safe) {
-
- GTGlobals::sleep(100);
- GT_CHECK(w != NULL, "widget is NULL");
-// GT_CHECK(w->isEnabled() == true, "widget " + w->objectName() + "is not enabled");
-
- if (p.isNull()) {
- p = w->rect().center();
-
- // TODO: this is a fast fix
- if (w->objectName().contains("ADV_single_sequence_widget")) {
- p += QPoint(0, 8);
- }
- }
- GTMouseDriver::moveTo(os, w->mapToGlobal(p));
- if(safe){
- GTMouseDriver::click(os, mouseButton);
- }else{
- //sometimes GTGlobals::sleep(os) should not be used after clicking
- GTMouseDriver::press(os, mouseButton);
- GTMouseDriver::release(os, mouseButton);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setFocus"
-void GTWidget::setFocus(GUITestOpStatus &os, QWidget *w) {
-
- GT_CHECK(w != NULL, "widget is NULL");
-
- GTWidget::click(os, w);
- GTGlobals::sleep(1000);
-
- if(!qobject_cast<QComboBox*>(w)){
- GT_CHECK(w->hasFocus(), "Can't set focus on widget " + w->objectName());
- }
-
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findWidget"
-QWidget* GTWidget::findWidget(GUITestOpStatus &os, const QString &widgetName, QWidget *parentWidget, const GTGlobals::FindOptions& options) {
- Q_UNUSED(os);
-
- if (parentWidget == NULL) {
- QList<QWidget*> list;
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- if(parent->findChild<QWidget*>(widgetName) != NULL){
- list.append(parent->findChild<QWidget*>(widgetName));
- }
- }
- if (options.failIfNull) {
- GT_CHECK_RESULT(list.count()!=0,"Widget " + widgetName + " not found", NULL);
- }
- GT_CHECK_RESULT(list.count()<2, QString("There are %1 widgets with this text").arg(list.count()), NULL);
- if(list.count() == 0){
- return NULL;
- }else{
- return list.takeFirst();
- }
- }
- QWidget* widget = parentWidget->findChild<QWidget*>(widgetName);
-
- if (options.failIfNull) {
- GT_CHECK_RESULT(widget != NULL, "Widget " + widgetName + " not found", NULL);
- }
-
- return widget;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getWidgetCenter"
-QPoint GTWidget::getWidgetCenter(GUITestOpStatus &os, QWidget *w){
- Q_UNUSED(os)
- return w->mapToGlobal(w->rect().center());
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findButtonByText"
-QAbstractButton* GTWidget::findButtonByText(GUITestOpStatus &os, const QString &text, QWidget *parentWidget, const GTGlobals::FindOptions& options) {
-
- if (parentWidget == NULL) {
- QList<QAbstractButton*> resultList;
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- QList<QAbstractButton*> list = parent->findChildren<QAbstractButton*>();
- foreach(QAbstractButton* ab, list){
- if(ab->text().contains(text, Qt::CaseInsensitive)){
- resultList.append(ab);
- }
- }
- }
-
- if (options.failIfNull) {
- GT_CHECK_RESULT(resultList.count()!=0,"button not found", NULL);
- }
- GT_CHECK_RESULT(resultList.count()<2, QString("There are %1 buttons with this text").arg(resultList.count()), NULL);
- if(resultList.count() == 0){
- return NULL;
- }else{
- return resultList.takeFirst();
- }
- }
- QList<QAbstractButton*> buttonList = parentWidget->findChildren<QAbstractButton*>();
- QList<QAbstractButton*> foundButtonList;
- QStringList sL;
-
- foreach(QAbstractButton* but, buttonList){
- sL.append(but->text());
- if (but->text().contains(text, Qt::CaseInsensitive)){
- foundButtonList << but;
- }
- }
-
- GT_CHECK_RESULT(foundButtonList.count()<=1, QString("there are %1 buttons with such text").arg(foundButtonList.count()), NULL);
-
- if (options.failIfNull) {
- GT_CHECK_RESULT(foundButtonList.count() != 0, QString("button with this text <%1> not found").arg(text), NULL);
- }
-
- return foundButtonList.takeFirst();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "findWidget"
-void GTWidget::getAllWidgetsInfo(GUITestOpStatus &os, QWidget *parent){
-
- QList<QObject*> list;
- if(parent == NULL){
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- list.append(parent->findChildren<QObject*>());
- }
- }else{
- list = parent->findChildren<QObject*>();
- }
- QString actStr;
- actStr.append("Getting all info about widget\n");
-
- foreach(QObject* act, list){
- actStr.append(act->objectName()+ " " + act->metaObject()->className() + " " + /*QString("%1").arg(act->isVisible()) + " " + QString("%1").arg(act->geometry().width()) +*/ "\n");
- }
- CHECK_SET_ERR(false, actStr);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "close"
-void GTWidget::close(GUITestOpStatus &os, QWidget *widget) {
-#ifndef Q_OS_MAC
- GT_CHECK(NULL != widget, "Widget is NULL");
-
- class Scenario : public CustomScenario {
- public:
- Scenario(QWidget *widget) :
- widget(widget)
- {
-
- }
-
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- CHECK_SET_ERR(NULL != widget, "Widget is NULL");
- widget->close();
- GTGlobals::sleep(100);
- }
-
- private:
- QWidget *widget;
- };
-
- GTThread::runInMainThread(os, new Scenario(widget));
-#else
- const QPoint closeButtonPos = GTWidget::getWidgetGlobalTopLeftPoint(os, widget) + QPoint(10, 5);
- GTMouseDriver::moveTo(os, closeButtonPos);
- GTMouseDriver::click(os);
- GTGlobals::sleep(100);
-#endif
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "showMaximized"
-void GTWidget::showMaximized(GUITestOpStatus &os, QWidget *widget) {
- GT_CHECK(NULL != widget, "Widget is NULL");
-
- class Scenario : public CustomScenario {
- public:
- Scenario(QWidget *widget) :
- widget(widget)
- {
-
- }
-
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- CHECK_SET_ERR(NULL != widget, "Widget is NULL");
- widget->showMaximized();
- GTGlobals::sleep(100);
- }
-
- private:
- QWidget *widget;
- };
-
- GTThread::runInMainThread(os, new Scenario(widget));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "showNormal"
-void GTWidget::showNormal(GUITestOpStatus &os, QWidget *widget) {
- GT_CHECK(NULL != widget, "Widget is NULL");
-
- class Scenario : public CustomScenario {
- public:
- Scenario(QWidget *widget) :
- widget(widget)
- {
-
- }
-
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- CHECK_SET_ERR(NULL != widget, "Widget is NULL");
- widget->showNormal();
- GTGlobals::sleep(100);
- }
-
- private:
- QWidget *widget;
- };
-
- GTThread::runInMainThread(os, new Scenario(widget));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getColor"
-QColor GTWidget::getColor(GUITestOpStatus &os, QWidget *widget, const QPoint &point) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != widget, "Widget is NULL", QColor());
-
- return QColor(getImage(os, widget).pixel(point));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getPixmap"
-QPixmap GTWidget::getPixmap(GUITestOpStatus &os, QWidget *widget) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != widget, "Widget is NULL", QPixmap());
-
- class Scenario : public CustomScenario {
- public:
- Scenario(QWidget *widget, QPixmap &pixmap) :
- widget(widget),
- pixmap(pixmap)
- {
-
- }
-
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- CHECK_SET_ERR(NULL != widget, "Widget to grab is NULL");
- pixmap = widget->grab(widget->rect());
- }
-
- private:
- QWidget *widget;
- QPixmap &pixmap;
- };
-
- QPixmap pixmap;
- GTThread::runInMainThread(os, new Scenario(widget, pixmap));
- return pixmap;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getImage"
-QImage GTWidget::getImage(GUITestOpStatus &os, QWidget *widget) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != widget, "Widget is NULL", QImage());
-
- return getPixmap(os, widget).toImage();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickLabelLink"
-void GTWidget::clickLabelLink(GUITestOpStatus &os, QWidget *label, int step, int indent){
-
- QRect r = label->rect();
-
- int left = r.left();
- int right = r.right();
- int top = r.top() + indent;
- int bottom = r.bottom();
- for(int i = left; i < right; i+=step){
- for(int j = top; j < bottom; j+=step){
- GTMouseDriver::moveTo(os, label->mapToGlobal(QPoint(i,j)));
- if(label->cursor().shape() == Qt::PointingHandCursor){
- GTGlobals::sleep(500);
- GTMouseDriver::click(os);
- return;
- }
- }
- }
- GT_CHECK(false, "label does not contain link");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickWindowTitle"
-void GTWidget::clickWindowTitle(GUITestOpStatus &os, QWidget *window) {
- GT_CHECK(NULL != window, "Window is NULL");
-
- QStyleOptionTitleBar opt;
- opt.initFrom(window);
- const QRect titleLabelRect = window->style()->subControlRect(QStyle::CC_TitleBar, &opt, QStyle::SC_TitleBarLabel);
- GTMouseDriver::moveTo(os, getWidgetGlobalTopLeftPoint(os, window) + titleLabelRect.center());
- GTMouseDriver::click(os);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "moveWidgetTo"
-void GTWidget::moveWidgetTo(GUITestOpStatus &os, QWidget *window, const QPoint &point){
- //QPoint(window->width()/2,3) - is hack
- GTMouseDriver::moveTo(os, getWidgetGlobalTopLeftPoint(os, window) + QPoint(window->width()/2,3));
- const QPoint p0 = getWidgetGlobalTopLeftPoint(os, window) + QPoint(window->width()/2,3);
- const QPoint p1 = point + QPoint(window->width()/2,3);
- GTMouseDriver::dragAndDrop(os, p0, p1);
- GTGlobals::sleep(1000);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "resizeWidget"
-void GTWidget::resizeWidget(GUITestOpStatus &os, QWidget *widget, const QSize &size) {
- GT_CHECK(NULL != widget, "Widget is NULL");
-
- QRect displayRect = QApplication::desktop()->screenGeometry();
- GT_CHECK( (displayRect.width() >= size.width()) && (displayRect.height() >= size.height()) , "Specified the size larger than the size of the screen");
-
- bool neededPositionFound = false;
- QSize oldSize = widget->size();
-
- QPoint topLeftPos = getWidgetGlobalTopLeftPoint(os, widget) + QPoint(5, 5);
- for (int i=0; i<5; i++){
- GTMouseDriver::moveTo(os, topLeftPos);
- QPoint newTopLeftPos = topLeftPos + QPoint(widget->frameGeometry().width() - 1, widget->frameGeometry().height() - 1) - QPoint(size.width(), size.height());
- GTMouseDriver::dragAndDrop(os, topLeftPos, newTopLeftPos);
- if (widget->size() != oldSize){
- neededPositionFound = true;
- break;
- }else{
- topLeftPos -= QPoint(1,1);
- }
- }
- GT_CHECK(neededPositionFound, "Needed mouse position for resizing not found");
-
- GTGlobals::sleep(1000);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getWidgetGlobalTopLeftPoint"
-QPoint GTWidget::getWidgetGlobalTopLeftPoint(GUITestOpStatus &os, QWidget *widget) {
- Q_UNUSED(os);
- GT_CHECK_RESULT(NULL != widget, "Widget is NULL", QPoint());
- return (widget->isWindow() ? widget->pos() : widget->parentWidget()->mapToGlobal(QPoint(0, 0)));
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/GTWidget.h b/src/libs_3rdparty/humimit/src/primitives/GTWidget.h
deleted file mode 100644
index 68f5cbb..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/GTWidget.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_GTWIDGET_H_
-#define _HI_GUI_GTWIDGET_H_
-
-#include "GTGlobals.h"
-
-#include <QAbstractButton>
-#include <QPushButton>
-#include <QWidget>
-
-namespace HI {
-/*!
- * \brief The class for working with QWidget primitive
- */
-class HI_EXPORT GTWidget {
-public:
- // fails if widget is NULL, not visible or not enabled; if p isNull, clicks on the center of widget
- static void click(GUITestOpStatus &os, QWidget *w, Qt::MouseButton mouseButton = Qt::LeftButton, QPoint p = QPoint(), bool safe = true);
-
- // fails if widget is NULL, GTWidget::click fails or widget hasn't got focus
- static void setFocus(GUITestOpStatus &os, QWidget *w);
-
- // finds widget with the given object name using given FindOptions. Parent widget is QMainWindow, if not set
- static QWidget *findWidget(GUITestOpStatus &os, const QString &widgetName, QWidget *parentWidget = NULL, const GTGlobals::FindOptions& = GTGlobals::FindOptions());
- static QPoint getWidgetCenter(GUITestOpStatus &os, QWidget* w);
-
- static QAbstractButton *findButtonByText(GUITestOpStatus &os, const QString &text, QWidget *parentWidget = NULL, const GTGlobals::FindOptions& = GTGlobals::FindOptions());
-
- //returns color of point p in widget w coordinates
- static QColor getColor(GUITestOpStatus &os, QWidget *widget, const QPoint &point);
- static QPixmap getPixmap(GUITestOpStatus &os, QWidget *widget);
- static QImage getImage(GUITestOpStatus &os, QWidget *widget);
-
- //this method writes info about all widgets to opStatus
- static void getAllWidgetsInfo(GUITestOpStatus &os, QWidget* parent=NULL);
-
- static void close(GUITestOpStatus &os, QWidget *widget);
- static void showMaximized(GUITestOpStatus &os, QWidget *widget);
- static void showNormal(GUITestOpStatus &os, QWidget *widget);
-
- static void clickLabelLink(GUITestOpStatus &os, QWidget* label, int step = 10, int indent = 0);
- static void clickWindowTitle(GUITestOpStatus &os, QWidget *window);
- static void moveWidgetTo(GUITestOpStatus &os, QWidget *window, const QPoint &point);
- static void resizeWidget(GUITestOpStatus &os, QWidget *widget, const QSize &size);
- static QPoint getWidgetGlobalTopLeftPoint(GUITestOpStatus &os, QWidget *widget);
-
- #define GT_CLASS_NAME "GTWidget"
- #define GT_METHOD_NAME "findWidget"
- template<class T>
- static T findExactWidget(GUITestOpStatus &os, const QString &widgetName, QWidget *parentWidget = NULL, const GTGlobals::FindOptions& options= GTGlobals::FindOptions()){
- T result = NULL;
- QWidget* w = findWidget(os, widgetName, parentWidget, options);
- result = qobject_cast<T>(w);
- if(options.failIfNull == true){
- GT_CHECK_RESULT(w != NULL, "widget " + widgetName + " not found", result);
- GT_CHECK_RESULT(result != NULL, "widget of specefied class not found, but there is another widget with the same name, its class is: " + QString(w->metaObject()->className()), result);
- }
- return result;
- }
- #undef GT_METHOD_NAME
- #undef GT_CLASS_NAME
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/PopupChooser.cpp b/src/libs_3rdparty/humimit/src/primitives/PopupChooser.cpp
deleted file mode 100644
index 7bf4b1c..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/PopupChooser.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/PopupChooser.h"
-#include "drivers/GTKeyboardDriver.h"
-#include "primitives/GTMenu.h"
-#include "drivers/GTMouseDriver.h"
-
-#include <QApplication>
-#include <QMenu>
-
-namespace HI {
-#define GT_CLASS_NAME "PopupChooser"
-
-#define GT_METHOD_NAME "run"
-void PopupChooser::commonScenario() {
- GTGlobals::sleep(1000);
- GTMouseDriver::release(os);
- QMenu* activePopupMenu = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- GT_CHECK(NULL != activePopupMenu, "Active popup menu is NULL");
-
- if (!namePath.isEmpty()) {
- GTMenu::clickMenuItemByName(os, activePopupMenu, namePath, useMethod);
- } else {
- clickEsc(os);
- }
-
- if (os.hasError()) {
- clickEsc(os);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickEsc"
-void PopupChooser::clickEsc(GUITestOpStatus &os) {
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["esc"]);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-void PopupChooserByText::commonScenario()
-{
- GTGlobals::sleep(1000);
- GTMouseDriver::release(os);
- QMenu* activePopupMenu = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- GTMenu::clickMenuItemByText(os, activePopupMenu, namePath, useMethod, matchFlag);
-}
-
-
-#define GT_CLASS_NAME "PopupChecker"
-
-#define GT_METHOD_NAME "run"
-PopupChecker::PopupChecker(GUITestOpStatus &os, CustomScenario *scenario) :
- Filler(os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup), scenario)
-{
-}
-
-void PopupChecker::commonScenario() {
- GTGlobals::sleep(1000);
- GTMouseDriver::release(os);
- QMenu* activePopupMenu = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- GT_CHECK(NULL != activePopupMenu, "Active popup menu is NULL");
-
- QAction* act;
- if (!namePath.isEmpty()) {
- QString actName;
- int escCount = namePath.size();
- if(namePath.size()>1){
- actName = namePath.takeLast();
- GTMenu::clickMenuItemByName(os, activePopupMenu, namePath, useMethod);
- QMenu* activePopupMenuToCheck = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- act = GTMenu::getMenuItem(os, activePopupMenuToCheck, actName);
- }else{
- QMenu* activePopupMenuToCheck = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- actName = namePath.last();
- act = GTMenu::getMenuItem(os, activePopupMenuToCheck, actName);
- }
-
- if(options.testFlag(Exists)){
- GT_CHECK(act != NULL, "action '" + actName + "' not found");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(Exists)");
- }else{
- GT_CHECK(act == NULL, "action '" + actName + "' unexpectidly found");
- }
- if(options.testFlag(IsEnabled)){
- GT_CHECK(act->isEnabled(), "action '" + act->objectName() + "' is not enabled");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsEnabled)");
- }
- if(options.testFlag(IsDisabled)){
- GT_CHECK(!act->isEnabled(), "action '" + act->objectName() + "' is enabled");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsDisabled");
- }
- if(options.testFlag(IsChecable)){
- GT_CHECK(act->isCheckable(), "action '" + act->objectName() + "' is not checkable");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsChecable)");
- }
- if(options.testFlag(IsChecked)){
- GT_CHECK(act->isCheckable(), "action '" + act->objectName() + "' is not checked");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsChecked)");
- }
- for(int i = 0; i<escCount; i++){
- PopupChooser::clickEsc(os);
- GTGlobals::sleep(300);
- }
- } else {
- PopupChooser::clickEsc(os);
- }
-
- if (os.hasError()) {
- PopupChooser::clickEsc(os);
- }
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "PopupCheckerByText"
-
-#define GT_METHOD_NAME "run"
-PopupCheckerByText::PopupCheckerByText(GUITestOpStatus &os, CustomScenario *scenario) :
- Filler(os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup), scenario)
-{
-}
-
-PopupCheckerByText::PopupCheckerByText(GUITestOpStatus &os,
- const QStringList &namePath,
- PopupChecker::CheckOptions options,
- GTGlobals::UseMethod useMethod) :
- Filler(os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup)),
- textPaths(QList<QStringList>() << namePath),
- options(options),
- useMethod(useMethod)
-{
-
-}
-
-PopupCheckerByText::PopupCheckerByText(GUITestOpStatus &os,
- const QList<QStringList> &namePaths,
- PopupChecker::CheckOptions options,
- GTGlobals::UseMethod useMethod) :
- Filler(os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup)),
- textPaths(namePaths),
- options(options),
- useMethod(useMethod)
-{
-
-}
-
-void PopupCheckerByText::commonScenario() {
- GTGlobals::sleep(1000);
- GTMouseDriver::release(os);
- QMenu* activePopupMenu = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- GT_CHECK(NULL != activePopupMenu, "Active popup menu is NULL");
-
- QAction* act;
-
- if (textPaths.isEmpty() || textPaths.first().isEmpty()) {
- PopupChooser::clickEsc(os);
- return;
- }
-
- foreach (QStringList textPath, textPaths) {
- QString actName;
- int escCount = textPath.size();
- if(textPath.size()>1){
- actName = textPath.takeLast();
- GTMenu::clickMenuItemByText(os, activePopupMenu, textPath, useMethod);
- QMenu* activePopupMenuToCheck = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- act = GTMenu::getMenuItem(os, activePopupMenuToCheck, actName, true);
- }else{
- QMenu* activePopupMenuToCheck = qobject_cast<QMenu*>(QApplication::activePopupWidget());
- actName = textPath.last();
- act = GTMenu::getMenuItem(os, activePopupMenuToCheck, actName, true);
- }
-
- if(options.testFlag(PopupChecker::Exists)){
- GT_CHECK(act != NULL, "action '" + actName + "' not found");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(Exists)");
- }else{
- GT_CHECK(act == NULL, "action '" + actName + "' unexpectidly found");
- }
- if(options.testFlag(PopupChecker::IsEnabled)){
- GT_CHECK(act->isEnabled(), "action '" + act->objectName() + "' is not enabled");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsEnabled)");
- }
- if(options.testFlag(PopupChecker::IsDisabled)){
- GT_CHECK(!act->isEnabled(), "action '" + act->objectName() + "' is enabled");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsDisabled");
- }
- if(options.testFlag(PopupChecker::IsChecable)){
- GT_CHECK(act->isCheckable(), "action '" + act->objectName() + "' is not checkable");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsChecable)");
- }
- if(options.testFlag(PopupChecker::IsChecked)){
- GT_CHECK(act->isCheckable(), "action '" + act->objectName() + "' is not checked");
- qDebug("GT_DEBUG_MESSAGE options.testFlag(IsChecked)");
- }
- for (int i = 0; i < escCount - 1; i++) {
- PopupChooser::clickEsc(os);
- GTGlobals::sleep(300);
- }
- }
-
- PopupChooser::clickEsc(os);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-}
-
diff --git a/src/libs_3rdparty/humimit/src/primitives/PopupChooser.h b/src/libs_3rdparty/humimit/src/primitives/PopupChooser.h
deleted file mode 100644
index 058ee79..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/PopupChooser.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_RUNNABLES_POPUP_CHOOSER_FILLER_H_
-#define _HI_GT_RUNNABLES_POPUP_CHOOSER_FILLER_H_
-
-#include "GTGlobals.h"
-#include "utils/GTUtilsDialog.h"
-
-namespace HI {
-
-class HI_EXPORT PopupChooser : public Filler {
- friend class PopupChecker;
- friend class PopupCheckerByText;
- public:
- PopupChooser(GUITestOpStatus &_os, const QStringList &_namePath, GTGlobals::UseMethod _useMethod = GTGlobals::UseKey) //UseKey need for Ubuntu
- :Filler(_os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup)), namePath(_namePath), useMethod(_useMethod){}
- virtual void commonScenario();
- protected:
- QStringList namePath;
- GTGlobals::UseMethod useMethod;
-
- private:
- static void clickEsc(GUITestOpStatus &_os);
- };
-
-class HI_EXPORT PopupChooserByText : public Filler {
- public:
- PopupChooserByText(GUITestOpStatus &_os, const QStringList &_namePath, GTGlobals::UseMethod _useMethod = GTGlobals::UseKey, Qt::MatchFlag _matchFlag = Qt::MatchExactly) //UseKey need for Ubuntu
- :Filler(_os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup)), namePath(_namePath), useMethod(_useMethod), matchFlag(_matchFlag){}
- virtual void commonScenario();
- protected:
- QStringList namePath;
- GTGlobals::UseMethod useMethod;
- Qt::MatchFlag matchFlag;
- };
-
-class HI_EXPORT PopupChecker : public Filler {
- public:
- enum CheckOption{
- NotExists = 0,
- Exists = 1,
- IsEnabled = 2 | Exists,
- IsDisabled = 4 | Exists,
- IsChecable = 8 | Exists,
- IsChecked = 16 | Exists | IsChecable
- };
- Q_DECLARE_FLAGS(CheckOptions, CheckOption)
- PopupChecker(GUITestOpStatus &os, CustomScenario *scenario);
- PopupChecker(GUITestOpStatus &_os, const QStringList &_namePath, CheckOptions _options = CheckOptions(IsEnabled),
- GTGlobals::UseMethod _useMethod = GTGlobals::UseKey) //UseKey need for Ubuntu
- :Filler(_os, GUIDialogWaiter::WaitSettings(QString(), GUIDialogWaiter::Popup)), namePath(_namePath), options(_options), useMethod(_useMethod){}
- virtual void commonScenario();
- protected:
- QStringList namePath;
- CheckOptions options;
- GTGlobals::UseMethod useMethod;
- };
- Q_DECLARE_OPERATORS_FOR_FLAGS(PopupChecker::CheckOptions)
-
-class HI_EXPORT PopupCheckerByText : public Filler {
- public:
- PopupCheckerByText(GUITestOpStatus &os, CustomScenario *scenario);
- PopupCheckerByText(GUITestOpStatus &os,
- const QStringList &namePath,
- PopupChecker::CheckOptions options = PopupChecker::CheckOptions(PopupChecker::IsEnabled),
- GTGlobals::UseMethod useMethod = GTGlobals::UseKey); //UseKey need for Ubuntu
- PopupCheckerByText(GUITestOpStatus &os, const QList<QStringList> &namePaths,
- PopupChecker::CheckOptions _options = PopupChecker::CheckOptions(PopupChecker::IsEnabled),
- GTGlobals::UseMethod useMethod = GTGlobals::UseKey);
-
- virtual void commonScenario();
- protected:
- QList<QStringList> textPaths;
- PopupChecker::CheckOptions options;
- GTGlobals::UseMethod useMethod;
- };
-}
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.cpp b/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.cpp
deleted file mode 100644
index 259b6e6..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMenuPrivate.h"
-#ifdef Q_OS_MAC
-#include "GTMenuPrivateMac.h"
-#endif
-#include "drivers/GTKeyboardDriver.h"
-#include "drivers/GTMouseDriver.h"
-#include "primitives/GTAction.h"
-#include "primitives/GTMainWindow.h"
-#include "primitives/PopupChooser.h"
-#include "utils/GTUtilsDialog.h"
-
-#include <QMainWindow>
-#include <QMenuBar>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTMenu"
-
-#define GT_METHOD_NAME "clickMainMenuItem"
-void GTMenuPrivate::clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, GTGlobals::UseMethod method, Qt::MatchFlag matchFlag) {
- GT_CHECK(itemPath.count() > 1, QString("Menu item path is too short: { %1 }").arg(itemPath.join(" -> ")));
-
-#ifdef Q_OS_MAC
- Q_UNUSED(method);
- GTMenuPrivateMac::clickMainMenuItem(os, itemPath, matchFlag);
-#else
- QStringList cuttedItemPath = itemPath;
- const QString menuName = cuttedItemPath.takeFirst();
- GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, cuttedItemPath, method, matchFlag));
- showMainMenu(os, menuName, method);
-#endif
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkMainMenuItemState"
-void GTMenuPrivate::checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState) {
- GT_CHECK(itemPath.count() > 1, QString("Menu item path is too short: { %1 }").arg(itemPath.join(" -> ")));
-
-#ifdef Q_OS_MAC
- GTMenuPrivateMac::checkMainMenuItemState(os, itemPath, expectedState);
-#else
- QStringList cuttedItemPath = itemPath;
- const QString menuName = cuttedItemPath.takeFirst();
- GTUtilsDialog::waitForDialog(os, new PopupCheckerByText(os, cuttedItemPath, expectedState, GTGlobals::UseMouse));
- showMainMenu(os, menuName, GTGlobals::UseMouse);
- GTGlobals::sleep(100);
-#endif
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "showMainMenu"
-void GTMenuPrivate::showMainMenu(GUITestOpStatus &os, const QString &menuName, GTGlobals::UseMethod m) {
-
- QMainWindow* mainWindow = NULL;
- QList<QAction*> resultList;
- foreach(QWidget* parent, GTMainWindow::getMainWindowsAsWidget(os)){
- QList<QAction*> list = parent->findChildren<QAction*>();
- bool isContainMenu = false;
- foreach(QAction* act, list){
- QString name = act->text().replace('&',"");
- if(name == menuName){
- resultList<<act;
- isContainMenu = true;
- }
- }
- if (isContainMenu){
- mainWindow = qobject_cast<QMainWindow*>(parent);
- }
- }
- GT_CHECK_RESULT(resultList.count()!=0,"action not found", );
- GT_CHECK_RESULT(resultList.count()<2, QString("There are %1 actions with this text").arg(resultList.count()), );
-
- QAction *menu = resultList.takeFirst();
-
- QPoint pos;
- QPoint gPos;
- QString menuText;
- int key = 0;
- int key_pos = 0;
-
- switch(m) {
- case GTGlobals::UseMouse:
- pos = mainWindow->menuBar()->actionGeometry(menu).center();
- gPos = mainWindow->menuBar()->mapToGlobal(pos);
-
- GTMouseDriver::moveTo(os, gPos);
- GTMouseDriver::click(os);
- break;
-
- case GTGlobals::UseKey:
- menuText = menu->text();
- key_pos = menuText.indexOf('&');
- key = (menuText.at(key_pos + 1)).toLatin1();
-
- GTKeyboardDriver::keyClick(os, key, GTKeyboardDriver::key["alt"]);
- break;
-
- default:
- break;
- }
-
- GTGlobals::sleep(1000);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.h b/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.h
deleted file mode 100644
index 7ef1c58..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivate.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_MENU_PRIVATE_H_
-#define _HI_GT_MENU_PRIVATE_H_
-
-#include "GTGlobals.h"
-#include "primitives/PopupChooser.h"
-
-namespace HI {
-
-class GTMenuPrivate {
-public:
- static void clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, GTGlobals::UseMethod method = GTGlobals::UseMouse, Qt::MatchFlag matchFlag = Qt::MatchExactly);
- static void checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState);
-
-private:
- static void showMainMenu(GUITestOpStatus &os, const QString &menuName, GTGlobals::UseMethod m = GTGlobals::UseMouse);
-
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.h b/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.h
deleted file mode 100644
index 6f105c2..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _U2_GT_MENU_PRIVATE_MAC_H_
-#define _U2_GT_MENU_PRIVATE_MAC_H_
-
-
-#ifdef __OBJC__
-#import <AppKit/AppKit.h>
-#endif // __OBJC__
-
-#include "GTGlobals.h"
-#include "primitives/PopupChooser.h"
-
-namespace HI {
-
-/**
- * It is supposed that Cocoa is used on OSX
- */
-class GTMenuPrivateMac {
-public:
- static void clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, Qt::MatchFlag matchFlag = Qt::MatchExactly);
- static void checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState);
-
-private:
-#ifdef __OBJC__
- static NSMenu *clickMenuItem(GUITestOpStatus &os, NSMenu *menu, const QString &itemTitle, Qt::MatchFlag matchFlag);
- static NSMenuItem *getMenuItem(GUITestOpStatus &os, NSMenu *menu, const QString &itemTitle, Qt::MatchFlag matchFlag);
- static void checkMenuItemState(GUITestOpStatus &os, NSMenu *containerMenu, const QString &itemTitle, PopupChecker::CheckOption expectedState);
-#endif // __OBJC__NSMenuItem
-};
-
-} // namespace U2
-
-#endif // _U2_GT_MENU_PRIVATE_MAC_H_
diff --git a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.mm b/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.mm
deleted file mode 100644
index c6765fa..0000000
--- a/src/libs_3rdparty/humimit/src/primitives/private/GTMenuPrivateMac.mm
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMenuPrivateMac.h"
-
-namespace HI {
-
-#ifdef __OBJC__
-
-#define GT_CLASS_NAME "GTMenuPrivateMac"
-class U2CocoaAutoReleasePool {
-public:
- U2CocoaAutoReleasePool();
- ~U2CocoaAutoReleasePool();
-
-private:
- NSAutoreleasePool *pool;
-};
-
-U2CocoaAutoReleasePool::U2CocoaAutoReleasePool() {
- pool = [[NSAutoreleasePool alloc] init];
-}
-
-U2CocoaAutoReleasePool::~U2CocoaAutoReleasePool() {
- [pool release];
-}
-
-#define GT_METHOD_NAME "clickMainMenuItem"
-void GTMenuPrivateMac::clickMainMenuItem(GUITestOpStatus &os, const QStringList &itemPath, Qt::MatchFlag matchFlag) {
- U2CocoaAutoReleasePool pool;
- Q_UNUSED(pool);
-
- NSMenu *menu = [NSApp mainMenu];
- foreach (const QString &itemTitle, itemPath) {
- GT_CHECK(NULL != menu, QString("Menu not found: '%1'").arg(itemTitle));
- menu = clickMenuItem(os, menu, itemTitle, matchFlag);
- GTGlobals::sleep(100);
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "checkMainMenuItemState"
-void GTMenuPrivateMac::checkMainMenuItemState(GUITestOpStatus &os, const QStringList &itemPath, PopupChecker::CheckOption expectedState) {
- U2CocoaAutoReleasePool pool;
- Q_UNUSED(pool);
-
- const QStringList itemContainerMenuPath = itemPath.mid(0, itemPath.size() - 1);
- NSMenu *menu = [NSApp mainMenu];
- foreach (const QString &itemTitle, itemContainerMenuPath) {
- GT_CHECK(NULL != menu, QString("Menu not found: '%1'").arg(itemTitle));
- menu = clickMenuItem(os, menu, itemTitle, Qt::MatchExactly);
- }
-
- checkMenuItemState(os, menu, itemPath.last(), expectedState);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickMenuItem"
-NSMenu * GTMenuPrivateMac::clickMenuItem(GUITestOpStatus &os, NSMenu *menu, const QString &itemTitle, Qt::MatchFlag matchFlag) {
- NSMenuItem *item = getMenuItem(os, menu, itemTitle, matchFlag);
- if (NULL == item) {
- QStringList items;
- for (NSInteger i = 0, itemsCount = [menu numberOfItems]; i < itemsCount; i++) {
- items << QString::fromNSString([[menu itemAtIndex:i] title]);
- }
- GT_CHECK_RESULT(NULL != item, QString("Menu item not found: '%1', available items: %2")
- .arg(itemTitle).arg(items.join(", ")), NULL);
- }
- NSMenu *submenu = [item submenu];
- [menu performActionForItemAtIndex:[menu indexOfItem:item]];
- return submenu;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getMenuItem"
-NSMenuItem *GTMenuPrivateMac::getMenuItem(GUITestOpStatus &os, NSMenu *menu, const QString &itemTitle, Qt::MatchFlag matchFlag) {
- switch (matchFlag) {
- case Qt::MatchExactly:
- return [menu itemWithTitle:(itemTitle.toNSString())];
- case Qt::MatchContains: {
- NSInteger itemsCount = [menu numberOfItems];
- for (NSInteger i = 0; i < itemsCount; i++) {
- NSMenuItem *menuItem = [menu itemAtIndex:i];
- if (QString::fromNSString([menuItem title]).contains(itemTitle)) {
- return menuItem;
- }
- }
- break;
- }
- default:
- GT_CHECK_RESULT(false, "Match flag is not supported", NULL);
- }
- return NULL;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getMenuItem"
-void GTMenuPrivateMac::checkMenuItemState(GUITestOpStatus &os, NSMenu *containerMenu, const QString &itemTitle, PopupChecker::CheckOption expectedState) {
- switch (expectedState) {
- case PopupChecker::NotExists: {
- NSMenuItem *menuItem = getMenuItem(os, containerMenu, itemTitle, Qt::MatchExactly);
- GT_CHECK(NULL == menuItem, QString("A menu item unexpectedly exists: %1").arg(itemTitle));
- break;
- }
-
- case PopupChecker::Exists: {
- NSMenuItem *menuItem = getMenuItem(os, containerMenu, itemTitle, Qt::MatchExactly);
- GT_CHECK(NULL != menuItem, QString("A menu item unexpectedly doesn't exist: %1").arg(itemTitle));
- break;
- }
-
- case PopupChecker::IsEnabled: {
- NSMenuItem *menuItem = getMenuItem(os, containerMenu, itemTitle, Qt::MatchExactly);
- GT_CHECK(NULL != menuItem, QString("A menu item unexpectedly doesn't exist: %1").arg(itemTitle));
- GT_CHECK([menuItem isEnabled], QString("A menu item is unexpectedly disabled: %1").arg(itemTitle));
- break;
- }
-
- case PopupChecker::IsDisabled: {
- NSMenuItem *menuItem = getMenuItem(os, containerMenu, itemTitle, Qt::MatchExactly);
- GT_CHECK(NULL != menuItem, QString("A menu item unexpectedly doesn't exist: %1").arg(itemTitle));
- GT_CHECK(![menuItem isEnabled], QString("A menu item is unexpectedly enabled: %1").arg(itemTitle));
- break;
- }
-
- case PopupChecker::IsChecable: {
- GT_CHECK(false, "Not implemented. Do you really need to check is menu item checkable or not?");
- break;
- }
-
- case PopupChecker::IsChecked: {
- NSMenuItem *menuItem = getMenuItem(os, containerMenu, itemTitle, Qt::MatchExactly);
- GT_CHECK(NULL != menuItem, QString("A menu item unexpectedly doesn't exist: %1").arg(itemTitle));
- GT_CHECK(NSOnState == [menuItem state], QString("A menu item is unexpectedly not checked: %1").arg(itemTitle));
- break;
- }
- }
-}
-
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
-
-#endif // __OBJC__
diff --git a/src/libs_3rdparty/humimit/src/system/GTClipboard.cpp b/src/libs_3rdparty/humimit/src/system/GTClipboard.cpp
deleted file mode 100644
index db4a850..0000000
--- a/src/libs_3rdparty/humimit/src/system/GTClipboard.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "system/GTClipboard.h"
-#ifdef Q_OS_WIN
-#include "utils/GTThread.h"
-#endif
-
-#include <QApplication>
-#include <QClipboard>
-#include <QFileInfo>
-#include <QMimeData>
-#include <QUrl>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTClipboard"
-
-#define GT_METHOD_NAME "text"
-QString GTClipboard::text(GUITestOpStatus &os) {
- GTGlobals::sleep(300);
-// check that clipboard contains text
- QClipboard *clipboard = QApplication::clipboard();
-
- GT_CHECK_RESULT(clipboard != NULL, "Clipboard is NULL", "");
- const QMimeData *mimeData = clipboard->mimeData();
- GT_CHECK_RESULT(mimeData != NULL, "Clipboard MimeData is NULL", "");
-
- GT_CHECK_RESULT(mimeData->hasText() == true, "Clipboard doesn't contain text data", "");
- QString clipboardText = mimeData->text();
-// need to clear clipboard, UGENE will crash on close otherwise because of Qt assert
- clipboard->clear();
-
- return clipboardText;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setText"
-void GTClipboard::setText(GUITestOpStatus &os, QString text ){
-#ifdef Q_OS_WIN
- //On windows clipboard actions should be done in main thread
- class Scenario : public CustomScenario {
- public:
- Scenario(const QString &_text) : text(_text){}
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->clear();
- clipboard->setText(text);
- GTGlobals::sleep();
- }
- private:
- QString text;
- };
-
- GTThread::runInMainThread(os, new Scenario(text));
-#else
- Q_UNUSED(os);
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->clear();
- clipboard->setText(text);
- GTGlobals::sleep();
-#endif
-}
-
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setUrls"
-void GTClipboard::setUrls(GUITestOpStatus &os, const QList<QString>& urls ){
- Q_UNUSED(os);
- QList<QUrl> updated;
- foreach (QString url, urls){
- QFileInfo fi (url);
- if (fi.makeAbsolute()){
- QString updatedurl = fi.absoluteFilePath();
- updatedurl.prepend("file://");
- updated.append(updatedurl);
- }else{
- os.setError("cannot make an absolute path");
- return;
- }
- }
- QMimeData *urlMime = new QMimeData();
- urlMime->setUrls(updated);
-
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->clear();
- clipboard->setMimeData(urlMime);
-}
-
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clear"
-void GTClipboard::clear(GUITestOpStatus &os){
-#ifdef Q_OS_WIN
- //On windows clipboard actions should be done in main thread
- class Scenario : public CustomScenario {
- public:
- Scenario(){}
- void run(GUITestOpStatus &os) {
- Q_UNUSED(os);
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->clear();
- GTGlobals::sleep(500);
- }
- };
-
- GTThread::runInMainThread(os, new Scenario());
-#else
- Q_UNUSED(os);
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->clear();
- GTGlobals::sleep(500);
-#endif
-}
-#undef GT_METHOD_NAME
-
-
-#undef GT_CLASS_NAME
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/system/GTClipboard.h b/src/libs_3rdparty/humimit/src/system/GTClipboard.h
deleted file mode 100644
index be63abd..0000000
--- a/src/libs_3rdparty/humimit/src/system/GTClipboard.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_CLIPBOARD_H_
-#define _HI_GT_CLIPBOARD_H_
-
-#include "GTGlobals.h"
-
-namespace HI {
-
-class HI_EXPORT GTClipboard {
-public:
- // fails if can't get clipboard or clipboard doesn't contain text data
- static QString text(GUITestOpStatus &os);
-
- static void setText(GUITestOpStatus &os, QString text);
-
- static void setUrls(GUITestOpStatus &os, const QList<QString>& urls);
-
- static void clear(GUITestOpStatus &os);
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/system/GTFile.cpp b/src/libs_3rdparty/humimit/src/system/GTFile.cpp
deleted file mode 100644
index 0775a22..0000000
--- a/src/libs_3rdparty/humimit/src/system/GTFile.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "system/GTFile.h"
-#include <QDir>
-
-#ifdef Q_OS_WIN
-
-// Microsoft's example of how to change file system permissions is used below.
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/aa379283%28v=vs.85%29.aspx for details.
-
-#include <Aclapi.h>
-
-DWORD AddAceToObjectsSecurityDescriptor (
- LPTSTR pszObjName, // name of object
- SE_OBJECT_TYPE ObjectType, // type of object
- LPTSTR pszTrustee, // trustee for new ACE
- TRUSTEE_FORM TrusteeForm, // format of trustee structure
- DWORD dwAccessRights, // access mask for new ACE
- ACCESS_MODE AccessMode, // type of ACE
- DWORD dwInheritance // inheritance flags for new ACE
- )
-{
- DWORD dwRes = 0;
- PACL pOldDACL = NULL;
- PACL pNewDACL = NULL;
- PSECURITY_DESCRIPTOR pSD = NULL;
- EXPLICIT_ACCESS ea;
-
- if ( NULL == pszObjName ) {
- return ERROR_INVALID_PARAMETER;
- }
-
- // Get a pointer to the existing DACL.
-
- dwRes = GetNamedSecurityInfo( pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL,
- &pOldDACL, NULL, &pSD );
- if ( ERROR_SUCCESS != dwRes ) {
- printf( "GetNamedSecurityInfo Error %u\n", dwRes );
- goto Cleanup;
- }
-
- // Initialize an EXPLICIT_ACCESS structure for the new ACE.
-
- ZeroMemory( &ea, sizeof( EXPLICIT_ACCESS ) );
- ea.grfAccessPermissions = dwAccessRights;
- ea.grfAccessMode = AccessMode;
- ea.grfInheritance= dwInheritance;
- ea.Trustee.TrusteeForm = TrusteeForm;
- ea.Trustee.ptstrName = pszTrustee;
-
- // Create a new ACL that merges the new ACE
- // into the existing DACL.
-
- dwRes = SetEntriesInAcl( 1, &ea, pOldDACL, &pNewDACL );
- if ( ERROR_SUCCESS != dwRes ) {
- printf( "SetEntriesInAcl Error %u\n", dwRes );
- goto Cleanup;
- }
-
- // Attach the new ACL as the object's DACL.
-
- dwRes = SetNamedSecurityInfo( pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL,
- pNewDACL, NULL );
- if ( ERROR_SUCCESS != dwRes ) {
- printf( "SetNamedSecurityInfo Error %u\n", dwRes );
- goto Cleanup;
- }
-
-Cleanup:
-
- if ( pSD != NULL ) {
- LocalFree( static_cast<HLOCAL>( pSD ) );
- }
- if (pNewDACL != NULL) {
- LocalFree( static_cast<HLOCAL>( pNewDACL ) );
- }
-
- return dwRes;
-}
-
-static void qt2WinPermissions( QFile::Permissions p, DWORD &allowedPermissions, DWORD &deniedPermissions )
-{
- if ( 0 != ( p & ( QFile::ReadOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup ) ) ) {
- allowedPermissions |= FILE_GENERIC_READ;
- } else {
- deniedPermissions |= FILE_GENERIC_READ;
- }
- if ( 0 != ( p & ( QFile::WriteOwner | QFile::WriteUser | QFile::WriteOther | QFile::WriteGroup ) ) ) {
- allowedPermissions |= FILE_GENERIC_WRITE;
- } else {
- deniedPermissions |= FILE_GENERIC_WRITE;
- }
- if ( 0 != ( p & ( QFile::ExeOwner | QFile::ExeUser | QFile::ExeOther | QFile::ExeGroup ) ) ) {
- allowedPermissions |= FILE_GENERIC_EXECUTE;
- } else {
- deniedPermissions |= FILE_GENERIC_EXECUTE;
- }
-}
-
-#endif
-
-namespace HI {
-
-#define GT_CLASS_NAME "PermissionsSetter"
-
-PermissionsSetter::PermissionsSetter() {
-}
-
-PermissionsSetter::~PermissionsSetter() {
- foreach (const QString& path, previousState.keys()) {
- QFile file(path);
- QFile::Permissions p = file.permissions();
-
- p = previousState.value(path, p);
- setOnce( path, p, false );
- }
-}
-
-bool PermissionsSetter::setPermissions(const QString& path, QFile::Permissions perm, bool recursive) {
- if (recursive) {
- return setRecursive(path, perm);
- } else {
- return setOnce(path, perm);
- }
-}
-
-#define GT_METHOD_NAME "setReadWrite"
-void PermissionsSetter::setReadWrite(GUITestOpStatus &os, const QString &path){
- QFile::Permissions p = QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | QFile::ReadUser | QFile::WriteUser |
- QFile::ExeUser | QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::ExeOther;
- PermissionsSetter setter;
- bool set = setter.setPermissions(path, p);
- GT_CHECK(set, "read-only permission could not be set")
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "setReadOnly"
-void PermissionsSetter::setReadOnly(GUITestOpStatus &os, const QString &path){
- QFile::Permissions p = QFile::ReadOwner | QFile::ExeOwner | QFile::ReadUser |
- QFile::ExeUser | QFile::ReadGroup | QFile::ExeGroup | QFile::ReadOther | QFile::ExeOther;
- bool set = setPermissions(path, p);
- GT_CHECK(set, "read-write permission could not be set")
-}
-#undef GT_METHOD_NAME
-
-bool PermissionsSetter::setRecursive(const QString& path, QFile::Permissions perm) {
- QFileInfo fileInfo(path);
- if (!(fileInfo.exists())) {
- return false;
- }
- if (fileInfo.isSymLink()) {
- return false;
- }
-
- if (fileInfo.isDir()) {
- QDir dir(path);
- foreach (const QString& entryPath, dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks)) {
- setOnce(path + "/" + entryPath, perm);
- bool res = setRecursive(path + "/" + entryPath, perm);
- if(!res){
- return res;
- }
- }
- }
-
- bool res = setOnce(path, perm);
-
- return res;
-}
-
-bool PermissionsSetter::setOnce( const QString &path, QFile::Permissions perm, bool savePreviousState ) {
- QFileInfo fileInfo( path );
- if (!(fileInfo.exists())) {
- return false;
- }
- if (fileInfo.isSymLink()) {
- return false;
- }
-
- QFile file( path );
- QFile::Permissions p = file.permissions( );
- if ( savePreviousState ) {
- previousState.insert( path, p );
- }
- p = perm;
-
-#ifdef Q_OS_WIN
- if ( fileInfo.isRelative( ) && !fileInfo.makeAbsolute( ) ) {
- return false;
- }
- const QString windowsPath = QDir::toNativeSeparators( fileInfo.filePath( ) );
-
- const int pathLength = windowsPath.size( );
- QScopedArrayPointer<wchar_t> pathString( new wchar_t[pathLength + 1] );
-
- windowsPath.toWCharArray( pathString.data( ) );
- pathString[pathLength] = '\0';
-
- DWORD allowed = 0;
- DWORD denied = 0;
- qt2WinPermissions( p, allowed, denied );
-
- DWORD dwRes = AddAceToObjectsSecurityDescriptor( pathString.data( ), SE_FILE_OBJECT, L"CURRENT_USER",
- TRUSTEE_IS_NAME, allowed, GRANT_ACCESS, NO_INHERITANCE );
- if ( ERROR_SUCCESS == dwRes ) {
- dwRes = AddAceToObjectsSecurityDescriptor( pathString.data( ), SE_FILE_OBJECT, L"CURRENT_USER",
- TRUSTEE_IS_NAME, denied, DENY_ACCESS, NO_INHERITANCE );
- }
-
- return ERROR_SUCCESS == dwRes;
-#else
- return file.setPermissions( p );
-#endif
-}
-
-#define GT_METHOD_NAME "setReadOnlyFlag"
-void PermissionsSetter::setReadOnlyFlag(GUITestOpStatus &os, const QString& path) {
-#ifdef Q_OS_WIN
- GT_CHECK(SetFileAttributesW(reinterpret_cast<LPCWSTR>(path.utf16()), FILE_ATTRIBUTE_READONLY),
- "Read flag could not be set");
-#else
- setReadOnly(os, path);
-#endif
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "GTFile"
-
-const QString GTFile::backupPostfix = "_GT_backup";
-
-#define GT_METHOD_NAME "equals"
-bool GTFile::equals(GUITestOpStatus &os, const QString& path1, const QString& path2) {
-
- QFile f1(path1);
- QFile f2(path2);
-
- bool ok = f1.open(QIODevice::ReadOnly) && f2.open(QIODevice::ReadOnly);
- GT_CHECK_RESULT(ok, f1.errorString() + " " + f2.errorString(), false);
-
- QByteArray byteArray1 = f1.readAll();
- QByteArray byteArray2 = f2.readAll();
-
- GT_CHECK_RESULT((f1.error() == QFile::NoError) && (f2.error() == QFile::NoError), f1.errorString() + " " + f2.errorString(), false);
-
- return byteArray1 == byteArray2;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "getSize"
-qint64 GTFile::getSize(GUITestOpStatus &os, const QString &path){
- QFile f(path);
- bool ok = f.open(QIODevice::ReadOnly);
- GT_CHECK_RESULT(ok, "file " + path + "not found",-1);
-
- int size = f.size();
- f.close();
- return size;
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "copy"
-void GTFile::copy(GUITestOpStatus &os, const QString& from, const QString& to) {
-
- QFile f2(to);
- bool ok = f2.open(QIODevice::ReadOnly);
- if (ok) {
- f2.remove();
- }
-
- bool copied = QFile::copy(from, to);
- GT_CHECK(copied == true, "can't copy <" + from + "> to <" + to + ">");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "copyDir"
-void GTFile::copyDir(GUITestOpStatus &os, const QString& dirToCopy, const QString& dirToPaste) {
-
- QDir from;
- from.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files);
- from.setPath(dirToCopy);
-
- QString pastePath = dirToPaste;
- bool ok = QDir().mkpath(pastePath);
- GT_CHECK(ok, "could not create directory: " + pastePath);
-
- QFileInfoList list = from.entryInfoList();
- foreach(QFileInfo info, list){
- if(info.fileName()=="." || info.fileName()==".."){
- continue;
- }
- if (info.isFile()){
- copy(os, info.filePath(), pastePath + '/' + info.fileName());
- }else if(info.isDir()){
- copyDir(os, info.filePath(), pastePath + '/' + info.fileName());
- }
-
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "removeDir"
-#ifdef Q_OS_WIN
-void GTFile::removeDir(QString dirName)
-{
- QDir dir(dirName);
- dir.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files);
-
- foreach (QFileInfo fileInfo, dir.entryInfoList()) {
- QString fileName = fileInfo.fileName();
- QString filePath = fileInfo.filePath();
- if (fileName != "." && fileName != "..") {
- QFile file(filePath);
- file.setPermissions(QFile::ReadOther | QFile::WriteOther);
- if(!file.remove(filePath)){
- QDir dir(filePath);
- if(!dir.rmdir(filePath)){
- removeDir(filePath);
- }
- }
- }
- }
- dir.rmdir(dir.absoluteFilePath(dirName));
-}
-#else
-void GTFile::removeDir(QString dirName)
-{
- QDir dir(dirName);
- qDebug("GT_DEBUG_MESSAGE removing dir: %s", dirName.toLocal8Bit().constData());
-
- foreach (QFileInfo fileInfo, dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden)) {
- QString fileName = fileInfo.fileName();
- QString filePath = fileInfo.filePath();
- if (fileName != "." && fileName != "..") {
- if(QFile::remove(filePath))
- continue;
- else{
- QDir dir(filePath);
- if(dir.rmdir(filePath))
- continue;
- else
- removeDir(filePath);
- }
- }
- }
- dir.rmdir(dir.absoluteFilePath(dirName));
-
- qDebug("GT_DEBUG_MESSAGE directory removed: %s", dirName.toLocal8Bit().constData());
-
-}
-#endif
-
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "backup"
-void GTFile::backup(GUITestOpStatus &os, const QString& path) {
-
- copy(os, path, path + backupPostfix);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "backupDir"
-void GTFile::backupDir(GUITestOpStatus &os, const QString& path) {
-
- copyDir(os, path, path + backupPostfix);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "restore"
-void GTFile::restore(GUITestOpStatus &os, const QString& path) {
-
- QFile backupFile(path + backupPostfix);
-
- bool ok = backupFile.open(QIODevice::ReadOnly);
- GT_CHECK(ok, "There is no backup file for <" + path + ">");
-
- QFile file(path);
- ok = file.open(QIODevice::ReadOnly);
- if (ok) {
- file.remove();
- }
-
- bool renamed = backupFile.rename(path);
- GT_CHECK(renamed == true, "restore of <" + path + "> can't be done");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "restoreDir"
-void GTFile::restoreDir(GUITestOpStatus &os, const QString& path) {
- QDir backupDir(path + backupPostfix);
- bool exists = backupDir.exists();
- if(!exists){
- return;
- }
-
- QDir dir(path);
- exists = dir.exists();
- if (exists) {
- removeDir(dir.absolutePath());
- }
-
- bool renamed = backupDir.rename(path + backupPostfix, path);
- GT_CHECK(renamed == true, "restore of <" + path + "> can't be done");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "check"
-bool GTFile::check(GUITestOpStatus &/*os*/, const QString& path) {
- QFile file(path);
- return file.exists();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "create"
-void GTFile::create(GUITestOpStatus &os, const QString &filePath) {
- Q_UNUSED(os);
- bool success = QFile(filePath).open(QIODevice::WriteOnly);
- GT_CHECK(success, "Can't open file to write");
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "readAll"
-QByteArray GTFile::readAll(GUITestOpStatus &os, const QString &filePath) {
- Q_UNUSED(os);
- QFile file(filePath);
- const bool opened = file.open(QFile::ReadOnly);
- GT_CHECK_RESULT(opened, "Can't open file for read", "");
-
- return file.readAll();
-}
-#undef GT_METHOD_NAME
-#undef GT_CLASS_NAME
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/system/GTFile.h b/src/libs_3rdparty/humimit/src/system/GTFile.h
deleted file mode 100644
index d5c4a7f..0000000
--- a/src/libs_3rdparty/humimit/src/system/GTFile.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_FILE_H_
-#define _HI_GT_FILE_H_
-
-#include "GTGlobals.h"
-#include <QFile>
-
-namespace HI {
-
-class HI_EXPORT PermissionsSetter {
- // If UGENE crash in the test, permissions won't be restored.
-public:
- PermissionsSetter();
- ~PermissionsSetter();
-
-
- static void setReadWrite(GUITestOpStatus &os, const QString& path);
- void setReadOnly(GUITestOpStatus &os, const QString& path);
-
- void setReadOnlyFlag(GUITestOpStatus &os, const QString& path);
-private:
- bool setPermissions(const QString& path, QFile::Permissions perm, bool recursive = true);
- bool setRecursive(const QString& path, QFile::Permissions perm);
- bool setOnce(const QString& path, QFile::Permissions perm, bool savePreviousState = true);
-
- QMap<QString, QFile::Permissions> previousState;
-};
-
-class HI_EXPORT GTFile {
-public:
- static bool equals(GUITestOpStatus &os, const QString&, const QString&);
-
- static qint64 getSize(GUITestOpStatus &os, const QString&);
-
- // backup file to the file with backupPostfix. fail the given file can't be opened
- static void backup(GUITestOpStatus &os, const QString&);
-
- // backup directory to the file with backupPostfix
- static void backupDir(GUITestOpStatus &os, const QString&);
-
- // copy file removing target file if exist
- static void copy(GUITestOpStatus &os, const QString& from, const QString& to);
-
- // copy directory entries removing target file if exist
- static void copyDir(GUITestOpStatus &os, const QString& dirToCopy, const QString& dirToPaste);
-
- // copy file removing target file if exist
- static void removeDir(QString dirName);
-
- // restores file and deletes backup. fail if there is no backup or can't write to the given file
- static void restore(GUITestOpStatus &os, const QString&);
-
- // restores file and deletes backup. fail if there is no backup or can't write to the given file
- static void restoreDir(GUITestOpStatus &os, const QString&);
-
- // checks if file exists
- static bool check(GUITestOpStatus &os, const QString&);
-
- // creates a new empty file, rewrite the file if it already exists
- static void create(GUITestOpStatus &os, const QString &filePath);
-
- static QByteArray readAll(GUITestOpStatus &os, const QString &filePath);
-
- static const QString backupPostfix;
-};
-
-} //namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.cpp b/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.cpp
deleted file mode 100644
index 385c8bd..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "utils/GTKeyboardUtils.h"
-
-namespace HI {
-
-void GTKeyboardUtils::selectAll(GUITestOpStatus &os)
-{
-#ifndef Q_OS_MAC
- int modifiers = GTKeyboardDriver::key["ctrl"];
-#else
- int modifiers = GTKeyboardDriver::key["cmd"];
-#endif
-
- GTKeyboardDriver::keyClick(os, 'a', modifiers);
-}
-
-void GTKeyboardUtils::copy(GUITestOpStatus &os)
-{
-#ifndef Q_OS_MAC
- int modifiers = GTKeyboardDriver::key["ctrl"];
-#else
- int modifiers = GTKeyboardDriver::key["cmd"];
-#endif
-
- GTKeyboardDriver::keyClick(os, 'c', modifiers);
-}
-
-void GTKeyboardUtils::paste(GUITestOpStatus &os)
-{
-#ifndef Q_OS_MAC
- int modifiers = GTKeyboardDriver::key["ctrl"];
-#else
- int modifiers = GTKeyboardDriver::key["cmd"];
-#endif
-
- GTKeyboardDriver::keyClick(os, 'v', modifiers);
-}
-
-void GTKeyboardUtils::cut(GUITestOpStatus &os)
-{
-#ifndef Q_OS_MAC
- int modifiers = GTKeyboardDriver::key["ctrl"];
-#else
- int modifiers = GTKeyboardDriver::key["cmd"];
-#endif
-
- GTKeyboardDriver::keyClick(os, 'x', modifiers);
-}
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.h b/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.h
deleted file mode 100644
index 96802b2..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTKeyboardUtils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef GTKEYBOARD_UTILS_H
-#define GTKEYBOARD_UTILS_H
-
-#include "drivers/GTKeyboardDriver.h"
-#include "GTGlobals.h"
-
-namespace HI {
-/*!
- * \brief The class contains the most commonly used keyboard hotkeys
- */
-class HI_EXPORT GTKeyboardUtils {
-public:
- static void selectAll(GUITestOpStatus&); // ctrl (or cmd on MacOS) + A
- static void copy(GUITestOpStatus&); // ctrl (or cmd on MacOS) + C
- static void paste(GUITestOpStatus&); // ctrl (or cmd on MacOS) + V
- static void cut(GUITestOpStatus&); // ctrl (or cmd on MacOS) + X
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.cpp b/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.cpp
deleted file mode 100644
index d1f3900..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTMouseUtils.h"
-#include "GTGlobals.h"
-#include "drivers/GTMouseDriver.h"
-#include <QtGui/QCursor>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTMouse"
-
-#define GT_METHOD_NAME "moveCursorToWidget"
-void GTMouseUtils::moveCursorToWidget(GUITestOpStatus &os, QWidget *widget) {
- GT_CHECK(widget != NULL, "Provided widget is null");
- QPoint widgetCenter = widget->rect().center();
- GTMouseDriver::moveTo(os, widgetCenter);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "moveCursorOutOfWidget"
-void GTMouseUtils::moveCursorOutOfWidget(GUITestOpStatus &os, QWidget *widget) {
- GT_CHECK(widget != NULL, "Provided widget is null");
- QPoint currentPosition = QCursor::pos();
- GT_CHECK(widget->rect().contains(currentPosition, false), "Cursor not over widget");
- QPoint finalPosition = widget->rect().topLeft() + QPoint(1, 1); //top left + offset
- GTMouseDriver::moveTo(os, finalPosition);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.h b/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.h
deleted file mode 100644
index a8303cf..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTMouseUtils.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef HI_GUI_GTMOUSE_H_
-#define HI_GUI_GTMOUSE_H_
-
-#include "GTGlobals.h"
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QWidget>
-#else
-#include <QtWidgets/QWidget>
-#endif
-
-
-namespace HI {
-
-class HI_EXPORT GTMouseUtils {
-public:
-
- static void moveCursorToWidget(GUITestOpStatus &os, QWidget *widget);
- static void moveCursorOutOfWidget(GUITestOpStatus &os, QWidget *widget);
-
-};
-
-}
-#endif
diff --git a/src/libs_3rdparty/humimit/src/utils/GTThread.cpp b/src/libs_3rdparty/humimit/src/utils/GTThread.cpp
deleted file mode 100644
index f951f94..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTThread.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <core/MainThreadRunnable.h>
-#include "core/MainThreadTimer.h"
-
-#include "GTGlobals.h"
-#include "utils/GTThread.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "ThreadWaiter"
-const qint64 TIMER_INTERVAL = 100;
-
-ThreadWaiter::ThreadWaiter(GUITestOpStatus &os) :
- os(os),
- startValue(0),
- endValue(0)
-{
-}
-
-#define GT_METHOD_NAME "wait"
-void ThreadWaiter::wait() {
- MainThreadTimer mainThreadTimer(TIMER_INTERVAL);
- startValue = mainThreadTimer.getCounter();
- while (endValue <= startValue) {
- GTGlobals::sleep(TIMER_INTERVAL);
- endValue = mainThreadTimer.getCounter();
- }
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "GTThread"
-
-#define GT_METHOD_NAME "waitForMainThread"
-void GTThread::waitForMainThread(GUITestOpStatus &os) {
- ThreadWaiter waiter(os);
- waiter.wait();
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "runInMainThread"
-void GTThread::runInMainThread(GUITestOpStatus &os, CustomScenario *scenario) {
- MainThreadRunnable::runInMainThread(os, scenario);
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-} // namespace
diff --git a/src/libs_3rdparty/humimit/src/utils/GTThread.h b/src/libs_3rdparty/humimit/src/utils/GTThread.h
deleted file mode 100644
index c362dee..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTThread.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GT_THREAD_H_
-#define _HI_GT_THREAD_H_
-
-#include <QTimer>
-#include <GTGlobals.h>
-#include <core/CustomScenario.h>
-
-namespace HI {
-
-class HI_EXPORT ThreadWaiter : public QObject {
- Q_OBJECT
-public:
- ThreadWaiter(GUITestOpStatus &os);
-
- void wait();
-
-private:
- GUITestOpStatus &os;
- qint64 startValue;
- qint64 endValue;
-};
-
-class HI_EXPORT GTThread {
-public:
- static void waitForMainThread(GUITestOpStatus &os);
- static void runInMainThread(GUITestOpStatus &os, CustomScenario *scenario);
-};
-
-} // namespace
-
-#endif // _HI_GT_THREAD_H_
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.cpp b/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.cpp
deleted file mode 100644
index f88fd5e..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "primitives/GTMainWindow.h"
-#include "utils/GTUtilsApp.h"
-
-#include <QMainWindow>
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTUtilsApp"
-
-#define GT_METHOD_NAME "checkUGENETitle"
-void GTUtilsApp::checkUGENETitle(GUITestOpStatus &os, const QString &title) {
-
- bool isTitleGood = false;
- foreach(QWidget* w, GTMainWindow::getMainWindowsAsWidget(os)){
- QString ugeneTitle = w->windowTitle();
- if(ugeneTitle == title){
- isTitleGood = true;
- }
- }
-
- GT_CHECK(isTitleGood, "UGENE title not <" + title + ">");
-}
-
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-#define GT_CLASS_NAME "GTUtilsApp"
-
-#define GT_METHOD_NAME "checkUGENETitleContains"
-void GTUtilsApp::checkUGENETitleContains(GUITestOpStatus &os, const QString& string) {
-
- bool isTitleContains = false;
- foreach(QWidget* w, GTMainWindow::getMainWindowsAsWidget(os)){
- QString ugeneTitle = w->windowTitle();
- if(ugeneTitle.contains(string)){
- isTitleContains = true;
- }
- }
-
- GT_CHECK(isTitleContains, "UGENE title not contains <" + string + ">");
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.h b/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.h
deleted file mode 100644
index 4624512..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsApp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_APP_UTILS_H_
-#define _HI_GUI_APP_UTILS_H_
-
-#include "GTGlobals.h"
-
-namespace HI {
-
-class HI_EXPORT GTUtilsApp {
-public:
- static void checkUGENETitle(GUITestOpStatus &os, const QString& title);
- static void checkUGENETitleContains(GUITestOpStatus &os, const QString& string);
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.cpp b/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.cpp
deleted file mode 100644
index cab8764..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
- /**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <QApplication>
-#include <QDateTime>
-#include <QPushButton>
-#include <QTimer>
-
-#include <core/GUITest.h>
-
-#include "GTUtilsDialog.h"
-#include "utils/GTThread.h"
-#include "primitives/GTWidget.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GUIDialogWaiter"
-
-GUIDialogWaiter::GUIDialogWaiter(GUITestOpStatus &_os, Runnable* _r, const WaitSettings& _settings)
-: hadRun(false), waiterId(-1), os(_os), runnable(_r), settings(_settings), timer(NULL), waitingTime(0) {
-
- static int totalWaiterCount = 0;
- waiterId = totalWaiterCount++;
-
- timer = new QTimer();
-
- timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkDialog()));
- timer->start(timerPeriod);
-}
-
-GUIDialogWaiter::~GUIDialogWaiter() {
-
- finishWaiting();
-}
-
-void GUIDialogWaiter::finishWaiting() {
- delete timer; timer = NULL;
- delete runnable; runnable = NULL;
-}
-
-void GUIDialogWaiter::stopTimer(){
- timer->stop();
-}
-
-bool GUIDialogWaiter::isExpectedName(const QString& widgetObjectName, const QString& expectedObjectName) {
-
- if (expectedObjectName.isNull()) {
- qWarning("GT_DEBUG_MESSAGE GUIDialogWaiter Warning!! Checking name, widget name '%s', but expected any, saying it's expected", widgetObjectName.toLocal8Bit().constData());
- return true;
- }
-
- qDebug("GT_DEBUG_MESSAGE GUIDialogWaiter Checking name, widget name '%s', expected '%s'", widgetObjectName.toLocal8Bit().constData(), expectedObjectName.toLocal8Bit().constData());
- return widgetObjectName == expectedObjectName;
-}
-
-void GUIDialogWaiter::checkDialogPool(){
- foreach(GUIDialogWaiter* waiter, GTUtilsDialog::pool){
- waiter->checkDialog();
- }
-}
-
-#define GT_METHOD_NAME "checkDialog"
-void GUIDialogWaiter::checkDialog() {
- try{
- QWidget *widget = NULL;
- GT_CHECK_NO_MESSAGE(runnable != NULL, "Runnable is NULL");
-
- switch (settings.dialogType) {
- case Modal:
- widget = QApplication::activeModalWidget();
- break;
-
- case Popup:
- widget = QApplication::activePopupWidget();
- break;
-
- default:
- break;
- }
-
- if (widget && !hadRun && isExpectedName(widget->objectName(), settings.objectName)) {
- timer->stop();
- qDebug("-------------------------");
- qDebug("GT_DEBUG_MESSAGE GUIDialogWaiter::wait ID = %d, name = '%s' going to RUN", waiterId, settings.objectName.toLocal8Bit().constData());
- qDebug("-------------------------");
-
- try {
- runnable->run();
- hadRun = true;
- } catch(GUITestOpStatus *) {
- GTGlobals::takeScreenShot(GUITest::screenshotDir + QDateTime::currentDateTime().toString() + ".jpg");
- QWidget* w = QApplication::activeModalWidget();
- while (w != NULL){
- w->close();
- w = QApplication::activeModalWidget();
- }
- w = QApplication::activePopupWidget();
- while (w != NULL){
- w->close();
- w = QApplication::activePopupWidget();
- }
- }
- }
- else {
- waitingTime += timerPeriod;
- if (waitingTime > settings.timeout) {
- qDebug("-------------------------");
- qDebug("GT_DEBUG_MESSAGE !!! GUIDialogWaiter::TIMEOUT Id = %d, going to finish waiting", waiterId);
- qDebug("-------------------------");
-
- finishWaiting();
- GT_CHECK(false, "TIMEOUT, waiterId = " + QString::number(waiterId));
- }
- }
-
- }
- catch(GUITestOpStatus *){}
-
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-
-#define GT_CLASS_NAME "GTUtilsDialog"
-
-HangChecker::HangChecker(GUITestOpStatus &_os):os(_os), mightHung(false){
- timer = new QTimer();
-}
-
-void HangChecker::startChecking(){
- timer->connect(timer, SIGNAL(timeout()), this, SLOT(sl_check()));
- timer->start(GTUtilsDialog::timerPeriod*100);
-}
-
-#define GT_METHOD_NAME "sl_check"
-void HangChecker::sl_check(){
- QWidget* dialog = QApplication::activeModalWidget();
- try{
- if(dialog != NULL){
- bool found = false;
- foreach (GUIDialogWaiter* waiter, GTUtilsDialog::pool) {
- if(!waiter->hadRun && waiter->isExpectedName(dialog->objectName(), waiter->getSettings().objectName)){
- found = true;
- mightHung = false;
- }
- }
-
- if(!found){
- if(mightHung){
- GT_CHECK(false, "dialog " + QString(dialog->metaObject()->className()) + " name: " + dialog->objectName() + " hang up");
- }
- }
-
- if(!found){
- if(!mightHung){
- mightHung = true;
- qWarning("GT_DEBUG_MESSAGE dialog mignt hang up");
- }
- }
-
- }else{
- mightHung = false;
- }
- } catch(GUITestOpStatus *) {
- GTGlobals::takeScreenShot(GUITest::screenshotDir + QDateTime::currentDateTime().toString() + ".jpg");
- QWidget* w = QApplication::activeModalWidget();
- while (w != NULL){
- w->close();
- w = QApplication::activeModalWidget();
- }
- w = QApplication::activePopupWidget();
- while (w != NULL){
- w->close();
- w = QApplication::activePopupWidget();
- }
- }
-}
-#undef GT_METHOD_NAME
-
-#undef GT_CLASS_NAME
-
-
-#define GT_CLASS_NAME "GTUtilsDialog"
-
-QList<GUIDialogWaiter*> GTUtilsDialog::pool = QList<GUIDialogWaiter*>();
-HangChecker* GTUtilsDialog::hangChecker = NULL;
-
-void GTUtilsDialog::startHangChecking(GUITestOpStatus &os){
- hangChecker = new HangChecker(os);
- hangChecker->startChecking();
-}
-
-void GTUtilsDialog::stopHangChecking(){
- if(hangChecker != NULL){
- hangChecker->timer->stop();
- }
-}
-
-#define GT_METHOD_NAME "buttonBox"
-QDialogButtonBox * GTUtilsDialog::buttonBox(GUITestOpStatus &os, QWidget *dialog) {
- return qobject_cast<QDialogButtonBox*>(GTWidget::findWidget(os, "buttonBox", dialog));
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickButtonBox"
-void GTUtilsDialog::clickButtonBox(GUITestOpStatus &os, QDialogButtonBox::StandardButton button) {
- clickButtonBox(os, QApplication::activeModalWidget(), button);
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "clickButtonBox"
-void GTUtilsDialog::clickButtonBox(GUITestOpStatus& os, QWidget* dialog, QDialogButtonBox::StandardButton button) {
- QDialogButtonBox* box = buttonBox(os, dialog);
- GT_CHECK(box != NULL, "buttonBox is NULL");
- QPushButton* pushButton = box->button(button);
- GT_CHECK(pushButton != NULL, "pushButton is NULL");
- GTWidget::click(os, pushButton);
-}
-#undef GT_METHOD_NAME
-
-void GTUtilsDialog::waitForDialog(GUITestOpStatus &os, Runnable *r, const GUIDialogWaiter::WaitSettings& settings)
-{
- GUIDialogWaiter *waiter = new GUIDialogWaiter(os, r, settings);
- pool.prepend(waiter);
-}
-
-void GTUtilsDialog::waitForDialog(GUITestOpStatus &os, Runnable *r, int timeout) {
- GUIDialogWaiter::WaitSettings settings;
- Filler* f = dynamic_cast<Filler*>(r);
- if (f) {
- settings = f->getSettings();
- if (timeout > 0) {
- settings.timeout = timeout;
- }
- }
-
- waitForDialog(os, r, settings);
-}
-
-void GTUtilsDialog::waitForDialogWhichMustNotBeRunned(GUITestOpStatus &os, Runnable *r) {
- GUIDialogWaiter::WaitSettings settings;
- Filler* f = dynamic_cast<Filler*>(r);
- if (f) {
- settings = f->getSettings();
- }
-
- settings.destiny = GUIDialogWaiter::MustNotBeRun;
- waitForDialog(os, r, settings);
-}
-
-void GTUtilsDialog::waitForDialogWhichMayRunOrNot(GUITestOpStatus &os, Runnable *r) {
- GUIDialogWaiter::WaitSettings settings;
- Filler* f = dynamic_cast<Filler*>(r);
- if (f) {
- settings = f->getSettings();
- }
-
- settings.destiny = GUIDialogWaiter::NoMatter;
- settings.timeout = 480000;
- waitForDialog(os, r, settings);
-}
-
-#define GT_METHOD_NAME "checkAllFinished"
-void GTUtilsDialog::checkAllFinished(GUITestOpStatus &os) {
- Q_UNUSED(os);
-
- foreach(GUIDialogWaiter* w, pool) {
- GT_CHECK(w, "NULL GUIDialogWaiter");
- switch (w->getSettings().destiny){
- case GUIDialogWaiter::MustBeRun:
- GT_CHECK(w->hadRun, QString("\"%1\" not run but should be").arg((w->getSettings().objectName)));
- break;
- case GUIDialogWaiter::MustNotBeRun:
- GT_CHECK(!w->hadRun, QString("\"%1\" had run but should not").arg((w->getSettings().objectName)));
- break;
- case GUIDialogWaiter::NoMatter:
- break;
- }
- }
-}
-#undef GT_METHOD_NAME
-
-#define GT_METHOD_NAME "isButtonEnabled"
-bool GTUtilsDialog::isButtonEnabled(GUITestOpStatus& os, QWidget* dialog, QDialogButtonBox::StandardButton button) {
- QDialogButtonBox* box = buttonBox(os, dialog);
- GT_CHECK_RESULT(box != NULL, "buttonBox is NULL", false);
- QPushButton* pushButton = box->button(button);
- GT_CHECK_RESULT(pushButton != NULL, "pushButton is NULL", false);
- return pushButton->isEnabled();
-}
-#undef GT_METHOD_NAME
-
-void GTUtilsDialog::cleanup(GUITestOpStatus &os, CleanupSettings s) {
- foreach (GUIDialogWaiter* waiter, pool) {
- waiter->stopTimer();
- }
-
- if (s == FailOnUnfinished) {
- checkAllFinished(os);
- }
-
- stopHangChecking();
-
- qDeleteAll(pool);
- pool.clear();
-}
-
-#undef GT_CLASS_NAME
-
-Filler::Filler(GUITestOpStatus &os, const GUIDialogWaiter::WaitSettings &settings, CustomScenario *scenario)
-: os(os), settings(settings), scenario(scenario)
-{
-
-}
-
-Filler::Filler(GUITestOpStatus &os, const QString &objectName, CustomScenario *scenario)
-: os(os), settings(GUIDialogWaiter::WaitSettings(objectName)), scenario(scenario)
-{
-
-}
-
-Filler::~Filler() {
- delete scenario;
-}
-
-GUIDialogWaiter::WaitSettings Filler::getSettings() const {
- return settings;
-}
-
-void Filler::run() {
- GTGlobals::sleep(500);
- if (NULL == scenario) {
- commonScenario();
- } else {
- scenario->run(os);
- }
- GTThread::waitForMainThread(os);
-}
-
-} //namespace
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.h b/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.h
deleted file mode 100644
index 12f396b..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsDialog.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_DIALOG_UTILS_H_
-#define _HI_GUI_DIALOG_UTILS_H_
-
-#include <QDialogButtonBox>
-
-#include <core/CustomScenario.h>
-
-#include "GTGlobals.h"
-
-namespace HI {
-
-class HI_EXPORT Runnable {
-public:
- virtual void run() = 0;
- virtual ~Runnable(){}
-};
-
-class HI_EXPORT GUIDialogWaiter : public QObject {
- Q_OBJECT
-public:
- enum DialogType {
- Modal,
- Popup
- };
- enum DialogDestiny {
- MustBeRun,
- MustNotBeRun,
- NoMatter
- };
-
- struct WaitSettings {
- WaitSettings(const QString& _objectName = "",
- DialogType _dialogType = GUIDialogWaiter::Modal,
- int _timeout = 120000,
- DialogDestiny _destiny = MustBeRun) :
- dialogType(_dialogType),
- objectName(_objectName),
- timeout(_timeout),
- destiny(_destiny) {}
-
- DialogType dialogType;
- QString objectName;
- int timeout;
- DialogDestiny destiny;
- };
-
- GUIDialogWaiter(GUITestOpStatus &os, Runnable* _r, const WaitSettings& settings = WaitSettings());
- virtual ~GUIDialogWaiter();
-
- WaitSettings getSettings(){return settings;}
- void stopTimer();
- static const int timerPeriod = 100;
-
- bool hadRun;
- int waiterId;
-
- bool isExpectedName(const QString& widgetObjectName, const QString& expectedObjectName);
-public slots:
- void checkDialog();
- void checkDialogPool();
-
-private:
- GUITestOpStatus &os;
- Runnable *runnable;
- WaitSettings settings;
-
- QTimer* timer;
- int waitingTime;
-
- void finishWaiting(); // deletes timer and runnable
-
-};
-
-class HI_EXPORT Filler : public Runnable {
-public:
- Filler(GUITestOpStatus &os, const GUIDialogWaiter::WaitSettings &settings, CustomScenario *scenario = NULL);
- Filler(GUITestOpStatus &os, const QString &objectName, CustomScenario *scenario = NULL);
- ~Filler();
-
- GUIDialogWaiter::WaitSettings getSettings() const;
- void run();
- virtual void commonScenario() {}
-
-protected:
- GUITestOpStatus &os;
- GUIDialogWaiter::WaitSettings settings;
- CustomScenario *scenario;
-};
-
-class HI_EXPORT HangChecker: public QObject{
- Q_OBJECT
-public:
- HangChecker(GUITestOpStatus &_os);
- QTimer* timer;
- void startChecking();
- GUITestOpStatus &os;
- bool mightHung;
-public slots:
- void sl_check();
-};
-
-class HI_EXPORT GTUtilsDialog{
- friend class TimerLauncher;
- friend class GUIDialogWaiter;
- friend class HangChecker;
-public:
- enum CleanupSettings {
- FailOnUnfinished, NoFailOnUnfinished
- };
-
- static QDialogButtonBox * buttonBox(GUITestOpStatus &os, QWidget *dialog);
-
- static void clickButtonBox(GUITestOpStatus &os, QDialogButtonBox::StandardButton button);
- static void clickButtonBox(GUITestOpStatus &os, QWidget *dialog, QDialogButtonBox::StandardButton button);
-
- // if objectName is not empty, waits for QWidget with a given name
- static void waitForDialog(GUITestOpStatus &os, Runnable *r, const GUIDialogWaiter::WaitSettings& settings);
-
- static void waitForDialog(GUITestOpStatus &os, Runnable *r, int timeout = 0);
-
- static void waitForDialogWhichMustNotBeRunned(GUITestOpStatus &os, Runnable *r);
-
- static void waitForDialogWhichMayRunOrNot(GUITestOpStatus &os, Runnable *r);
-
- // deletes all GUIDialogWaiters, sets err if there are unfinished waiters
- static void cleanup(GUITestOpStatus &os, CleanupSettings s = FailOnUnfinished);
-
- static void startHangChecking(GUITestOpStatus &os);
- static void stopHangChecking();
-
- static bool isButtonEnabled(GUITestOpStatus& os, QWidget* dialog, QDialogButtonBox::StandardButton button);
-
-private:
- static void checkAllFinished(GUITestOpStatus &os);
-
- static QList<GUIDialogWaiter*> pool;
- static HangChecker* hangChecker;
- static const int timerPeriod = 100;
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.cpp b/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.cpp
deleted file mode 100644
index b0b2281..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include "GTUtilsToolTip.h"
-
-namespace HI {
-
-#define GT_CLASS_NAME "GTUtilsToolTip"
-
-#define GT_METHOD_NAME "checkExistingToolTip"
-void GTUtilsToolTip::checkExistingToolTip(GUITestOpStatus &os, const QString& tooltip) {
-
- QString t = getToolTip();
- GT_CHECK(t.contains(tooltip), "Tooltip is <" + t + ">, doesn't contain <" + tooltip + ">");
-}
-#undef GT_METHOD_NAME
-
-QString GTUtilsToolTip::getToolTip() {
- GTGlobals::sleep(3000);
- return QToolTip::text();
-}
-
-#undef GT_CLASS_NAME
-
-}
diff --git a/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.h b/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.h
deleted file mode 100644
index 97cebd9..0000000
--- a/src/libs_3rdparty/humimit/src/utils/GTUtilsToolTip.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef _HI_GUI_TOOLTIP_UTILS_H_
-#define _HI_GUI_TOOLTIP_UTILS_H_
-
-#include "GTGlobals.h"
-#include <QToolTip>
-
-namespace HI {
-
-class HI_EXPORT GTUtilsToolTip {
-public:
- static void checkExistingToolTip(GUITestOpStatus &os, const QString& tooltip);
-
- static QString getToolTip();
-};
-
-} // namespace
-
-#endif
diff --git a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
index a89f4a1..e3268e4 100644
--- a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
+++ b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -227,6 +227,7 @@ QList<U2AuxData> SamtoolsAdapter::samString2aux(const QByteArray &auxString) {
}
QList<U2AuxData> SamtoolsAdapter::string2aux(const QByteArray &auxString) {
+ CHECK(!auxString.isEmpty(), QList<U2AuxData>());
// Adapted samtools code:
QList<U2AuxData> result;
const char *s = auxString.data();
diff --git a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
index 19dbdce..84f23c4 100644
--- a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
+++ b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp b/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
index a9356ed..5acbcc0 100644
--- a/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
+++ b/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/AnnotationTableObjectTest.h b/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
index 2b16900..62d4b95 100644
--- a/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
+++ b/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/AsnParserTests.cpp b/src/plugins/CoreTests/src/AsnParserTests.cpp
index 6a2e54a..c79a703 100644
--- a/src/plugins/CoreTests/src/AsnParserTests.cpp
+++ b/src/plugins/CoreTests/src/AsnParserTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/AsnParserTests.h b/src/plugins/CoreTests/src/AsnParserTests.h
index 2bf9958..5f01761 100644
--- a/src/plugins/CoreTests/src/AsnParserTests.h
+++ b/src/plugins/CoreTests/src/AsnParserTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
index 5430fc2..14dddcf 100644
--- a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
+++ b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
index 4963069..7b858e3 100644
--- a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
+++ b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp b/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
index ab2d558..42c39a9 100644
--- a/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
+++ b/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/BioStruct3DObjectTests.h b/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
index 7d5fdef..56b7442 100644
--- a/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
+++ b/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/CMDLineTests.cpp b/src/plugins/CoreTests/src/CMDLineTests.cpp
index 6c58b57..c55782a 100644
--- a/src/plugins/CoreTests/src/CMDLineTests.cpp
+++ b/src/plugins/CoreTests/src/CMDLineTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/CMDLineTests.h b/src/plugins/CoreTests/src/CMDLineTests.h
index e2960cc..36ddc1c 100644
--- a/src/plugins/CoreTests/src/CMDLineTests.h
+++ b/src/plugins/CoreTests/src/CMDLineTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/CoreTests.cpp b/src/plugins/CoreTests/src/CoreTests.cpp
index 04f25a7..72efcf8 100644
--- a/src/plugins/CoreTests/src/CoreTests.cpp
+++ b/src/plugins/CoreTests/src/CoreTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/CoreTests.h b/src/plugins/CoreTests/src/CoreTests.h
index 40b33c4..5e8c8a7 100644
--- a/src/plugins/CoreTests/src/CoreTests.h
+++ b/src/plugins/CoreTests/src/CoreTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp b/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
index 53e665c..ae54ae7 100644
--- a/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
+++ b/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DNASequenceObjectTests.h b/src/plugins/CoreTests/src/DNASequenceObjectTests.h
index 52f9aeb..1738d81 100644
--- a/src/plugins/CoreTests/src/DNASequenceObjectTests.h
+++ b/src/plugins/CoreTests/src/DNASequenceObjectTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DNATranslationImplTests.cpp b/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
index 1542072..2e55a10 100644
--- a/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
+++ b/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DNATranslationImplTests.h b/src/plugins/CoreTests/src/DNATranslationImplTests.h
index 181bdda..5559e60 100644
--- a/src/plugins/CoreTests/src/DNATranslationImplTests.h
+++ b/src/plugins/CoreTests/src/DNATranslationImplTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DnaAssemblyTests.cpp b/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
index 23c60cd..a745f45 100644
--- a/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
+++ b/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DnaAssemblyTests.h b/src/plugins/CoreTests/src/DnaAssemblyTests.h
index 94d4d14..fdd0322 100644
--- a/src/plugins/CoreTests/src/DnaAssemblyTests.h
+++ b/src/plugins/CoreTests/src/DnaAssemblyTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/DocumentModelTests.cpp b/src/plugins/CoreTests/src/DocumentModelTests.cpp
index 4c74390..b9d51d5 100644
--- a/src/plugins/CoreTests/src/DocumentModelTests.cpp
+++ b/src/plugins/CoreTests/src/DocumentModelTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,6 +41,7 @@
#include <U2Formats/SAMFormat.h>
+#include <QStringList>
namespace U2 {
@@ -89,6 +90,8 @@ void GTest_LoadDocument::init(XMLTestFormat*, const QDomElement& el) {
hints[DocumentReadingMode_SequenceAsAlignmentHint] = true;
} else if ("merge" == seqMode) {
hints[DocumentReadingMode_SequenceMergeGapSize] = 10; // just default value
+ } else if ("split" == seqMode) {
+ hints[DocumentReadingMode_SequenceAsSeparateHint] = true;
}
}
@@ -937,24 +940,30 @@ Task::ReportResult GTest_Compare_VCF_Files::report() {
QScopedPointer<IOAdapter> doc2Adapter(createIoAdapter(doc2Path));
CHECK_OP(stateInfo, ReportResult_Finished);
- int lineNum = 0;
- while(!doc1Adapter->isEof() && !doc2Adapter->isEof()) {
- QByteArray bytes1 = getLine(doc1Adapter.data());
- QByteArray bytes2 = getLine(doc2Adapter.data());
- lineNum++;
-
- if (bytes1 != bytes2) {
- setError(QString("The files %1 and %2 are not equal at line %3."
- "The first file contains '%4'' and the second contains '%5'!")
- .arg(doc1Path).arg(doc2Path).arg(lineNum).arg(QString(bytes1)).arg(QString(bytes2)));
- return ReportResult_Finished;
- }
+ QStringList vcfList1;
+ while(!doc1Adapter->isEof()) {
+ QString line = getLine(doc1Adapter.data());
+ vcfList1.append(line);
}
-
- if (!doc1Adapter->isEof() || !doc2Adapter->isEof()) {
+ QStringList vcfList2;
+ while(!doc2Adapter->isEof()) {
+ QString line = getLine(doc2Adapter.data());
+ vcfList2.append(line);
+ }
+ if (vcfList1.size() != vcfList2.size()) {
setError("files are of different size");
return ReportResult_Finished;
}
+ vcfList1.sort();
+ vcfList2.sort();
+ for(int i = 0; i < vcfList1.size(); i++){
+ if(vcfList1.at(i) != vcfList2.at(i)){
+ setError(QString("The files %1 and %2 are not equal."
+ "The first file contains '%3'' and the second contains '%4'!")
+ .arg(doc1Path).arg(doc2Path).arg(vcfList1.at(i)).arg(vcfList2.at(i)));
+ return ReportResult_Finished;
+ }
+ }
return ReportResult_Finished;
}
@@ -973,7 +982,7 @@ IOAdapter* GTest_Compare_VCF_Files::createIoAdapter(const QString& filePath) {
return ioAdapter;
}
-QByteArray GTest_Compare_VCF_Files::getLine(IOAdapter* io) {
+QString GTest_Compare_VCF_Files::getLine(IOAdapter* io) {
QByteArray line;
QByteArray readBuff(READ_BUFF_SIZE + 1, 0);
@@ -988,7 +997,7 @@ QByteArray GTest_Compare_VCF_Files::getLine(IOAdapter* io) {
line = (QByteArray::fromRawData(buff, len)).trimmed();
} while (line.startsWith(COMMENT_MARKER));
- return line;
+ return QString(line);
}
/*******************************
diff --git a/src/plugins/CoreTests/src/DocumentModelTests.h b/src/plugins/CoreTests/src/DocumentModelTests.h
index 9f69eaa..c2cf734 100644
--- a/src/plugins/CoreTests/src/DocumentModelTests.h
+++ b/src/plugins/CoreTests/src/DocumentModelTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -230,7 +230,7 @@ class GTest_Compare_VCF_Files : public GTest {
private:
IOAdapter* createIoAdapter(const QString& filePath);
- QByteArray getLine(IOAdapter* io);
+ QString getLine(IOAdapter* io);
QString doc1Path;
QString doc2Path;
diff --git a/src/plugins/CoreTests/src/EditAlignmentTests.cpp b/src/plugins/CoreTests/src/EditAlignmentTests.cpp
index 685b1b5..31b00de 100644
--- a/src/plugins/CoreTests/src/EditAlignmentTests.cpp
+++ b/src/plugins/CoreTests/src/EditAlignmentTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/EditAlignmentTests.h b/src/plugins/CoreTests/src/EditAlignmentTests.h
index 08883f5..b94070c 100644
--- a/src/plugins/CoreTests/src/EditAlignmentTests.h
+++ b/src/plugins/CoreTests/src/EditAlignmentTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/EditSequenceTests.cpp b/src/plugins/CoreTests/src/EditSequenceTests.cpp
index ce0568f..73b6d8b 100644
--- a/src/plugins/CoreTests/src/EditSequenceTests.cpp
+++ b/src/plugins/CoreTests/src/EditSequenceTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/EditSequenceTests.h b/src/plugins/CoreTests/src/EditSequenceTests.h
index 760f645..a616bf7 100644
--- a/src/plugins/CoreTests/src/EditSequenceTests.h
+++ b/src/plugins/CoreTests/src/EditSequenceTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/FindAlgorithmTests.cpp b/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
index 9cba8a0..ee438a8 100644
--- a/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
+++ b/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/FindAlgorithmTests.h b/src/plugins/CoreTests/src/FindAlgorithmTests.h
index aaf1e81..be25133 100644
--- a/src/plugins/CoreTests/src/FindAlgorithmTests.h
+++ b/src/plugins/CoreTests/src/FindAlgorithmTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/FormatDetectionTests.cpp b/src/plugins/CoreTests/src/FormatDetectionTests.cpp
index be9bc48..172b1c1 100644
--- a/src/plugins/CoreTests/src/FormatDetectionTests.cpp
+++ b/src/plugins/CoreTests/src/FormatDetectionTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/FormatDetectionTests.h b/src/plugins/CoreTests/src/FormatDetectionTests.h
index c6dcd5c..1b46391 100644
--- a/src/plugins/CoreTests/src/FormatDetectionTests.h
+++ b/src/plugins/CoreTests/src/FormatDetectionTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/GUrlTests.cpp b/src/plugins/CoreTests/src/GUrlTests.cpp
index 827428b..87c3e89 100644
--- a/src/plugins/CoreTests/src/GUrlTests.cpp
+++ b/src/plugins/CoreTests/src/GUrlTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/GUrlTests.h b/src/plugins/CoreTests/src/GUrlTests.h
index 7c33411..161bff5 100644
--- a/src/plugins/CoreTests/src/GUrlTests.h
+++ b/src/plugins/CoreTests/src/GUrlTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
index 5610823..70791b8 100644
--- a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
+++ b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
index 7cd7cbf..c67b4dc 100644
--- a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
+++ b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PWMatrixTests.cpp b/src/plugins/CoreTests/src/PWMatrixTests.cpp
index 102af9d..173f9b2 100644
--- a/src/plugins/CoreTests/src/PWMatrixTests.cpp
+++ b/src/plugins/CoreTests/src/PWMatrixTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PWMatrixTests.h b/src/plugins/CoreTests/src/PWMatrixTests.h
index 34a06bf..caf0ef0 100644
--- a/src/plugins/CoreTests/src/PWMatrixTests.h
+++ b/src/plugins/CoreTests/src/PWMatrixTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp b/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
index df15d8e..69757d8 100644
--- a/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
+++ b/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PhyTreeObjectTests.h b/src/plugins/CoreTests/src/PhyTreeObjectTests.h
index 465d23d..c6ae88f 100644
--- a/src/plugins/CoreTests/src/PhyTreeObjectTests.h
+++ b/src/plugins/CoreTests/src/PhyTreeObjectTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PingRemoteServiceTests.cpp b/src/plugins/CoreTests/src/PingRemoteServiceTests.cpp
index a318941..86cd234 100644
--- a/src/plugins/CoreTests/src/PingRemoteServiceTests.cpp
+++ b/src/plugins/CoreTests/src/PingRemoteServiceTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/PingRemoteServiceTests.h b/src/plugins/CoreTests/src/PingRemoteServiceTests.h
index ab63885..8273eee 100644
--- a/src/plugins/CoreTests/src/PingRemoteServiceTests.h
+++ b/src/plugins/CoreTests/src/PingRemoteServiceTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SMatrixTests.cpp b/src/plugins/CoreTests/src/SMatrixTests.cpp
index 35938ea..46a30ba 100644
--- a/src/plugins/CoreTests/src/SMatrixTests.cpp
+++ b/src/plugins/CoreTests/src/SMatrixTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SMatrixTests.h b/src/plugins/CoreTests/src/SMatrixTests.h
index 7e6bc64..bc9c042 100644
--- a/src/plugins/CoreTests/src/SMatrixTests.h
+++ b/src/plugins/CoreTests/src/SMatrixTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SecStructPredictTests.cpp b/src/plugins/CoreTests/src/SecStructPredictTests.cpp
index 4c0d5cd..9deaa16 100644
--- a/src/plugins/CoreTests/src/SecStructPredictTests.cpp
+++ b/src/plugins/CoreTests/src/SecStructPredictTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SecStructPredictTests.h b/src/plugins/CoreTests/src/SecStructPredictTests.h
index ed62265..21a902f 100644
--- a/src/plugins/CoreTests/src/SecStructPredictTests.h
+++ b/src/plugins/CoreTests/src/SecStructPredictTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SequenceWalkerTests.cpp b/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
index 20b2cc4..5727bd4 100644
--- a/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
+++ b/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/SequenceWalkerTests.h b/src/plugins/CoreTests/src/SequenceWalkerTests.h
index 917ba9f..7ebfd6a 100644
--- a/src/plugins/CoreTests/src/SequenceWalkerTests.h
+++ b/src/plugins/CoreTests/src/SequenceWalkerTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/TaskTests.cpp b/src/plugins/CoreTests/src/TaskTests.cpp
index 07a417c..96c6636 100644
--- a/src/plugins/CoreTests/src/TaskTests.cpp
+++ b/src/plugins/CoreTests/src/TaskTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/TaskTests.h b/src/plugins/CoreTests/src/TaskTests.h
index 2e11703..909b795 100644
--- a/src/plugins/CoreTests/src/TaskTests.h
+++ b/src/plugins/CoreTests/src/TaskTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/TextObjectTests.cpp b/src/plugins/CoreTests/src/TextObjectTests.cpp
index a638ee8..b9cd51e 100644
--- a/src/plugins/CoreTests/src/TextObjectTests.cpp
+++ b/src/plugins/CoreTests/src/TextObjectTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/TextObjectTests.h b/src/plugins/CoreTests/src/TextObjectTests.h
index 3cab11a..0693595 100644
--- a/src/plugins/CoreTests/src/TextObjectTests.h
+++ b/src/plugins/CoreTests/src/TextObjectTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/UtilTestActions.cpp b/src/plugins/CoreTests/src/UtilTestActions.cpp
index 6fff4a4..4e7a622 100644
--- a/src/plugins/CoreTests/src/UtilTestActions.cpp
+++ b/src/plugins/CoreTests/src/UtilTestActions.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/CoreTests/src/UtilTestActions.h b/src/plugins/CoreTests/src/UtilTestActions.h
index 2691b06..2a82b3a 100644
--- a/src/plugins/CoreTests/src/UtilTestActions.h
+++ b/src/plugins/CoreTests/src/UtilTestActions.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/GUITestBase.pri b/src/plugins/GUITestBase/GUITestBase.pri
index abd5a3f..715f264 100644
--- a/src/plugins/GUITestBase/GUITestBase.pri
+++ b/src/plugins/GUITestBase/GUITestBase.pri
@@ -7,8 +7,8 @@ PLUGIN_VENDOR=Unipro
QT += testlib
greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
-INCLUDEPATH += ../../corelibs/U2View/_tmp/ ../../libs_3rdparty/humimit/src
-LIBS +=-L../../_release -lhumimit
+INCLUDEPATH += ../../corelibs/U2View/_tmp/ ../../libs_3rdparty/QSpec/src
+LIBS +=-L../../_release -L../../libs_3rdparty/humimit/ -lhumimit
!debug_and_release|build_pass {
diff --git a/src/plugins/GUITestBase/GUITestBase.pro b/src/plugins/GUITestBase/GUITestBase.pro
index c07abaf..e60e287 100644
--- a/src/plugins/GUITestBase/GUITestBase.pro
+++ b/src/plugins/GUITestBase/GUITestBase.pro
@@ -256,7 +256,8 @@ HEADERS += src/GUITestBasePlugin.h \
# src/api/GTFileDialog.h \
# src/GTGlobals.h \
src/api/GTGraphicsItem.h \ #\
- src/test_runner/GUITestRunner.h
+ src/test_runner/GUITestRunner.h \
+ src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h
# src/api/GTGroupBox.h \
# src/drivers/GTKeyboardDriver.h \
# src/api/GTKeyboardUtils.h \
@@ -538,7 +539,8 @@ SOURCES += src/GUITestBasePlugin.cpp \
# src/api/GTFileDialog.cpp \
# src/api/GTGlobals.cpp \
src/api/GTGraphicsItem.cpp \ #\
- src/test_runner/GUITestRunner.cpp
+ src/test_runner/GUITestRunner.cpp \
+ src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp
# src/api/GTGroupBox.cpp \
# src/api/GTKeyboardDriver.cpp \
# src/api/GTKeyboardDriverLinux.cpp \
diff --git a/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp b/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
index f93600c..b961591 100644
--- a/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
+++ b/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
#include <U2Core/Settings.h>
#include <U2Core/U2DbiUtils.h>
-#include <core/GUITest.h>
+#include <U2Test/UGUITest.h>
#include "GTDatabaseConfig.h"
@@ -48,7 +48,7 @@ const QString READ_ONLY_LOGIN = "read_only_login";
const QString PASSWORD = "password";
QVariant getSetting(const QString &key) {
- QSettings settings(HI::GUITest::testDir +"_common_data/database.ini", QSettings::IniFormat);
+ QSettings settings(UGUITest::testDir +"_common_data/database.ini", QSettings::IniFormat);
return settings.value(SETTINGS_ROOT + key);
}
diff --git a/src/plugins/GUITestBase/src/GTDatabaseConfig.h b/src/plugins/GUITestBase/src/GTDatabaseConfig.h
index d1579df..51f7faa 100644
--- a/src/plugins/GUITestBase/src/GTDatabaseConfig.h
+++ b/src/plugins/GUITestBase/src/GTDatabaseConfig.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
index c88d7a5..42d4188 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -75,7 +75,7 @@ QTreeWidgetItem* GTUtilsAnnotHighlightingTreeView::findItem(HI::GUITestOpStatus
return vi;
}
}
- GT_CHECK_RESULT(options.failIfNull == false, "Item " + itemName + " not found in tree widget", NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, "Item " + itemName + " not found in tree widget", NULL);
return NULL;
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
index 8279318..adfa73b 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
index acd91e0..86ff21f 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,26 +22,28 @@
#include <QMainWindow>
#include <QTreeWidget>
+#include <drivers/GTKeyboardDriver.h>
+#include <drivers/GTMouseDriver.h>
+#include <primitives/GTTreeWidget.h>
+#include <primitives/GTWidget.h>
+#include <primitives/PopupChooser.h>
+#include <utils/GTKeyboardUtils.h>
+#include <utils/GTThread.h>
+#include <utils/GTUtilsDialog.h>
+
#include <U2Core/Annotation.h>
#include <U2Core/AnnotationGroup.h>
#include <U2Core/ProjectModel.h>
+#include <U2Core/U2SafePoints.h>
#include <U2Gui/MainWindow.h>
#include <U2View/AnnotationsTreeView.h>
-#include <U2Core/U2SafePoints.h>
#include "GTUtilsAnnotationsTreeView.h"
-#include "utils/GTUtilsDialog.h"
#include "GTUtilsMdi.h"
#include "GTUtilsProjectTreeView.h"
#include "GTUtilsTaskTreeView.h"
-#include <drivers/GTKeyboardDriver.h>
-#include "utils/GTKeyboardUtils.h"
-#include <drivers/GTMouseDriver.h>
-#include <primitives/GTTreeWidget.h>
-#include <primitives/GTWidget.h>
-#include "primitives/PopupChooser.h"
#include "runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h"
#include "runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h"
@@ -63,6 +65,7 @@ QTreeWidget* GTUtilsAnnotationsTreeView::getTreeWidget(HI::GUITestOpStatus &os)
void GTUtilsAnnotationsTreeView::addAnnotationsTableFromProject(HI::GUITestOpStatus &os, const QString &tableName) {
GTUtilsDialog::waitForDialog(os, new CreateObjectRelationDialogFiller(os));
GTUtilsProjectTreeView::dragAndDrop(os, GTUtilsProjectTreeView::findIndex(os, tableName), GTUtilsAnnotationsTreeView::getTreeWidget(os));
+ GTThread::waitForMainThread(os);
}
#undef GT_METHOD_NAME
@@ -177,7 +180,7 @@ QTreeWidgetItem * GTUtilsAnnotationsTreeView::findFirstAnnotation(HI::GUITestOpS
return item;
}
}
- GT_CHECK_RESULT(options.failIfNull == false, "No items in tree widget", NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, "No items in tree widget", NULL);
return NULL;
}
#undef GT_METHOD_NAME
@@ -197,7 +200,7 @@ QTreeWidgetItem * GTUtilsAnnotationsTreeView::findItem(HI::GUITestOpStatus &os,
return item;
}
}
- GT_CHECK_RESULT(options.failIfNull == false, QString("Item '%1' not found in tree widget").arg(itemName), NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, QString("Item '%1' not found in tree widget").arg(itemName), NULL);
return NULL;
}
@@ -218,7 +221,7 @@ QTreeWidgetItem * GTUtilsAnnotationsTreeView::findItem(HI::GUITestOpStatus &os,
return item;
}
}
- GT_CHECK_RESULT(options.failIfNull == false, "Item " + itemName + " not found in tree widget", NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, "Item " + itemName + " not found in tree widget", NULL);
return NULL;
}
@@ -240,7 +243,7 @@ QList<QTreeWidgetItem*> GTUtilsAnnotationsTreeView::findItems(HI::GUITestOpStatu
result.append(item);
}
}
- GT_CHECK_RESULT(!options.failIfNull || !result.isEmpty(), "Item " + itemName + " not found in tree widget", result);
+ GT_CHECK_RESULT(!options.failIfNotFound || !result.isEmpty(), "Item " + itemName + " not found in tree widget", result);
return result;
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
index b67a6cb..80768ab 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
index e1c79dd..9a86358 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
index 5d1a50e..fc0a49e 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
index 572f2d8..b47f154 100644
--- a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -90,7 +90,7 @@ QTreeWidgetItem* GTUtilsBookmarksTreeView::findItem(HI::GUITestOpStatus &os, con
}
}
}
- GT_CHECK_RESULT(options.failIfNull == false, "Item " + itemName + " not found in tree widget", NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, "Item " + itemName + " not found in tree widget", NULL);
return NULL;
}
@@ -119,6 +119,7 @@ void GTUtilsBookmarksTreeView::addBookmark(HI::GUITestOpStatus &os, const QStrin
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << ACTION_ADD_BOOKMARK));
GTMouseDriver::moveTo(os, getItemCenter(os, viewName));
GTMouseDriver::click(os, Qt::RightButton);
+ GTGlobals::sleep(500);
QWidget *bookmarkLineEdit = getTreeWidget(os)->itemWidget(getTreeWidget(os)->currentItem(), 0);
GTLineEdit::setText(os, qobject_cast<QLineEdit *>(bookmarkLineEdit), bookmarkName);
diff --git a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
index 30c5cc1..826dcf4 100644
--- a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp b/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
index 1bae558..12e18aa 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,19 +50,19 @@ QTabWidget* GTUtilsDashboard::getTabWidget(HI::GUITestOpStatus &os){
return GTWidget::findExactWidget<QTabWidget*>(os, "WorkflowTabView");
}
-QWebElement GTUtilsDashboard::findElement(HI::GUITestOpStatus &os, QString text, QString tag, bool exactMatch){
+HIWebElement GTUtilsDashboard::findElement(HI::GUITestOpStatus &os, QString text, QString tag, bool exactMatch){
return GTWebView::findElement(os, getDashboard(os), text, tag, exactMatch);
}
-QWebElement GTUtilsDashboard::findTreeElement(HI::GUITestOpStatus &os, QString text){
+HIWebElement GTUtilsDashboard::findTreeElement(HI::GUITestOpStatus &os, QString text){
return GTWebView::findTreeElement(os, getDashboard(os), text);
}
-QWebElement GTUtilsDashboard::findContextMenuElement(HI::GUITestOpStatus &os, QString text){
+HIWebElement GTUtilsDashboard::findContextMenuElement(HI::GUITestOpStatus &os, QString text){
return GTWebView::findContextMenuElement(os, getDashboard(os), text);
}
-void GTUtilsDashboard::click(HI::GUITestOpStatus &os, QWebElement el, Qt::MouseButton button){
+void GTUtilsDashboard::click(HI::GUITestOpStatus &os, HIWebElement el, Qt::MouseButton button){
GTWebView::click(os, getDashboard(os), el, button);
}
@@ -73,7 +73,7 @@ bool GTUtilsDashboard::areThereProblems(HI::GUITestOpStatus &os) {
#define GT_METHOD_NAME "openTab"
void GTUtilsDashboard::openTab(HI::GUITestOpStatus &os, Tabs tab){
- QWebElement el = GTWebView::findElement(os, getDashboard(os), tabMap.key(tab), "A");
+ HIWebElement el = GTWebView::findElement(os, getDashboard(os), tabMap.key(tab), "A");
GTWebView::click(os, getDashboard(os), el);
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsDashboard.h b/src/plugins/GUITestBase/src/GTUtilsDashboard.h
index 5c18031..4e42096 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDashboard.h
+++ b/src/plugins/GUITestBase/src/GTUtilsDashboard.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
#define GTUTILSDASHBOARD_H
#include "GTGlobals.h"
+#include <primitives/GTWebView.h>
class QWebView;
class QWebElement;
@@ -39,10 +40,10 @@ public:
static QWebView* getDashboard(HI::GUITestOpStatus &os);
static QTabWidget* getTabWidget(HI::GUITestOpStatus &os);
- static QWebElement findElement(HI::GUITestOpStatus &os, QString text, QString tag = "*", bool exactMatch = false);
- static QWebElement findTreeElement(HI::GUITestOpStatus &os, QString text);
- static QWebElement findContextMenuElement(HI::GUITestOpStatus &os, QString text);
- static void click(HI::GUITestOpStatus &os, QWebElement el, Qt::MouseButton button = Qt::LeftButton);
+ static HIWebElement findElement(HI::GUITestOpStatus &os, QString text, QString tag = "*", bool exactMatch = false);
+ static HIWebElement findTreeElement(HI::GUITestOpStatus &os, QString text);
+ static HIWebElement findContextMenuElement(HI::GUITestOpStatus &os, QString text);
+ static void click(HI::GUITestOpStatus &os, HIWebElement el, Qt::MouseButton button = Qt::LeftButton);
static bool areThereProblems(HI::GUITestOpStatus &os);
static void openTab(HI::GUITestOpStatus &os, Tabs tab);
diff --git a/src/plugins/GUITestBase/src/GTUtilsDocument.cpp b/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
index cf364d6..c713432 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -187,6 +187,13 @@ void GTUtilsDocument::lockDocument(HI::GUITestOpStatus &os, const QString &docum
}
#undef GT_METHOD_NAME
+#define GT_METHOD_NAME "unlockDocument"
+void GTUtilsDocument::unlockDocument(HI::GUITestOpStatus &os, const QString &documentName) {
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Edit" << "Unlock document for editing"));
+ GTUtilsProjectTreeView::click(os, documentName, Qt::RightButton);
+}
+#undef GT_METHOD_NAME
+
QList<GObjectView*> GTUtilsDocument::getAllGObjectViews() {
QList<GObjectView*> gObjectViews;
diff --git a/src/plugins/GUITestBase/src/GTUtilsDocument.h b/src/plugins/GUITestBase/src/GTUtilsDocument.h
index f75fe1c..f40cbcc 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDocument.h
+++ b/src/plugins/GUITestBase/src/GTUtilsDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,6 +49,7 @@ public:
static void loadDocument(HI::GUITestOpStatus &os, const QString& documentName);
static void lockDocument(HI::GUITestOpStatus &os, const QString& documentName);
+ static void unlockDocument(HI::GUITestOpStatus &os, const QString& documentName);
protected:
static GObjectView* getDocumentGObjectView(HI::GUITestOpStatus &os, Document* d);
diff --git a/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp b/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
index 793fec3..bb8887a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ GTUtilsEscClicker::GTUtilsEscClicker( HI::GUITestOpStatus &_os, const QString &m
}
-void GTUtilsEscClicker::run( )
+void GTUtilsEscClicker::commonScenario( )
{
GTGlobals::sleep( 1000 );
if ( mouse ) {
diff --git a/src/plugins/GUITestBase/src/GTUtilsEscClicker.h b/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
index 0f9b027..80c5662 100644
--- a/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
+++ b/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ using namespace HI;
class GTUtilsEscClicker : public Filler {
public:
GTUtilsEscClicker( HI::GUITestOpStatus &_os, const QString &menuObjectName, bool _mouse = false );
- virtual void run();
+ void commonScenario();
private:
bool mouse;
diff --git a/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp b/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
index 52d3173..920745b 100644
--- a/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsExternalTools.h b/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
index 464a0c4..98f31e7 100644
--- a/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
+++ b/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsLog.cpp b/src/plugins/GUITestBase/src/GTUtilsLog.cpp
index 0af659d..8d2709f 100644
--- a/src/plugins/GUITestBase/src/GTUtilsLog.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsLog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsLog.h b/src/plugins/GUITestBase/src/GTUtilsLog.h
index 2468529..6c5d3ae 100644
--- a/src/plugins/GUITestBase/src/GTUtilsLog.h
+++ b/src/plugins/GUITestBase/src/GTUtilsLog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsMdi.cpp b/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
index 136f708..d70e62e 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -108,7 +108,7 @@ QWidget * GTUtilsMdi::findWindow(HI::GUITestOpStatus &os, const QString &windowN
}
}
- if (options.failIfNull) {
+ if (options.failIfNotFound) {
GT_CHECK_RESULT(false, "Widget " + windowName + " not found", NULL);
}
@@ -201,7 +201,7 @@ QWidget* GTUtilsMdi::activeWindow(HI::GUITestOpStatus &os, const GTGlobals::Find
GT_CHECK_RESULT(mw != NULL, "MainWindow == NULL", NULL);
QWidget* w = mw->getMDIManager()->getActiveWindow();
- if (options.failIfNull) {
+ if (options.failIfNotFound) {
GT_CHECK_RESULT(w != NULL, "Active window is not found", NULL);
}
return w;
@@ -279,7 +279,7 @@ bool isWidgetPartVisible(QWidget *widget) {
#define GT_METHOD_NAME "isAnyPartOfWindowVisible"
bool GTUtilsMdi::isAnyPartOfWindowVisible(HI::GUITestOpStatus &os, const QString &windowName) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *window = findWindow(os, windowName, options);
CHECK(NULL != window, false);
return isWidgetPartVisible(window);
diff --git a/src/plugins/GUITestBase/src/GTUtilsMdi.h b/src/plugins/GUITestBase/src/GTUtilsMdi.h
index 500a05f..eb8b087 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMdi.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMdi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
index 4fd8d55..253512e 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
index ef2e291..d5c69b1 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
index cbbe9cd..1f3e62f 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,6 +36,7 @@
#include "api/GTMSAEditorStatusWidget.h"
#include <drivers/GTMouseDriver.h>
#include <primitives/GTWidget.h>
+#include <utils/GTThread.h>
#include "primitives/PopupChooser.h"
#include "runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h"
@@ -273,6 +274,7 @@ QStringList GTUtilsMSAEditorSequenceArea::getVisibaleNames(HI::GUITestOpStatus &
void GTUtilsMSAEditorSequenceArea::removeSequence(HI::GUITestOpStatus &os, const QString &sequenceName) {
selectSequence(os, sequenceName);
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
+ GTThread::waitForMainThread(os);
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
index 49ff9fc..63442b2 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp b/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
index cad8153..eb86591 100644
--- a/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -88,13 +88,13 @@ void NotificationDialogFiller::commonScenario() {
QWidget* ok = GTWidget::findButtonByText(os, "Ok", dialog);
GTWidget::click(os, ok);
-#ifndef Q_OS_UNIX
+#if defined Q_OS_WIN || defined Q_OS_MAC
dialog = QApplication::activeModalWidget();
if (dialog != NULL) {
ok = GTWidget::findButtonByText(os, "Ok", dialog);
GTWidget::click(os, ok);
}
-#endif // !Q_OS_UNIX
+#endif
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsNotifications.h b/src/plugins/GUITestBase/src/GTUtilsNotifications.h
index cd85542..9f0a4c9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsNotifications.h
+++ b/src/plugins/GUITestBase/src/GTUtilsNotifications.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
index 20e204d..6b2b66f 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,6 +33,7 @@
#include <drivers/GTKeyboardDriver.h>
#include <primitives/GTTreeWidget.h>
#include <primitives/GTWidget.h>
+#include "utils/GTThread.h"
namespace U2 {
using namespace HI;
@@ -89,7 +90,7 @@ void GTUtilsOptionPanelMsa::closeTab(HI::GUITestOpStatus &os, Tabs tab) {
#define GT_METHOD_NAME "isTabOpened"
bool GTUtilsOptionPanelMsa::isTabOpened(HI::GUITestOpStatus &os, Tabs tab) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *innerTabWidget = GTWidget::findWidget(os, innerWidgetNames[tab], NULL, options);
return NULL != innerTabWidget && innerTabWidget->isVisible();
}
@@ -119,6 +120,7 @@ void GTUtilsOptionPanelMsa::addReference(HI::GUITestOpStatus &os, QString seqNam
GTBaseCompleter::click(os, completer, seqName);
break;
}
+ GTThread::waitForMainThread(os);
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
index 345f70a..da61124 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
index 234f4dd..83017a9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -114,7 +114,7 @@ void GTUtilsOptionPanelSequenceView::closeTab(HI::GUITestOpStatus &os, GTUtilsOp
#define GT_METHOD_NAME "isTabOpened"
bool GTUtilsOptionPanelSequenceView::isTabOpened(HI::GUITestOpStatus &os, GTUtilsOptionPanelSequenceView::Tabs tab) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *innerTabWidget = GTWidget::findWidget(os, innerWidgetNames[tab], GTUtilsMdi::activeWindow(os), options);
return NULL != innerTabWidget && innerTabWidget->isVisible();
}
@@ -221,7 +221,8 @@ void GTUtilsOptionPanelSequenceView::setReversePrimer(HI::GUITestOpStatus &os, c
#define GT_METHOD_NAME "showPrimersDetails"
void GTUtilsOptionPanelSequenceView::showPrimersDetails(HI::GUITestOpStatus &os) {
openTab(os, InSilicoPcr);
- GTWidget::clickLabelLink(os, GTWidget::findWidget(os, "detailsLinkLabel"));
+ QWidget *label = GTWidget::findWidget(os, "detailsLinkLabel");
+ GTWidget::click(os, GTWidget::findWidget(os, "detailsLinkLabel"), Qt::LeftButton, QPoint(20, label->geometry().height()/2));
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
index 1aef48f..30ede7a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
index 1aa3d81..19bfa55 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
index c5671d2..95ea2ea 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsPcr.cpp b/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
index 7881c9f..ee9a439 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsPcr.h b/src/plugins/GUITestBase/src/GTUtilsPcr.h
index 0a4e6a6..8c22b30 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPcr.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPcr.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp b/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
index 8fb28f7..86b0415 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,6 +30,7 @@
#include "GTUtilsPhyTree.h"
#include <drivers/GTMouseDriver.h>
#include <primitives/GTWidget.h>
+#include <utils/GTThread.h>
namespace U2 {
using namespace HI;
@@ -190,6 +191,8 @@ QPoint GTUtilsPhyTree::getGlobalCoord(HI::GUITestOpStatus& os,QGraphicsItem *ite
#define GT_METHOD_NAME "clickNode"
void GTUtilsPhyTree::clickNode(HI::GUITestOpStatus &os, GraphicsButtonItem *node) {
GT_CHECK(NULL != node, "Node to click is NULL");
+ node->ensureVisible();
+ GTThread::waitForMainThread(os);
GTMouseDriver::moveTo(os, getGlobalCoord(os, node));
GTMouseDriver::click(os);
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsPhyTree.h b/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
index f9ae5a1..b90456a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
index 964866e..6261cfb 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
index 8e02fea..ad2d790 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsProject.cpp b/src/plugins/GUITestBase/src/GTUtilsProject.cpp
index 1d06bca..04946ba 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProject.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsProject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsProject.h b/src/plugins/GUITestBase/src/GTUtilsProject.h
index cdbe43a..a6dc666 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProject.h
+++ b/src/plugins/GUITestBase/src/GTUtilsProject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
index 0e42fe9..43799b9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,14 +50,14 @@ using namespace HI;
const QString GTUtilsProjectTreeView::widgetName = "documentTreeWidget";
#define GT_METHOD_NAME "openView"
-void GTUtilsProjectTreeView::openView(HI::GUITestOpStatus& os) {
+void GTUtilsProjectTreeView::openView(HI::GUITestOpStatus& os, GTGlobals::UseMethod method) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *documentTreeWidget = GTWidget::findWidget(os, widgetName, NULL, options);
if (!documentTreeWidget) {
- toggleView(os);
+ toggleView(os, method);
}
GTGlobals::sleep(100);
GTThread::waitForMainThread(os);
@@ -68,7 +68,7 @@ void GTUtilsProjectTreeView::openView(HI::GUITestOpStatus& os) {
#undef GT_METHOD_NAME
#define GT_METHOD_NAME "toggleView"
-void GTUtilsProjectTreeView::toggleView(HI::GUITestOpStatus& os) {
+void GTUtilsProjectTreeView::toggleView(HI::GUITestOpStatus& os, GTGlobals::UseMethod method) {
MainWindow* mw = AppContext::getMainWindow();
GT_CHECK(mw != NULL, "MainWindow is NULL");
@@ -77,7 +77,18 @@ void GTUtilsProjectTreeView::toggleView(HI::GUITestOpStatus& os) {
//qmw->setFocus();
- GTKeyboardDriver::keyClick(os, '1', GTKeyboardDriver::key["alt"]);
+ switch (method) {
+ case GTGlobals::UseKey:
+ case GTGlobals::UseKeyBoard:
+ GTKeyboardDriver::keyClick(os, '1', GTKeyboardDriver::key["alt"]);
+ break;
+ case GTGlobals::UseMouse:
+ GTWidget::click(os, GTWidget::findWidget(os, "doc_lable_project_view"));
+ break;
+ default:
+ break;
+ }
+
GTGlobals::sleep(100);
GTThread::waitForMainThread(os);
}
@@ -116,8 +127,9 @@ void editItemName(HI::GUITestOpStatus &os, const QString &newItemName, GTGlobals
#endif // Q_OS_MAC
break;
case GTGlobals::UseMouse:
- GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "Edit" << "Rename...", GTGlobals::UseMouse));
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "action_project__edit_menu" << "Rename", GTGlobals::UseMouse));
GTMouseDriver::click(os, Qt::RightButton);
+ GTGlobals::sleep(300);
break;
default:
os.setError("An unsupported way of a rename procedure invocation");
@@ -125,6 +137,7 @@ void editItemName(HI::GUITestOpStatus &os, const QString &newItemName, GTGlobals
}
GTKeyboardDriver::keySequence(os, newItemName);
+ GTGlobals::sleep(500);
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["Enter"]);
GTGlobals::sleep(500);
@@ -244,7 +257,7 @@ QModelIndex GTUtilsProjectTreeView::findIndex(HI::GUITestOpStatus &os, QTreeView
QModelIndexList foundIndexes = findIndecies(os, treeView, itemName, parent, 0, options);
if (foundIndexes.isEmpty()) {
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(foundIndexes.size() != 0, QString("Item with name %1 not found").arg(itemName), QModelIndex());
} else {
return QModelIndex();
@@ -267,6 +280,15 @@ QModelIndexList GTUtilsProjectTreeView::findIndecies(HI::GUITestOpStatus &os, co
}
#undef GT_METHOD_NAME
+namespace {
+ bool compareStrings(const QString &pattern, const QString &data, Qt::MatchFlags matchPolicy) {
+ if (matchPolicy.testFlag(Qt::MatchContains)) {
+ return data.contains(pattern);
+ }
+ return (data == pattern);
+ }
+}
+
#define GT_METHOD_NAME "findIndecies"
QModelIndexList GTUtilsProjectTreeView::findIndecies(HI::GUITestOpStatus &os,
QTreeView* treeView,
@@ -306,7 +328,7 @@ QModelIndexList GTUtilsProjectTreeView::findIndecies(HI::GUITestOpStatus &os,
}
if (!itemName.isEmpty()) {
- if (s == itemName) {
+ if (compareStrings(itemName, s, options.matchPolicy)) {
foundIndecies << index;
} else {
foundIndecies << findIndecies(os, treeView, itemName, index, parentDepth + 1, options);
@@ -514,7 +536,7 @@ void GTUtilsProjectTreeView::itemActiveCheck(HI::GUITestOpStatus &os, QModelInde
#define GT_METHOD_NAME "isVisible"
bool GTUtilsProjectTreeView::isVisible( HI::GUITestOpStatus &os ){
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *documentTreeWidget = GTWidget::findWidget(os, widgetName, NULL, options);
if (documentTreeWidget) {
return true;
diff --git a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
index db94f3f..efa29a0 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,8 +41,8 @@ public:
static void rename(HI::GUITestOpStatus &os, const QString &itemName, const QString &newItemName, GTGlobals::UseMethod invokeMethod = GTGlobals::UseKey);
static void rename(HI::GUITestOpStatus &os, const QModelIndex& itemIndex, const QString &newItemName, GTGlobals::UseMethod invokeMethod = GTGlobals::UseKey);
- static void openView(HI::GUITestOpStatus& os);
- static void toggleView(HI::GUITestOpStatus& os);
+ static void openView(HI::GUITestOpStatus& os, GTGlobals::UseMethod method = GTGlobals::UseMouse);
+ static void toggleView(HI::GUITestOpStatus& os, GTGlobals::UseMethod method = GTGlobals::UseMouse);
// returns center or item's rect
// fails if the item wasn't found
diff --git a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
index fe732e2..ca4f2ca 100644
--- a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ QTreeWidgetItem* GTUtilsQueryDesigner::findAlgorithm(HI::GUITestOpStatus &os,QSt
void GTUtilsQueryDesigner::addAlgorithm(HI::GUITestOpStatus &os, QString algName){
QTreeWidgetItem *w = findAlgorithm(os, algName);
- GTGlobals::sleep(100);
+ GTGlobals::sleep(500);
CHECK_SET_ERR(w!=NULL,"algorithm is NULL");
GTMouseDriver::moveTo(os,GTTreeWidget::getItemCenter(os,w));
diff --git a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
index 60356df..7ae8bdd 100644
--- a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
+++ b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp b/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
index 87e1df0..242314a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -70,12 +70,11 @@ namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "GTSequenceReader"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
class GTSequenceReader : public Filler {
public:
GTSequenceReader(HI::GUITestOpStatus &_os, QString *_str):Filler(_os, "EditSequenceDialog"), str(_str){}
- void run()
- {
+ void commonScenario() {
QWidget *widget = QApplication::activeModalWidget();
GT_CHECK(widget != NULL, "active widget not found");
@@ -306,7 +305,7 @@ ADVSingleSequenceWidget* GTUtilsSequenceView::getSeqWidgetByNumber(HI::GUITestOp
ADVSingleSequenceWidget *seqWidget = qobject_cast<ADVSingleSequenceWidget*>(widget);
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(NULL != widget, QString("Sequence widget %1 was not found!").arg(number), NULL);
}
@@ -317,14 +316,14 @@ ADVSingleSequenceWidget* GTUtilsSequenceView::getSeqWidgetByNumber(HI::GUITestOp
#define GT_METHOD_NAME "getPanViewByNumber"
PanView* GTUtilsSequenceView::getPanViewByNumber(HI::GUITestOpStatus &os, int number, const GTGlobals::FindOptions &options){
ADVSingleSequenceWidget* seq = getSeqWidgetByNumber(os, number, options);
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(seq != NULL, QString("sequence view with num %1 not found").arg(number), NULL);
}else {
return NULL;
}
PanView* result = seq->findChild<PanView*>();
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(seq != NULL, QString("pan view with number %1 not fount").arg(number), NULL)
}
@@ -335,14 +334,14 @@ PanView* GTUtilsSequenceView::getPanViewByNumber(HI::GUITestOpStatus &os, int nu
#define GT_METHOD_NAME "getOverViewByNumber"
Overview* GTUtilsSequenceView::getOverviewByNumber(HI::GUITestOpStatus &os, int number, const GTGlobals::FindOptions &options){
ADVSingleSequenceWidget* seq = getSeqWidgetByNumber(os, number, options);
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(seq != NULL, QString("sequence view with num %1 not found").arg(number), NULL);
}else {
return NULL;
}
Overview* result = seq->findChild<Overview*>();
- if(options.failIfNull){
+ if(options.failIfNotFound){
GT_CHECK_RESULT(seq != NULL, QString("pan view with number %1 not fount").arg(number), NULL)
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsSequenceView.h b/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
index 8a58854..14b1fb8 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
index 87bee2f..72b1fd5 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ QModelIndex GTUtilsSharedDatabaseDocument::getItemIndex(HI::GUITestOpStatus &os,
GTGlobals::FindOptions options;
options.depth = 1;
- options.failIfNull = mustExist;
+ options.failIfNotFound = mustExist;
foreach (const QString& folder, folders) {
itemIndex = GTUtilsProjectTreeView::findIndex(os, folder, itemIndex, options);
CHECK_OP_BREAK(os);
diff --git a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
index 1d45d6e..dfac0dc 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
+++ b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp b/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
index 3beb1f3..252b070 100644
--- a/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,6 @@
#include "GTUtilsStartPage.h"
namespace U2 {
-
#define GT_CLASS_NAME "GTUtilsStartPage"
void GTUtilsStartPage::openStartPage(HI::GUITestOpStatus &os){
@@ -44,7 +43,7 @@ QWebView* GTUtilsStartPage::getStartPage(HI::GUITestOpStatus &os){
}
#define GT_METHOD_NAME "getButton"
-QWebElement GTUtilsStartPage::getButton(HI::GUITestOpStatus &os, Buttons button) {
+HIWebElement GTUtilsStartPage::getButton(HI::GUITestOpStatus &os, Buttons button) {
switch (button) {
case OpenFile:
return GTWebView::findElement(os, getStartPage(os), "Open File(s)", "DIV");
@@ -62,13 +61,13 @@ QWebElement GTUtilsStartPage::getButton(HI::GUITestOpStatus &os, Buttons button)
#undef GT_METHOD_NAME
void GTUtilsStartPage::clickButton(HI::GUITestOpStatus &os, Buttons b) {
- QWebElement but = getButton(os, b);
+ HIWebElement but = getButton(os, b);
QWebView* start = getStartPage(os);
GTWebView::click(os, start, but);
}
void GTUtilsStartPage::clickResentDocument(HI::GUITestOpStatus &os, QString text){
- QWebElement el = GTWebView::findElement(os, getStartPage(os), "- " + text, "A");
+ HIWebElement el = GTWebView::findElement(os, getStartPage(os), "- " + text, "A");
GTWebView::click(os, getStartPage(os), el);
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsStartPage.h b/src/plugins/GUITestBase/src/GTUtilsStartPage.h
index 94f1037..f9887c8 100644
--- a/src/plugins/GUITestBase/src/GTUtilsStartPage.h
+++ b/src/plugins/GUITestBase/src/GTUtilsStartPage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
#define _U2_GT_UTILS_START_PAGE_
#include "GTGlobals.h"
+#include <primitives/GTWebView.h>
class QWebView;
class QWebElement;
@@ -37,7 +38,7 @@ public:
enum Buttons{OpenFile, CreateSequence, CreateWorkflow, QuickStartGuide};
static void openStartPage(HI::GUITestOpStatus &os);
static QWebView* getStartPage(HI::GUITestOpStatus &os);
- static QWebElement getButton(HI::GUITestOpStatus &os, Buttons button);
+ static HIWebElement getButton(HI::GUITestOpStatus &os, Buttons button);
static void clickButton(HI::GUITestOpStatus &os, Buttons button);
static void clickResentDocument(HI::GUITestOpStatus &os, QString text);
static void clickResentProject(HI::GUITestOpStatus &os, QString text);
diff --git a/src/plugins/GUITestBase/src/GTUtilsTask.cpp b/src/plugins/GUITestBase/src/GTUtilsTask.cpp
index 713f3c5..d183d22 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTask.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ Task* GTUtilsTask::getSubTaskByName(HI::GUITestOpStatus &os, QString taskName, G
foreach (Task* t, tasks) {
result = getSubTaskByName(os, t, taskName, false);
}
- if(options.failIfNull == true){
+ if(options.failIfNotFound == true){
GT_CHECK_RESULT(result != NULL, "no subtask with name " + taskName, NULL);
}
return result;
@@ -65,7 +65,7 @@ Task* GTUtilsTask::getSubTaskByName(HI::GUITestOpStatus &os, Task *parent, QStri
}
}
- if(options.failIfNull == true){
+ if(options.failIfNotFound == true){
GT_CHECK_RESULT(result != NULL, "no subtask with name " + taskName, NULL);
}
return result;
@@ -81,7 +81,7 @@ Task* GTUtilsTask::getTaskByName(HI::GUITestOpStatus &os, QString taskName, GTGl
return t;
}
}
- if(options.failIfNull == true){
+ if(options.failIfNotFound == true){
GT_CHECK_RESULT(false, "task " + taskName + " not found", NULL);
}
return NULL;
diff --git a/src/plugins/GUITestBase/src/GTUtilsTask.h b/src/plugins/GUITestBase/src/GTUtilsTask.h
index 3c4aff8..55f2805 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTask.h
+++ b/src/plugins/GUITestBase/src/GTUtilsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
index 1ab8c48..e517669 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -77,7 +77,7 @@ QString GTUtilsTaskTreeView::getTasksInfo(QList<Task *> tasks, int level){
}
void GTUtilsTaskTreeView::openView(HI::GUITestOpStatus& os) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *documentTreeWidget = GTWidget::findWidget(os, widgetName, NULL, options);
if (!documentTreeWidget) {
@@ -122,7 +122,7 @@ QTreeWidgetItem* GTUtilsTaskTreeView::getTreeWidgetItem( QTreeWidget* tree, cons
QTreeWidget* GTUtilsTaskTreeView::getTreeWidget(HI::GUITestOpStatus &os) {
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QTreeWidget *treeWidget = static_cast<QTreeWidget*>(GTWidget::findWidget(os, widgetName, NULL, options));
return treeWidget;
diff --git a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
index 56c2b19..c6dca9a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsWizard.cpp b/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
index 7e533fb..c7c644c 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsWizard.h b/src/plugins/GUITestBase/src/GTUtilsWizard.h
index 34a51ce..5cee12b 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWizard.h
+++ b/src/plugins/GUITestBase/src/GTUtilsWizard.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
index a75647f..74abbfd 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,36 +31,37 @@
#include <QToolButton>
#include <QTreeWidget>
-#include <U2Core/AppContext.h>
-
-#include <U2View/MSAEditor.h>
-
-#include "../../workflow_designer/src/WorkflowViewItems.h"
-#include "GTUtilsMdi.h"
-#include "GTUtilsWorkflowDesigner.h"
-#include "primitives/GTAction.h"
+#include <base_dialogs/GTFileDialog.h>
+#include <base_dialogs/MessageBoxFiller.h>
+#include <drivers/GTKeyboardDriver.h>
+#include <drivers/GTMouseDriver.h>
+#include <primitives/GTAction.h>
#include <primitives/GTCheckBox.h>
#include <primitives/GTComboBox.h>
#include <primitives/GTDoubleSpinBox.h>
-#include <base_dialogs/GTFileDialog.h>
-#include "api/GTGraphicsItem.h"
-#include <drivers/GTKeyboardDriver.h>
#include <primitives/GTLineEdit.h>
-#include "primitives/GTMenu.h"
-#include <drivers/GTMouseDriver.h>
+#include <primitives/GTMenu.h>
#include <primitives/GTSpinBox.h>
#include <primitives/GTTabWidget.h>
#include <primitives/GTTableView.h>
#include <primitives/GTToolbar.h>
#include <primitives/GTTreeWidget.h>
#include <primitives/GTWidget.h>
-#include <base_dialogs/MessageBoxFiller.h>
-#include "primitives/PopupChooser.h"
+#include <primitives/PopupChooser.h>
+#include <utils/GTThread.h>
+
+#include <U2Core/AppContext.h>
+
+#include <U2View/MSAEditor.h>
+
+#include "../../workflow_designer/src/WorkflowViewItems.h"
+#include "GTUtilsMdi.h"
+#include "GTUtilsWorkflowDesigner.h"
+#include "api/GTGraphicsItem.h"
#include "runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h"
-#include "utils/GTThread.h"
namespace U2 {
using namespace HI;
@@ -216,6 +217,7 @@ void GTUtilsWorkflowDesigner::addAlgorithm(HI::GUITestOpStatus &os, QString algN
GT_CHECK(tabs!=NULL, "tabs widget not found");
GTTabWidget::setCurrentIndex(os,tabs,0);
+ GTGlobals::sleep(500);
QTreeWidgetItem *alg = findTreeItem(os, algName, algoriths, exactMatch);
GTGlobals::sleep(100);
@@ -245,6 +247,7 @@ void GTUtilsWorkflowDesigner::selectAlgorithm(HI::GUITestOpStatus &os, QTreeWidg
GTGlobals::sleep(500);
algorithm->treeWidget()->scrollToItem(algorithm, QAbstractItemView::PositionAtCenter);
+ GTGlobals::sleep(200);
GTMouseDriver::moveTo(os,GTTreeWidget::getItemCenter(os,algorithm));
}
#undef GT_METHOD_NAME
@@ -273,6 +276,7 @@ void GTUtilsWorkflowDesigner::selectSample(HI::GUITestOpStatus &os, QTreeWidgetI
QTreeWidget *paletteTree = qobject_cast<QTreeWidget *>(GTWidget::findWidget(os,"samples"));
paletteTree->scrollToItem(sample);
+ GTThread::waitForMainThread(os);
GTMouseDriver::moveTo(os, GTTreeWidget::getItemCenter(os, sample));
GTMouseDriver::doubleClick(os);
GTThread::waitForMainThread(os);
@@ -370,6 +374,16 @@ QList<QTreeWidgetItem *> GTUtilsWorkflowDesigner::getPaletteGroupEntries(HI::GUI
}
#undef GT_METHOD_NAME
+#define GT_METHOD_NAME "getPaletteGroupEntriesNames"
+QStringList GTUtilsWorkflowDesigner::getPaletteGroupEntriesNames(GUITestOpStatus &os, const QString &groupName) {
+ QStringList entriesNames;
+ foreach (QTreeWidgetItem *entryItem, getPaletteGroupEntries(os, groupName)) {
+ entriesNames << entryItem->text(0);
+ }
+ return entriesNames;
+}
+#undef GT_METHOD_NAME
+
QPoint GTUtilsWorkflowDesigner::getItemCenter(HI::GUITestOpStatus &os,QString itemName){
QRect r = getItemRect(os, itemName);
QPoint p = r.center();
@@ -380,6 +394,7 @@ QPoint GTUtilsWorkflowDesigner::getItemCenter(HI::GUITestOpStatus &os,QString it
void GTUtilsWorkflowDesigner::removeItem(HI::GUITestOpStatus &os, QString itemName) {
click(os, itemName);
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
+ GTThread::waitForMainThread(os);
}
#undef GT_METHOD_NAME
@@ -411,6 +426,7 @@ void GTUtilsWorkflowDesigner::click(HI::GUITestOpStatus &os, QString itemName, Q
QGraphicsView* sceneView = qobject_cast<QGraphicsView*>(GTWidget::findWidget(os,"sceneView"));
GT_CHECK(sceneView!=NULL, "scene view is NULL");
sceneView->ensureVisible(getWorker(os, itemName));
+ GTThread::waitForMainThread(os);
GTMouseDriver::moveTo(os, getItemCenter(os, itemName) + p);
GTMouseDriver::click(os);
@@ -460,7 +476,7 @@ WorkflowProcessItem* GTUtilsWorkflowDesigner::getWorker(HI::GUITestOpStatus &os,
}
}
}
- GT_CHECK_RESULT(options.failIfNull == false, "Item '" + itemName + "' not found at scene", NULL);
+ GT_CHECK_RESULT(options.failIfNotFound == false, "Item '" + itemName + "' not found at scene", NULL);
return NULL;
}
@@ -750,7 +766,7 @@ void GTUtilsWorkflowDesigner::setDatasetInputFile(HI::GUITestOpStatus &os, QStri
GTUtilsDialog::waitForDialog(os, ob);
GTWidget::click(os, addFileButton);
- GTGlobals::sleep(500);
+ GTGlobals::sleep(3000);
}
#undef GT_METHOD_NAME
@@ -774,6 +790,7 @@ void GTUtilsWorkflowDesigner::createDataset(HI::GUITestOpStatus &os, QString dat
GTUtilsDialog::waitForDialog(os, new DatasetNameEditDialogFiller(os, datasetName));
GTWidget::click(os, plusButton);
+ GTGlobals::sleep();
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
index 13709f1..0b67498 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
+++ b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,18 +19,13 @@
* MA 02110-1301, USA.
*/
-#ifndef GT_UTILS_WORKFLOW_DESIGNER_H
-#define GT_UTILS_WORKFLOW_DESIGNER_H
+#ifndef _U2_GT_UTILS_WORKFLOW_DESIGNER_H_
+#define _U2_GT_UTILS_WORKFLOW_DESIGNER_H_
-#include "GTGlobals.h"
+#include <QTreeWidget>
+#include <QGraphicsItem>
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QTreeWidget>
-#include <QtGui/QGraphicsItem>
-#else
-#include <QtWidgets/QTreeWidget>
-#include <QtWidgets/QGraphicsItem>
-#endif
+#include <GTGlobals.h>
class QTableView;
class QTableWidget;
@@ -81,6 +76,7 @@ public:
static QStringList getPaletteGroupNames(HI::GUITestOpStatus &os);
static QList<QTreeWidgetItem *> getPaletteGroupEntries(HI::GUITestOpStatus &os, QTreeWidgetItem *groupItem);
static QList<QTreeWidgetItem *> getPaletteGroupEntries(HI::GUITestOpStatus &os, const QString &groupName);
+ static QStringList getPaletteGroupEntriesNames(HI::GUITestOpStatus &os, const QString &groupName);
//add to scene
static void addSample(HI::GUITestOpStatus &os, const QString &sampName);
@@ -177,4 +173,4 @@ private:
} // namespace
Q_DECLARE_METATYPE( QAction* )
-#endif // GT_UTILS_WORKFLOW_DESIGNER_H
+#endif // _U2_GT_UTILS_WORKFLOW_DESIGNER_H_
diff --git a/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp b/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
index e3c323d..8141e37 100644
--- a/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
+++ b/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#include <U2Core/AppContext.h>
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
#include <U2Gui/ToolsMenu.h>
#include "GUITestBasePlugin.h"
@@ -88,6 +88,7 @@
#include "tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.h"
#include "tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.h"
#include "tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.h"
+#include "tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h"
#define REGISTER_TEST(X) if (guiTestBase) guiTestBase->registerTest(new X())
#define REGISTER_TEST_WITH_TIMEOUT(X, TIMEOUT) \
@@ -134,7 +135,7 @@ extern "C" Q_DECL_EXPORT Plugin* U2_PLUGIN_INIT_FUNC() {
GUITestBasePlugin::GUITestBasePlugin() : Plugin(tr("GUITestBase"), tr("GUI Test Base")) {
- GUITestBase *guiTestBase = AppContext::getGUITestBase();
+ UGUITestBase *guiTestBase = AppContext::getGUITestBase();
registerTests(guiTestBase);
registerAdditionalChecks(guiTestBase);
@@ -154,7 +155,7 @@ void GUITestBasePlugin::sl_showWindow() {
view->show();
}
-void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
+void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
//////////////////////////////////////////////////////////////////////////
// Regression scenarios/
@@ -1129,6 +1130,7 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4391);
REGISTER_TEST(GUITest_regression_scenarios::test_4400);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4434);
REGISTER_TEST(GUITest_regression_scenarios::test_4439);
REGISTER_TEST(GUITest_regression_scenarios::test_4440);
REGISTER_TEST(GUITest_regression_scenarios::test_4463);
@@ -1149,6 +1151,7 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4588_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4588_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4606);
REGISTER_TEST(GUITest_regression_scenarios::test_4620);
REGISTER_TEST(GUITest_regression_scenarios::test_4621);
REGISTER_TEST(GUITest_regression_scenarios::test_4624);
@@ -1170,6 +1173,7 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4710_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4714_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4714_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4712);
REGISTER_TEST(GUITest_regression_scenarios::test_4718);
REGISTER_TEST(GUITest_regression_scenarios::test_4719_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4719_2);
@@ -1178,11 +1182,15 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4732);
REGISTER_TEST(GUITest_regression_scenarios::test_4734);
REGISTER_TEST(GUITest_regression_scenarios::test_4735);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4764_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4764_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4764_3);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_2);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_3);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_4);
- REGISTER_TEST(GUITest_regression_scenarios::test_4785);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4785_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4785_2);
REGISTER_TEST(GUITest_regression_scenarios::test_4795);
REGISTER_TEST(GUITest_regression_scenarios::test_4803_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4803_2);
@@ -1202,15 +1210,36 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4833_6);
REGISTER_TEST(GUITest_regression_scenarios::test_4833_7);
REGISTER_TEST(GUITest_regression_scenarios::test_4833_8);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4839_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4839_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4852);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4860);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4871);
REGISTER_TEST(GUITest_regression_scenarios::test_4885_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4885_2);
REGISTER_TEST(GUITest_regression_scenarios::test_4885_3);
REGISTER_TEST(GUITest_regression_scenarios::test_4886);
- REGISTER_TEST(GUITest_regression_scenarios::test_4908);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4908);
REGISTER_TEST(GUITest_regression_scenarios::test_4913);
REGISTER_TEST(GUITest_regression_scenarios::test_4918);
REGISTER_TEST(GUITest_regression_scenarios::test_4918_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4934);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4936);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4938);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4938_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4966);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4969_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4969_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4983);
+ REGISTER_TEST(GUITest_regression_scenarios::test_4986);
+ REGISTER_TEST_IGNORED_WINDOWS(GUITest_regression_scenarios::test_4990, "Required \"slow\" machine");
+
+ REGISTER_TEST(GUITest_regression_scenarios::test_5012);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5012_1);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5012_2);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5029);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5052);
//////////////////////////////////////////////////////////////////////////
// Common scenarios/project/
@@ -1246,25 +1275,45 @@ void GUITestBasePlugin::registerTests(GUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_common_scenarios_project::test_0038);
REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0038_1, "UGENE-4434");
REGISTER_TEST(GUITest_common_scenarios_project::test_0039);
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0040, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0041, "UGENE-4595");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0040, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0041, "UGENE-4900");
REGISTER_TEST(GUITest_common_scenarios_project::test_0042);
REGISTER_TEST(GUITest_common_scenarios_project::test_0043);
REGISTER_TEST(GUITest_common_scenarios_project::test_0044);
REGISTER_TEST(GUITest_common_scenarios_project::test_0045);
REGISTER_TEST(GUITest_common_scenarios_project::test_0046);
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0047, "UGENE-4595");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0047, "UGENE-4900");
REGISTER_TEST(GUITest_common_scenarios_project::test_0048);
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0049, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0050, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0051, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0052, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0053, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0054, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0055, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0056, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0057, "UGENE-4595");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0058, "UGENE-4595");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0049, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0050, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0051, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0052, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0053, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0054, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0055, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0056, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0057, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0058, "UGENE-4900");
+
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0059);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0060);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0061);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0062);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0063);
+
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0064);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0065);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0066);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0067);
+
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0068);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0069);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0070);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0071);
+
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0072);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0073);
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0074);
//////////////////////////////////////////////////////////////////////////
// Common scenarios/project/bookmarks/
@@ -2630,24 +2679,24 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_start_page::test_0008);
}
-void GUITestBasePlugin::registerAdditionalChecks(GUITestBase *guiTestBase) {
+void GUITestBasePlugin::registerAdditionalChecks(UGUITestBase *guiTestBase) {
if (guiTestBase) {
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0000, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0001, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0002, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0003, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0004, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0005, GUITestBase::PreAdditional);
- guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0006, GUITestBase::PreAdditional);
-
- guiTestBase->registerTest(new GUITest_initial_checks::post_check_0000, GUITestBase::PostAdditionalChecks);
- //guiTestBase->registerTest(new GUITest_initial_checks::post_check_0001, GUITestBase::PostAdditionalChecks);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0000, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0001, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0002, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0003, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0004, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0005, UGUITestBase::PreAdditional);
+ guiTestBase->registerTest(new GUITest_initial_checks::pre_action_0006, UGUITestBase::PreAdditional);
+
+ guiTestBase->registerTest(new GUITest_initial_checks::post_check_0000, UGUITestBase::PostAdditionalChecks);
+ //guiTestBase->registerTest(new GUITest_initial_checks::post_check_0001, UGUITestBase::PostAdditionalChecks);
//temporary ignored. Causes problems on mac
- guiTestBase->registerTest(new GUITest_initial_checks::post_action_0000, GUITestBase::PostAdditionalActions);
- guiTestBase->registerTest(new GUITest_initial_checks::post_action_0001, GUITestBase::PostAdditionalActions);
- guiTestBase->registerTest(new GUITest_initial_checks::post_action_0002, GUITestBase::PostAdditionalActions);
- guiTestBase->registerTest(new GUITest_initial_checks::post_action_0003, GUITestBase::PostAdditionalActions);
+ guiTestBase->registerTest(new GUITest_initial_checks::post_action_0000, UGUITestBase::PostAdditionalActions);
+ guiTestBase->registerTest(new GUITest_initial_checks::post_action_0001, UGUITestBase::PostAdditionalActions);
+ guiTestBase->registerTest(new GUITest_initial_checks::post_action_0002, UGUITestBase::PostAdditionalActions);
+ guiTestBase->registerTest(new GUITest_initial_checks::post_action_0003, UGUITestBase::PostAdditionalActions);
}
}
diff --git a/src/plugins/GUITestBase/src/GUITestBasePlugin.h b/src/plugins/GUITestBase/src/GUITestBasePlugin.h
index d283d08..167bd24 100644
--- a/src/plugins/GUITestBase/src/GUITestBasePlugin.h
+++ b/src/plugins/GUITestBase/src/GUITestBasePlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
namespace U2 {
-class GUITestBase;
+class UGUITestBase;
class GUITestBasePlugin : public Plugin {
Q_OBJECT
@@ -37,8 +37,8 @@ public:
private slots:
void sl_showWindow();
private:
- void registerTests(GUITestBase *guiTestBase);
- void registerAdditionalChecks(GUITestBase *guiTestBase);
+ void registerTests(UGUITestBase *guiTestBase);
+ void registerAdditionalChecks(UGUITestBase *guiTestBase);
QAction* openGUITestRunnerAction;
GUITestRunner* view;
diff --git a/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp b/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
index 5e0d53a..050d184 100644
--- a/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
+++ b/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTBaseCompleter.h b/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
index aeadcfb..b079354 100644
--- a/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
+++ b/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp b/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
index f89daa6..051d663 100644
--- a/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
+++ b/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTGraphicsItem.h b/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
index 4f58b13..2d2a78a 100644
--- a/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
+++ b/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
index 28c7cb8..159a6ec 100644
--- a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
+++ b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
index d13dd5f..23e6d9e 100644
--- a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
+++ b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp b/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
index c47a6f9..12fd20a 100644
--- a/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
+++ b/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTRegionSelector.h b/src/plugins/GUITestBase/src/api/GTRegionSelector.h
index 0f4795e..7399aa0 100644
--- a/src/plugins/GUITestBase/src/api/GTRegionSelector.h
+++ b/src/plugins/GUITestBase/src/api/GTRegionSelector.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
index fdd64db..fee5393 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
index 08238cf..96a56b6 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
index a6f65e2..7b48aee 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
index 9c08ffb..2cdebc1 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
index ab2f9c2..dc5075b 100644
--- a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
+++ b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
index eb75a51..44643b1 100644
--- a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
+++ b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
index a04eaef..1877a1f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -42,9 +42,9 @@ AddFolderDialogFiller::AddFolderDialogFiller(HI::GUITestOpStatus &os, const QStr
}
#define GT_CLASS_NAME "U2::AddFolderDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void AddFolderDialogFiller::run() {
+void AddFolderDialogFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "active modal widget is invalid");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
index d6acb7a..da8a17c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ using namespace HI;
class AddFolderDialogFiller : public Filler {
public:
AddFolderDialogFiller(HI::GUITestOpStatus &os, const QString &folderName, GTGlobals::UseMethod acceptMethod);
- void run();
+ void commonScenario();
private:
const QString folderName;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
index 22b89b7..b72b951 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
index db7c0fd..b136cbf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
index 7815bb2..3fb736d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
index 3a5b0b4..030a4e7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
index 607ec7d..8a444c7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
index 816379d..acf2203 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.cpp
index 0f48671..58e5a9c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.cpp
@@ -21,8 +21,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::BuildIndexDialogFiller"
-#define GT_METHOD_NAME "run"
-void BuildIndexDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void BuildIndexDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
index a90ab1f..a571690 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ public:
indFileName(_indFileName),
method(_method),
useDefaultIndexName(_useDefaultIndexName) {}
- virtual void run();
+ void commonScenario();
private:
QString refPath;
QString refFileName;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
index 4907b10..94e54a9 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -42,8 +42,8 @@ CommonImportOptionsDialogFiller::CommonImportOptionsDialogFiller(HI::GUITestOpSt
{
}
-#define GT_METHOD_NAME "run"
-void CommonImportOptionsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void CommonImportOptionsDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(NULL != dialog, "activeModalWidget is NULL");
GTWidget::clickWindowTitle(os, dialog);
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
index b92ec13..f3de368 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ class CommonImportOptionsDialogFiller : public Filler {
public:
CommonImportOptionsDialogFiller(HI::GUITestOpStatus& os, const QVariantMap& data);
- void run();
+ void commonScenario();
private:
QVariantMap data;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
index 91ba6a0..f211180 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,8 +34,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::ConvertAssemblytoSamFiller"
-#define GT_METHOD_NAME "run"
-void ConvertAssemblyToSAMDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ConvertAssemblyToSAMDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
index 6588acf..e0cb0f8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ using namespace HI;
Filler(_os, "AssemblyToSamDialog"),
databasePath(_dbPath),
databaseFileName(_dbFileName){}
- virtual void run();
+ void commonScenario();
private:
const QString databasePath;
const QString databaseFileName;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
index 4f093e5..10f1ce3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
index 87fdb27..e9673fa 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
index 6660248..fca9d5b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -169,8 +169,8 @@ Filler(_os, "CreateDocumentFromTextDialog"), customSettings(_customSettings), al
comboBoxAlphabetItems[AllSymbols] = "All symbols";
}
-#define GT_METHOD_NAME "run"
-void CancelCreateDocumentFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void CancelCreateDocumentFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
index 6bf2efe..f2fb1cf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -62,7 +62,7 @@ using namespace HI;
CancelCreateDocumentFiller(HI::GUITestOpStatus &_os, const QString &_pasteDataHere, bool customSettings, documentAlphabet _alphabet, bool skipUnknownSymbols,
bool replaceUnknownSymbols, const QString symbol, const QString &_documentLocation,
documentFormat _format, const QString &_sequenceName, bool saveFile, GTGlobals::UseMethod method = GTGlobals::UseMouse);
- virtual void run();
+ void commonScenario();
private:
QString pasteDataHere;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
index 577a0f3..b206c84 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
index 7b9aa6c..a9b5d86 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
index b99bfcd..e22d139 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
index 4c1f6b6..b25bc01 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
index e8c0701..4cdd9d2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
index d39d3ad..101092e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
index a985cbf..d4ff5e6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
index 8343673..1b01fc9 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.cpp
index a22ac57..6e2324f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.cpp
@@ -87,9 +87,9 @@ AuthenticationDialogFiller::AuthenticationDialogFiller(HI::GUITestOpStatus &os,
}
#define GT_CLASS_NAME "GTUtilsDialog::AuthenticationDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void AuthenticationDialogFiller::run() {
+void AuthenticationDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.h
index 8d3f2ab..00ac071 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.h
@@ -43,7 +43,7 @@ private:
class AuthenticationDialogFiller : public Filler {
public:
AuthenticationDialogFiller(HI::GUITestOpStatus &os, const QString &login, const QString &password);
- void run();
+ void commonScenario();
private:
QString login;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
index 127e790..b18a188 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,8 +44,8 @@ namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::EditGroupAnnotationsFiller"
-#define GT_METHOD_NAME "run"
-void EditGroupAnnotationsFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void EditGroupAnnotationsFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
index a13c7ae..74b0cc1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ using namespace HI;
EditGroupAnnotationsFiller(HI::GUITestOpStatus &_os, const QString &_groupName):
Filler(_os, ""), groupName(_groupName) {}
- virtual void run();
+ void commonScenario();
private:
QString groupName;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
index d30a8fe..d7ba4fc 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,8 +48,8 @@ namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::EditQualifierFiller"
-#define GT_METHOD_NAME "run"
-void EditQualifierFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void EditQualifierFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
@@ -83,8 +83,8 @@ void EditQualifierFiller::run()
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::RenameQualifierFiller"
-#define GT_METHOD_NAME "run"
-void RenameQualifierFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void RenameQualifierFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
index 6557b30..df84494 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ class EditQualifierFiller : public Filler {
public:
EditQualifierFiller(HI::GUITestOpStatus &_os, const QString &_qualifierName, const QString &_valueName, bool _noCheck = false, bool _closeErrorMessageBox = false)
:Filler(_os, "EditQualifierDialog"), qualifierName(_qualifierName), valueName(_valueName), noCheck(_noCheck), closeErrormessageBox(_closeErrorMessageBox){}
- virtual void run();
+ void commonScenario();
private:
QString qualifierName;
QString valueName;
@@ -42,7 +42,7 @@ class RenameQualifierFiller : public Filler {
public:
RenameQualifierFiller(HI::GUITestOpStatus &_os, const QString &_newName)
:Filler(_os, ""), newName(_newName) {}
- virtual void run();
+ void commonScenario();
private:
QString newName;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
index 31f6bcf..4d006b5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,9 +57,8 @@ InsertSequenceFiller::InsertSequenceFiller(HI::GUITestOpStatus &_os, const QStri
mergeAnnotations = _mergeAnnotations;
}
-#define GT_METHOD_NAME "run"
-void InsertSequenceFiller::run()
-{
+#define GT_METHOD_NAME "commonScenario"
+void InsertSequenceFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
index 56a111b..7534e52 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ public:
InsertSequenceFiller(HI::GUITestOpStatus &_os, const QString &_pasteDataHere, RegionResolvingMode _regionResolvingMode = Resize, int _insertPosition = 1,
const QString &_documentLocation = "", documentFormat _format = FASTA, bool _saveToNewFile = false, bool _mergeAnnotations = false,
GTGlobals::UseMethod method = GTGlobals::UseMouse, bool _wrongInput = false, bool recalculateQuals = false);
- void run();
+ void commonScenario();
private:
QString pasteDataHere;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
index 13af04a..f56e235 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,8 +49,8 @@ Filler(_os, "ExportChromatogramDialog"), name(_name), useMethod(method), format(
comboBoxItems[SCF] = "SCF";
}
-#define GT_METHOD_NAME "run"
-void ExportChromatogramFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ExportChromatogramFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
index a84275f..b8f0b64 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ using namespace HI;
ExportChromatogramFiller(HI::GUITestOpStatus &_os, const QString &_path, const QString &_name,
ExportChromatogramFiller::FormatToUse _format, bool reversed, bool complement,
bool addDocumentToProject, GTGlobals::UseMethod method = GTGlobals::UseMouse);
- virtual void run();
+ void commonScenario();
private:
QString path, name;
GTGlobals::UseMethod useMethod;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
index 7758085..34243bc 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -66,8 +66,8 @@ path(_path), name(_name), useMethod(method), format(_format), compressFile(compr
comboBoxItems[VectorNTI] = "Vector NTI sequence";
}
-#define GT_METHOD_NAME "run"
-void ExportDocumentDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ExportDocumentDialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
index e28e306..1d80afd 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ using namespace HI;
ExportDocumentDialogFiller(HI::GUITestOpStatus &_os, const QString &_path = "", const QString &_name = "",
ExportDocumentDialogFiller::FormatToUse _format = ExportDocumentDialogFiller::Genbank, bool compressFile = false,
bool addToProject = false, GTGlobals::UseMethod method = GTGlobals::UseMouse);
- virtual void run();
+ void commonScenario();
static QString defaultExportString;
private:
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
index 3f1a1c9..c1fd335 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -115,8 +115,8 @@ void CircularViewExportImage::commonScenario() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::ExportMsaImage"
-#define GT_METHOD_NAME "run"
-void ExportMsaImage::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportMsaImage::commonScenario() {
GT_CHECK( (exportWholeAlignment && exportCurrentSelection) != true, "Wrong filler parameters");
QWidget* dialog = QApplication::activeModalWidget();
@@ -163,8 +163,8 @@ void ExportMsaImage::run() {
#define GT_CLASS_NAME "GTUtilsDialog::ExportSequenceImage"
-#define GT_METHOD_NAME "run"
-void ExportSequenceImage::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportSequenceImage::commonScenario() {
GTGlobals::sleep(500);
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -217,8 +217,8 @@ void ExportSequenceImage::run() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::SelectSubalignmentFiller"
-#define GT_METHOD_NAME "run"
-void SelectSubalignmentFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void SelectSubalignmentFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -270,9 +270,9 @@ ImageExportFormFiller::ImageExportFormFiller(HI::GUITestOpStatus &os, const Para
}
#define GT_CLASS_NAME "GTUtilsDialog::ImageExportFormFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void ImageExportFormFiller::run() {
+void ImageExportFormFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
index e7b4963..9b3392a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -105,7 +105,7 @@ public:
exportCurrentSelection(exportCurrentSelection),
region(region) {}
- virtual void run();
+ void commonScenario();
private:
Settings settings;
@@ -140,7 +140,7 @@ public:
: ExportImage(os, filePath, comboValue, spinValue),
settings(settings) {}
- virtual void run();
+ void commonScenario();
private:
Settings settings;
@@ -151,7 +151,7 @@ public:
SelectSubalignmentFiller(HI::GUITestOpStatus &_os, const RegionMsa ®ionMsa)
: Filler(_os, "SelectSubalignmentDialog"),
msaRegion(regionMsa) {}
- virtual void run();
+ void commonScenario();
private:
RegionMsa msaRegion;
};
@@ -173,7 +173,7 @@ public:
};
ImageExportFormFiller(HI::GUITestOpStatus &os, const Parameters ¶meters);
- void run();
+ void commonScenario();
private:
Parameters parameters;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
index 1b45003..b915920 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
index 6310f96..2177ff1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
index ac40462..d959c21 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
index 76988be..47d52a5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
index 43d7a16..39e1c77 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
index cc81b9b..218c785 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
index 8b8220e..00ff145 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
index df450d1..15091b4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
index 7f92b6a..638b4e7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
index 3ba6187..e7ac9da 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
index 3f16be9..5ef44b3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
index 611e92f..eadd5a1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
index 0f6f9a3..59dbed8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
index 4974023..d2e3ec6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
index 3330234..e1ad793 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
index 84005c4..68c4aa4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
index 3e9e23d..b2410c8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -42,8 +42,8 @@ ItemToImportEditDialogFiller::ItemToImportEditDialogFiller(HI::GUITestOpStatus&
{
}
-#define GT_METHOD_NAME "run"
-void ItemToImportEditDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ItemToImportEditDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(NULL != dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
index e30a47f..9f6e5f2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ class ItemToImportEditDialogFiller : public Filler {
public:
ItemToImportEditDialogFiller(HI::GUITestOpStatus& os, const QVariantMap& data);
- void run();
+ void commonScenario();
private:
QVariantMap data;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
index eda9c73..3ae74b3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,8 +35,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::GoToDialogFiller"
-#define GT_METHOD_NAME "run"
-void GoToDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void GoToDialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
index 25f013f..c868bff 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class GoToDialogFiller : public Filler {
public:
GoToDialogFiller(HI::GUITestOpStatus &_os, int _goTo) : Filler(_os, ""), goTo(_goTo){}
- virtual void run();
+ void commonScenario();
private:
int goTo;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
index 3074d57..884b3b5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
index 3f08644..1272231 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
index 776b4bf..d7977a6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
index ed22481..c856f9c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
index a121a65..cedbebd 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -99,8 +99,8 @@ selectSequenceRegionDialogFiller::selectSequenceRegionDialogFiller(HI::GUITestOp
multipleRange = QString();
}
-#define GT_METHOD_NAME "run"
-void selectSequenceRegionDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void selectSequenceRegionDialogFiller::commonScenario()
{
GTGlobals::sleep(500);
QWidget *dialog = QApplication::activeModalWidget();
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
index 950c839..b4f3e68 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ using namespace HI;
selectSequenceRegionDialogFiller(HI::GUITestOpStatus &_os, const QString &range);
selectSequenceRegionDialogFiller(HI::GUITestOpStatus &_os, int _length, bool selectFromBegin = true);
- virtual void run();
+ void commonScenario();
private:
RangeType rangeType;
bool selectAll, fromBegin;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
index aa2e18c..28fd477 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,8 +34,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::ZoomToRangeDialogFiller"
-#define GT_METHOD_NAME "run"
-void ZoomToRangeDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ZoomToRangeDialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
index 615459f..2bafefd 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class ZoomToRangeDialogFiller : public Filler {
public:
ZoomToRangeDialogFiller(HI::GUITestOpStatus &_os, int min = -1, int max = -1) : Filler(_os, "range_selection_dialog"), minVal(min), maxVal(max){}
- virtual void run();
+ void commonScenario();
private:
int minVal, maxVal;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
index f143df6..79b3f14 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -61,8 +61,8 @@ RemovePartFromSequenceDialogFiller::RemovePartFromSequenceDialogFiller(HI::GUITe
}
-#define GT_METHOD_NAME "run"
-void RemovePartFromSequenceDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void RemovePartFromSequenceDialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
index 3e11e8e..d8d2080 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ public:
RemovePartFromSequenceDialogFiller(HI::GUITestOpStatus &_os,RemoveType _removeType, bool _saveNew, const QString &_saveToFile, FormatToUse _format);
RemovePartFromSequenceDialogFiller(HI::GUITestOpStatus &_os, RemoveType _removeType);
- void run();
+ void commonScenario();
private:
QString range;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
index 9e8dd16..ce806de 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
index 3c194ff..92981d8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
index b87f738..59aba3e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
index 401a761..cad6644 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
index 68e27f5..2d78b32 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -75,7 +75,7 @@ QListWidgetItem * findConnection(HI::GUITestOpStatus &os, QListWidget *list, con
GTGlobals::sleep(1000);
QList<QListWidgetItem*> items = list->findItems(name, Qt::MatchExactly);
if (1 != items.size()) {
- if (options.failIfNull) {
+ if (options.failIfNotFound) {
CHECK_SET_ERR_RESULT(false, QString("List item %1 not found").arg(name), NULL);
}
return NULL;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
index 400f3f7..80b91f5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp
index 582b50a..63fe4a0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h
index 1c7bca7..5246309 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp
index 9ad4bb5..85f852a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h
index c716f50..7262d1c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp
index d518811..d4291b8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,8 +48,8 @@ ExportCoverageDialogFiller::ExportCoverageDialogFiller(HI::GUITestOpStatus &os,
{
}
-#define GT_METHOD_NAME "run"
-void ExportCoverageDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportCoverageDialogFiller::commonScenario() {
dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "Active modal widget not found");
@@ -138,6 +138,7 @@ void ExportCoverageDialogFiller::selectFile(const QVariant &actionData) {
QFileInfo(actionData.toString()).fileName(),
GTFileDialogUtils::Save));
GTWidget::click(os, GTWidget::findWidget(os, "tbFilePath", dialog));
+ GTGlobals::sleep(500);
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h
index 3976cb7..890657d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ public:
ExportCoverageDialogFiller(HI::GUITestOpStatus &os, const QList<Action> &actions);
- void run();
+ void commonScenario();
private:
void enterFilePath(const QVariant &actionData);
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp
index 641067f..4e22d0c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,8 +50,8 @@ ExportReadsDialogFiller::ExportReadsDialogFiller(HI::GUITestOpStatus &os, const
{
}
-#define GT_METHOD_NAME "run"
-void ExportReadsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportReadsDialogFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h
index 1c0615d..6a0e1d6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class ExportReadsDialogFiller : public Filler {
public:
ExportReadsDialogFiller(HI::GUITestOpStatus &os, const QString &filePath, const QString format = "fasta", bool addToProject = true);
- virtual void run();
+ void commonScenario();
private:
QString filePath;
QString format;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.cpp
index 5c597d0..6fac611 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,8 +40,8 @@
namespace U2{
#define GT_CLASS_NAME "GTUtilsDialog::BranchSettingsDialogFiller"
-#define GT_METHOD_NAME "run"
-void BranchSettingsDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void BranchSettingsDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog!=NULL, "Active modal widget not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h
index 2cee66b..e04bea0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ class BranchSettingsDialogFiller : public Filler
{
public:
BranchSettingsDialogFiller(HI::GUITestOpStatus &os) : Filler(os,"BranchSettingsDialog"){}
- virtual void run();
+ void commonScenario();
};
}
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp
index 2a5ff6c..fcb8f8e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h
index dd19b5e..b53ae97 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp
index 98c55a2..5297015 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,8 +41,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::DeleteGapsDialogFiller"
-#define GT_METHOD_NAME "run"
-void DeleteGapsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void DeleteGapsDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -66,8 +66,8 @@ void DeleteGapsDialogFiller::run() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::RemoveGapColsDialogFiller"
-#define GT_METHOD_NAME "run"
-void RemoveGapColsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void RemoveGapColsDialogFiller::commonScenario() {
GTGlobals::sleep(1000);
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h
index 69a3537..a2556db 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ class DeleteGapsDialogFiller : public Filler {
public:
DeleteGapsDialogFiller(HI::GUITestOpStatus &os, int _radioButNum=0) : Filler(os, "DeleteGapsDialog"),
radioButNum(_radioButNum){}
- virtual void run();
+ void commonScenario();
private:
int radioButNum;
};
@@ -45,7 +45,7 @@ public:
radioMap[Percent] = "relativeRadioButton";
radioMap[Column] = "allRadioButton";
}
- virtual void run();
+ void commonScenario();
private:
Radio button;
int spinValue;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp
index 0f70a55..9cb4d5b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h
index 9b8a845..0d4237c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp
index 061fa3b..10a9814 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,8 +36,8 @@ ExportHighlightedDialogFiller::ExportHighlightedDialogFiller(HI::GUITestOpStatus
{
}
-#define GT_METHOD_NAME "run"
-void ExportHighlightedDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportHighlightedDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(NULL != dialog, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h
index c2cfa65..b6dca0b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ public:
ExportHighlightedDialogFiller(HI::GUITestOpStatus &os, const QString &filePath,
bool invertredExport = true);
- void run();
+ void commonScenario();
private:
const QString filePath;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp
index a718e68..47387cb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h
index 4b22670..9098350 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp
index 112c8c8..81bb448 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,8 +47,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::GenerateAlignmentProfileDialogFiller"
-#define GT_METHOD_NAME "run"
-void GenerateAlignmentProfileDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void GenerateAlignmentProfileDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h
index c51c975..633085a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ public:
format(NONE)
{}
- virtual void run();
+ void commonScenario();
private:
bool counts, gapScore,symdolScore, skipGaps;
saveFormat format;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp
index 4f7b752..506f33b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h
index 3b30de2..fada796 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp
index 35ede37..15e8928 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h
index 6c09da5..65ef84d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
index c4e93f3..06c6159 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,8 +37,8 @@ namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::FindAnnotationCollocationsDialogFiller"
-#define GT_METHOD_NAME "run"
-void FindAnnotationCollocationsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void FindAnnotationCollocationsDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
index d5b0db2..9ad5b1d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ using namespace HI;
class FindAnnotationCollocationsDialogFiller : public Filler {
public:
FindAnnotationCollocationsDialogFiller(HI::GUITestOpStatus &os): Filler(os, "FindAnnotationCollocationsDialog"){}
- virtual void run();
+ void commonScenario();
QToolButton* getPlusButton() const;
QList<QToolButton*> getMinusButtons() const;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp
index 9de4f40..cd1afc7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,8 +35,8 @@ StructuralAlignmentDialogFiller::StructuralAlignmentDialogFiller(HI::GUITestOpSt
{
}
-#define GT_METHOD_NAME "run"
-void StructuralAlignmentDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void StructuralAlignmentDialogFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h
index 35934be..0cf52e1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ class StructuralAlignmentDialogFiller : public Filler {
public:
StructuralAlignmentDialogFiller(HI::GUITestOpStatus &os, const QStringList& chainIndex = QStringList());
- void run();
+ void commonScenario();
private:
QStringList chainIndexes;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
index 20f2906..27672a7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
index 202f25e..1afca8e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp
index d56db5e..7ef91c8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -64,8 +64,8 @@ void ExportAnnotationsFiller::init(const QString &exportToFile) {
comboBoxItems[csv] = "csv";
}
-#define GT_METHOD_NAME "run"
-void ExportAnnotationsFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ExportAnnotationsFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h
index 7373c8f..150908a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ using namespace HI;
ExportAnnotationsFiller(const QString &exportToFile, fileFormat format, HI::GUITestOpStatus &os);
ExportAnnotationsFiller(HI::GUITestOpStatus &_os, const QString &_exportToFile, fileFormat _format, bool _saveSequencesUnderAnnotations = true,
bool _saveSequenceNames = true, GTGlobals::UseMethod method = GTGlobals::UseMouse);
- virtual void run();
+ void commonScenario();
private:
void init(const QString &exportToFile);
bool softMode;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp
index 0994952..5f8d2bf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h
index d1f3b73..fcd24e9 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp
index da44775..7242a74 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -46,8 +46,8 @@ ExportMSA2MSADialogFiller::ExportMSA2MSADialogFiller(HI::GUITestOpStatus &_os, i
formatVal(_formatVal),
path(_path){}
-#define GT_METHOD_NAME "run"
-void ExportMSA2MSADialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ExportMSA2MSADialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h
index aab25fa..b1e597a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class ExportMSA2MSADialogFiller : public Filler {
public:
ExportMSA2MSADialogFiller(HI::GUITestOpStatus &_os, int _formatVal = -1, QString _path="");
- virtual void run();
+ void commonScenario();
private:
int formatVal;
QString path;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp
index 8cc5481..9dbda46 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h
index b49ddf6..1047b68 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp
index f837217..db54aea 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h
index ee06070..a30dd39 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp
index d528d49..be4dbe5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h
index b5ffcb3..73bf707 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp
index f866aa4..2e05f0d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -129,8 +129,8 @@ ExportSequenceOfSelectedAnnotationsFiller::ExportSequenceOfSelectedAnnotationsFi
mergeRadioButtons[Merge] = "mergeButton";
}
-#define GT_METHOD_NAME "run"
-void ExportSequenceOfSelectedAnnotationsFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void ExportSequenceOfSelectedAnnotationsFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h
index 3f42ea3..3beaa93 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ using namespace HI;
enum MergeOptions {SaveAsSeparate, Merge};
ExportSequenceOfSelectedAnnotationsFiller(HI::GUITestOpStatus &_os, const QString &_path, FormatToUse _format, MergeOptions _options, int _gapLength = 0,
bool _addDocToProject = true, bool _exportWithAnnotations = false, GTGlobals::UseMethod method = GTGlobals::UseMouse);
- virtual void run();
+ void commonScenario();
private:
QString path;
int gapLength;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp
index 1fc7181..322af00 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h
index 944fdcd..7b3759c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
index 8337a1c..6339b3e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,8 +40,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::DotPlotFiller"
-#define GT_METHOD_NAME "run"
-void BuildDotPlotFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void BuildDotPlotFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
index e3883c9..2d964e0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,7 +41,7 @@ using namespace HI;
secondFileEdit(_secondFileEdit),
gapFirstVal(_gapFirstVal),gapSecondVal(_gapSecondVal),
cancel(cancel){}
- virtual void run();
+ void commonScenario();
private:
bool mergeFirstBoxChecked, oneSequenceBoxChecked,mergeSecondBoxChecked;
const QString firstFileEdit;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
index 932e96d..52eab6a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,8 +37,8 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::DotPlotFiller"
-#define GT_METHOD_NAME "run"
-void DotPlotFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void DotPlotFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -46,6 +46,7 @@ void DotPlotFiller::run() {
QSpinBox *minLenBox = qobject_cast<QSpinBox*>(GTWidget::findWidget(os, "minLenBox", dialog));
if(but1kpressed){
GTWidget::click(os, GTWidget::findWidget(os, "minLenHeuristicsButton", dialog));
+ GTGlobals::sleep();
GT_CHECK(minLenBox->value()==2,"minLem not 2, 1k button works wrong");
}
else
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
index b63ae69..576bd63 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class DotPlotFiller : public Filler {
public:
DotPlotFiller(HI::GUITestOpStatus &_os, int _minLen=100, int _identity = 0, bool _invertedRepeats = false, bool _but1kpressed=false) : Filler(_os, "DotPlotDialog"), minLen(_minLen), identity(_identity), invertedRepeats(_invertedRepeats), but1kpressed(_but1kpressed) {}
- virtual void run();
+ void commonScenario();
private:
int minLen, identity;
bool invertedRepeats, but1kpressed;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp
index 89729bf..97d633a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
index 56d35c8..b068b55 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
index 688c25f..2aeec28 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
index f6ba641..8cca98e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
index a0f4c20..d951183 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
index c63fc15..1bff24b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
index 732a75c..6c0c288 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
index 8534138..4b451e7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
index ea40e61..a0ca9d4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
index 161d091..1dae064 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp
index 215eba3..4b72044 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
#include <QtWidgets/QComboBox>
#endif
-#include <core/GUITest.h>
+#include <U2Test/UGUITest.h>
#include <primitives/GTComboBox.h>
#include <base_dialogs/GTFileDialog.h>
@@ -95,7 +95,7 @@ void BlastAllSupportDialogFiller::test_3211() {
CHECK_SET_ERR(NULL == widget, "Annotations widget exists");
//2. Set any input sequence.
- GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, HI::GUITest::dataDir + "samples/FASTA/human_T1.fa"));
+ GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, UGUITest::dataDir + "samples/FASTA/human_T1.fa"));
GTWidget::click(os, GTWidget::findWidget(os, "browseInput"));
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -103,7 +103,7 @@ void BlastAllSupportDialogFiller::test_3211() {
GTWidget::findWidget(os, "rbCreateNewTable");
//3. Set any another input sequence.
- GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, HI::GUITest::testDir + "_common_data/fasta/human_T1_cutted.fa"));
+ GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, UGUITest::testDir + "_common_data/fasta/human_T1_cutted.fa"));
GTWidget::click(os, GTWidget::findWidget(os, "browseInput"));
GTUtilsTaskTreeView::waitTaskFinished(os);
//Expected state: there is a single annotation widget.
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h
index c9de525..149ed26 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp
index 15e70a4..668e151 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h
index 09a40ed..766515f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp
index 656e5ff..4738626 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -51,9 +51,9 @@ FormatDBSupportRunDialogFiller::FormatDBSupportRunDialogFiller(HI::GUITestOpStat
}
#define GT_CLASS_NAME "GTUtilsDialog::FormatDBSupportRunDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void FormatDBSupportRunDialogFiller::run() {
+void FormatDBSupportRunDialogFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h
index 7b5998d..27a44b0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ public:
FormatDBSupportRunDialogFiller(HI::GUITestOpStatus &os, const Parameters ¶meters);
- void run();
+ void commonScenario();
private:
Parameters parameters;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp
index 3de30b8..c67a169 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h
index 75111da..a251837 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp
index 31467d5..d5a02e7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.h
index 2c6245e..794967b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.cpp
index 52bd127..664af33 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
namespace U2{
#define GT_CLASS_NAME "GTUtilsDialog::DotPlotFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
TCoffeeDailogFiller::TCoffeeDailogFiller(HI::GUITestOpStatus &os, int gapOpen, int gapExt, int numOfIters) :
Filler(os, "TCoffeeSupportRunDialog"),
@@ -47,7 +47,7 @@ TCoffeeDailogFiller::TCoffeeDailogFiller(HI::GUITestOpStatus &os, int gapOpen, i
}
-void TCoffeeDailogFiller::run(){
+void TCoffeeDailogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h
index 276b78a..299aa4e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ class TCoffeeDailogFiller : public Filler {
public:
TCoffeeDailogFiller(HI::GUITestOpStatus& os, int gapOpen = INT_MAX, int gapExt = INT_MAX, int numOfIters = INT_MAX);
- virtual void run();
+ void commonScenario();
private:
int gapOpen;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp
index da8b847..72e5873 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h
index 20ebf6f..8eb1f3b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
index 003731f..f93610f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
index 606cbfa..bd2fde8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
index 9d1148a..6ae7331 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
index 438c6e8..be26283 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
index 638b1d9..249188b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
index e29ae38..36853b9 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
index 088a407..7e7f58b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
index 5bba1c1..3264a89 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
index 2a7ca20..6d24322 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
index 561e15f..4d17820 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp
index ef56bba..5a26db7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h
index d083557..26c3bfb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp
index b4b00c2..8dcb574 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h
index e57896a..fa8fbae 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp
index 02a1da6..8fc0903 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,9 +38,9 @@
namespace U2{
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::StartupDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void AliasesDialogFiller::run(){
+void AliasesDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
GTGlobals::sleep(500);
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h
index fa55231..5a45681 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ class AliasesDialogFiller : public Filler
public:
AliasesDialogFiller(HI::GUITestOpStatus &_os, QMap<QPoint*,QString> _map):Filler(_os,"SchemaAliasesConfigurationDialog"),
map(_map){}
- void run();
+ void commonScenario();
private:
QMap<QPoint*,QString> map;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp
index 867200f..c35adc0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h
index fc80cf4..cb67dc6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp
index 278ac0f..8be46fe 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h
index f831a74..752a7e6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,22 +22,17 @@
#ifndef _U2_GT_CREATE_ELEMENT_WITH_COMMAND_LINE_TOOL_FILLER_H_
#define _U2_GT_CREATE_ELEMENT_WITH_COMMAND_LINE_TOOL_FILLER_H_
-#include "utils/GTUtilsDialog.h"
+#include <QApplication>
+#include <QTableView>
-#include <primitives/GTComboBox.h>
#include <drivers/GTKeyboardDriver.h>
-#include <primitives/GTLineEdit.h>
#include <drivers/GTMouseDriver.h>
+#include <primitives/GTComboBox.h>
+#include <primitives/GTLineEdit.h>
#include <primitives/GTTableView.h>
#include <primitives/GTWidget.h>
-
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QApplication>
-#include <QtGui/QTableView>
-#else
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QTableView>
-#endif
+#include <utils/GTThread.h>
+#include <utils/GTUtilsDialog.h>
namespace U2 {
using namespace HI;
@@ -99,6 +94,7 @@ private:
void setType(QTableView *table, int row, const DataType &type) {
GTMouseDriver::moveTo(os, GTTableView::getCellPosition(os, table, 1, row));
GTMouseDriver::doubleClick(os);
+ GTThread::waitForMainThread(os);
QComboBox* box = qobject_cast<QComboBox*>(QApplication::focusWidget());
GTComboBox::setIndexWithText(os, box, dataTypeToString(type));
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp
index b997741..b70b3bc 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,8 +33,8 @@
namespace U2{
#define GT_CLASS_NAME "CreateElementWithScriptDialogFiller"
-#define GT_METHOD_NAME "run"
-void CreateElementWithScriptDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void CreateElementWithScriptDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -48,8 +48,8 @@ void CreateElementWithScriptDialogFiller::run(){
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "ScriptEditorDialogFiller"
-#define GT_METHOD_NAME "run"
-void ScriptEditorDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void ScriptEditorDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -83,8 +83,8 @@ void ScriptEditorDialogFiller::run(){
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "ScriptEditorDialogFiller"
-#define GT_METHOD_NAME "run"
-void ScriptEditorDialogSyntaxChecker::run(){
+#define GT_METHOD_NAME "commonScenario"
+void ScriptEditorDialogSyntaxChecker::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h
index 30727a6..0e5cbfa 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ class CreateElementWithScriptDialogFiller : public Filler
public:
CreateElementWithScriptDialogFiller(HI::GUITestOpStatus& os, QString _name):Filler(os, "CreateScriptBlockDialog"),
name(_name){}
- virtual void run();
+ void commonScenario();
private:
QString name;
};
@@ -45,7 +45,7 @@ public:
text(_text),
checkSyntaxResult(_checkSyntaxResult),
checkSyntax(_checkSyntax) {}
- virtual void run();
+ void commonScenario();
private:
QString url;
QString text;
@@ -59,7 +59,7 @@ public:
ScriptEditorDialogSyntaxChecker(HI::GUITestOpStatus& os, QString _text = "", QString _message = ""): Filler(os, "ScriptEditorDialog"),
text(_text),
message(_message){}
- virtual void run();
+ void commonScenario();
private:
QString text, message;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp
index 62a4534..7c49eee 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h
index cc3d08b..8f7ad9f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp
index 305a615..59ab9c2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,22 +19,20 @@
* MA 02110-1301, USA.
*/
-#include "DatasetNameEditDialogFiller.h"
-#include <primitives/GTLineEdit.h>
+#include <QApplication>
+
#include <drivers/GTKeyboardDriver.h>
+#include <primitives/GTLineEdit.h>
+#include <primitives/GTWidget.h>
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QApplication>
-#else
-#include <QtWidgets/QApplication>
-#endif
+#include "DatasetNameEditDialogFiller.h"
-namespace U2{
+namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "DatasetNameEditDialogFiller"
-#define GT_METHOD_NAME "run"
-void DatasetNameEditDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void DatasetNameEditDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -43,10 +41,9 @@ void DatasetNameEditDialogFiller::run(){
GT_CHECK(line, "lineEdit not found");
GTLineEdit::setText(os, line, datasetName);
}
- GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
+ GTWidget::click(os, GTWidget::findButtonByText(os, "OK", dialog));
}
#undef GT_METHOD_NAME
#undef GT_CLASS_NAME
-
}
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h
index aeed207..c327fe4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef DATASETNAMEEDITDIALOGFILLER_H
#define DATASETNAMEEDITDIALOGFILLER_H
-#include "utils/GTUtilsDialog.h"
+#include <utils/GTUtilsDialog.h>
namespace U2 {
using namespace HI;
@@ -32,7 +32,7 @@ class DatasetNameEditDialogFiller : public Filler
public:
DatasetNameEditDialogFiller(HI::GUITestOpStatus& os, QString _datasetName = ""):Filler(os, ""),
datasetName(_datasetName){}
- virtual void run();
+ void commonScenario();
private:
QString datasetName;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp
index 915823f..8e6e32a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h
index 1cc8523..7e4109a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp
index a2aefa1..d58d332 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h
index 5f8677a..a668143 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp
index 103ccd8..ba0d1f3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ void StartupDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
- if (path != GUITest::sandBoxDir) {
+ if (path != UGUITest::sandBoxDir) {
QLineEdit *pathEdit = GTWidget::findExactWidget<QLineEdit *>(os, "pathEdit", dialog);
CHECK(NULL != pathEdit, );
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h
index 668b80e..667884d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,8 @@
#ifndef _U2_STARTUP_DIALOG_FILLER_H_
#define _U2_STARTUP_DIALOG_FILLER_H_
-#include <core/GUITest.h>
+#include <core/GUITestOpStatus.h>
+#include <U2Test/UGUITest.h>
#include "utils/GTUtilsDialog.h"
@@ -34,7 +35,7 @@ using namespace HI;
class StartupDialogFiller : public Filler {
public:
- StartupDialogFiller(HI::GUITestOpStatus &os, const QString &path = HI::GUITest::sandBoxDir, bool isPathValid = true);
+ StartupDialogFiller(HI::GUITestOpStatus &os, const QString &path = UGUITest::sandBoxDir, bool isPathValid = true);
void commonScenario();
private:
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp
index 2d17e72..ff09f23 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.h
index 06125ae..0be2ac6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp
index 64eaad0..4d003bb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,8 +36,8 @@
namespace U2{
#define GT_CLASS_NAME "GTUtilsDialog::StartupDialogFiller"
-#define GT_METHOD_NAME "run"
-void WorkflowMetaDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void WorkflowMetaDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h
index 8f41482..01a44aa 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ public:
WorkflowMetaDialogFiller(HI::GUITestOpStatus& os, QString _url, QString _name): Filler(os, "WorkflowMetaDialog"),
url(_url),
name(_name){}
- virtual void run();
+ void commonScenario();
private:
QString url, name;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp
index 03aabab..bd9b797 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,9 +35,9 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::MAFFTSupportRunDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void MAFFTSupportRunDialogFiller::run() {
+void MAFFTSupportRunDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h
index b171bcd..fe02fbf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -55,7 +55,7 @@ public:
CHECK_SET_ERR(parameters, "Invalid filler parameters: NULL pointer");
}
-virtual void run();
+void commonScenario();
private:
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp
index 193b977..a6efffd 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,9 +41,8 @@ namespace U2 {
ClustalWDialogFiller::ClustalWDialogFiller(HI::GUITestOpStatus &_os, int _gapOpenVal) : Filler(_os, "ClustalWSupportRunDialog"),
gapOpenVal(_gapOpenVal) {}
-#define GT_METHOD_NAME "run"
-void ClustalWDialogFiller::run()
-{
+#define GT_METHOD_NAME "commonScenario"
+void ClustalWDialogFiller::commonScenario() {
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h
index 29e69b8..214532e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,8 @@ using namespace HI;
class ClustalWDialogFiller : public Filler {
public:
ClustalWDialogFiller(HI::GUITestOpStatus &_os, int _gapOpenVal=0);
- virtual void run();
+
+ void commonScenario();
private:
int gapOpenVal;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp
index bfbe700..07c499c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,9 +31,9 @@
namespace U2 {
#define GT_CLASS_NAME "UHMM3PhmmerDialogFiller"
-#define GT_METHOD_NAME "run"
+#define GT_METHOD_NAME "commonScenario"
-void UHMM3PhmmerDialogFiller::run(){
+void UHMM3PhmmerDialogFiller::commonScenario(){
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h
index 086a884..df5b897 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ class UHMM3PhmmerDialogFiller: public Filler
{
public:
UHMM3PhmmerDialogFiller(HI::GUITestOpStatus &os, QString _input):Filler(os, "UHMM3PhmmerDialog"), input(_input){}
- virtual void run();
+ void commonScenario();
private:
QString input;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp
index 4437b23..3e49783 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h
index 84b3b23..db7897e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp
index 66832fc..67f5114 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,8 +41,8 @@ namespace U2 {
KalignDialogFiller::KalignDialogFiller(HI::GUITestOpStatus &_os, int _gapOpenVal, bool _toAmino) : Filler(_os, "KalignDialog"),
gapOpenVal(_gapOpenVal), toAmino(_toAmino) {}
-#define GT_METHOD_NAME "run"
-void KalignDialogFiller::run()
+#define GT_METHOD_NAME "commonScenario"
+void KalignDialogFiller::commonScenario()
{
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h
index 6ddbb57..ee5aa9e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
class KalignDialogFiller : public Filler {
public:
KalignDialogFiller(HI::GUITestOpStatus &_os, int _gapOpenVal=0, bool _toAmino = false);
- virtual void run();
+ void commonScenario();
private:
int gapOpenVal;
bool toAmino;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp
index 77f215a..4db0154 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h
index f926dc9..121fa61 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp
index bfce4eb..a5072ce 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -41,7 +41,6 @@
namespace U2 {
#define GT_CLASS_NAME "GTUtilsDialog::MuscleDialogFiller"
-#define GT_METHOD_NAME "run"
MuscleDialogFiller::MuscleDialogFiller(HI::GUITestOpStatus &os, Mode _mode, bool _doNotReArr, bool translateToAmino)
: Filler(os, "MuscleAlignmentDialog"), mode(_mode), doNotReArr(_doNotReArr), translateToAmino(translateToAmino)
@@ -49,7 +48,8 @@ MuscleDialogFiller::MuscleDialogFiller(HI::GUITestOpStatus &os, Mode _mode, bool
}
-void MuscleDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void MuscleDialogFiller::commonScenario(){
QWidget *dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h
index 3f85db7..995883f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ public:
Refine = 2
};
MuscleDialogFiller(HI::GUITestOpStatus &os, Mode mode = Default, bool _doNotReArr = true, bool translateToAmino = false);
- virtual void run();
+ void commonScenario();
private:
Mode mode;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
index adac8a0..b040305 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,8 +35,8 @@ namespace U2{
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::SaveProjectAsDialogFiller"
-#define GT_METHOD_NAME "run"
-void ConvertAceToSqliteDialogFiller::run(){
+#define GT_METHOD_NAME "commonScenario"
+void ConvertAceToSqliteDialogFiller::commonScenario(){
QString button;
switch (action) {
case NOT_SET:
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
index 2ae4778..30fdaf8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ public:
enum OutFileAction { NOT_SET, REPLACE, APPEND, CANCEL };
ConvertAceToSqliteDialogFiller(HI::GUITestOpStatus& _os, QString _leDest, OutFileAction action = NOT_SET): Filler(_os, "AceImportDialog"),
leDestUrl(_leDest), action(action) {}
- virtual void run();
+ void commonScenario();
private:
QString leDestUrl;
OutFileAction action;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
index e16133d..415bd7c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,8 +38,8 @@
namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::SaveProjectAsDialogFiller"
-#define GT_METHOD_NAME "run"
-void SaveProjectAsDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void SaveProjectAsDialogFiller::commonScenario() {
GTGlobals::sleep();
QWidget* dialog = QApplication::activeModalWidget();
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
index 8482718..4e2daa1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ using namespace HI;
public:
SaveProjectAsDialogFiller(HI::GUITestOpStatus &_os, const QString &_projectName, const QString &_projectFolder, const QString &_projectFile)
:Filler(_os, "CreateNewProjectDialog"), projectName(_projectName), projectFolder(_projectFolder), projectFile(_projectFile){}
- virtual void run();
+ void commonScenario();
private:
const QString projectName;
const QString projectFolder;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
index c30d630..0ad25a7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
index 5216855..13312f8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
index adbbd79..99b404c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
index 2eef0fd..1c8f6a2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
index d0e7184..8eaa196 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -39,8 +39,8 @@ namespace U2 {
using namespace HI;
#define GT_CLASS_NAME "GTUtilsDialog::ExportProjectDialogChecker"
-#define GT_METHOD_NAME "run"
-void ExportProjectDialogChecker::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportProjectDialogChecker::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -55,8 +55,8 @@ void ExportProjectDialogChecker::run() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::ExportProjectDialogSizeChecker"
-#define GT_METHOD_NAME "run"
-void ExportProjectDialogSizeChecker::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportProjectDialogSizeChecker::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -75,8 +75,8 @@ void ExportProjectDialogSizeChecker::run() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::ExportProjectDialogFiller"
-#define GT_METHOD_NAME "run"
-void ExportProjectDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void ExportProjectDialogFiller::commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
index e642393..ed3caae 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ using namespace HI;
public:
ExportProjectDialogFiller(HI::GUITestOpStatus &_os, const QString &_projectFolder, const QString &_projectName = "")
:Filler(_os, "ExportProjectDialog"), projectFolder(_projectFolder), projectName(_projectName){}
- virtual void run();
+ void commonScenario();
private:
const QString projectFolder;
const QString projectName;
@@ -41,7 +41,7 @@ using namespace HI;
public:
ExportProjectDialogChecker(HI::GUITestOpStatus &_os, const QString &_projectName)
:Filler(_os, "ExportProjectDialog"), projectName(_projectName){}
- virtual void run();
+ void commonScenario();
private:
const QString projectName;
};
@@ -50,7 +50,7 @@ using namespace HI;
public:
ExportProjectDialogSizeChecker(HI::GUITestOpStatus &_os, const QString &_projectName)
:Filler(_os, "ExportProjectDialog"), projectName(_projectName){}
- virtual void run();
+ void commonScenario();
private:
const QString projectName;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
index c5535d0..e96f7fc 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,8 +48,8 @@ NcbiSearchDialogFiller::NcbiSearchDialogFiller(HI::GUITestOpStatus &os, const QL
{
}
-#define GT_METHOD_NAME "run"
-void NcbiSearchDialogFiller::run() {
+#define GT_METHOD_NAME "commonScenario"
+void NcbiSearchDialogFiller::commonScenario() {
dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
@@ -311,8 +311,8 @@ void NcbiSearchDialogFiller::waitTasksFinish() {
#undef GT_CLASS_NAME
#define GT_CLASS_NAME "GTUtilsDialog::NCBISearchDialogFillerDeprecated"
-#define GT_METHOD_NAME "run"
-void NCBISearchDialogFillerDeprecated::run(){
+#define GT_METHOD_NAME "commonScenario"
+void NCBISearchDialogFillerDeprecated::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
index 9922ba7..54c6e60 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ public:
NcbiSearchDialogFiller(HI::GUITestOpStatus &os, const QList<Action> &actions);
- void run();
+ void commonScenario();
private:
void setField(const QVariant &actionData);
@@ -89,7 +89,7 @@ public:
query(_query),
doubleEnter(_doubleEnter),
resultLimit(_resultLimit){}
- virtual void run();
+ void commonScenario();
private:
QString query;
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
index b730bce..6c98f47 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
#include <primitives/GTWidget.h>
namespace U2{
-void SaveProjectDialogFiller::run(){
+void SaveProjectDialogFiller::commonScenario(){
QWidget* dialog = QApplication::activeModalWidget();
CHECK_SET_ERR(dialog, "save project dialog not found");
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
index 8ae3720..bb2d443 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ class SaveProjectDialogFiller: public Filler{
public:
SaveProjectDialogFiller(HI::GUITestOpStatus &os, QDialogButtonBox::StandardButton _b):
Filler(os,"SaveProjectDialog"),b(_b){}
- virtual void run();
+ void commonScenario();
private:
QDialogButtonBox::StandardButton b;
};
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
index 83e8be0..fae7974 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
index f68c856..cd57aad 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
index 34ec46e..6ae2b81 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
index 2bf1802..f122da4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
index 5c55954..0bb6cec 100644
--- a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
+++ b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
#include <QMessageBox>
#include <U2Test/GUITestThread.h>
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
#include <U2Test/GUITestService.h>
#include "GUITestRunner.h"
@@ -34,8 +34,9 @@ namespace U2 {
#define ULOG_CAT_TEST_RUNNER "GUI Test Runner Log"
static Logger log(ULOG_CAT_TEST_RUNNER);
-GUITestRunner::GUITestRunner(GUITestBase* _guiTestBase, QWidget *parent) :
- guiTestBase(_guiTestBase), QWidget(parent)
+GUITestRunner::GUITestRunner(UGUITestBase* _guiTestBase, QWidget *parent) :
+ QWidget(parent),
+ guiTestBase(_guiTestBase)
{
setupUi(this);
setWindowIcon(QIcon(QString(":gui_test/images/open_gui_test_runner.png")));
diff --git a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
index c7fd44c..5cd23e8 100644
--- a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
+++ b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
#include <QWidget>
#include "ui_GUITestRunner.h"
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
@@ -33,7 +33,7 @@ class GUITestRunner : public QWidget, public Ui_GUITestRunner
Q_OBJECT
public:
- explicit GUITestRunner(GUITestBase* guiTestBase, QWidget *parent = 0);
+ explicit GUITestRunner(UGUITestBase* guiTestBase, QWidget *parent = 0);
~GUITestRunner();
private slots:
@@ -46,7 +46,7 @@ private slots:
private:
void revisible(const QString &nameFilter);
- GUITestBase* guiTestBase;
+ UGUITestBase* guiTestBase;
QAction* delTextAction;
};
diff --git a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
index ef87294..11e97b7 100644
--- a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
+++ b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -58,20 +58,22 @@ using namespace HI;
GUI_TEST_CLASS_DEFINITION(pre_action_0000) {
GTUtilsTaskTreeView::waitTaskFinished(os);
+
#ifdef Q_OS_WIN
QProcess::execute("closeAllErrors.exe"); //this exe file, compiled Autoit script
#endif
+
GTUtilsDialog::cleanup(os, GTUtilsDialog::NoFailOnUnfinished);
+
#ifndef Q_OS_WIN
GTMouseDriver::release(os, Qt::RightButton);
GTMouseDriver::release(os);
GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["ctrl"]);
GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["shift"]);
GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["alt"]);
+ uiLog.trace(QString("pre_action_0000: next keyboard modifiers are pressed before test: %1").arg(QGuiApplication::queryKeyboardModifiers()));
#endif
-#ifdef Q_OS_MAC
- GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["cmd"]);
-#endif
+
GTUtilsDialog::startHangChecking(os);
}
@@ -92,12 +94,14 @@ GUI_TEST_CLASS_DEFINITION(pre_action_0002) {
}
GUI_TEST_CLASS_DEFINITION(pre_action_0003) {
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj1.uprj");
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj2-1.uprj");
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj2.uprj");
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj3.uprj");
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj4.uprj");
- GTFile::backup(os, testDir + "_common_data/scenarios/project/proj5.uprj");
+ if(QDir(testDir).exists()){
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj1.uprj");
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj2-1.uprj");
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj2.uprj");
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj3.uprj");
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj4.uprj");
+ GTFile::backup(os, testDir + "_common_data/scenarios/project/proj5.uprj");
+ }
}
GUI_TEST_CLASS_DEFINITION(pre_action_0004) {
@@ -109,11 +113,13 @@ GUI_TEST_CLASS_DEFINITION(pre_action_0004) {
}
GUI_TEST_CLASS_DEFINITION(pre_action_0005) {
- PermissionsSetter::setReadWrite(os, sandBoxDir);
- GTGlobals::sleep();
- QDir sandBox = QDir(sandBoxDir);
- foreach (QString path, sandBox.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden)) {
- GTFile::removeDir(sandBox.absolutePath() + "/" + path);
+ if(QDir(sandBoxDir).exists()){
+ PermissionsSetter::setReadWrite(os, sandBoxDir);
+ GTGlobals::sleep();
+ QDir sandBox = QDir(sandBoxDir);
+ foreach (QString path, sandBox.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden)) {
+ GTFile::removeDir(sandBox.absolutePath() + "/" + path);
+ }
}
}
@@ -152,6 +158,8 @@ GUI_TEST_CLASS_DEFINITION(post_action_0000) {
if (modifiers & Qt::AltModifier) {
GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["alt"]);
}
+
+ uiLog.trace(QString("post_action_0000: next keyboard modifiers are pressed after test: %1").arg(QGuiApplication::queryKeyboardModifiers()));
}
GUI_TEST_CLASS_DEFINITION(post_action_0001) {
@@ -203,18 +211,21 @@ GUI_TEST_CLASS_DEFINITION(post_action_0002) {
}
GUI_TEST_CLASS_DEFINITION(post_action_0003) {
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj1.uprj");
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj2-1.uprj");
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj2.uprj");
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj3.uprj");
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj4.uprj");
- GTFile::restore(os, testDir + "_common_data/scenarios/project/proj5.uprj");
-
- PermissionsSetter::setReadWrite(os, sandBoxDir);
- GTGlobals::sleep();
- QDir sandBox = QDir(sandBoxDir);
- foreach (QString path, sandBox.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden)) {
- GTFile::removeDir(sandBox.absolutePath() + "/" + path);
+ if(QDir(testDir).exists()){
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj1.uprj");
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj2-1.uprj");
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj2.uprj");
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj3.uprj");
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj4.uprj");
+ GTFile::restore(os, testDir + "_common_data/scenarios/project/proj5.uprj");
+ }
+ if(QDir(sandBoxDir).exists()){
+ PermissionsSetter::setReadWrite(os, sandBoxDir);
+ GTGlobals::sleep();
+ QDir sandBox = QDir(sandBoxDir);
+ foreach (QString path, sandBox.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden)) {
+ GTFile::removeDir(sandBox.absolutePath() + "/" + path);
+ }
}
}
diff --git a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
index 93f84ac..1d5cb4a 100644
--- a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
+++ b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_INITIAL_CHECKS_H_
#define _U2_GUI_INITIAL_CHECKS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp
index 2515f61..357b670 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -157,6 +157,8 @@ GUI_TEST_CLASS_DEFINITION(test_0010) {
GTUtilsDialog::waitForDialog(os, new ExportCoverageDialogFiller(os, actions));
GTUtilsAssemblyBrowser::callExportCoverageDialog(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
// 8. Create a file it the same folder as you set in the point 6 with name "chrM_coverage.bedgraph".
GTFile::create(os, sandBoxDir + "/common_assembly_browser/chrM_coverage.bedgraph");
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h
index 2f9f5c5..7cb51d7 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef U2_GUITEST_ASSEMBLY_BROWSER_H_
#define U2_GUITEST_ASSEMBLY_BROWSER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.cpp
index d905484..b019d5c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.h
index f74778e..fecb65a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUITEST_BOWTIE2_H_
#define _U2_GUITEST_BOWTIE2_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_Bowtie2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.cpp
index e979fcf..ac2830a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.h
index 7930652..f3e5f68 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUITEST_DNA_ASSEMBLY_H_
#define _U2_GUITEST_DNA_ASSEMBLY_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_dna_assembly {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.cpp
index 08f1d8b..f3f5bbf 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.h
index 947a8a6..649e371 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_INDEX_REUSE_H_
#define _U2_INDEX_REUSE_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_index_reuse {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp
index a5559c7..7364a8b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h
index 6b561dc..a00f501 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#define _U2_GUITEST_DNA_ASSEMBLY_CONVERSIONS_H_
#include <U2Core/global.h>
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_dna_assembly_conversions {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.cpp
index 4132f05..7376f85 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.h
index cd72095..a0a6c6b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef _U2_GUITEST_SAM_H_
#define _U2_GUITEST_SAM_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_SAM {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.cpp
index b6de255..9c967a4 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.h b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.h
index d352017..aed515f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_NIAID_PIPELINES_H_
#define GTTESTS_NIAID_PIPELINES_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.cpp
index 5bdc468..b6cf57b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.h
index 2cf912a..2cd5618 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_QUERY_DESIGNER_H_
#define GTTESTS_QUERY_DESIGNER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
index 6e913f9..56e46bd 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
index f7d1ec2..cb61530 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_ANNOTATIONS_H_
#define _U2_GT_TESTS_ANNOTATIONS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
index 6708938..569d7e4 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -506,11 +506,12 @@ GUI_TEST_CLASS_DEFINITION(test_0007) {
// 3. Enter "tel".
GTKeyboardDriver::keySequence(os, "tel");
+ GTGlobals::sleep(500);
// Expected state: "Telomere" type is selected. Cancel the dialog.
const QString type = getTypeFromFullWidget(os, dialog);
CHECK_SET_ERR("Telomere" == type,
- QString("An unexpected feature type: expect '%1', got '%2'")
+ QString("1: An unexpected feature type: expect '%1', got '%2'")
.arg("Telomere").arg(type));
GTUtilsDialog::clickButtonBox(os, dialog, QDialogButtonBox::Cancel);
@@ -540,7 +541,7 @@ GUI_TEST_CLASS_DEFINITION(test_0007) {
// Expected state: "Telomere" type is selected. Cancel the dialog.
const QString type = getTypeFromNormalWidget(os, dialog);
CHECK_SET_ERR("Telomere" == type,
- QString("An unexpected feature type: expect '%1', got '%2'")
+ QString("2: An unexpected feature type: expect '%1', got '%2'")
.arg("Telomere").arg(type));
GTUtilsDialog::clickButtonBox(os, dialog, QDialogButtonBox::Cancel);
@@ -564,7 +565,7 @@ GUI_TEST_CLASS_DEFINITION(test_0007) {
const QString type = getTypeFromOptionsPanelWidget(os);
CHECK_SET_ERR("Telomere" == type,
- QString("An unexpected feature type: expect '%1', got '%2'")
+ QString("3: An unexpected feature type: expect '%1', got '%2'")
.arg("Telomere").arg(type));
}
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
index e2163ff..518b5be 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_CREATE_ANNOTATION_WIDGET_H_
#define _U2_GT_TESTS_CREATE_ANNOTATION_WIDGET_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.cpp
index c5fd07d..99019b0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -590,7 +590,7 @@ GUI_TEST_CLASS_DEFINITION(test_0005_1) {
//6. CHECK if misc_feature annotation is removed
//TODO: 6.1 CHECK if "group" subgroups/annotations counter displays (0,0)
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QTreeWidgetItem *annotationItem = GTUtilsAnnotationsTreeView::findItem(os, "misc_feature", options);
CHECK_SET_ERR(NULL == annotationItem, "The annotation 'misc_feature' unexpectedly was not removed");
GTGlobals::sleep();
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.h
index 9b4f6eb..e57677b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_ANNOTATIONS_EDIT_H_
#define _U2_GT_TESTS_ANNOTATIONS_EDIT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp
index c7ad3b0..e1472d5 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.h
index 7b0c563..f3c2a72 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_ANNOTATIONS_QUALIFIERS_H_
#define _U2_GT_TESTS_ANNOTATIONS_QUALIFIERS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.cpp
index 45dfd46..66e278a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.h
index 9471eee..88f4aae 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_ANNOTATIONS_IMPORT_H_
#define _U2_GT_TESTS_ANNOTATIONS_IMPORT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.cpp
index aa17a39..43c2099 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.h b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.h
index f6e1af7..25a8d77 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _GT_TESTS_CV_GENERAL_H_
#define _GT_TESTS_CV_GENERAL_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_common_scenarios_circular_view {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
index 9a3e217..a62e6fb 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
index 92e094e..a1b69cc 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_CLONING_H_
#define _U2_GT_TESTS_CLONING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.cpp
index 96a74e3..3311c9c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.h b/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.h
index 9dc088b..73f2d87 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_DOCUMENT_FROM_TEXT_H_
#define _U2_GT_TESTS_DOCUMENT_FROM_TEXT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.cpp
index b735a3d..a24983b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ GUI_TEST_CLASS_DEFINITION(test_0011){
//Expected state: Dot plot view has closed.
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *w=GTWidget::findWidget(os,"dotplot widget",NULL, options);
CHECK_SET_ERR(w==NULL, "Dotplot not deleted");
@@ -99,7 +99,7 @@ GUI_TEST_CLASS_DEFINITION(test_0011_1){
GTGlobals::sleep(500);
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *w=GTWidget::findWidget(os,"dotplot widget",NULL, options);
CHECK_SET_ERR(w==NULL, "Dotplot not deleted");
@@ -117,7 +117,7 @@ GUI_TEST_CLASS_DEFINITION(test_0011_2){//commit DotPlotWidget.cpp exitButton
GTGlobals::sleep(500);
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *w=GTWidget::findWidget(os,"dotplot widget",NULL, options);
CHECK_SET_ERR(w==NULL, "Dotplot not deleted");
@@ -134,7 +134,7 @@ GUI_TEST_CLASS_DEFINITION(test_0011_3){
GTGlobals::sleep(500);
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
QWidget *w=GTWidget::findWidget(os,"dotplot widget",NULL, options);
CHECK_SET_ERR(w==NULL, "Dotplot not deleted");
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.h
index 36b568e..2fe791a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_DP_VIEW_H_
#define GTTESTS_DP_VIEW_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
#include "utils/GTUtilsDialog.h"
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.cpp
index 863927a..cd9656c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -75,6 +75,7 @@
#include <U2View/MSAEditor.h>
#include <U2View/MSAEditorNameList.h>
#include <U2View/ADVConstants.h>
+#include <U2Test/UGUITest.h>
namespace U2 {
@@ -2904,7 +2905,7 @@ GUI_TEST_CLASS_DEFINITION(test_0028_windows){
// 3. Fill dialog: svg format, output file
qint64 fileSize = GTFile::getSize(os,testDir + "_common_data/scenarios/sandbox/test.svg");
- CHECK_SET_ERR(fileSize > 7400000 && fileSize < 9800000, "Current size: " + QString().setNum(fileSize));
+ CHECK_SET_ERR(fileSize > 6500000 && fileSize < 9800000, "Current size: " + QString().setNum(fileSize));
// Expected state: SVG is exported
}
@@ -3556,7 +3557,7 @@ GUI_TEST_CLASS_DEFINITION(test_0038_4){
void test_0039_function(HI::GUITestOpStatus &os, int comboNum, QString extention){
//1. open document samples/CLUSTALW/COI.aln
- GTFileDialog::openFile(os, GUITest::dataDir + "samples/CLUSTALW/", "COI.aln");
+ GTFileDialog::openFile(os, UGUITest::dataDir + "samples/CLUSTALW/", "COI.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
//2. Use project tree context menu->Export/Import->Export Nucleic Alignment to Amino Translation
@@ -3567,7 +3568,7 @@ void test_0039_function(HI::GUITestOpStatus &os, int comboNum, QString extention
// Amino translation: Standart genetic code
// Add document to project: checked
GTMouseDriver::moveTo(os,GTUtilsProjectTreeView::getItemCenter(os,"COI"));
- GTUtilsDialog::waitForDialog(os, new ExportMSA2MSADialogFiller(os, comboNum, GUITest::testDir + "_common_data/scenarios/sandbox/COI_transl.aln"));
+ GTUtilsDialog::waitForDialog(os, new ExportMSA2MSADialogFiller(os, comboNum, UGUITest::testDir + "_common_data/scenarios/sandbox/COI_transl.aln"));
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList()<<ACTION_PROJECT__EXPORT_IMPORT_MENU_ACTION<<ACTION_PROJECT__EXPORT_TO_AMINO_ACTION));
GTMouseDriver::click(os,Qt::RightButton);
GTGlobals::sleep(500);
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.h
index c9a682c..3045ebf 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef GTTESTSMSAEDITOR_H
#define GTTESTSMSAEDITOR_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.cpp
index 870b26e..44eb982 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.h
index ffc3664..9ae5452 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_ALIGN_SEQUENCE_TO_ALIGNMENT_H_
#define GTTESTS_ALIGN_SEQUENCE_TO_ALIGNMENT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.cpp
index a7d8acd..3d9a5cf 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.h
index 1f32974..948ac72 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_MSA_EDITOR_COLORS_H_
#define GTTESTS_MSA_EDITOR_COLORS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
#include "utils/GTUtilsDialog.h"
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp
index 6312c7e..15816be 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.h
index 78948fd..86d7673 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_MSA_EDITOR_CONSENSUS_H_
#define GTTESTS_MSA_EDITOR_CONSENSUS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.cpp
index 3a13418..fce7824 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.h
index c6a560f..907591f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_MSA_EDITOR_EDIT_H_
#define GTTESTS_MSA_EDITOR_EDIT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.cpp
index 9c7d8ea..f4d1cf0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.h
index 92b8b13..3160c06 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#ifndef GTTESTSMSAEDITOROVERVIEW_H
#define GTTESTSMSAEDITOROVERVIEW_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp
index 08546ea..3733b0d 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.h
index 42bed33..544546c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
#define GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.cpp
index 23967fa..063b2f9 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.h b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.h
index a3a501e..d39f1bc 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ k
#include <QApplication>
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
#include "utils/GTUtilsDialog.h"
#include <drivers/GTKeyboardDriver.h>
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.cpp
index b6abc7c..94b6568 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.h b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.h
index 08f0d3a..53c7864 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef U2_GTTESTS_OPTION_PANEL_MSA_H
#define U2_GTTESTS_OPTION_PANEL_MSA_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2{
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp
index 67ff43d..e7daae6 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h
index 3fa9eb5..377e27d 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef U2_GTTESTS_OPTION_PANEL_SEQUENCE_VIEW_H
#define U2_GTTESTS_OPTION_PANEL_SEQUENCE_VIEW_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2{
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
index cd14a6e..8b6d4c3 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
index 4841afc..76471a2 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _GTTESTS_IN_SILICO_PCR_H_
#define _GTTESTS_IN_SILICO_PCR_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_common_scenarios_in_silico_pcr {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
index 1c78c7e..4b87186 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
index 0fa042a..14f5359 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _GTTESTS_PRIMER_LIBRARY_H_
#define _GTTESTS_PRIMER_LIBRARY_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_common_scenarios_primer_library {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
index 458aaa1..bf0f82d 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -28,6 +28,7 @@
#include <U2Core/AppSettings.h>
#include <U2Core/UserApplicationsSettings.h>
+#include <U2View/ADVConstants.h>
#include <U2View/AnnotatedDNAViewFactory.h>
#include <U2View/AssemblyBrowserFactory.h>
#include <U2View/MSAEditorFactory.h>
@@ -37,6 +38,7 @@
#include "GTUtilsDocument.h"
#include "GTUtilsLog.h"
#include "GTUtilsMdi.h"
+#include "GTUtilsMsaEditorSequenceArea.h"
#include "GTUtilsProject.h"
#include "GTUtilsProjectTreeView.h"
#include "GTUtilsSequenceView.h"
@@ -468,8 +470,6 @@ GUI_TEST_CLASS_DEFINITION(test_0031) {
GTGlobals::sleep();
GTUtilsMdi::click(os, GTGlobals::Close);
-
- GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok));
GTUtilsProject::openFiles(os, dataDir+"samples/FASTA/human_T1.fa");
GTGlobals::sleep();
@@ -644,6 +644,7 @@ GUI_TEST_CLASS_DEFINITION(test_0039){
GTClipboard::setText(os, ">human_T1 (UCS\r\nACGT\r\nACG");
GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCS");
}
@@ -770,7 +771,7 @@ GUI_TEST_CLASS_DEFINITION(test_0046){
GTUtilsProjectTreeView::itemModificationCheck(os, GTUtilsProjectTreeView::findIndex(os, "clipboard.pdb"), false);
GTUtilsStartPage::openStartPage(os);
- QWebElement recentDocElement = GTWebView::findElement(os, GTUtilsStartPage::getStartPage(os), "- clipboard.pdb", "A");
+ HIWebElement recentDocElement = GTWebView::findElement(os, GTUtilsStartPage::getStartPage(os), "- clipboard.pdb", "A");
QString elem = recentDocElement.toPlainText();
CHECK_SET_ERR(elem == "- clipboard.pdb", "Recent doc not found");
}
@@ -1013,6 +1014,206 @@ GUI_TEST_CLASS_DEFINITION(test_0058) {
//Expected: there are no dialog of file format choosing.
}
+GUI_TEST_CLASS_DEFINITION(test_0059) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTGlobals::sleep();
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0060) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTGlobals::sleep();
+ GTClipboard::setText(os, "ACGT");
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "clipboard", GTGlobals::FindOptions(true, Qt::MatchContains));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0061) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0062) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa" << dataDir + "samples/HMM/aligment15900.hmm");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+ GTUtilsProjectTreeView::findIndex(os, "aligment15900");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0063) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTUtilsDialog::waitForDialog(os, new SaveProjectDialogFiller(os, QDialogButtonBox::No));
+ GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Close project");
+ GTGlobals::sleep();
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0064) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(7, 3), QPoint(12, 7));
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ const QStringList sequencesNameList = GTUtilsMSAEditorSequenceArea::getNameList(os);
+ CHECK_SET_ERR(sequencesNameList.length() > 0, "No sequences");
+ CHECK_SET_ERR(sequencesNameList.last() == "human_T1 (UCSC April 2002 chr7:115977709-117855134)", "No pasted sequences");
+
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0065) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(7, 3), QPoint(12, 7));
+
+ GTClipboard::setText(os, ">human_T1\r\nACGTACG\r\n");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ const QStringList sequencesNameList = GTUtilsMSAEditorSequenceArea::getNameList(os);
+ CHECK_SET_ERR(sequencesNameList.length() > 0, "No sequences");
+ CHECK_SET_ERR(sequencesNameList.last() == "human_T1", "No pasted sequences");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0066) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(7, 3), QPoint(12, 7));
+
+ GTClipboard::setText(os, ">human_T1\r\nACGTACG\r\n");
+
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "MSAE_MENU_COPY" << "paste"));
+ GTMouseDriver::click(os, Qt::RightButton);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ const QStringList sequencesNameList = GTUtilsMSAEditorSequenceArea::getNameList(os);
+ CHECK_SET_ERR(sequencesNameList.length() > 0, "No sequences");
+ CHECK_SET_ERR(sequencesNameList.last() == "human_T1", "No pasted sequences");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0067) {
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+}
+
+//seq
+GUI_TEST_CLASS_DEFINITION(test_0068) {
+ GTFileDialog::openFile(os, dataDir + "samples/FASTA/human_T1.fa");
+ GTUtilsSequenceView::selectSequenceRegion(os, 1, 2);
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ int len = GTUtilsSequenceView::getLengthOfSequence(os);
+ CHECK_SET_ERR(len > 199950, "No sequences pasted");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0069) {
+ GTFileDialog::openFile(os, dataDir + "samples/FASTA/human_T1.fa");
+ GTUtilsSequenceView::selectSequenceRegion(os, 1, 2);
+ GTClipboard::setText(os, ">human_T1\r\nACGTACGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r\n");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ int len = GTUtilsSequenceView::getLengthOfSequence(os);
+ CHECK_SET_ERR(len > 199950, "No sequences pasted");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0070) {
+ GTFileDialog::openFile(os, dataDir + "samples/FASTA/human_T1.fa");
+ GTUtilsSequenceView::selectSequenceRegion(os, 1, 2);
+ GTClipboard::setText(os, ">human_T1\r\nACGTACGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r\n");
+
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList()<<ADV_MENU_COPY<< "Paste sequence",GTGlobals::UseMouse));
+ GTMenu::showContextMenu(os, GTWidget::findWidget(os,"ADV_single_sequence_widget_0"));
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ int len = GTUtilsSequenceView::getLengthOfSequence(os);
+ CHECK_SET_ERR(len > 199950, "No sequences pasted");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0071) {
+ GTFileDialog::openFile(os, dataDir + "samples/FASTA/human_T1.fa");
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/Genbank/sars.gb");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "NC_004718");
+}
+
+//ann
+GUI_TEST_CLASS_DEFINITION(test_0072) {
+ //Ctrl+Shift+V в GUI-test?
+ //UGENE-4907
+ /*
+ GTUtilsProject::openFiles(os, dataDir + "samples/Genbank/murine.gb");
+ //select annotations
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/Genbank/sars.gb");
+ //Ctrl+Shift+V в GUI-test?
+ //GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"] + GTKeyboardDriver::key["shift"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+ */
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0073) {
+ //Ctrl+Shift+V в GUI-test?
+ /*
+ GTUtilsProject::openFiles(os, dataDir + "samples/Genbank/murine.gb");
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "human_T1 (UCSC April 2002 chr7:115977709-117855134)");
+ */
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0074) {
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank/murine.gb");
+
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/Genbank/sars.gb");
+
+ GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep();
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsProjectTreeView::findIndex(os, "NC_004718");
+}
+
+
}
}
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
index 79cc01e..455744d 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_H_
#define _U2_GUI_TEST_PROJECT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
@@ -81,6 +81,30 @@ GUI_TEST_CLASS_DECLARATION(test_0056)
GUI_TEST_CLASS_DECLARATION(test_0057)
GUI_TEST_CLASS_DECLARATION(test_0058)
+//applicaation
+GUI_TEST_CLASS_DECLARATION(test_0059)
+GUI_TEST_CLASS_DECLARATION(test_0060)
+GUI_TEST_CLASS_DECLARATION(test_0061)
+GUI_TEST_CLASS_DECLARATION(test_0062)
+GUI_TEST_CLASS_DECLARATION(test_0063)
+
+//msa
+GUI_TEST_CLASS_DECLARATION(test_0064)
+GUI_TEST_CLASS_DECLARATION(test_0065)
+GUI_TEST_CLASS_DECLARATION(test_0066)
+GUI_TEST_CLASS_DECLARATION(test_0067)
+
+//seq
+GUI_TEST_CLASS_DECLARATION(test_0068)
+GUI_TEST_CLASS_DECLARATION(test_0069)
+GUI_TEST_CLASS_DECLARATION(test_0070)
+GUI_TEST_CLASS_DECLARATION(test_0071)
+
+//annotations
+GUI_TEST_CLASS_DECLARATION(test_0072)
+GUI_TEST_CLASS_DECLARATION(test_0073)
+GUI_TEST_CLASS_DECLARATION(test_0074)
+
#undef GUI_TEST_SUITE
}
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.cpp
index 36e3f7c..46d8493 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.h
index d841aa7..2cff2d6 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_ANONYMOUS_PROJECT_H_
#define _U2_GUI_TEST_PROJECT_ANONYMOUS_PROJECT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.cpp
index 2f27f5b..a73f829 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.h
index 1164b37..bfa6e95 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_BOOKMARKS_H_
#define _U2_GUI_TEST_PROJECT_BOOKMARKS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.cpp
index ef91793..b0d5438 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.h
index 3ae1265..7265b1a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_DOCUMENT_MODIFYING_H_
#define _U2_GUI_TEST_PROJECT_DOCUMENT_MODIFYING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.cpp
index 4cd85b2..ce736d1 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.h
index cac56bc..bd1ecb7 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_MULTIPLE_DOCS_H_
#define _U2_GUI_TEST_PROJECT_MULTIPLE_DOCS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.cpp
index 57d3396..f3a99e0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.h
index 500e178..4f16367 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_FILTERING_H_
#define _U2_GUI_TEST_PROJECT_FILTERING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.cpp
index 71db13f..b6239a9 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.h
index 8b8be12..3334f8c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_RELATIONS_H_
#define _U2_GUI_TEST_PROJECT_RELATIONS_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.cpp
index 962553f..94f94e8 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.h
index a169dca..802d0f9 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_REMOTE_REQUEST_H_
#define _U2_GUI_TEST_PROJECT_REMOTE_REQUEST_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp
index fc04abb..6c5ede0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.h
index 3e1189a..8850de1 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TESTS_PROJECT_SEQUENCE_EXPORTING_H_
#define _U2_GUI_TESTS_PROJECT_SEQUENCE_EXPORTING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.cpp
index e247d10..738a0ab 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.h
index 9f7985c..b631a2e 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/from_project_view/GTTestsFromProjectView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_FROM_PROJECT_VIEW_H_
#define _U2_GUI_TEST_FROM_PROJECT_VIEW_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.cpp
index c6a6276..f5a7ed0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@ GUI_TEST_CLASS_DEFINITION(test_0001) {
class CreateAnnnotationDialogComboBoxChecker : public Filler {
public:
CreateAnnnotationDialogComboBoxChecker(HI::GUITestOpStatus &_os, const QString &radioButtonName): Filler(_os, "CreateAnnotationDialog"), buttonName(radioButtonName){}
- void run() {
+ void commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "activeModalWidget is NULL");
@@ -119,7 +119,7 @@ GUI_TEST_CLASS_DEFINITION(test_0002)
class CreateAnnnotationDialogComboBoxChecker : public Filler {
public:
CreateAnnnotationDialogComboBoxChecker(HI::GUITestOpStatus &_os, const QString &radioButtonName): Filler(_os, "CreateAnnotationDialog"), buttonName(radioButtonName){}
- void run() {
+ void commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
GT_CHECK(dialog != NULL, "activeModalWidget is NULL");
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.h
index 29f7a2b..e31603c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_PROJECT_USER_LOCKING_H_
#define _U2_GUI_TEST_PROJECT_USER_LOCKING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.cpp
index 67885cc..c18f0a3 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.h b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.h
index 3944ee6..fd70f64 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REPEAT_FINDER_H_
#define _U2_GT_TESTS_REPEAT_FINDER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.cpp
index 07de354..f86e575 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -127,6 +127,8 @@ GUI_TEST_CLASS_DEFINITION(test_0002) {
GTUtilsDialog::waitForDialog(os, removeDialog);
GTWidget::click(os, GTWidget::findWidget(os, "ADV_single_sequence_widget_0"), Qt::RightButton);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
// Expected state:
// document with edited sequence must appear in project view,
// sequence length in new document must be 199900
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.h
index 7ce8b7f..1cc25db 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_SEQUENCE_EDIT_H_
#define _U2_GUI_TEST_SEQUENCE_EDIT_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.cpp
index 931684a..5da44a3 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -101,7 +101,7 @@ GUI_TEST_CLASS_DEFINITION(test_0002) {
QWidget *w3 = GTWidget::findWidget(os, "ADV_single_sequence_widget_3");
GTGlobals::FindOptions f;
- f.failIfNull=false;
+ f.failIfNotFound = false;
QWidget *button0 = GTWidget::findWidget(os,"CircularViewAction",w0,f);
QWidget *button1 = GTWidget::findWidget(os,"CircularViewAction",w1,f);
@@ -1723,10 +1723,12 @@ GUI_TEST_CLASS_DEFINITION(test_0053){
// Open human_T1.fa
GTFileDialog::openFile(os, dataDir + "samples/FASTA/", "human_T1.fa");
GTUtilsTaskTreeView::waitTaskFinished(os);
+
// Open any graph
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "GC Content (%)", GTGlobals::UseMouse));
GTWidget::click(os, GTWidget::findWidget(os, "GraphMenuAction"));
- GTGlobals::sleep(500);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
// Add label with shift+left mouse
QWidget* graphView = GTUtilsSequenceView::getGraphView(os);
GTKeyboardDriver::keyPress(os, GTKeyboardDriver::key["shift"]);
@@ -1867,6 +1869,7 @@ GUI_TEST_CLASS_DEFINITION(test_0057){
// In dialog select any value
int labelsNum = GTUtilsSequenceView::getGraphLabels(os, graphView).size();
CHECK_SET_ERR(labelsNum == 81, QString("unexpected labels number: %1").arg(labelsNum))
+ GTUtilsProject::closeProject(os);
}
GUI_TEST_CLASS_DEFINITION(test_0058){
@@ -2315,8 +2318,6 @@ GUI_TEST_CLASS_DEFINITION(test_0070) {
CHECK_SET_ERR(!wrapButton->isChecked(), "Multi-line mode is unexpectedly active");
GTWidget::click(os, wrapButton);
-// DetView* detView = GTUtilsSequenceView::getSeqWidgetByNumber(os)->getDetView();
-// CHECK_SET_ERR(detView != NULL, "DetView is NULL");
GTUtilsSequenceView::clickAnnotationDet(os, "CDS", 1042);
CHECK_SET_ERR(!GTUtilsSequenceView::getSelection(os).isEmpty(), "Selection is empty");
CHECK_SET_ERR(GTUtilsSequenceView::getSelection(os) != selection, "Selection was not changed");
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.h
index 9b74737..5f43e17 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_SEQUENCE_VIEW_H_
#define _U2_GUI_TEST_SEQUENCE_VIEW_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.cpp
index 4bbc129..9e238a4 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,6 +22,19 @@
#include <QTreeWidgetItem>
#include <QListWidget>
+#include <base_dialogs/GTFileDialog.h>
+#include <base_dialogs/MessageBoxFiller.h>
+#include <drivers/GTKeyboardDriver.h>
+#include <drivers/GTMouseDriver.h>
+#include <primitives/GTLineEdit.h>
+#include <primitives/GTListWidget.h>
+#include <primitives/GTMenu.h>
+#include <primitives/GTTreeWidget.h>
+#include <primitives/GTWidget.h>
+#include <primitives/PopupChooser.h>
+#include <system/GTFile.h>
+#include <utils/GTThread.h>
+
#include <U2Core/ImportToDatabaseOptions.h>
#include <U2Core/U2ObjectDbi.h>
@@ -41,17 +54,6 @@
#include "GTUtilsSequenceView.h"
#include "GTUtilsSharedDatabaseDocument.h"
#include "GTUtilsTaskTreeView.h"
-#include "system/GTFile.h"
-#include <base_dialogs/GTFileDialog.h>
-#include <drivers/GTKeyboardDriver.h>
-#include <primitives/GTLineEdit.h>
-#include <primitives/GTListWidget.h>
-#include "primitives/GTMenu.h"
-#include <drivers/GTMouseDriver.h>
-#include <primitives/GTTreeWidget.h>
-#include <primitives/GTWidget.h>
-#include <base_dialogs/MessageBoxFiller.h>
-#include "primitives/PopupChooser.h"
#include "runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/EditConnectionDialogFiller.h"
@@ -410,11 +412,13 @@ GUI_TEST_CLASS_DEFINITION(cm_test_0006) {
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::No, "is not initialized"));
GTWidget::click(os, GTWidget::findWidget(os, "pbConnect", dialog));
+ GTGlobals::sleep();
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes, "is not initialized"));
GTWidget::click(os, GTWidget::findWidget(os, "pbConnect", dialog));
GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
}
};
@@ -1352,7 +1356,7 @@ GUI_TEST_CLASS_DEFINITION(import_test_0006) {
const QModelIndex dstFolderIndex = GTUtilsSharedDatabaseDocument::getItemIndex(os, databaseDoc, dstFolderPath);
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
const QModelIndex notImportedFolderIndexIndex = GTUtilsProjectTreeView::findIndex(os, notImportedFolderName, dstFolderIndex, options);
CHECK_SET_ERR(!notImportedFolderIndexIndex.isValid(), "The inner folder is unexpectedly imported");
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.h b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.h
index b5c7c28..4377223 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _GTTESTS_SHARED_DATABASE_H_
#define _GTTESTS_SHARED_DATABASE_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.cpp
index 333d646..b6016ff 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.h b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.h
index 10b3a8b..86702e7 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_SW_DIALOG_H_
#define _U2_GUI_TEST_SW_DIALOG_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.cpp
index 0632a99..1db48b8 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.h b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.h
index 89a0d66..563a429 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#ifndef GTTESTSSTARTPAGE_H
#define GTTESTSSTARTPAGE_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.cpp
index a11ab2c..39ce3f9 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,42 +19,40 @@
* MA 02110-1301, USA.
*/
-#include "GTTestsToggleView.h"
-#include "GTGlobals.h"
+#include <QApplication>
+#include <QClipboard>
+#include <QMainWindow>
+
+#include <GTGlobals.h>
+#include <base_dialogs/GTFileDialog.h>
#include <drivers/GTKeyboardDriver.h>
#include <drivers/GTMouseDriver.h>
-#include "primitives/GTMenu.h"
-#include "primitives/GTAction.h"
-#include <base_dialogs/GTFileDialog.h>
+#include <primitives/GTAction.h>
+#include <primitives/GTMenu.h>
#include <primitives/GTTreeWidget.h>
-#include "GTUtilsProject.h"
+#include <primitives/PopupChooser.h>
+#include <utils/GTUtilsApp.h>
+#include <utils/GTUtilsToolTip.h>
+
+#include <U2Core/AppContext.h>
+#include <U2Core/DocumentModel.h>
+
+#include <U2View/ADVConstants.h>
+#include <U2View/AnnotatedDNAViewFactory.h>
+#include <U2View/MSAEditorFactory.h>
+
+#include "GTTestsToggleView.h"
+#include "GTUtilsAnnotationsTreeView.h"
#include "GTUtilsDocument.h"
#include "GTUtilsLog.h"
-#include "utils/GTUtilsApp.h"
-#include "utils/GTUtilsToolTip.h"
#include "GTUtilsMdi.h"
-#include "GTUtilsAnnotationsTreeView.h"
+#include "GTUtilsProject.h"
#include "GTUtilsProjectTreeView.h"
-#include "GTUtilsTaskTreeView.h"
#include "GTUtilsSequenceView.h"
-#include "GTUtilsMdi.h"
-#include "runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h"
-#include "primitives/PopupChooser.h"
+#include "GTUtilsTask.h"
+#include "GTUtilsTaskTreeView.h"
#include "runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h"
-
-#include <U2Core/AppContext.h>
-#include <U2Core/DocumentModel.h>
-#include <U2View/AnnotatedDNAViewFactory.h>
-#include <U2View/MSAEditorFactory.h>
-#include <U2View/ADVConstants.h>
-#include <QtGui/QClipboard>
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QApplication>
-#include <QtGui/QMainWindow>
-#else
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMainWindow>
-#endif
+#include "runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h"
namespace U2 {
@@ -1449,13 +1447,12 @@ GUI_TEST_CLASS_DEFINITION(test_0015) {
Runnable *chooser = new PopupChooser(os, QStringList() << "GC Content (%)");
GTUtilsDialog::waitForDialog(os, chooser);
GTWidget::click(os, circularViewSe1);
- CHECK_SET_ERR(GTUtilsTaskTreeView::countTasks(os, "Calculate graph points") == 1, "Calculation task didn't start");
- GTGlobals::sleep();
+ GTUtilsTask::waitTaskStart(os, "Calculate graph points", 10000);
Runnable *chooser2 = new PopupChooser(os, QStringList() << "GC Content (%)");
GTUtilsDialog::waitForDialog(os, chooser2);
GTWidget::click(os, circularViewSe1);
- GTGlobals::sleep();
+ GTGlobals::sleep(500);
CHECK_SET_ERR(GTUtilsTaskTreeView::countTasks(os, "Calculate graph points") == 0, "Calculation task was not cancelled");
}
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.h
index e7887cc..11f48f9 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GUI_TEST_TOGGLE_VIEW_H_
#define _U2_GUI_TEST_TOGGLE_VIEW_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp
index acc9cb4..599b4fe 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -79,6 +79,7 @@ GUI_TEST_CLASS_DEFINITION(test_0001){
//3. Set save path to _common_data/scenarios/sandbox/COI.nwk . Click OK button
//Expected state: philogenetic tree appears
+ GTUtilsTaskTreeView::waitTaskFinished(os);
//4. Use "Capture tree" button on toolbar to make screenshots
GTUtilsDialog::waitForDialog(os, new PopupChooser(os,QStringList()<<"Screen Capture"));
@@ -107,6 +108,7 @@ GUI_TEST_CLASS_DEFINITION(test_0001_1){
//3. Set save path to _common_data/scenarios/sandbox/COI.nwk . Click OK button
//Expected state: philogenetic tree appears
+ GTUtilsTaskTreeView::waitTaskFinished(os);
//4. Use "Capture tree" button on toolbar to make screenshots
GTUtilsDialog::waitForDialog(os, new PopupChooser(os,QStringList()<<"Export Tree Image"<<"Screen Capture"));
@@ -149,21 +151,20 @@ GUI_TEST_CLASS_DEFINITION(test_0002){
//1. Open file samples/CLUSTALW/COI.aln
GTFileDialog::openFile(os,dataDir + "samples/CLUSTALW/", "COI.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTGlobals::sleep(500);
+
//2. Click on "Build tree" button on toolbar "Build Tree"
//Expected state: "Create Philogenetic Tree" dialog appears
GTUtilsDialog::waitForDialog(os, new BuildTreeDialogFiller(os, testDir + "_common_data/scenarios/sandbox/COI.nwk"));
+ GTWidget::click(os, GTAction::button(os, "Build Tree"));
+ GTUtilsTaskTreeView::waitTaskFinished(os);
- QAbstractButton *tree= GTAction::button(os,"Build Tree");
- GTWidget::click(os,tree);
- GTGlobals::sleep(500);
//3. Set save path to _common_data/scenarios/sandbox/COI.nwk Click OK button
//Expected state: philogenetic tree appears
- QGraphicsView* treeView = qobject_cast<QGraphicsView*>(GTWidget::findWidget(os, "treeView"));
- CHECK_SET_ERR(treeView!=NULL,"TreeView not found")
+ QGraphicsView *treeView = qobject_cast<QGraphicsView *>(GTWidget::findWidget(os, "treeView"));
+ CHECK_SET_ERR(treeView != NULL, "TreeView not found")
GTGlobals::sleep();
+
//4. Remove document "COI.nwk" from project view.
- //GTUtilsDialog::waitForDialog(os,new MessageBoxDialogFiller(os,QMessageBox::No));
GTMouseDriver::moveTo(os,GTUtilsProjectTreeView::getItemCenter(os,"COI.nwk"));
GTMouseDriver::click(os);
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
@@ -175,20 +176,20 @@ GUI_TEST_CLASS_DEFINITION(test_0002){
//5. Double click on COI object.
//Expected state: MSA editor view window opens
- GTMouseDriver::moveTo(os,GTUtilsProjectTreeView::getItemCenter(os,"COI.aln"));
- GTGlobals::sleep(500);
+ GTMouseDriver::moveTo(os, GTUtilsProjectTreeView::getItemCenter(os, "COI.aln"));
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
+
//6. Click on "Build tree" button on toolbar
//Expected state: "Create Philogenetic Tree" dialog appears
- GTUtilsDialog::waitForDialog(os, new BuildTreeDialogFiller(os,testDir + "_common_data/scenarios/sandbox/COI.nwk"));
- GTGlobals::sleep(500);
- tree= GTAction::button(os,"Build Tree");
- GTWidget::click(os,tree);
+ GTUtilsDialog::waitForDialog(os, new BuildTreeDialogFiller(os, testDir + "_common_data/scenarios/sandbox/COI.nwk"));
+ GTWidget::click(os, GTAction::button(os,"Build Tree"));
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
//7. Click OK button
//Expected state: philogenetic tree appears
- GTGlobals::sleep(500);
- QWidget* w1 = GTWidget::findWidget(os, "treeView");
- CHECK_SET_ERR(w1!=NULL,"treeView not found");
+ QWidget *w1 = GTWidget::findWidget(os, "treeView");
+ CHECK_SET_ERR(w1 != NULL,"treeView not found");
}
GUI_TEST_CLASS_DEFINITION(test_0002_1){
@@ -245,24 +246,26 @@ GUI_TEST_CLASS_DEFINITION(test_0002_1){
CHECK_SET_ERR(w1!=NULL,"treeView not found");
}
-GUI_TEST_CLASS_DEFINITION(test_0002_2){
+GUI_TEST_CLASS_DEFINITION(test_0002_2) {
//Rebuilding tree after removing tree file
//1. Open file samples/CLUSTALW/COI.aln
GTFileDialog::openFile(os,dataDir + "samples/CLUSTALW/", "COI.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTGlobals::sleep(500);
+
//2. Click on "Build tree" button on toolbar "Build Tree"
//Expected state: "Create Philogenetic Tree" dialog appears
GTUtilsDialog::waitForDialog(os, new BuildTreeDialogFiller(os, testDir + "_common_data/scenarios/sandbox/COI.nwk"));
//DIFFERENCE: Main menu is used for building tree
GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Tree" << "Build Tree");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
//3. Set save path to _common_data/scenarios/sandbox/COI.nwk Click OK button
//Expected state: philogenetic tree appears
- QGraphicsView* treeView = qobject_cast<QGraphicsView*>(GTWidget::findWidget(os, "treeView"));
- CHECK_SET_ERR(treeView!=NULL,"TreeView not found")
+ QGraphicsView *treeView = qobject_cast<QGraphicsView *>(GTWidget::findWidget(os, "treeView"));
+ CHECK_SET_ERR(treeView != NULL,"TreeView not found")
GTGlobals::sleep();
+
//4. Remove document "COI.nwk" from project view.
//GTUtilsDialog::waitForDialog(os,new MessageBoxDialogFiller(os,QMessageBox::No));
GTMouseDriver::moveTo(os,GTUtilsProjectTreeView::getItemCenter(os,"COI.nwk"));
@@ -271,28 +274,30 @@ GUI_TEST_CLASS_DEFINITION(test_0002_2){
GTGlobals::sleep(500);
- QWidget* w = GTWidget::findWidget(os, "treeView",NULL,GTGlobals::FindOptions(false));
- CHECK_SET_ERR(w==0, "treeView not deleted")
-
- GTUtilsProjectTreeView::findIndex(os,"COI.nwk",GTGlobals::FindOptions(false));
//Expected state: document "COI.nwk" not presents at project tree, tree editor view window closes
+ QWidget *w = GTWidget::findWidget(os, "treeView", NULL, GTGlobals::FindOptions(false));
+ CHECK_SET_ERR(w == NULL, "treeView not deleted")
+
+ GTUtilsProjectTreeView::findIndex(os, "COI.nwk", GTGlobals::FindOptions(false));
//5. Double click on COI object.
//Expected state: MSA editor view window opens
- GTMouseDriver::moveTo(os,GTUtilsProjectTreeView::getItemCenter(os,"COI.aln"));
- GTGlobals::sleep(500);
+ GTMouseDriver::moveTo(os, GTUtilsProjectTreeView::getItemCenter(os, "COI.aln"));
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
+
//6. Click on "Build tree" button on toolbar
//Expected state: "Create Philogenetic Tree" dialog appears
GTUtilsDialog::waitForDialog(os, new BuildTreeDialogFiller(os,testDir + "_common_data/scenarios/sandbox/COI.nwk"));
+
//DIFFERENCE: Main menu is used for building tree
GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Tree" << "Build Tree");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
//7. Click OK button
//Expected state: philogenetic tree appears
- GTGlobals::sleep(500);
- QWidget* w1 = GTWidget::findWidget(os, "treeView");
- CHECK_SET_ERR(w1!=NULL,"treeView not found");
+ QWidget *w1 = GTWidget::findWidget(os, "treeView");
+ CHECK_SET_ERR(w1 != NULL,"treeView not found");
}
GUI_TEST_CLASS_DEFINITION(test_0003){
@@ -805,7 +810,9 @@ GUI_TEST_CLASS_DEFINITION(test_0011_1) {
// 2. Do context menu {Collapse} for any node
GTMouseDriver::moveTo(os, globalCoord);
+ GTGlobals::sleep(1000);
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
QList<QGraphicsSimpleTextItem *> branchList;
foreach (QGraphicsItem *item, list) {
@@ -823,7 +830,9 @@ GUI_TEST_CLASS_DEFINITION(test_0011_1) {
// 3. Do context menu {Expand} for same
GTMouseDriver::moveTo(os, globalCoord);
+ GTGlobals::sleep(1000);
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
foreach (QGraphicsSimpleTextItem *item, branchList) {
CHECK_SET_ERR(item->isVisible(), item->text() + " is not visible");
@@ -856,7 +865,9 @@ GUI_TEST_CLASS_DEFINITION(test_0011_2) {
// 2. Do context menu {Collapse} for any node
GTMouseDriver::moveTo(os, globalCoord);
+ GTGlobals::sleep(1000);
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
QList<QGraphicsSimpleTextItem *> branchList;
foreach (QGraphicsItem* item, list) {
@@ -877,7 +888,9 @@ GUI_TEST_CLASS_DEFINITION(test_0011_2) {
// 3. Do context menu {Expand} for same
GTMouseDriver::moveTo(os, globalCoord);
+ GTGlobals::sleep(1000);
GTMouseDriver::doubleClick(os);
+ GTGlobals::sleep(1000);
foreach (QGraphicsSimpleTextItem *item, branchList) {
if (item->text() == "0.011") {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.h b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.h
index cdb78c1..aa2e60c 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_TREE_VIEWER_H_
#define GTTESTS_TREE_VIEWER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.cpp
index 7099917..b8fd93b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.h b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.h
index 32eae91..bf625ca 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTSUNDOREDO_H
#define GTTESTSUNDOREDO_H
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2{
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.cpp
index 9b6445e..a543195 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.h
index cf32e3e..1b1b425 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_WORKFLOW_DESIGNER_H_
#define GTTESTS_WORKFLOW_DESIGNER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp
index 987c4eb..77e079f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.h
index 44516b7..736378f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef GTTESTS_WORKFLOW_ESTIMATING_H_
#define GTTESTS_WORKFLOW_ESTIMATING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp
index 22fdc48..0f16031 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.h
index 6f1c2ac..97eaadb 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_WORKFLOW_NAME_FILTER_H_
#define GTTESTS_WORKFLOW_NAME_FILTER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp
index 13eb895..55596ab 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.h
index 54466f1..b61708b 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef GTTESTS_WORKFLOW_PARAMETERS_VALIDATION_H_
#define GTTESTS_WORKFLOW_PARAMETERS_VALIDATION_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.cpp
index 43f1078..f5cceb4 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.h
index 020555a..1c1ca79 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ k
#ifndef _GTTESTS_WORKFLOW_SCRIPTING_H_
#define _GTTESTS_WORKFLOW_SCRIPTING_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
namespace GUITest_common_scenarios_workflow_scripting {
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.cpp
index 00e2741..681e0fa 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.h b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.h
index 09244ea..6b325c6 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _GTTESTS_SHARED_DB_WD_H_
#define _GTTESTS_SHARED_DB_WD_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
index d874fce..98a0e4d 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
index b3b1d57..a25406c 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
index 1f85abd..f286aa9 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,6 +30,7 @@
#endif
#include <QtCore/QDirIterator>
#include <U2Core/U2SafePoints.h>
+#include <U2Test/UGUITest.h>
namespace U2 {
@@ -89,7 +90,7 @@ public:
QFileDialog* objCasted = qobject_cast<QFileDialog*>(obj);
SAFE_POINT(NULL != objCasted, "", );
- QString findPath = GUITest::dataDir;
+ QString findPath = UGUITest::dataDir;
QDir dir(findPath);
QStringList files;
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
index 9adf619..9a69d47 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
index 495e984..00973ae 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
index 2e47dcf..0579971 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_CRAZY_USER_H_
#define _U2_GT_TESTS_CRAZY_USER_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
//#include <U2Core/U2OpStatus.h>
#include "utils/GTUtilsDialog.h"
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp
index cc5ebd3..ce8f5cc 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,26 +19,52 @@
* MA 02110-1301, USA.
*/
-#include "GTTestsRegressionScenarios_1001_2000.h"
+#include <U2Core/AppContext.h>
+#include <U2Core/ExternalToolRegistry.h>
+#include <U2Core/U2ObjectDbi.h>
-#include <primitives/GTRadioButton.h>
-#include "primitives/GTAction.h"
-#include <primitives/GTCheckBox.h>
-#include "system/GTClipboard.h"
-#include <primitives/GTComboBox.h>
-#include "api/GTGraphicsItem.h"
-#include "system/GTFile.h"
+#include <U2Gui/ProjectViewModel.h>
+#include <U2Gui/ToolsMenu.h>
+
+#include <U2View/ADVConstants.h>
+#include <U2View/ADVSingleSequenceWidget.h>
+#include <U2View/AnnotatedDNAViewFactory.h>
+#include <U2View/AnnotationsTreeView.h>
+#include <U2View/AssemblyBrowser.h>
+#include <U2View/AssemblyModel.h>
+#include <U2View/AssemblyNavigationWidget.h>
+#include <U2View/MSAEditor.h>
+#include <U2View/MSAEditorFactory.h>
+#include <U2View/MSAEditorNameList.h>
+
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QListWidget>
+#include <QMainWindow>
+#include <QMenu>
+#include <QPlainTextEdit>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebView>
+#include <QWizard>
+
+#include <GTGlobals.h>
+#include <base_dialogs/DefaultDialogFiller.h>
#include <base_dialogs/GTFileDialog.h>
-#include "GTGlobals.h"
+#include <base_dialogs/MessageBoxFiller.h>
#include <drivers/GTKeyboardDriver.h>
-#include "utils/GTKeyboardUtils.h"
-#include "utils/GTThread.h"
+#include <drivers/GTMouseDriver.h>
+#include <primitives/GTAction.h>
+#include <primitives/GTCheckBox.h>
+#include <primitives/GTComboBox.h>
#include <primitives/GTLineEdit.h>
#include <primitives/GTListWidget.h>
-#include "primitives/GTMenu.h"
-#include <drivers/GTMouseDriver.h>
-#include "api/GTSequenceReadingModeDialog.h"
-#include "api/GTSequenceReadingModeDialogUtils.h"
+#include <primitives/GTMenu.h>
+#include <primitives/GTRadioButton.h>
#include <primitives/GTSlider.h>
#include <primitives/GTSpinBox.h>
#include <primitives/GTTabWidget.h>
@@ -48,15 +74,23 @@
#include <primitives/GTTreeWidget.h>
#include <primitives/GTWebView.h>
#include <primitives/GTWidget.h>
+#include <primitives/PopupChooser.h>
+#include <system/GTClipboard.h>
+#include <system/GTFile.h>
+#include <utils/GTKeyboardUtils.h>
+#include <utils/GTThread.h>
+#include <utils/GTUtilsDialog.h>
+#include <utils/GTUtilsToolTip.h>
+#include "../../workflow_designer/src/WorkflowViewItems.h"
#include "GTDatabaseConfig.h"
+#include "GTTestsRegressionScenarios_1001_2000.h"
#include "GTUtilsAnnotationsHighlightingTreeView.h"
#include "GTUtilsAnnotationsTreeView.h"
#include "GTUtilsAssemblyBrowser.h"
#include "GTUtilsBookmarksTreeView.h"
#include "GTUtilsCircularView.h"
#include "GTUtilsDashboard.h"
-#include "utils/GTUtilsDialog.h"
#include "GTUtilsEscClicker.h"
#include "GTUtilsExternalTools.h"
#include "GTUtilsLog.h"
@@ -74,14 +108,12 @@
#include "GTUtilsSharedDatabaseDocument.h"
#include "GTUtilsTask.h"
#include "GTUtilsTaskTreeView.h"
-#include "utils/GTUtilsToolTip.h"
#include "GTUtilsWizard.h"
#include "GTUtilsWorkflowDesigner.h"
-
-#include <base_dialogs/DefaultDialogFiller.h>
+#include "api/GTGraphicsItem.h"
+#include "api/GTSequenceReadingModeDialog.h"
+#include "api/GTSequenceReadingModeDialogUtils.h"
#include "runnables/qt/EscapeClicker.h"
-#include <base_dialogs/MessageBoxFiller.h>
-#include "primitives/PopupChooser.h"
#include "runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h"
@@ -129,8 +161,8 @@
#include "runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h"
#include "runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h"
#include "runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h"
-#include "runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h"
#include "runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h"
+#include "runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h"
#include "runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h"
#include "runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h"
#include "runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h"
@@ -147,13 +179,13 @@
#include "runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/WizardFiller.h"
#include "runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h"
+#include "runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h"
+#include "runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h"
-#include "runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h"
-#include "runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h"
-#include "runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h"
+#include "runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h"
#include "runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h"
#include "runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h"
#include "runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h"
@@ -163,41 +195,6 @@
#include "runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h"
#include "runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h"
-#include <U2Core/AppContext.h>
-#include <U2Core/ExternalToolRegistry.h>
-#include <U2Core/U2ObjectDbi.h>
-
-#include <U2Gui/ProjectViewModel.h>
-#include <U2Gui/ToolsMenu.h>
-
-#include "../../workflow_designer/src/WorkflowViewItems.h"
-
-#include <U2View/ADVConstants.h>
-#include <U2View/ADVSingleSequenceWidget.h>
-#include <U2View/AnnotatedDNAViewFactory.h>
-#include <U2View/AnnotationsTreeView.h>
-#include <U2View/AssemblyBrowser.h>
-#include <U2View/AssemblyModel.h>
-#include <U2View/AssemblyNavigationWidget.h>
-#include <U2View/MSAEditor.h>
-#include <U2View/MSAEditorFactory.h>
-#include <U2View/MSAEditorNameList.h>
-
-#include <QDialogButtonBox>
-#include <QFileDialog>
-#include <QHeaderView>
-#include <QListWidget>
-#include <QMainWindow>
-#include <QMenu>
-#include <QPlainTextEdit>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QTableWidget>
-#include <QWebElement>
-#include <QWebFrame>
-#include <QWebView>
-#include <QWizard>
-
namespace U2 {
namespace GUITest_regression_scenarios {
@@ -2547,8 +2544,8 @@ GUI_TEST_CLASS_DEFINITION(test_1229) {
const QModelIndex firstDoc = GTUtilsProjectTreeView::findIndex(os, "1.txt");
const QModelIndex secondDoc = GTUtilsProjectTreeView::findIndex(os, "2.txt");
- GTUtilsProjectTreeView::rename(os, GTUtilsProjectTreeView::findIndex(os, "tub", firstDoc), "tub_1");
- GTUtilsProjectTreeView::rename(os, GTUtilsProjectTreeView::findIndex(os, "tub", secondDoc), "tub_2");
+ GTUtilsProjectTreeView::rename(os, GTUtilsProjectTreeView::findIndex(os, "tub", firstDoc), "tub_1", GTGlobals::UseMouse);
+ GTUtilsProjectTreeView::rename(os, GTUtilsProjectTreeView::findIndex(os, "tub", secondDoc), "tub_2", GTGlobals::UseMouse);
// 3. Select both sequence objects and export them as multiple alignment.
GTKeyboardDriver::keyPress(os, GTKeyboardDriver::key["ctrl"]);
@@ -3354,6 +3351,7 @@ GUI_TEST_CLASS_DEFINITION(test_1300_2) {
// Expected state: the sequecne view opens. There are two MSA Editors and one sequence view (active).
// 5.1 document
GTUtilsProjectTreeView::doubleClickItem(os, "murine.gb");
+ GTThread::waitForMainThread(os);
sequenceViewIsVisible = GTUtilsMdi::isAnyPartOfWindowVisible(os, "murine [s] NC_001363");
CHECK_SET_ERR(sequenceViewIsVisible, "Sequence view is unexpectedly not visible");
@@ -3367,6 +3365,7 @@ GUI_TEST_CLASS_DEFINITION(test_1300_2) {
// 5.2 sequence
GTUtilsMdi::click(os, GTGlobals::Close);
GTUtilsProjectTreeView::doubleClickItem(os, "NC_001363");
+ GTThread::waitForMainThread(os);
sequenceViewIsVisible = GTUtilsMdi::isAnyPartOfWindowVisible(os, "murine [s] NC_001363");
CHECK_SET_ERR(sequenceViewIsVisible, "Sequence view is unexpectedly not visible");
@@ -3380,6 +3379,7 @@ GUI_TEST_CLASS_DEFINITION(test_1300_2) {
// 5.3 sequence
GTUtilsMdi::click(os, GTGlobals::Close);
GTUtilsProjectTreeView::doubleClickItem(os, "NC_001363 features");
+ GTThread::waitForMainThread(os);
sequenceViewIsVisible = GTUtilsMdi::isAnyPartOfWindowVisible(os, "murine [s] NC_001363");
CHECK_SET_ERR(sequenceViewIsVisible, "Sequence view is unexpectedly not visible");
@@ -3394,6 +3394,7 @@ GUI_TEST_CLASS_DEFINITION(test_1300_2) {
// Expected state: a popup menu is shown to select a MSA Editor to show. Select the first. There are two MSA Editors (the first one is active) and one sequence view.
GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Activate view: COI [m] COI"));
GTUtilsProjectTreeView::doubleClickItem(os, "COI");
+ GTThread::waitForMainThread(os);
sequenceViewIsVisible = GTUtilsMdi::isAnyPartOfWindowVisible(os, "murine [s] NC_001363");
CHECK_SET_ERR(!sequenceViewIsVisible, "Sequence view is unexpectedly visible");
@@ -3807,17 +3808,12 @@ GUI_TEST_CLASS_DEFINITION(test_1348) {
GTMouseDriver::click(os, Qt::RightButton);
GTGlobals::sleep(4000);
-#ifdef Q_OS_UNIX
- GTUtilsDialog::waitForDialog(os, new PopupCheckerByText(os, QStringList() << "Add element"
- << "Custom Elements with CMD Tools" << settings.elementName, PopupChecker::NotExists));
-#endif // Q_OS_UNIX
-#ifdef Q_OS_WIN
- GTUtilsDialog::waitForDialog(os, new PopupCheckerByText(os, QStringList() << "Add element"
- << "Custom Elements with CMD Tools", PopupChecker::NotExists));
-#endif // Q_OS_UNIX
-
- GTWidget::click(os, GTWidget::findWidget(os,"sceneView"), Qt::RightButton);
+ const QString groupName = "Custom Elements with CMD Tools";
+ const QStringList groups = GTUtilsWorkflowDesigner::getPaletteGroupNames(os);
+ if (groups.contains(groupName)) {
+ CHECK_SET_ERR(!GTUtilsWorkflowDesigner::getPaletteGroupEntriesNames(os, groupName).contains(settings.elementName), "Element was not removed");
+ }
}
GUI_TEST_CLASS_DEFINITION(test_1358) {
@@ -4348,7 +4344,21 @@ GUI_TEST_CLASS_DEFINITION(test_1426) {
CHECK_SET_ERR(GTWidget::findWidget(os, "addButton", NULL, GTGlobals::FindOptions(false)) == NULL, "addButton is shown");
GTUtilsWorkflowDesigner::click(os, "Read HMM2 Profile");
- GTUtilsWorkflowDesigner::setParameter(os, "Input file(s)", dataDir + "samples/FASTA/HMM/aligment15900.hmm", GTUtilsWorkflowDesigner::textValue);
+ GTGlobals::sleep(500);
+
+ QTableView* table = qobject_cast<QTableView*>(GTWidget::findWidget(os,"table"));
+ CHECK_SET_ERR(table,"tableView not found");
+
+ GTMouseDriver::moveTo(os,GTTableView::getCellPosition(os,table,1,0));
+ GTMouseDriver::click(os);
+ GTGlobals::sleep(500);
+
+ QLineEdit* line = qobject_cast<QLineEdit*>(table->findChild<QLineEdit*>());
+ CHECK_SET_ERR(line, "QLineEdit not found. Widget in this cell might be not QLineEdit");
+ GTLineEdit::setText(os, line, dataDir + "samples/FASTA/HMM/aligment15900.hmm");
+
+
+ GTGlobals::sleep(1000);
#ifdef Q_OS_MAC
GTGlobals::sleep();
GTMouseDriver::doubleClick(os);
@@ -4457,6 +4467,7 @@ GUI_TEST_CLASS_DEFINITION(test_1432) {
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
GTUtilsWorkflowDesigner::addAlgorithm(os, "Sequence Marker");
+ GTGlobals::sleep(1000);
QToolButton* addButton = qobject_cast<QToolButton*>(GTWidget::findWidget(os, "addButton"));
CHECK_SET_ERR( addButton != NULL, "AddButton not found!");
@@ -4845,7 +4856,7 @@ GUI_TEST_CLASS_DEFINITION(test_1443){
GUI_TEST_CLASS_DEFINITION(test_1445) {
/* 1. Open "data/samples/CLUSTALW/COI.aln"
2. Choose last sequence (i.e. in bottom) with mouse in sequences area
- 3. Choose { Edit -> Remove current sequence } in context menu
+ 3. Choose { Edit -> Remove sequence } in context menu
Expected state: UGENE doesn't crash
*/
GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/", "COI.aln");
@@ -4855,7 +4866,7 @@ GUI_TEST_CLASS_DEFINITION(test_1445) {
int numSelectedSequences = GTUtilsMSAEditorSequenceArea::getSelectedSequencesNum(os);
CHECK_SET_ERR(numSelectedSequences == 1, "There is no selection in MSA, but expected");
- GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "Remove current sequence", GTGlobals::UseMouse));
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "Remove sequence", GTGlobals::UseMouse));
GTMouseDriver::click(os, Qt::RightButton);
}
@@ -5083,7 +5094,7 @@ GUI_TEST_CLASS_DEFINITION(test_1499) {
const QStringList msaSequences1 = GTUtilsMSAEditorSequenceArea::getNameList(os);
CHECK_SET_ERR(msaSequences1 != msaSequences0, "MSA is not changed");
-GTGlobals::sleep(5000);
+ GTGlobals::sleep(5000);
QWidget* qt_toolbar_ext_button = GTWidget::findWidget(os, "qt_toolbar_ext_button",
GTWidget::findWidget(os, "COI [m] COI"), GTGlobals::FindOptions(false));
if(qt_toolbar_ext_button != NULL && qt_toolbar_ext_button->isVisible()){
@@ -5816,7 +5827,7 @@ GUI_TEST_CLASS_DEFINITION(test_1586) {
GTUtilsDialog::waitForDialog(os, new MuscleDialogFiller(os, MuscleDialogFiller::Default));
GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Align" << "Align with MUSCLE..."));
GTUtilsMSAEditorSequenceArea::callContextMenu(os);
-
+
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsMsaEditor::undo(os);
@@ -5886,7 +5897,7 @@ GUI_TEST_CLASS_DEFINITION(test_1588) {
// 4. Go to dashboard, click "External tools" button
GTUtilsDashboard::openTab(os, GTUtilsDashboard::ExternalTools);
// Expected state: A tree appeared, it contains information about every tool launch including errors
- QWebElement topHat = GTUtilsDashboard::findElement(os, "TopHat run 1", "SPAN");
+ HIWebElement topHat = GTUtilsDashboard::findElement(os, "TopHat run 1", "SPAN");
GTUtilsDashboard::findElement(os, "Cufflinks run 1", "SPAN");
GTUtilsDashboard::click(os, topHat);
@@ -6102,15 +6113,15 @@ GUI_TEST_CLASS_DEFINITION( test_1600_5 ){
// 3. Choose some sequence by left mouse button
GTUtilsMSAEditorSequenceArea::click(os, QPoint(-5, 1));
-// 4. Use the context menu in the name list area { Edit -> Remove current sequence }
- GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "MSAE_MENU_EDIT" << "Remove current sequence"));
+// 4. Use the context menu in the name list area { Edit -> Remove sequence }
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "MSAE_MENU_EDIT" << "Remove sequence"));
GTMouseDriver::click(os, Qt::RightButton);
-// Expected state: The chosen sequence has been removed from alignment, collapsing mode has been switched off
+// Expected state: The chosen sequence has been removed from alignment, collapsing mode has been switched on
QStringList names = GTUtilsMSAEditorSequenceArea::getNameList(os);
int num = names.size();
CHECK_SET_ERR(num == 9, QString("unexpected sequence number: %1").arg(num));
CHECK_SET_ERR(!names.contains("Isophya_altaica_EF540820"), "Isophya_altaica_EF540820 was not removed");
- CHECK_SET_ERR(!collapce->isChecked(), "collapce button unexpectidly checked");
+ CHECK_SET_ERR(collapce->isChecked(), "collapce button unexpectidly checked");
}
GUI_TEST_CLASS_DEFINITION( test_1600_6 ){
@@ -7747,7 +7758,7 @@ GUI_TEST_CLASS_DEFINITION(test_1738){
GTWidget::click(os,GTAction::button(os,"Stop workflow"));
GTUtilsTaskTreeView::waitTaskFinished(os);
- QWebElement initEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
+ HIWebElement initEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
GTGlobals::sleep(500);
}
@@ -7907,7 +7918,7 @@ GUI_TEST_CLASS_DEFINITION(test_1764){
// 4) Run workflow, click on dashboard "readed_fasta.fa"
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
- QWebElement button = GTUtilsDashboard::findElement(os, "readed_fasta.fa", "BUTTON");
+ HIWebElement button = GTUtilsDashboard::findElement(os, "readed_fasta.fa", "BUTTON");
GTUtilsDashboard::click(os, button);
GTGlobals::sleep();
//GTWebView::traceAllWebElements(os, GTUtilsDashboard::getDashboard(os));
@@ -8158,7 +8169,7 @@ GUI_TEST_CLASS_DEFINITION(test_1834) {
GTWidget::click(os, GTAction::button(os, "Run workflow"));
GTUtilsTaskTreeView::waitTaskFinished(os);
- QWebElement button = GTUtilsDashboard::findElement(os, "COI.aln.meg", "BUTTON");
+ HIWebElement button = GTUtilsDashboard::findElement(os, "COI.aln.meg", "BUTTON");
GTUtilsDashboard::click(os, button);
GTGlobals::sleep(1000);
GTUtilsProjectTreeView::findIndex(os, "COI.aln.meg");
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.h
index fe90809..cde450e 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_1001_2000_H_
#define _U2_GT_TESTS_REGRESSION_SCENARIOS_1001_2000_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp
index 9ff1c69..a9e7435 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -445,6 +445,7 @@ GUI_TEST_CLASS_DEFINITION(test_0339) {
GTKeyboardDriver::keyPress(os, GTKeyboardDriver::key["cmd"]);
GTKeyboardDriver::keyClick(os, 'f', GTKeyboardDriver::key["shift"]);
GTKeyboardDriver::keyRelease(os, GTKeyboardDriver::key["cmd"]);
+ GTGlobals::sleep();
// 5. Press Ctrl+N
// hotkey replaced with Cmd+N on Mac
@@ -452,12 +453,14 @@ GUI_TEST_CLASS_DEFINITION(test_0339) {
// 6. Close the dialog
GTUtilsDialog::waitForDialog(os, new DefaultDialogFiller(os, "CreateAnnotationDialog", QDialogButtonBox::Cancel));
GTKeyboardDriver::keyClick(os, 'n', GTKeyboardDriver::key["cmd"]);
+ GTGlobals::sleep();
// 7. Press Ctrl+F
// hotkey replaced with Cmd+F on Mac
// Expected: Search pattern panel appears
GTKeyboardDriver::keyClick(os, 'f', GTKeyboardDriver::key["cmd"]);
GTThread::waitForMainThread(os);
+ GTGlobals::sleep();
const bool isTabOpened = GTUtilsOptionPanelSequenceView::isTabOpened(os, GTUtilsOptionPanelSequenceView::Search);
CHECK_SET_ERR(isTabOpened, "'Search in sequence' tab is not opened");
}
@@ -668,7 +671,7 @@ GUI_TEST_CLASS_DEFINITION(test_0597) {
public:
SaveGraphCutoffsDialogFiller(HI::GUITestOpStatus &os)
: Filler (os, "SaveGraphCutoffsDialog") {}
- virtual void run() {
+ void commonScenario() {
QWidget* dialog = QApplication::activeModalWidget();
CHECK_SET_ERR(dialog, "activeModalWidget is NULL");
@@ -712,9 +715,8 @@ GUI_TEST_CLASS_DEFINITION(test_0598) {
Runnable *chooser = new PopupChooser(os, QStringList() << "DNA Flexibility");
GTUtilsDialog::waitForDialog(os, chooser);
GTWidget::click(os, graphAction);
- GTGlobals::sleep(500);
+ GTUtilsTask::waitTaskStart(os, "Calculate graph points", 30000);
- CHECK_SET_ERR(1 == GTUtilsTaskTreeView::getTopLevelTasksCount(os), "'Calculate graph points' task is not started");
GTUtilsTaskTreeView::waitTaskFinished(os);
// 3. Zoom graph
@@ -2206,6 +2208,7 @@ GUI_TEST_CLASS_DEFINITION(test_0842) {
GTUtilsWorkflowDesigner::setCurrentTab(os, GTUtilsWorkflowDesigner::algoriths);
GTUtilsWorkflowDesigner::clickOnPalette(os, "test", Qt::RightButton);
+ GTGlobals::sleep(5000);//added to ensure that crash is not here or to fix this crash
// Expected state: There are two custom workers on the palette now (test and test1).
const QList<QTreeWidgetItem *> customElements = GTUtilsWorkflowDesigner::getPaletteGroupEntries(os, "Custom Elements with CMD Tools");
@@ -2433,13 +2436,14 @@ GUI_TEST_CLASS_DEFINITION(test_0868){
GTUtilsDialog::waitForDialog(os, new ImportBAMFileFiller(os, sandBoxDir + "chrM.sorted.bam.ugenedb"));
GTFileDialog::openFile(os, dataDir + "samples/Assembly", "chrM.sorted.bam");
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTUtilsTaskTreeView::waitTaskFinished(os);
+
// 2. Zoom to any covered
GTWidget::click(os, GTUtilsMdi::activeWindow(os));
- for (int i = 0;i < 24;i++){
+ for (int i = 0; i < 24; i++){
GTKeyboardDriver::keyClick(os, '=', GTKeyboardDriver::key["shift"]);
GTGlobals::sleep(100);
}
+
// 3. Add bookmark
GTUtilsBookmarksTreeView::addBookmark(os, GTUtilsMdi::activeWindow(os)->objectName(), "bookmark");
GTGlobals::sleep();
@@ -2448,18 +2452,22 @@ GUI_TEST_CLASS_DEFINITION(test_0868){
GTGlobals::sleep();
QWidget* assembly_reads_area = GTWidget::findWidget(os, "assembly_reads_area");
- QPixmap pixmap = QPixmap::grabWidget(assembly_reads_area, assembly_reads_area->rect());
+ QPixmap pixmap = GTWidget::getPixmap(os, assembly_reads_area);
QImage initImg = pixmap.toImage();
+
// 4. Go to any other region
GTWidget::click(os, GTUtilsMdi::activeWindow(os));
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["home"]);
+ GTGlobals::sleep();
+
// 5. Double click on the bookmark
GTMouseDriver::moveTo(os, GTUtilsBookmarksTreeView::getItemCenter(os, "bookmark"));
GTMouseDriver::doubleClick(os);
GTGlobals::sleep();
+
// Expected state: it shows the location that you saved before
assembly_reads_area = GTWidget::findWidget(os, "assembly_reads_area");
- pixmap = QPixmap::grabWidget(assembly_reads_area, assembly_reads_area->rect());
+ pixmap = GTWidget::getPixmap(os, assembly_reads_area);
QImage finalImg = pixmap.toImage();
CHECK_SET_ERR(initImg == finalImg, "bookmark does not work");
}
@@ -2507,8 +2515,9 @@ GUI_TEST_CLASS_DEFINITION( test_0873 ){
GTUtilsTaskTreeView::waitTaskFinished(os);
// Expected state: there are more then 10 result files and they are grouped into sublists
- QWebElement button = GTUtilsDashboard::findElement(os, "merged.fa", "BUTTON");
+ HIWebElement button = GTUtilsDashboard::findElement(os, "merged.fa", "BUTTON");
GTUtilsDashboard::click(os, button);
+ GTThread::waitForMainThread(os);
int sequenceLength = GTUtilsSequenceView::getLengthOfSequence(os);
CHECK_SET_ERR(sequenceLength == 35594, "Sequence length is " + QString::number(sequenceLength) + ", expected 35594");
@@ -2760,14 +2769,14 @@ GUI_TEST_CLASS_DEFINITION(test_0908) {
//1) Open WD
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
- GTUtilsWorkflowDesigner::removeCmdlineWorkerFromPalette(os, "test");
+ GTUtilsWorkflowDesigner::removeCmdlineWorkerFromPalette(os, "test_0908");
//2) Click "Create element with command line tool"
//3) input name "test"
//4) input data : "in1" and "in2" of FASTA
//5) output data : "out1" of FASTA
//6) Execution string : "cmd /c copy $in1 $out1 | copy $in2 $out1"
- GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/_regression/908/test.etc"));
+ GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/_regression/908/test_0908.etc"));
GTWidget::click(os, GTAction::button(os, "AddElementWithCommandLineTool"));
//7) Add input and output readers of FASTA
@@ -2779,7 +2788,7 @@ GUI_TEST_CLASS_DEFINITION(test_0908) {
WorkflowProcessItem* writer = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
- WorkflowProcessItem *cmdlineWorker = GTUtilsWorkflowDesigner::getWorker(os, "test");
+ WorkflowProcessItem *cmdlineWorker = GTUtilsWorkflowDesigner::getWorker(os, "test_0908");
GTUtilsWorkflowDesigner::connect(os, GTUtilsWorkflowDesigner::getWorker(os, "Read Sequence"), cmdlineWorker);
GTUtilsWorkflowDesigner::connect(os, GTUtilsWorkflowDesigner::getWorker(os, "Read Sequence 1"), cmdlineWorker);
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.h
index 2c4eace..e2ce51d 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_1_1000_H_
#define _U2_GT_TESTS_REGRESSION_SCENARIOS_1_1000_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp
index afc6799..d0ecd91 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -757,7 +757,7 @@ GUI_TEST_CLASS_DEFINITION( test_2053 ){
// Expected state: after scheme finish there is the hint on the dashboard -
GTUtilsTaskTreeView::waitTaskFinished(os);
GTGlobals::sleep();
- QWebElement button = GTUtilsDashboard::findElement(os, "OK, got it!", "BUTTON");
+ HIWebElement button = GTUtilsDashboard::findElement(os, "OK, got it!", "BUTTON");
// "You can always open the original workflow for your results by clicking on this button."
GTUtilsDashboard::click(os, button);
GTWebView::traceAllWebElements(os, GTUtilsDashboard::getDashboard(os));
@@ -1007,8 +1007,8 @@ GUI_TEST_CLASS_DEFINITION(test_2091) {
QStringList originalNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
- //3. Call context menu on the name list area, select the {Edit -> Remove current sequence} menu item.
- GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "Remove current sequence"));
+ //3. Call context menu on the name list area, select the {Edit -> Remove sequence} menu item.
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "Remove sequence"));
GTMouseDriver::click(os, Qt::RightButton);
//Expected state: the sequence is removed.
QStringList modifiedNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
@@ -1532,7 +1532,7 @@ GUI_TEST_CLASS_DEFINITION( test_2192 ){
// Expected state: correct data was copied.
// 8. Select some amount of text on a tree and click on "Copy selected text" which is now should be available.
GTUtilsDashboard::click(os, GTUtilsDashboard::findTreeElement(os, "SAMtools run 1"));
- QWebElement el = GTUtilsDashboard::findElement(os, samtoolsPath, "SPAN");
+ HIWebElement el = GTUtilsDashboard::findElement(os, samtoolsPath, "SPAN");
GTWebView::selectElementText(os, GTUtilsDashboard::getDashboard(os), el);
GTUtilsDashboard::click(os, el, Qt::RightButton);
GTUtilsDashboard::click(os, GTUtilsDashboard::findContextMenuElement(os, "Copy selected text"));
@@ -1937,6 +1937,7 @@ GUI_TEST_CLASS_DEFINITION( test_2298 ){
QGraphicsItem* node = GTUtilsPhyTree::getNodes(os).at(1);
QGraphicsView* treeView = qobject_cast<QGraphicsView*>(GTWidget::findWidget(os, "treeView"));
treeView->ensureVisible(node);
+ GTThread::waitForMainThread(os);
GTMouseDriver::moveTo(os, GTUtilsPhyTree::getGlobalCoord(os, node));
GTMouseDriver::doubleClick(os);
GTGlobals::sleep();
@@ -2964,6 +2965,7 @@ GUI_TEST_CLASS_DEFINITION( test_2410 ) {
GTUtilsDialog::waitForDialog( os, chooser );
GTWidget::click( os, graphAction );
+ GTGlobals::sleep(500);
GTWidget::click( os, GTAction::button( os,
"action_zoom_in_human_T1 (UCSC April 2002 chr7:115977709-117855134)" ) );
@@ -3396,7 +3398,7 @@ GUI_TEST_CLASS_DEFINITION( test_2482 ) {
GTMouseDriver::click(os, Qt::RightButton);
GTGlobals::sleep();
- GTUtilsDialog::waitForDialog(os, new PopupCheckerByText(os, QStringList()<<"Swap Sublings", PopupChecker::IsDisabled));
+ GTUtilsDialog::waitForDialog(os, new PopupCheckerByText(os, QStringList()<<"Swap Siblings", PopupChecker::IsDisabled));
GTMouseDriver::click(os, Qt::RightButton);
GTGlobals::sleep();
}
@@ -4550,7 +4552,7 @@ GUI_TEST_CLASS_DEFINITION( test_2667 ) {
// Expected state: the annotation object is removed from the document.
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
GTGlobals::FindOptions options;
- options.failIfNull = false;
+ options.failIfNotFound = false;
GTUtilsProjectTreeView::findIndex(os, "NC_001363 features", options);
}
@@ -5813,8 +5815,9 @@ GUI_TEST_CLASS_DEFINITION(test_2910_2) {
public:
CancelClicker(HI::GUITestOpStatus& _os) : Filler(_os, "RangeSelectionDialog"){}
virtual void run() {
- QWidget *w = QApplication::activeWindow();
- CHECK(NULL != w, );
+ GTGlobals::sleep(1000);
+ QWidget *w = QApplication::activeModalWidget();
+ CHECK_SET_ERR(NULL != w, "active modal widget is null");
QRadioButton *multipleButton = w->findChild<QRadioButton*>("miltipleButton");
CHECK_SET_ERR(multipleButton != NULL, "RadioButton \"miltipleButton\" not found");
GTRadioButton::click(os, multipleButton);
@@ -5824,9 +5827,9 @@ GUI_TEST_CLASS_DEFINITION(test_2910_2) {
GTLineEdit::setText(os, regionEdit, "0..5000");
QDialogButtonBox *buttonBox = w->findChild<QDialogButtonBox*>(QString::fromUtf8("buttonBox"));
- CHECK(NULL != buttonBox, );
+ CHECK_SET_ERR(NULL != buttonBox, "button box is null");
QPushButton *button = buttonBox->button(QDialogButtonBox::Cancel);
- CHECK(NULL != button, );
+ CHECK_SET_ERR(NULL != button, "cancel button is null");
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
CHECK_SET_ERR(!okButton->isEnabled(), "OK button is unexpectedly enabled");
GTWidget::click(os, button);
@@ -5835,7 +5838,6 @@ GUI_TEST_CLASS_DEFINITION(test_2910_2) {
GTUtilsDialog::waitForDialog(os, new CancelClicker(os));
GTKeyboardDriver::keyClick(os, 'A', GTKeyboardDriver::key["ctrl"]);
GTGlobals::sleep(500);
-
}
GUI_TEST_CLASS_DEFINITION(test_2910_3) {
// 1. Open {data/samples/FASTA/human_T1.fa}.
@@ -5851,8 +5853,9 @@ GUI_TEST_CLASS_DEFINITION(test_2910_3) {
public:
CancelClicker(HI::GUITestOpStatus& _os) : Filler(_os, "RangeSelectionDialog"){}
virtual void run() {
- QWidget *w = QApplication::activeWindow();
- CHECK(NULL != w, );
+ GTGlobals::sleep(1000);
+ QWidget *w = QApplication::activeModalWidget();
+ CHECK_SET_ERR(NULL != w, "active modal widget is null");
QRadioButton *multipleButton = w->findChild<QRadioButton*>("miltipleButton");
CHECK_SET_ERR(multipleButton != NULL, "RadioButton \"miltipleButton\" not found");
GTRadioButton::click(os, multipleButton);
@@ -5863,9 +5866,9 @@ GUI_TEST_CLASS_DEFINITION(test_2910_3) {
GTLineEdit::setText(os, regionEdit, "1..199951");
QDialogButtonBox *buttonBox = w->findChild<QDialogButtonBox*>(QString::fromUtf8("buttonBox"));
- CHECK(NULL != buttonBox, );
+ CHECK_SET_ERR(NULL != buttonBox, "button box is null");
QPushButton *button = buttonBox->button(QDialogButtonBox::Cancel);
- CHECK(NULL != button, );
+ CHECK_SET_ERR(NULL != button, "cancel button is null");
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
CHECK_SET_ERR(!okButton->isEnabled(), "OK button is unexpectedly enabled");
GTWidget::click(os, button);
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.h
index a43baa8..3803753 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_2001_3000_H_
#define _U2_GT_TESTS_REGRESSION_SCENARIOS_2001_3000_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp
index c0c1537..31d6d11 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -538,7 +538,7 @@ GUI_TEST_CLASS_DEFINITION(test_3085_1) {
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes));
QFile(sandBoxDir + "murine_3085_1.gb").rename(sandBoxDir + "murine_3085_1_1.gb");
QFile(testDir + "_common_data/regression/3085/murine_1.gb").copy(sandBoxDir + "murine_3085_1.gb");
- GTGlobals::sleep(5000);
+ GTGlobals::sleep(10000);
//Expected state: file was updated, the sequence view with annotations is opened and updated.
QWidget *reloaded1Sv = GTUtilsMdi::activeWindow(os);
@@ -550,7 +550,7 @@ GUI_TEST_CLASS_DEFINITION(test_3085_1) {
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes));
QFile(sandBoxDir + "murine_3085_1.gb").rename(sandBoxDir + "murine_3085_1_2.gb");
QFile(testDir + "_common_data/regression/3085/murine_2.gb").copy(sandBoxDir + "murine_3085_1.gb");
- GTGlobals::sleep(5000);
+ GTGlobals::sleep(10000);
//Expected state:: file was updated, the sequence view with annotations is opened and updated.
QWidget *reloaded2Sv = GTUtilsMdi::activeWindow(os);
@@ -1498,7 +1498,7 @@ GUI_TEST_CLASS_DEFINITION(test_3229){
GTUtilsTaskTreeView::waitTaskFinished(os);
// Expected state: there is a single result file on the WD dashboard.
//QString text = "test.fa\"
- QWebElement table = GTUtilsDashboard::findElement(os, "test.fa", "TABLE");
+ HIWebElement table = GTUtilsDashboard::findElement(os, "test.fa", "TABLE");
QString s = table.toInnerXml();
int i = s.count("test.fa");
@@ -2126,11 +2126,18 @@ GUI_TEST_CLASS_DEFINITION(test_3318) {
// 7. Drag the reference sequence in the list of sequences
const QPoint mouseDragPosition(-5, 18);
GTUtilsMSAEditorSequenceArea::moveTo(os, mouseDragPosition);
+// GTMouseDriver::click(os);
+// GTGlobals::sleep();
+ //GTMouseDriver::dragAndDrop(os, GTMouseDriver::getMousePosition(), GTMouseDriver::getMousePosition() + QPoint(0, -200));
+
GTMouseDriver::click(os);
GTGlobals::sleep(1000);
GTMouseDriver::press(os);
+ for(int i = 0; i<50; i++){
+ GTMouseDriver::moveTo(os, GTMouseDriver::getMousePosition() + QPoint(0, -5));
+ }
GTGlobals::sleep(200);
- GTUtilsMSAEditorSequenceArea::moveTo(os, mouseDragPosition + QPoint(0, -10));
+ //GTUtilsMSAEditorSequenceArea::moveTo(os, mouseDragPosition + QPoint(0, -10));
GTMouseDriver::release(os);
GTGlobals::sleep(200);
@@ -2173,7 +2180,7 @@ GUI_TEST_CLASS_DEFINITION(test_3328) {
void run() {
// 1. Open "test/_common_data/fasta/human_T1_cutted.fa".
- GTFileDialog::openFile(os, GUITest::testDir + "/_common_data/fasta/", "human_T1_cutted.fa");
+ GTFileDialog::openFile(os, testDir + "/_common_data/fasta/", "human_T1_cutted.fa");
GTUtilsTaskTreeView::waitTaskFinished(os);
// 2. Click the "Find restriction sites" button on the main toolbar.
@@ -2696,10 +2703,10 @@ GUI_TEST_CLASS_DEFINITION(test_3414){
// Launch pipeline
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep(1000);
- QWebElement initEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
+ HIWebElement initEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
QString s = initEl.toPlainText();
GTGlobals::sleep(5000);
- QWebElement finalEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
+ HIWebElement finalEl = GTUtilsDashboard::findElement(os, "00:00:0", "SPAN");
QString s1 = finalEl.toPlainText();
CHECK_SET_ERR(s!=s1, "timer not changed");
}
@@ -3060,7 +3067,7 @@ GUI_TEST_CLASS_DEFINITION(test_3472) {
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok));
GTWidget::click(os, GTWidget::findWidget(os, "alignButton"));
- GTGlobals::sleep();
+ GTGlobals::sleep(5000);//needed for windows
GTWidget::setFocus(os, outputFilePathEdit);
#ifndef Q_OS_MAC
@@ -3250,7 +3257,7 @@ GUI_TEST_CLASS_DEFINITION(test_3484_1) {
GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Close project");
GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/sandbox/", "proj_3484_1.uprj"));
- GTWidget::clickWindowTitle(os, AppContext::getMainWindow()->getQMainWindow());
+ //GTWidget::clickWindowTitle(os, AppContext::getMainWindow()->getQMainWindow());
GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Open...");
GTGlobals::sleep();
@@ -3261,7 +3268,7 @@ GUI_TEST_CLASS_DEFINITION(test_3484_1) {
GTUtilsDocument::removeDocument(os, "COI_3484_1.nwk");
GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Save all");
- GTWidget::clickWindowTitle(os, AppContext::getMainWindow()->getQMainWindow());
+ //GTWidget::clickWindowTitle(os, AppContext::getMainWindow()->getQMainWindow());
GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Close project");
GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/sandbox/", "proj_3484_1.uprj"));
@@ -3377,7 +3384,7 @@ GUI_TEST_CLASS_DEFINITION(test_3519_2) {
// dialog can't be closed until the search task finish,
// the search task waits until the "auto-annotation update" task finish.
- GTFileDialog::openFile(os, testDir + "_common_data/FASTA/", "Mycobacterium.fna");
+ GTFileDialog::openFile(os, testDir + "_common_data/fasta/", "Mycobacterium.fna");
GTUtilsTaskTreeView::waitTaskFinished(os);
class SiteconCustomFiller : public Filler {
@@ -3419,7 +3426,7 @@ GUI_TEST_CLASS_DEFINITION(test_3519_2) {
GTUtilsDialog::waitForDialog(os, new FindEnzymesDialogFiller(os, QStringList(), new AllEnzymesSearchScenario()));
GTWidget::click(os, GTWidget::findWidget(os, "Find restriction sites_widget"));
GTThread::waitForMainThread(os);
- GTGlobals::sleep(20000);
+ GTGlobals::sleep(40000);
GTUtilsTaskTreeView::openView(os);
GTUtilsDialog::waitForDialog(os, new SiteconCustomFiller(os));
@@ -4228,7 +4235,7 @@ GUI_TEST_CLASS_DEFINITION(test_3639) {
//Expected state: the document is removed, the folder is not removed, no message boxes appear.
CHECK_SET_ERR(!logTracer.hasError(), "Error message");
GTUtilsProjectTreeView::getItemCenter(os, "Recycle bin");
- options.failIfNull = false;
+ options.failIfNotFound = false;
humanT1Doc = GTUtilsProjectTreeView::findIndex(os, "human_T1.fa", options);
CHECK_SET_ERR(!humanT1Doc.isValid(), "The document is not removed");
}
@@ -4266,7 +4273,7 @@ GUI_TEST_CLASS_DEFINITION(test_3640) {
//Expected state: the document is removed, the folder is not removed.
CHECK_SET_ERR(!logTracer.hasError(), "Error message");
GTUtilsProjectTreeView::findIndex(os, "genomes");
- options.failIfNull = false;
+ options.failIfNotFound = false;
humanT1Doc = GTUtilsProjectTreeView::findIndex(os, "human_T1.fa", options);
CHECK_SET_ERR(!humanT1Doc.isValid(), "The document is not removed");
}
@@ -5377,6 +5384,7 @@ GUI_TEST_CLASS_DEFINITION(test_3829){
// Expected state: UGENE warning about annotation is out of range.
class scenario : public CustomScenario {
void run(HI::GUITestOpStatus &os) {
+ GTGlobals::sleep();
QWidget* dialog = QApplication::activeModalWidget();
CHECK_SET_ERR(NULL != dialog, "activeModalWidget is NULL");
@@ -5387,10 +5395,15 @@ GUI_TEST_CLASS_DEFINITION(test_3829){
// Agree with warning.
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes));
GTWidget::click(os, okButton);
+ GTGlobals::sleep(500);
+ if(QApplication::activeModalWidget()){
+ GTWidget::click(os, okButton);
+ }
}
};
+
GTUtilsDialog::waitForDialog(os, new CreateObjectRelationDialogFiller(os, new scenario()));
- GTUtilsProjectTreeView::dragAndDrop(os, index, GTUtilsSequenceView::getSeqWidgetByNumber(os, 0));
+ GTUtilsProjectTreeView::dragAndDrop(os, index, GTUtilsSequenceView::getSeqWidgetByNumber(os, 0)->getDetView());
GTGlobals::sleep(2000);
// Expected state: there is a sequence with attached annotation table object, there is an annotation that is located beyond the sequence.
GTMouseDriver::moveTo(os, GTUtilsAnnotationsTreeView::getItemCenter(os, "5_prime_UTR_intron"));
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.h
index fdfe371..2619671 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_3001_4000_H_
#define _U2_GT_TESTS_REGRESSION_SCENARIOS_3001_4000_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
@@ -153,7 +153,7 @@ GUI_TEST_CLASS_DECLARATION(test_3484_1)
GUI_TEST_CLASS_DECLARATION(test_3504)
GUI_TEST_CLASS_DECLARATION(test_3518)
GUI_TEST_CLASS_DECLARATION(test_3519_1)
-GUI_TEST_CLASS_DECLARATION(test_3519_2)
+GUI_TEST_CLASS_DECLARATION_SET_TIMEOUT(test_3519_2, 480000)
GUI_TEST_CLASS_DECLARATION(test_3545)
GUI_TEST_CLASS_DECLARATION(test_3551)
GUI_TEST_CLASS_DECLARATION(test_3552)
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp
index a9bbd1b..d12c99b 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,7 +19,9 @@
* MA 02110-1301, USA.
*/
+#include <QFile>
#include <QListWidget>
+#include <QMainWindow>
#include <QPlainTextEdit>
#include <QTableView>
#include <QWebElement>
@@ -32,6 +34,7 @@
#include <U2View/ADVConstants.h>
#include <U2View/ADVSequenceObjectContext.h>
#include <U2View/DetView.h>
+#include <U2View/MSAEditorNameList.h>
#include <U2View/MSAEditorTreeViewer.h>
#include <U2View/MSAGraphOverview.h>
@@ -83,6 +86,7 @@
#include "GTUtilsProjectTreeView.h"
#include "GTUtilsSequenceView.h"
#include "GTUtilsSharedDatabaseDocument.h"
+#include "GTUtilsStartPage.h"
#include "GTUtilsTask.h"
#include "GTUtilsTaskTreeView.h"
#include "GTUtilsWizard.h"
@@ -96,6 +100,7 @@
#include "runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h"
#include "runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h"
+#include "runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h"
#include "runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h"
@@ -119,9 +124,11 @@
#include "runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h"
#include "runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h"
+#include "runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h"
#include "runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h"
#include "runnables/ugene/plugins/workflow_designer/WizardFiller.h"
+#include "runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h"
#include "runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h"
#include "runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h"
@@ -297,6 +304,7 @@ GUI_TEST_CLASS_DEFINITION(test_4013) {
GTKeyboardDriver::keyClick(os, 'f', GTKeyboardDriver::key["ctrl"]);
GTKeyboardDriver::keySequence(os, "ACCCTATTTTATACCAACAAACTare");
GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["enter"]);
+ GTThread::waitForMainThread(os);
GTUtilsMSAEditorSequenceArea::checkSelectedRect(os, oldRect);
}
@@ -940,7 +948,7 @@ GUI_TEST_CLASS_DEFINITION(test_4100) {
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "action_project__add_menu" << "action_project__import_to_database"));
GTUtilsProjectTreeView::click(os, "ugene_gui_test", Qt::RightButton);
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTGlobals::sleep(5000);
+ GTGlobals::sleep(10000);
GTUtilsSharedDatabaseDocument::doubleClickItem(os, databaseDoc, "JQ040024.1");
QModelIndex idx = GTUtilsSharedDatabaseDocument::getItemIndex(os, databaseDoc, "/JQ040024.1/JQ040025");
@@ -997,7 +1005,7 @@ GUI_TEST_CLASS_DEFINITION(test_4104) {
//Current state : the "Write Sequence" worker gives the "Nothing to write" error in the log.
GTUtilsLog::check(os, l);
- QWebElement button = GTUtilsDashboard::findElement(os, "Dataset 1.gb", "BUTTON");
+ HIWebElement button = GTUtilsDashboard::findElement(os, "Dataset 1.gb", "BUTTON");
GTUtilsDashboard::click(os, button);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -2251,18 +2259,19 @@ GUI_TEST_CLASS_DEFINITION(test_4306_2) {
GUI_TEST_CLASS_DEFINITION(test_4308) {
// 1. Open "_common_data/clustal/10000_sequences.aln".
- GTFileDialog::openFile(os, testDir + "_common_data/clustal/10000_sequences.aln", GTFileDialog::Open, GTGlobals::UseMouse);
+ GTFileDialog::openFile(os, testDir + "_common_data/fasta/PF07724_full_family.fa", GTFileDialog::Open, GTGlobals::UseMouse);
GTUtilsTask::waitTaskStart(os, "Loading documents");
// 2. Remove the document while the file is opening.
- const bool itemExistsBefore = GTUtilsProjectTreeView::checkItem(os, "10000_sequences.aln");
+ const bool itemExistsBefore = GTUtilsProjectTreeView::checkItem(os, "PF07724_full_family.fa");
CHECK_SET_ERR(itemExistsBefore, "A loading item not found");
- GTUtilsNotifications::waitForNotification(os, true, "Subtask {Load '10000_sequences.aln'} is canceled Document was removed");
- GTUtilsDocument::removeDocument(os, "10000_sequences.aln");
+ GTUtilsNotifications::waitForNotification(os, true, "Subtask {Load 'PF07724_full_family.fa'} is canceled Document was removed");
+ GTUtilsDocument::removeDocument(os, "PF07724_full_family.fa");
+ GTGlobals::sleep(500);
// Expected state: the document is removed from the project, the loading task is canceled, a notification about the canceled task appears.
- const bool itemExists = GTUtilsProjectTreeView::checkItem(os, "10000_sequences.aln");
+ const bool itemExists = GTUtilsProjectTreeView::checkItem(os, "PF07724_full_family.fa");
CHECK_SET_ERR(!itemExists, "The document is not removed from the project");
GTUtilsTask::checkNoTask(os, "Loading documents");
}
@@ -2621,8 +2630,10 @@ GUI_TEST_CLASS_DEFINITION(test_4373) {
GTMouseDriver::moveTo(os, point);
GTMouseDriver::release(os);
GTThread::waitForMainThread(os);
- GTGlobals::sleep(5000);//splitter is moved slowly on some versions of linux
-
+ GTGlobals::sleep();
+#ifdef Q_OS_LINUX
+ GTGlobals::sleep(15000);//splitter is moved slowly on some versions of linux
+#endif
QWidget* toolBar = GTWidget::findWidget(os, "circular_view_local_toolbar");
CHECK_SET_ERR(toolBar != NULL, "Cannot find circular_view_local_toolbar");
@@ -2765,6 +2776,38 @@ GUI_TEST_CLASS_DEFINITION(test_4400) {
CHECK_SET_ERR( qualValue == "GenBank", "ORIGDB comment was parced incorreclty");
}
+GUI_TEST_CLASS_DEFINITION(test_4434) {
+ GTLogTracer l;
+ //1. Open murine.gb and human_T1.fa
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank", "murine.gb");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTFileDialog::openFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Drag the annotations from murine to human_t1
+ GTUtilsDialog::waitForDialog(os, new CreateObjectRelationDialogFiller(os));
+ GTUtilsProjectTreeView::dragAndDrop(os, GTUtilsProjectTreeView::findIndex(os, "NC_001363 features"), GTUtilsAnnotationsTreeView::getTreeWidget(os));
+ CHECK_SET_ERR(GTUtilsAnnotationsTreeView::findFirstAnnotation(os) != NULL, "Annotations are connected to human_T1.fa");
+
+ //3. Save the project
+ GTUtilsProject::saveProjectAs(os, sandBoxDir + "test_4434.uprj");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //4. Close the project.
+ GTUtilsProject::closeProject(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //5. Open the saved project.
+ GTFileDialog::openFile(os, sandBoxDir + "test_4434.uprj");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //6. Current state : human_t1 is loaded with annotations
+ GTUtilsProjectTreeView::doubleClickItem(os, "human_T1.fa");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ CHECK_SET_ERR(GTUtilsAnnotationsTreeView::findFirstAnnotation(os) != NULL, "Annotations are connected to human_T1.fa");
+}
+
GUI_TEST_CLASS_DEFINITION(test_4439) {
// 1. Open "data/samples/Genbank/sars.gb".
GTFileDialog::openFile(os, dataDir + "samples/Genbank/sars.gb");
@@ -3283,6 +3326,46 @@ GUI_TEST_CLASS_DEFINITION(test_4588_2) {
GTMouseDriver::click(os, Qt::RightButton);
}
+GUI_TEST_CLASS_DEFINITION(test_4606) {
+ //1. Create custom WD element
+ //2. Do not fill "Description" and "Parameters description" fields
+ //3. Create workflow with created element and tun it
+ //Expected state: no safepoint triggered
+
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+ CreateElementWithCommandLineToolFiller::ElementWithCommandLineSettings settings;
+ settings.elementName = "Element_4606";
+
+ QList<CreateElementWithCommandLineToolFiller::InOutData> input;
+ CreateElementWithCommandLineToolFiller::InOutDataType inOutDataType;
+ inOutDataType.first = CreateElementWithCommandLineToolFiller::Sequence;
+ inOutDataType.second = "FASTA";
+ input << CreateElementWithCommandLineToolFiller::InOutData("in1",
+ inOutDataType);
+ settings.input = input;
+ settings.executionString = "echo";
+
+ GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, "Continue"));
+
+ GTUtilsDialog::waitForDialog(os, new CreateElementWithCommandLineToolFiller(os, settings));
+ QAbstractButton *createElement = GTAction::button(os, "createElementWithCommandLineTool");
+ GTWidget::click(os, createElement);
+ GTGlobals::sleep();
+
+ WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
+ CHECK_SET_ERR(read != NULL, "Failed to add an element");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+
+ WorkflowProcessItem* customWorker = GTUtilsWorkflowDesigner::getWorker(os, "Element_4606");
+
+ GTUtilsWorkflowDesigner::connect(os, read, customWorker);
+ GTLogTracer l;
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsLog::check(os, l);
+}
+
GUI_TEST_CLASS_DEFINITION(test_4620) {
// 1. Open "data/samples/ABIF/A01.abi".
GTFileDialog::openFile(os, dataDir + "samples/ABIF/A01.abi");
@@ -3802,6 +3885,8 @@ GUI_TEST_CLASS_DEFINITION(test_4710){
GTGlobals::sleep();
CHECK_SET_ERR(initTabName == finalTabName, "tab name changed. Initial: " + initTabName + ", actual: " + finalTabName);
+ AppContext::getTaskScheduler()->cancelAllTasks();
+ GTUtilsTaskTreeView::waitTaskFinished(os, 60000);
}
GUI_TEST_CLASS_DEFINITION(test_4710_1){
@@ -3826,6 +3911,37 @@ GUI_TEST_CLASS_DEFINITION(test_4710_1){
// Expected result: Close dashboard tab button is enabled
}
+GUI_TEST_CLASS_DEFINITION(test_4712) {
+ class Scenario : public CustomScenario {
+ void run(HI::GUITestOpStatus &os) {
+ GTGlobals::sleep(1000);
+ QWidget *dialog = QApplication::activeModalWidget();
+ CHECK_SET_ERR(dialog != NULL, "dialog was not found");
+
+ QTreeView* treeView = dialog->findChild<QTreeView*>();
+ int visibleItemCount = 0;
+ for (int i = 0; i < treeView->model()->rowCount(); ++i) {
+ if (Qt::NoItemFlags != treeView->model()->flags(treeView->model()->index(i, 0))) {
+ ++visibleItemCount;
+ }
+ }
+ CHECK_SET_ERR(visibleItemCount == 0, "Should be zero items");
+
+ GTUtilsDialog::clickButtonBox(os, dialog, QDialogButtonBox::Cancel);
+ }
+ };
+
+ // 1. Open "data/samples/ABIF/A01.abi".
+ GTFileDialog::openFile(os, dataDir + "samples/ABIF/A01.abi");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ // 2. Open "data/samples/ABIF/A01.abi".
+ GTUtilsSharedDatabaseDocument::connectToTestDatabase(os);
+ // 3. Click context menu item "Edit existing sequence"
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Edit existing sequence"));
+ GTUtilsDialog::waitForDialog(os, new ProjectTreeItemSelectorDialogFiller(os, new Scenario()));
+ GTWidget::click(os, GTUtilsSequenceView::getSeqWidgetByNumber(os), Qt::RightButton);
+}
+
GUI_TEST_CLASS_DEFINITION(test_4714_1) {
// 1. Open "data/samples/ABIF/A01.abi".
GTFileDialog::openFile(os, dataDir + "samples/ABIF/A01.abi");
@@ -4128,12 +4244,15 @@ GUI_TEST_CLASS_DEFINITION(test_4735) {
CHECK_SET_ERR(simple->isVisible(), "simple overveiw is not visiable");
//Check empty simple overview gray color
- QPixmap pixmap = QPixmap::grabWidget(simple, simple->rect());
+ QPixmap pixmap = GTWidget::getPixmap(os, simple);
QImage img = pixmap.toImage();
QRgb rgb = img.pixel(simple->rect().topLeft() + QPoint(5, 5));
QColor c(rgb);
+#ifdef Q_OS_WIN
+ CHECK_SET_ERR(c.name() == "#e7e7e7", "First check: simple overview has wrong color on windows. Expected: #e7e7e7, Found: " + c.name());
+#else
CHECK_SET_ERR(c.name() == "#ededed", "First check: simple overview has wrong color. Expected: #ededed, Found: " + c.name());
-
+#endif
//3. Add sequence eas.fastq to alignment
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_LOAD << "Sequence from file"));
GTFileDialogUtils *ob = new GTFileDialogUtils(os, testDir + "_common_data/fastq/", "eas.fastq");
@@ -4142,11 +4261,15 @@ GUI_TEST_CLASS_DEFINITION(test_4735) {
GTUtilsTaskTreeView::waitTaskFinished(os);
//check not empty overview color
- pixmap = QPixmap::grabWidget(simple, simple->rect());
+ pixmap = GTWidget::getPixmap(os, simple);
img = pixmap.toImage();
rgb = img.pixel(simple->rect().topLeft() + QPoint(5, 5));
c = QColor(rgb);
+#ifdef Q_OS_WIN
+ CHECK_SET_ERR(c.name() == "#bde7bd", "simple overview has wrong color on windows. Expected: #bde7bd, Found: " + c.name());
+#else
CHECK_SET_ERR(c.name() == "#c3ebc3", "simple overview has wrong color. Expected: #c3ebc3, Found: " + c.name());
+#endif
//4. Undo changes
GTUtilsMsaEditor::undo(os);
@@ -4154,11 +4277,110 @@ GUI_TEST_CLASS_DEFINITION(test_4735) {
GTThread::waitForMainThread(os);
//Check empty simple overview gray color again
- pixmap = QPixmap::grabWidget(simple, simple->rect());
+ pixmap = GTWidget::getPixmap(os, simple);
img = pixmap.toImage();
rgb = img.pixel(simple->rect().topLeft() + QPoint(5, 5));
c = QColor(rgb);
+#ifdef Q_OS_WIN
+ CHECK_SET_ERR(c.name() == "#e7e7e7", "Second check: simple overview has wrong color on windows. Expected: #e7e7e7, Found: " + c.name());
+#else
CHECK_SET_ERR(c.name() == "#ededed", "Second check: simple overview has wrong color. Expected: #ededed, Found: " + c.name());
+#endif
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4764_1) {
+ //1. Open "COI.aln"
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Add some gaps
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(5, 5));
+ GTKeyboardDriver::keyClick(os, ' ');
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(5, 6));
+ GTKeyboardDriver::keyClick(os, ' ');
+ GTKeyboardDriver::keyClick(os, ' ');
+ GTKeyboardDriver::keyClick(os, ' ');
+
+ //3. Select region with edited sequences, one of sequences should starts with gap
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(5,5), QPoint(16, 9));
+
+ //4. Copy this subalignment
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Copy formatted"));
+ GTUtilsMSAEditorSequenceArea::callContextMenu(os);
+ GTGlobals::sleep();
+
+ QMainWindow* mw = AppContext::getMainWindow()->getQMainWindow();
+ MSAEditor* editor = mw->findChild<MSAEditor*>();
+ QWidget *nameListWidget = editor->getUI()->getEditorNameList();
+
+ //5. Open conext menu by right clicking "Name list area". Paste this subaliment throu context menu {Copy/Paste->Paste}
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Paste"));
+ GTWidget::click(os, nameListWidget, Qt::RightButton);
+ GTGlobals::sleep();
+
+ CHECK_SET_ERR(GTUtilsMSAEditorSequenceArea::getNameList(os).size() == 23, "Number of sequences should be 26");
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 18), QPoint(11, 27));
+
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Copy selection"));
+ GTUtilsMSAEditorSequenceArea::callContextMenu(os);
+ GTGlobals::sleep();
+
+ //Expected state subalignment pasted correctly
+ QString expectedClipboard = "-CTACTAATTCG\n---TTATTAATT\nTTGCTAATTCGA\nTTATTAATCCGG\nCTATTAATTCGA";
+ GTKeyboardDriver::keyClick(os, 'c', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep(200);
+ QString clipboardText = GTClipboard::text(os);
+ GTWidget::click(os, GTWidget::findWidget(os, "msa_editor_sequence_area"));
+ CHECK_SET_ERR(clipboardText == expectedClipboard, "expected test didn't equal to actual");
+
+ GTGlobals::sleep(11000);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4764_2) {
+ //1. Select one sequence in the alignment
+ //2. Copy and paste it
+ //3. Expected state : sequence added to the end of file
+ GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4764", "4764.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ QMainWindow* mw = AppContext::getMainWindow()->getQMainWindow();
+ MSAEditor* editor = mw->findChild<MSAEditor*>();
+ QWidget *sequenceAreaWidget = editor->getUI()->getSequenceArea();
+
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 0), QPoint(15, 0));
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Copy selection"));
+ GTWidget::click(os, sequenceAreaWidget, Qt::RightButton);
+ GTGlobals::sleep();
+
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Paste"));
+ GTWidget::click(os, sequenceAreaWidget, Qt::RightButton);
+ GTGlobals::sleep();
+
+ CHECK_SET_ERR(GTUtilsMsaEditor::getSequencesCount(os) == 7, "Sequence count should be 7");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4764_3) {
+ //1. Select sub - alignment with a few lines full of gaps
+ //2. Copy and paste it
+ //3. Expected state : gapped only sequences not added to msa
+ GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4764", "4764.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ QMainWindow* mw = AppContext::getMainWindow()->getQMainWindow();
+ MSAEditor* editor = mw->findChild<MSAEditor*>();
+ QWidget *sequenceAreaWidget = editor->getUI()->getSequenceArea();
+
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(3, 0), QPoint(5, 4));
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Copy selection"));
+ GTWidget::click(os, sequenceAreaWidget, Qt::RightButton);
+ GTGlobals::sleep();
+
+ GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList() << "Copy/Paste" << "Paste"));
+ GTWidget::click(os, sequenceAreaWidget, Qt::RightButton);
+ GTGlobals::sleep();
+
+ CHECK_SET_ERR(GTUtilsMsaEditor::getSequencesCount(os) == 8, "Sequence count should be 7");
}
GUI_TEST_CLASS_DEFINITION(test_4784_1) {
@@ -4258,12 +4480,13 @@ GUI_TEST_CLASS_DEFINITION(test_4784_4) {
GTUtilsNotifications::waitForNotification(os, true, "The sequence is no more available");
GTUtilsDocument::removeDocument(os, "regression_test_4784_4.fa");
GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
}
-GUI_TEST_CLASS_DEFINITION(test_4785) {
+GUI_TEST_CLASS_DEFINITION(test_4785_1) {
//1. Open "COI.aln"
//Expected state : a file browser appeared
- GTFile::copy(os, testDir + "_common_data/clustal/1000_sequences.aln", sandBoxDir + "test_4785.aln");
+ GTFile::copy(os, testDir + "_common_data/clustal/3000_sequences.aln", sandBoxDir + "test_4785.aln");
GTFileDialog::openFile(os, sandBoxDir, "test_4785.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
GTGlobals::sleep();
@@ -4282,6 +4505,32 @@ GUI_TEST_CLASS_DEFINITION(test_4785) {
GTUtilsNotifications::waitForNotification(os, true, "A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available.");
QFile::remove(sandBoxDir + "test_4785.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4785_2) {
+ //Difference with previous scenario is to delete alignment before alignment, selected in dialog box, will be loaded.
+ //1. Open "1000_sequences.aln"
+ //Expected state : a file browser appeared
+ GTFile::copy(os, testDir + "_common_data/clustal/1000_sequences.aln", sandBoxDir + "test_4785.aln");
+ GTFileDialog::openFile(os, sandBoxDir, "test_4785.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+
+ //2. Use context menu { Align->Align profile to profile with MUSCLE }
+ //3. Select any alignment and press "Ok"
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_ALIGN << "Align profile to profile with MUSCLE"));
+ GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/clustal/","1000_sequences.aln"));
+ GTUtilsMSAEditorSequenceArea::callContextMenu(os);
+ GTGlobals::sleep(500);
+
+ //4. Delete "test_4785.aln"
+ //Expected result : An error notification appears :
+ //A problem occurred during aligning profile to profile with MUSCLE.The original alignment is no more available.
+ GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::No, "was removed from"));
+ GTUtilsNotifications::waitForNotification(os, true, "A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available.");
+ QFile::remove(sandBoxDir + "test_4785.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
}
@@ -4370,7 +4619,7 @@ GUI_TEST_CLASS_DEFINITION(test_4803_3) {
GTTabWidget::clickTab(os, GTWidget::findExactWidget<QTabWidget *>(os, "MsaEditorTreeTab"), 0, Qt::RightButton);
//6. Call context menu on tree tab. Press "Close tab".
- //Expected state: tree tab widget is closed
+ //Expected state: tree tab widget is closed
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "Close tab"));
GTTabWidget::clickTab(os, GTWidget::findExactWidget<QTabWidget *>(os, "MsaEditorTreeTab"), 0, Qt::RightButton);
@@ -4408,7 +4657,7 @@ GUI_TEST_CLASS_DEFINITION(test_4804_1) {
GTGlobals::sleep();
// 3. Add dna extended sequence throu context menu {Add->Sequence from file}
- GTUtilsNotifications::waitForNotification(os, true, "from \"Extended DNA\" to \"All symbols\"");
+ GTUtilsNotifications::waitForNotification(os, true, "from \"Extended DNA\" to \"Raw\"");
GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/_regression/4804/ext_rna.fa"));
GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_LOAD << "Sequence from file"));
GTUtilsMSAEditorSequenceArea::callContextMenu(os);
@@ -4428,7 +4677,7 @@ GUI_TEST_CLASS_DEFINITION(test_4804_2) {
// 3. Add dna extended sequence throu context menu {Add->Sequence from file}
GTUtilsDialog::waitForDialog(os, new GTFileDialogUtils(os, testDir + "_common_data/scenarios/_regression/4804/standard_amino.fa"));
- GTUtilsNotifications::waitForNotification(os, true, "from \"Extended RNA\" to \"All symbols\"");
+ GTUtilsNotifications::waitForNotification(os, true, "from \"Extended RNA\" to \"Raw\"");
GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Add" << "Sequence from file...");
GTGlobals::sleep();
}
@@ -4459,7 +4708,7 @@ GUI_TEST_CLASS_DEFINITION(test_4804_4) {
// 1. Open _common_data/scenarios/_regression/4804/standard_dna.aln
GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_dna.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
- // 2. Check what MAFFT tool is set up
+ // 2. Check what MAFFT tool is set up
// 3. Use 'Align sequence to this alignment' toolbar button to align Extended rna sequence to alignment
//Expected state: corresponding notification message has appeared
GTFileDialogUtils *ob = new GTFileDialogUtils(os, testDir + "_common_data/scenarios/_regression/4804", "ext_rna.fa");
@@ -4474,7 +4723,7 @@ GUI_TEST_CLASS_DEFINITION(test_4804_4) {
}
GUI_TEST_CLASS_DEFINITION(test_4804_5) {
- // 1. Check what MAFFT tool is not set up
+ // 1. Check what MAFFT tool is not set up
// 2. Open _common_data/scenarios/_regression/4804/standard_rna.aln
GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_rna.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -4507,7 +4756,7 @@ GUI_TEST_CLASS_DEFINITION(test_4804_6) {
GTUtilsMsaEditor::undo(os);
GTThread::waitForMainThread(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
-
+
// 5. Redo changes and check appearing notifications
GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Raw\". Use \"Undo\", if you'd like to restore the original alignment.");
GTUtilsMsaEditor::redo(os);
@@ -4618,6 +4867,131 @@ GUI_TEST_CLASS_DEFINITION(test_4833_8) {
GTUtilsTaskTreeView::waitTaskFinished(os);
}
+GUI_TEST_CLASS_DEFINITION(test_4839_1) {
+ //1. Open "data/samples/CLUSTALW/COI.aln".
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //Expected state: document are opened in the project view; MSA Editor are shown with test_alignment.
+ GTUtilsProjectTreeView::findIndex(os, "COI.aln");
+ QWidget *msaView = GTUtilsMdi::activeWindow(os);
+ CHECK(NULL != msaView, );
+
+ //2. Select some sequences on sequence view.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(2, 4), QPoint(2, 6));
+ QStringList originalNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
+
+ //3. Call context menu on the name list area, select the {Edit -> Remove sequence} menu item.
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "Remove sequence"));
+ GTMouseDriver::click(os, Qt::RightButton);
+ //Expected state: the sequences are removed.
+ QStringList modifiedNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
+
+ CHECK_SET_ERR(originalNames.length() - modifiedNames.length() == 3, "The number of sequences remained unchanged.");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4839_2) {
+ //1. Open "data/samples/CLUSTALW/COI.aln".
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //Expected state: document are opened in the project view; MSA Editor are shown with test_alignment.
+ GTUtilsProjectTreeView::findIndex(os, "COI.aln");
+ QWidget *msaView = GTUtilsMdi::activeWindow(os);
+ CHECK(NULL != msaView, );
+
+ //2. Select some sequences on sequence view.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(2, 4), QPoint(2, 6));
+ QStringList originalNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
+
+ //3. Use main menu item {Actions -> Edit -> Remove sequence}.
+ GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Edit" << "Remove sequence(s)");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+ //Expected state: the sequences are removed.
+ QStringList modifiedNames = GTUtilsMSAEditorSequenceArea::getNameList(os);
+
+ CHECK_SET_ERR(originalNames.length() - modifiedNames.length() == 3, "The number of sequences remained unchanged.");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4852) {
+ //1. Open _common_data/genome_aligner/chrY.fa
+ GTFileDialog::openFile(os, testDir + "_common_data/genome_aligner", "chrY.fa");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Run Find repeats with default parameters
+ QDir().mkpath(sandBoxDir + "test_4852");
+ GTUtilsDialog::waitForDialog(os, new FindRepeatsDialogFiller(os, sandBoxDir + "test_4852"));
+ GTWidget::click(os, GTToolbar::getWidgetForActionTooltip(os, GTToolbar::getToolbar(os, MWTOOLBAR_ACTIVEMDI), "Find repeats"));
+
+ //3. Delete chrY.fa document from project view
+ GTUtilsProjectTreeView::click(os, "chrY.fa");
+ GTKeyboardDriver::keyClick(os, GTKeyboardDriver::key["delete"]);
+
+ //Expected state: 'find repeats' task cancelled
+ GTGlobals::sleep(1000);
+ CHECK_SET_ERR(GTUtilsTaskTreeView::getTopLevelTasksCount(os) == 0, "Running task count should be 0");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4860) {
+ // 1. Open murine.gb
+ // 2. Open Find Pattern tab
+ // 3. Input pattern
+ // 4. Click Next a few times
+ // Expected state: the results are selected one by one from left to right, no random selection
+
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank", "murine.gb");
+
+ GTUtilsOptionPanelSequenceView::openTab(os, GTUtilsOptionPanelSequenceView::Search);
+ GTUtilsOptionPanelSequenceView::enterPattern(os, "AAAAA");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ QWidget* next = GTWidget::findWidget(os, "nextPushButton");
+ CHECK_SET_ERR(GTUtilsSequenceView::getSelection(os).size() == 1, "Incorrect selection: selected region should be only one");
+ int startPosPrev = GTUtilsSequenceView::getSelection(os).first().startPos;
+ int startPosNext = -1;
+ for (int i = 0; i < 10; i++) {
+ GTWidget::click(os, next);
+
+ CHECK_SET_ERR(GTUtilsSequenceView::getSelection(os).size() == 1, "Incorrect selection: selected region should be only one");
+ startPosNext = GTUtilsSequenceView::getSelection(os).first().startPos;
+
+ CHECK_SET_ERR(startPosPrev < startPosNext, "Search results are disordered");
+ startPosPrev = startPosNext;
+ }
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4871) {
+ //1. Open COI.aln
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ //2. Open OP and select pairwice alignment tab, select sequences to align, set "in new window" parameter to "false"
+ GTUtilsOptionPanelMsa::openTab(os, GTUtilsOptionPanelMsa::PairwiseAlignment);
+ //3. Set pairwise algorithm "Smith-Waterman"
+ GTUtilsOptionPanelMsa::setPairwiseAlignmentAlgorithm(os, "Smith-Waterman");
+ GTUtilsOptionPanelMsa::addFirstSeqToPA(os, "Phaneroptera_falcata");
+ GTGlobals::sleep(500);
+ GTUtilsOptionPanelMsa::addSecondSeqToPA(os, "Isophya_altaica_EF540820");
+
+ QWidget* widget = GTWidget::findWidget(os, "outputContainerWidget");
+ CHECK_SET_ERR(widget != NULL, QString("%1 not found").arg("outputContainerWidget"));
+ if (widget->isHidden()) {
+ GTWidget::click(os, GTWidget::findWidget(os, "ArrowHeader_Output settings"));
+ }
+ QCheckBox* inNewWindowCheckBox = qobject_cast<QCheckBox*>(GTWidget::findWidget(os, "inNewWindowCheckBox"));
+ CHECK_SET_ERR(inNewWindowCheckBox != NULL, "inNewWindowCheckBox not found");
+ GTCheckBox::setChecked(os, inNewWindowCheckBox, false);
+ GTWidget::click(os, GTWidget::findWidget(os, "alignButton"));
+
+ //4. Undo changes
+ GTKeyboardDriver::keyClick(os, 'z', GTKeyboardDriver::key["ctrl"]);
+ GTGlobals::sleep(500);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ //Expected state "Undo" button is disabled
+ QAbstractButton *undo = GTAction::button(os, "msa_action_undo");
+ CHECK_SET_ERR(!undo->isEnabled(), "Button should be disabled");
+}
+
GUI_TEST_CLASS_DEFINITION(test_4885_1) {
// 1. Open "data/samples/CLUSTALW/ty3.aln.gz".
GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW/ty3.aln.gz");
@@ -4705,14 +5079,24 @@ GUI_TEST_CLASS_DEFINITION(test_4886) {
}
GUI_TEST_CLASS_DEFINITION(test_4908) {
- GTUtilsProject::openFiles(os, testDir + "_common_data/fasta/multy_fa.fa");
- GTWidget::click(os, GTUtilsSequenceView::getSeqWidgetByNumber(os, 0));
- GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
+ //1. Open s file with multiple sequences
+ GTUtilsDialog::waitForDialog(os, new SequenceReadingModeSelectorDialogFiller(os, SequenceReadingModeSelectorDialogFiller::Separate));
+ GTFileDialog::openFile(os, testDir + "_common_data/fasta/", "DNA.fa");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ //2. Select the first sequence and add data to the clipboard
+ ADVSingleSequenceWidget *firstSeqWidget = GTUtilsSequenceView::getSeqWidgetByNumber(os, 0);
+ GTWidget::click(os, firstSeqWidget);
+ GTClipboard::setUrls(os, QList<QString>() << dataDir + "samples/FASTA/human_T1.fa");
GTKeyboardDriver::keyClick(os, 'v', GTKeyboardDriver::key["ctrl"]);
- GTWidget::click(os, GTUtilsSequenceView::getSeqWidgetByNumber(os, 1));
+
+ //3. While the data is been pasted, select the second sequence
+ ADVSingleSequenceWidget *secondSeqWidget = GTUtilsSequenceView::getSeqWidgetByNumber(os, 1);
+ GTWidget::click(os, secondSeqWidget);
GTGlobals::sleep();
GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //4. Check if the data is pasted to the first sequence
int len = GTUtilsSequenceView::getSequenceAsString(os, 0).length();
CHECK_SET_ERR(len > 199950, "No sequences pasted");
}
@@ -4790,6 +5174,225 @@ GUI_TEST_CLASS_DEFINITION(test_4918_1) {
GTUtilsTaskTreeView::waitTaskFinished(os);
}
+GUI_TEST_CLASS_DEFINITION(test_4934) {
+ //1. Open samples/CLUSTALW/ty3.aln.gz
+ GTLogTracer l;
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "ty3.aln.gz");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ //2. Align with Kalign
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_ALIGN << "align_with_kalign", GTGlobals::UseMouse));
+ GTUtilsDialog::waitForDialog(os, new KalignDialogFiller(os));
+ GTUtilsMSAEditorSequenceArea::callContextMenu(os);
+ //3. while aligning lock document for editing
+ GTGlobals::sleep();
+ GTUtilsDocument::lockDocument(os, "ty3.aln.gz");
+
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ //4. Unlock document after alignment finished
+ GTUtilsDocument::unlockDocument(os, "ty3.aln.gz");
+
+ //5. Align with Kalign again
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_ALIGN << "align_with_kalign", GTGlobals::UseMouse));
+ GTUtilsDialog::waitForDialog(os, new KalignDialogFiller(os));
+ GTUtilsMSAEditorSequenceArea::callContextMenu(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsLog::checkContainsError(os, l, "Object 'ty3.aln.gz' removed");
+ int errorNum = GTUtilsLog::getErrors(os, l).size();
+ CHECK_SET_ERR(errorNum==1, QString("Too many errors in log: %1").arg(errorNum));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4936) {
+ GTLogTracer logTracer;
+
+// 1. Open "data/samples/Swiss-Prot/D0VTW9.txt".
+ GTFile::copy(os, dataDir + "samples/Swiss-Prot/D0VTW9.txt", sandBoxDir + "test_4936.sw");
+ GTFileDialog::openFile(os, sandBoxDir + "test_4936.sw");
+
+// 2. Edit the file directly.
+// Expected state: UGENE offers to reload the file.
+ GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes, "Do you want to reload it?"));
+
+ QByteArray data = GTFile::readAll(os, sandBoxDir + "test_4936.sw");
+ data.replace("D0VTW9_9INFA", "00VTW9_9INFA");
+
+ QFile file(sandBoxDir + "test_4936.sw");
+ file.open(QFile::WriteOnly);
+ file.write(data);
+ file.close();
+
+ GTGlobals::sleep(5000);
+
+// 3. Accept the offer.
+// Expected state: the document is successfully reloaded, there are no errors in the log.
+ GTUtilsProjectTreeView::findIndex(os, "00VTW9_9INFA");
+ GTUtilsLog::check(os, logTracer);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4938) {
+ // 1. Open murine.gb
+ // 2. Open Annotations Highlighting tab
+ // 3. Remove all annotation groups one by one
+ // Expected state: annotations table from Options Panel is not visible, no errors
+ // 4. Add annotation
+ // Expected state: annotation table is visible
+
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank", "murine.gb");
+
+ GTUtilsOptionPanelSequenceView::openTab(os, GTUtilsOptionPanelSequenceView::AnnotationsHighlighting);
+ QWidget* annTree = GTWidget::findWidget(os, "OP_ANNOT_HIGHLIGHT_TREE");
+ CHECK_SET_ERR(annTree != NULL, "Cannot find OP_ANNOT_HIGHLIGHT_TREE");
+ CHECK_SET_ERR(annTree->isVisible(), "OP_ANNOT_HIGHLIGHT_TREE is not visible")
+
+ GTUtilsAnnotationsTreeView::deleteItem(os, "CDS (0, 4)");
+ GTUtilsAnnotationsTreeView::deleteItem(os, "misc_feature (0, 2)");
+ GTUtilsAnnotationsTreeView::deleteItem(os, "comment (0, 1)");
+ GTUtilsAnnotationsTreeView::deleteItem(os, "source (0, 1)");
+ GTGlobals::sleep();
+ CHECK_SET_ERR(!annTree->isVisible(), "OP_ANNOT_HIGHLIGHT_TREE is still visible")
+
+ GTUtilsDialog::waitForDialog(os, new CreateAnnotationWidgetFiller(os, false, "group", "feature", "50..60"));
+ GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Add" << "New annotation...");
+ CHECK_SET_ERR(annTree->isVisible(), "OP_ANNOT_HIGHLIGHT_TREE is not visible")
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4938_1) {
+ // 1. Open murine.gb
+ // 2. Open Annotations Highlighting tab
+ // 3. Click "Show all annotations"
+ // 4. Remove annotation group, e.g. CDS
+ // Expected state: CDS is still peresent in annotation table on Options Panel
+
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank", "murine.gb");
+
+ GTUtilsOptionPanelSequenceView::openTab(os, GTUtilsOptionPanelSequenceView::AnnotationsHighlighting);
+ QTreeWidget* annTree = qobject_cast<QTreeWidget*>(GTWidget::findWidget(os, "OP_ANNOT_HIGHLIGHT_TREE"));
+ CHECK_SET_ERR(annTree != NULL, "Cannot find OP_ANNOT_HIGHLIGHT_TREE");
+ CHECK_SET_ERR(annTree->isVisible(), "OP_ANNOT_HIGHLIGHT_TREE is not visible");
+ GTWidget::click(os, GTWidget::findWidget(os, "show_all_annotation_types"));
+ CHECK_SET_ERR(!annTree->findItems("CDS", Qt::MatchExactly).isEmpty(), "Cannot find CDS item in OP_ANNOT_HIGHLIGHT_TREE");
+
+ GTUtilsAnnotationsTreeView::deleteItem(os, "CDS (0, 4)");
+ GTGlobals::sleep();
+ CHECK_SET_ERR(!annTree->findItems("CDS", Qt::MatchExactly).isEmpty(), "CDS item is missing in OP_ANNOT_HIGHLIGHT_TREE");
+}
+
+
+GUI_TEST_CLASS_DEFINITION(test_4966) {
+ //GTLogTracer l;
+ // 1. Open WD
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+ // 2. Open sample "Align sequences with MUSCLE"
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTUtilsWorkflowDesigner::addSample(os, "Align sequences with MUSCLE");
+ // 3. Align "_common_data\clustal\big.aln"
+ GTUtilsWorkflowDesigner::click(os, "Read alignment");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/clustal", "big.aln");
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ // Expected state:
+ // Workflow finished with error "Not enough resources for the task"
+ GTUtilsWorkflowDesigner::checkErrorList(os, "Not enough resources for the task");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4969_1) {
+ //1. Open "samples/Genbank/murine.gb".
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank/murine.gb");
+ //2. Open Start Page.
+ GTUtilsStartPage::openStartPage(os);
+ //3. Click the main menu item: "File" -> "Recent files" -> ".../samples/Genbank/murine.gb".
+ GTMenu::clickMainMenuItem(os, QStringList() << "File" << "Recent files" << QFileInfo(dataDir + "samples/Genbank/murine.gb").absoluteFilePath());
+ //Expected: sequence view is activated.
+ QString title = GTUtilsMdi::activeWindowTitle(os);
+ CHECK_SET_ERR(title.contains("NC_"), "Wrong MDI window is active");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4969_2) {
+ //1. Open "samples/Genbank/murine.gb".
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank/murine.gb");
+ //2. Unload the sequence.
+ GTUtilsDocument::unloadDocument(os, "murine.gb");
+ //3. Click "murine.gb" on Start Page.
+ GTUtilsStartPage::clickResentDocument(os, "murine.gb");
+ //Expected: The file is loaded, the view is opened.
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ CHECK_SET_ERR(GTUtilsDocument::isDocumentLoaded(os, "murine.gb"), "The file is not loaded");
+ QString title = GTUtilsMdi::activeWindowTitle(os);
+ CHECK_SET_ERR(title.contains("NC_"), "Wrong MDI window is active");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4983) {
+ //1. Open file : "data/samples/PDB/1CF7.PDB"
+ GTLogTracer l;
+ GTFileDialog::openFile(os, dataDir + "samples/PDB/1CF7.PDB");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+ //2. Use context menu on 3D view : {"Coloring schemes"->"Molecular chains"}
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "Coloring Scheme" << "Molecular Chains"));
+ QWidget *widget3d = GTWidget::findWidget(os, "1-1CF7");
+ GTWidget::click(os, widget3d, Qt::RightButton);
+ GTGlobals::sleep();
+
+ //Expected: the color scheme is changed without errors.
+ GTUtilsLog::check(os, l);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4986) {
+// 1. Open "data/samples/Genbank/murine.gb".
+// 2. Open "data/samples/GFF/5prime_utr_intron_A20.gff".
+// 3. Drag and drop any annotation table object from the GFF document to the sequence.
+// Expected state: you are notified, that some annotations are out of boundaries.
+// 4. Select an annotation which is outside the sequence.
+// 5. Call a context menu, select "Export > Export sequence of selected annotations".
+// 6. Accept the export dialog.
+// Expected state: there is an error in the log
+
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank/murine.gb");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTFileDialog::openFile(os, dataDir + "samples/GFF/5prime_utr_intron_A20.gff");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes));
+ GTUtilsDialog::waitForDialog(os, new CreateObjectRelationDialogFiller(os));
+ GTUtilsProjectTreeView::dragAndDrop(os, GTUtilsProjectTreeView::findIndex(os, "Ca20Chr1 features"), GTWidget::findWidget(os, "render_area_NC_001363"));
+ GTGlobals::sleep();
+
+ GTLogTracer l;
+ GTUtilsDialog::waitForDialog(os, new ExportSequenceOfSelectedAnnotationsFiller(os, sandBoxDir + "test_4986.fa", ExportSequenceOfSelectedAnnotationsFiller::Fasta,
+ ExportSequenceOfSelectedAnnotationsFiller::SaveAsSeparate));
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << ADV_MENU_EXPORT << "action_export_sequence_of_selected_annotations"));
+ GTUtilsAnnotationsTreeView::callContextMenuOnItem(os, GTUtilsAnnotationsTreeView::findItem(os, "5_prime_UTR_intron"));
+
+ GTThread::waitForMainThread(os);
+ CHECK_SET_ERR(l.hasError(), "There is no error in the log");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_4990) {
+ //1. Open file "_common_data/clustal/big.aln"
+ GTFileDialog::openFile(os, testDir + "_common_data/clustal/big.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+
+ //2. Open "Export Consensus" OP tab
+ GTUtilsOptionPanelMsa::openTab(os, GTUtilsOptionPanelMsa::ExportConsensus);
+
+ //3. Press "Export" button 3x times
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+ GTWidget::click(os, GTWidget::findWidget(os, "exportBtn"));
+
+ //4. Remove "big.aln" document
+ GTUtilsDocument::removeDocument(os, "big.aln");
+ qDebug()<<QString("");
+}
+
} // namespace GUITest_regression_scenarios
} // namespace U2
+
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.h
index ca6b184..0cd6183 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_4001_5000_H_
#define _U2_GT_TESTS_REGRESSION_SCENARIOS_4001_5000_H_
-#include <U2Test/GUITestBase.h>
+#include <U2Test/UGUITestBase.h>
namespace U2 {
@@ -127,6 +127,7 @@ GUI_TEST_CLASS_DECLARATION(test_4386_2)
GUI_TEST_CLASS_DECLARATION(test_4391)
GUI_TEST_CLASS_DECLARATION(test_4400)
+GUI_TEST_CLASS_DECLARATION(test_4434)
GUI_TEST_CLASS_DECLARATION(test_4439)
GUI_TEST_CLASS_DECLARATION(test_4440)
GUI_TEST_CLASS_DECLARATION(test_4463)
@@ -145,6 +146,7 @@ GUI_TEST_CLASS_DECLARATION(test_4588)
GUI_TEST_CLASS_DECLARATION(test_4588_1)
GUI_TEST_CLASS_DECLARATION(test_4588_2)
+GUI_TEST_CLASS_DECLARATION(test_4606)
GUI_TEST_CLASS_DECLARATION(test_4620)
GUI_TEST_CLASS_DECLARATION(test_4621)
GUI_TEST_CLASS_DECLARATION(test_4624)
@@ -166,6 +168,7 @@ GUI_TEST_CLASS_DECLARATION(test_4710)
GUI_TEST_CLASS_DECLARATION(test_4710_1)
GUI_TEST_CLASS_DECLARATION(test_4714_1)
GUI_TEST_CLASS_DECLARATION(test_4714_2)
+GUI_TEST_CLASS_DECLARATION(test_4712)
GUI_TEST_CLASS_DECLARATION(test_4718)
GUI_TEST_CLASS_DECLARATION(test_4719_1)
GUI_TEST_CLASS_DECLARATION(test_4719_2)
@@ -174,11 +177,15 @@ GUI_TEST_CLASS_DECLARATION(test_4728)
GUI_TEST_CLASS_DECLARATION(test_4732)
GUI_TEST_CLASS_DECLARATION(test_4734)
GUI_TEST_CLASS_DECLARATION(test_4735)
+GUI_TEST_CLASS_DECLARATION(test_4764_1)
+GUI_TEST_CLASS_DECLARATION(test_4764_2)
+GUI_TEST_CLASS_DECLARATION(test_4764_3)
GUI_TEST_CLASS_DECLARATION(test_4784_1)
GUI_TEST_CLASS_DECLARATION(test_4784_2)
GUI_TEST_CLASS_DECLARATION(test_4784_3)
GUI_TEST_CLASS_DECLARATION(test_4784_4)
-GUI_TEST_CLASS_DECLARATION(test_4785)
+GUI_TEST_CLASS_DECLARATION(test_4785_1)
+GUI_TEST_CLASS_DECLARATION(test_4785_2)
GUI_TEST_CLASS_DECLARATION(test_4795)
GUI_TEST_CLASS_DECLARATION(test_4803_1)
GUI_TEST_CLASS_DECLARATION(test_4803_2)
@@ -199,15 +206,30 @@ GUI_TEST_CLASS_DECLARATION(test_4833_5)
GUI_TEST_CLASS_DECLARATION(test_4833_6)
GUI_TEST_CLASS_DECLARATION(test_4833_7)
GUI_TEST_CLASS_DECLARATION(test_4833_8)
+GUI_TEST_CLASS_DECLARATION(test_4839_1)
+GUI_TEST_CLASS_DECLARATION(test_4839_2)
+GUI_TEST_CLASS_DECLARATION(test_4852)
+GUI_TEST_CLASS_DECLARATION(test_4860)
+GUI_TEST_CLASS_DECLARATION(test_4871)
GUI_TEST_CLASS_DECLARATION(test_4885_1)
GUI_TEST_CLASS_DECLARATION(test_4885_2)
GUI_TEST_CLASS_DECLARATION(test_4885_3)
GUI_TEST_CLASS_DECLARATION(test_4886)
-GUI_TEST_CLASS_DECLARATION(test_4908)
+GUI_TEST_CLASS_DECLARATION(test_4908)
GUI_TEST_CLASS_DECLARATION(test_4913)
GUI_TEST_CLASS_DECLARATION(test_4918)
GUI_TEST_CLASS_DECLARATION(test_4918_1)
+GUI_TEST_CLASS_DECLARATION(test_4934)
+GUI_TEST_CLASS_DECLARATION(test_4936)
+GUI_TEST_CLASS_DECLARATION(test_4938)
+GUI_TEST_CLASS_DECLARATION(test_4938_1)
+GUI_TEST_CLASS_DECLARATION(test_4966)
+GUI_TEST_CLASS_DECLARATION(test_4969_1)
+GUI_TEST_CLASS_DECLARATION(test_4969_2)
+GUI_TEST_CLASS_DECLARATION(test_4983)
+GUI_TEST_CLASS_DECLARATION(test_4986)
+GUI_TEST_CLASS_DECLARATION(test_4990)
#undef GUI_TEST_SUITE
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp
new file mode 100644
index 0000000..a04e371
--- /dev/null
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp
@@ -0,0 +1,207 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QFile>
+#include <QListWidget>
+#include <QPlainTextEdit>
+#include <QTableView>
+#include <QWebElement>
+
+#include <U2Core/BaseDocumentFormats.h>
+#include <U2Core/DocumentModel.h>
+
+#include <U2Gui/ToolsMenu.h>
+
+#include <U2View/ADVConstants.h>
+#include <U2View/ADVSequenceObjectContext.h>
+#include <U2View/DetView.h>
+#include <U2View/MSAEditorTreeViewer.h>
+#include <U2View/MSAGraphOverview.h>
+
+#include <base_dialogs/DefaultDialogFiller.h>
+#include <base_dialogs/GTFileDialog.h>
+#include <base_dialogs/MessageBoxFiller.h>
+#include <drivers/GTKeyboardDriver.h>
+#include <drivers/GTMouseDriver.h>
+#include <primitives/GTAction.h>
+#include <primitives/GTCheckBox.h>
+#include <primitives/GTComboBox.h>
+#include <primitives/GTLineEdit.h>
+#include <primitives/GTListWidget.h>
+#include <primitives/GTMenu.h>
+#include <primitives/GTRadioButton.h>
+#include <primitives/GTSlider.h>
+#include <primitives/GTSpinBox.h>
+#include <primitives/GTTabWidget.h>
+#include <primitives/GTTableView.h>
+#include <primitives/GTTextEdit.h>
+#include <primitives/GTToolbar.h>
+#include <primitives/GTTreeWidget.h>
+#include <primitives/GTWidget.h>
+#include <primitives/PopupChooser.h>
+#include <system/GTClipboard.h>
+#include <system/GTFile.h>
+#include <utils/GTThread.h>
+#include <utils/GTUtilsDialog.h>
+
+#include "GTTestsRegressionScenarios_5001_6000.h"
+#include "GTUtilsAnnotationsTreeView.h"
+#include "GTUtilsAssemblyBrowser.h"
+#include "GTUtilsCircularView.h"
+#include "GTUtilsDashboard.h"
+#include "GTUtilsDocument.h"
+#include "GTUtilsExternalTools.h"
+#include "GTUtilsLog.h"
+#include "GTUtilsMdi.h"
+#include "GTUtilsMsaEditor.h"
+#include "GTUtilsMsaEditorSequenceArea.h"
+#include "GTUtilsNotifications.h"
+#include "GTUtilsOptionPanelMSA.h"
+#include "GTUtilsOptionPanelSequenceView.h"
+#include "GTUtilsOptionsPanel.h"
+#include "GTUtilsPcr.h"
+#include "GTUtilsPhyTree.h"
+#include "GTUtilsPrimerLibrary.h"
+#include "GTUtilsProject.h"
+#include "GTUtilsProjectTreeView.h"
+#include "GTUtilsSequenceView.h"
+#include "GTUtilsSharedDatabaseDocument.h"
+#include "GTUtilsStartPage.h"
+#include "GTUtilsTask.h"
+#include "GTUtilsTaskTreeView.h"
+#include "GTUtilsWizard.h"
+#include "GTUtilsWorkflowDesigner.h"
+
+
+namespace U2 {
+
+namespace GUITest_regression_scenarios {
+using namespace HI;
+
+GUI_TEST_CLASS_DEFINITION(test_5012) {
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+
+ GTUtilsWorkflowDesigner::addSample(os, "Call variants with SAMtools");
+ GTUtilsWorkflowDesigner::click(os, "Read Assembly (BAM/SAM)");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam1.sam");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam2.sam");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam3.sam");
+
+ GTUtilsWorkflowDesigner::click(os, "Read Sequence");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "pBR322.gb");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "JQ040024.1.gb");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+
+ GTUtilsWorkflowDesigner::click(os, "Call Variants");
+ GTUtilsWorkflowDesigner::setParameter(os, "Output variants file", QDir(sandBoxDir).absoluteFilePath("test_5012.vcf"), GTUtilsWorkflowDesigner::textValue);
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5012_1) {
+ GTLogTracer l;
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+
+ GTUtilsWorkflowDesigner::addSample(os, "Call variants with SAMtools");
+ GTUtilsWorkflowDesigner::click(os, "Read Assembly (BAM/SAM)");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam1.sam");
+
+ GTUtilsWorkflowDesigner::click(os, "Read Sequence");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "pBR322.gb");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "JQ040024.1.gb");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+
+ GTUtilsWorkflowDesigner::click(os, "Call Variants");
+ GTUtilsWorkflowDesigner::setParameter(os, "Output variants file", QDir(sandBoxDir).absoluteFilePath("test_5012_1.vcf"), GTUtilsWorkflowDesigner::textValue);
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ CHECK_SET_ERR(l.hasError(), "There is no error in the log");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5012_2) {
+ GTLogTracer l;
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+
+ GTUtilsWorkflowDesigner::addSample(os, "Call variants with SAMtools");
+ GTUtilsWorkflowDesigner::click(os, "Read Assembly (BAM/SAM)");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam1.sam");
+
+ GTUtilsWorkflowDesigner::createDataset(os);
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam2.sam");
+
+ GTUtilsWorkflowDesigner::click(os, "Read Sequence");
+
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "pBR322.gb");
+
+ GTUtilsWorkflowDesigner::click(os, "Call Variants");
+ GTUtilsWorkflowDesigner::setParameter(os, "Output variants file", QDir(sandBoxDir).absoluteFilePath("test_5012_2.vcf"), GTUtilsWorkflowDesigner::textValue);
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ CHECK_SET_ERR(l.hasError(), "There is no error in the log");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5029) {
+ GTMenu::clickMainMenuItem(os, QStringList() << "Settings" << "Plugins...");
+ GTGlobals::sleep();
+ QTreeWidget* tree = qobject_cast<QTreeWidget*>(GTWidget::findWidget(os,"treeWidget"));
+ int numPlugins = tree->topLevelItemCount();
+ CHECK_SET_ERR( numPlugins > 10, QString("Not all plugins were loaded. Loaded %1 plugins").arg(numPlugins));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5052) {
+ //1. Open "samples/Genbank/murine.gb".
+ GTFileDialog::openFile(os, dataDir + "samples/Genbank/murine.gb");
+ //2. Close the opened sequence view.
+ GTGlobals::FindOptions findOptions;
+ findOptions.matchPolicy = Qt::MatchContains;
+ GTUtilsMdi::closeWindow(os, "NC_", findOptions);
+ //3. Click "murine.gb" on Start Page.
+ GTUtilsStartPage::clickResentDocument(os, "murine.gb");
+ //Expected: The file is loaded, the view is opened.
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ CHECK_SET_ERR(GTUtilsDocument::isDocumentLoaded(os, "murine.gb"), "The file is not loaded");
+ QString title = GTUtilsMdi::activeWindowTitle(os);
+ CHECK_SET_ERR(title.contains("NC_"), "Wrong MDI window is active");
+}
+
+
+} // namespace GUITest_regression_scenarios
+
+} // namespace U2
diff --git a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h
new file mode 100644
index 0000000..5673e6a
--- /dev/null
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h
@@ -0,0 +1,45 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_GT_TESTS_REGRESSION_SCENARIOS_5001_6000_H_
+#define _U2_GT_TESTS_REGRESSION_SCENARIOS_5001_6000_H_
+
+#include <U2Test/UGUITestBase.h>
+
+namespace U2 {
+
+namespace GUITest_regression_scenarios {
+
+#undef GUI_TEST_SUITE
+#define GUI_TEST_SUITE "GUITest_regression_scenarios"
+GUI_TEST_CLASS_DECLARATION(test_5012)
+GUI_TEST_CLASS_DECLARATION(test_5012_1)
+GUI_TEST_CLASS_DECLARATION(test_5012_2)
+GUI_TEST_CLASS_DECLARATION(test_5029)
+GUI_TEST_CLASS_DECLARATION(test_5052)
+
+#undef GUI_TEST_SUITE
+
+} // namespace GUITest_regression_scenarios
+
+} // namespace U2
+
+#endif // _U2_GT_TESTS_REGRESSION_SCENARIOS_5001_6000_H_
diff --git a/src/plugins/annotator/src/AnnotatorPlugin.cpp b/src/plugins/annotator/src/AnnotatorPlugin.cpp
index 9c4eb9d..bec888a 100644
--- a/src/plugins/annotator/src/AnnotatorPlugin.cpp
+++ b/src/plugins/annotator/src/AnnotatorPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/AnnotatorPlugin.h b/src/plugins/annotator/src/AnnotatorPlugin.h
index 58765a5..ab20940 100644
--- a/src/plugins/annotator/src/AnnotatorPlugin.h
+++ b/src/plugins/annotator/src/AnnotatorPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/AnnotatorTests.cpp b/src/plugins/annotator/src/AnnotatorTests.cpp
index 22592d1..37e8a69 100644
--- a/src/plugins/annotator/src/AnnotatorTests.cpp
+++ b/src/plugins/annotator/src/AnnotatorTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/AnnotatorTests.h b/src/plugins/annotator/src/AnnotatorTests.h
index b7259bd..cfbbbe4 100644
--- a/src/plugins/annotator/src/AnnotatorTests.h
+++ b/src/plugins/annotator/src/AnnotatorTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CollocationWorker.cpp b/src/plugins/annotator/src/CollocationWorker.cpp
index 0b01bee..4d04f86 100644
--- a/src/plugins/annotator/src/CollocationWorker.cpp
+++ b/src/plugins/annotator/src/CollocationWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CollocationWorker.h b/src/plugins/annotator/src/CollocationWorker.h
index bcc80a3..ffb02e1 100644
--- a/src/plugins/annotator/src/CollocationWorker.h
+++ b/src/plugins/annotator/src/CollocationWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CollocationsDialogController.cpp b/src/plugins/annotator/src/CollocationsDialogController.cpp
index e0df80f..3c7a7d1 100644
--- a/src/plugins/annotator/src/CollocationsDialogController.cpp
+++ b/src/plugins/annotator/src/CollocationsDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ CollocationsDialogController::CollocationsDialogController(QStringList _names, A
task = NULL;
qSort(allNames);
setupUi(this);
- new HelpButton(this, buttonBox, "17466173");
+ new HelpButton(this, buttonBox, "17467720");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/annotator/src/CollocationsDialogController.h b/src/plugins/annotator/src/CollocationsDialogController.h
index e0976fd..dddfb27 100644
--- a/src/plugins/annotator/src/CollocationsDialogController.h
+++ b/src/plugins/annotator/src/CollocationsDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp b/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
index 4dd77f6..67ac786 100644
--- a/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
+++ b/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CollocationsSearchAlgorithm.h b/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
index 506e284..244f28c 100644
--- a/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
+++ b/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp b/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
index 4ddf0fb..596c5be 100644
--- a/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
+++ b/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ CustomAutoAnnotationDialog::CustomAutoAnnotationDialog(ADVSequenceObjectContext*
: QDialog(ctx->getAnnotatedDNAView()->getWidget()), seqCtx(ctx)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466252");
+ new HelpButton(this, buttonBox, "17467799");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Annotate"));
loadSettings();
diff --git a/src/plugins/annotator/src/CustomAutoAnnotationDialog.h b/src/plugins/annotator/src/CustomAutoAnnotationDialog.h
index ba8595b..927fd37 100644
--- a/src/plugins/annotator/src/CustomAutoAnnotationDialog.h
+++ b/src/plugins/annotator/src/CustomAutoAnnotationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp b/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
index ad8cf8e..7323f09 100644
--- a/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
+++ b/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/CustomPatternAnnotationTask.h b/src/plugins/annotator/src/CustomPatternAnnotationTask.h
index 23d5e8d..65f6873 100644
--- a/src/plugins/annotator/src/CustomPatternAnnotationTask.h
+++ b/src/plugins/annotator/src/CustomPatternAnnotationTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/GeneByGeneReportTask.cpp b/src/plugins/annotator/src/GeneByGeneReportTask.cpp
index 754c497..269f95e 100644
--- a/src/plugins/annotator/src/GeneByGeneReportTask.cpp
+++ b/src/plugins/annotator/src/GeneByGeneReportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/GeneByGeneReportTask.h b/src/plugins/annotator/src/GeneByGeneReportTask.h
index 421ed66..90373fa 100644
--- a/src/plugins/annotator/src/GeneByGeneReportTask.h
+++ b/src/plugins/annotator/src/GeneByGeneReportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/GeneByGeneReportWorker.cpp b/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
index d696d48..744f17d 100644
--- a/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
+++ b/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/annotator/src/GeneByGeneReportWorker.h b/src/plugins/annotator/src/GeneByGeneReportWorker.h
index 7387ad9..d3c4974 100644
--- a/src/plugins/annotator/src/GeneByGeneReportWorker.h
+++ b/src/plugins/annotator/src/GeneByGeneReportWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/ApiTestsPlugin.cpp b/src/plugins/api_tests/src/ApiTestsPlugin.cpp
index f2d8c3d..97e2763 100644
--- a/src/plugins/api_tests/src/ApiTestsPlugin.cpp
+++ b/src/plugins/api_tests/src/ApiTestsPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/ApiTestsPlugin.h b/src/plugins/api_tests/src/ApiTestsPlugin.h
index 20dfb1b..71ace7d 100644
--- a/src/plugins/api_tests/src/ApiTestsPlugin.h
+++ b/src/plugins/api_tests/src/ApiTestsPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/UnitTestSuite.cpp b/src/plugins/api_tests/src/UnitTestSuite.cpp
index e49ed44..5be0ac7 100644
--- a/src/plugins/api_tests/src/UnitTestSuite.cpp
+++ b/src/plugins/api_tests/src/UnitTestSuite.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/UnitTestSuite.h b/src/plugins/api_tests/src/UnitTestSuite.h
index 6a34635..9c1e174 100644
--- a/src/plugins/api_tests/src/UnitTestSuite.h
+++ b/src/plugins/api_tests/src/UnitTestSuite.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
index b2c4052..c2d8b82 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
index ebf823c..13cf31a 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
index 56a2407..7196a2e 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
index 924c82d..fc2e8e1 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
index d3f137f..492f4db 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
index b5d1710..24e75b6 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
index e4f7987..4b9d16c 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
index af19738..1bc42cb 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
index 2680260..7d3281d 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
index ae3d5f1..3dd82f4 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
index dda435e..2e03228 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
index 35e61e4..3df1f2c 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/DbiTest.cpp b/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
index c0276f1..d927fee 100644
--- a/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
+++ b/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp
index df1582f..a4638ac 100644
--- a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,6 +22,8 @@
#include <U2Core/U2FeatureDbi.h>
#include <U2Core/U2SequenceDbi.h>
#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2DbiUtils.h>
+#include <U2Core/U2FeatureUtils.h>
#include "FeatureDbiUnitTests.h"
@@ -30,8 +32,11 @@ namespace U2 {
static const U2Feature INVALID_FEATURE = U2Feature();
TestDbiProvider FeatureTestData::dbiProvider = TestDbiProvider();
+TestDbiProvider FeatureTestData::subgroupsDbiProvider = TestDbiProvider();
const QString FeatureTestData::featureDbiUrl("features-dbi.ugenedb");
+const QString FeatureTestData::subgroupDbiUrl("featureSubgroupsSorting.ugenedb");
U2FeatureDbi *FeatureTestData::featureDbi = NULL;
+U2FeatureDbi *FeatureTestData::subgroupDbi = NULL;
U2SequenceDbi *FeatureTestData::sequenceDbi = NULL;
void FeatureTestData::init() {
@@ -46,18 +51,34 @@ void FeatureTestData::init() {
sequenceDbi = dbi->getSequenceDbi();
SAFE_POINT(NULL != sequenceDbi, "Failed to get sequenceDbi!",);
+
+ SAFE_POINT(NULL == subgroupDbi, "subgroupDbi has been already initialized!", );
+
+ ok = subgroupsDbiProvider.init(subgroupDbiUrl, false);
+ SAFE_POINT(ok, "Dbi provider failed to initialize in FeaturesTestData::init()!", );
+
+ dbi = subgroupsDbiProvider.getDbi();
+ subgroupDbi = dbi->getFeatureDbi();
+ SAFE_POINT(NULL != featureDbi, "Failed to get subgroupDbi!", );
}
void FeatureTestData::shutdown() {
+ U2OpStatusImpl os;
if (NULL != featureDbi) {
SAFE_POINT(NULL != sequenceDbi, "sequenceDbi must also be not NULL on this step!",);
- U2OpStatusImpl os;
dbiProvider.close();
featureDbi = NULL;
sequenceDbi = NULL;
SAFE_POINT_OP(os,);
}
+ if (NULL != subgroupDbi) {
+ SAFE_POINT(NULL != subgroupDbi, "subgroupDbi must also be not NULL on this step!", );
+
+ subgroupsDbiProvider.close();
+ subgroupDbi = NULL;
+ SAFE_POINT_OP(os, );
+ }
}
U2FeatureDbi *FeatureTestData::getFeatureDbi() {
@@ -67,6 +88,13 @@ U2FeatureDbi *FeatureTestData::getFeatureDbi() {
return featureDbi;
}
+U2FeatureDbi *FeatureTestData::getSubgroupDbi() {
+ if (NULL == subgroupDbi) {
+ init();
+ }
+ return subgroupDbi;
+}
+
U2SequenceDbi* FeatureTestData::getSequenceDbi() {
if (NULL == sequenceDbi) {
init();
@@ -716,4 +744,26 @@ IMPLEMENT_TEST(FeatureDbiUnitTests, getFeaturesBySequence) {
}
}
+IMPLEMENT_TEST(FeatureDbiUnitTests, sortingSubgroups) {
+ U2OpStatusImpl os;
+ U2FeatureDbi *subgroupDbi = FeatureTestData::getSubgroupDbi();
+
+ U2DataId rootFeatureId = U2DbiUtils::toU2DataId(2, U2Type::AnnotationTable);
+ QList<FeatureAndKey> rawData = subgroupDbi->getFeatureTable(rootFeatureId, os);
+ QList<FeatureAndKey> groups = U2FeatureUtils::getSortedSubgroups(rawData, rootFeatureId);
+
+ QList<U2DataId> passedFeaturesList;
+ for (int i = 0; i < groups.size(); i++) {
+ U2DataId id = groups.at(i).feature.id;
+ U2DataId parentId = groups.at(i).feature.parentFeatureId;
+ passedFeaturesList.append(id);
+ if (i == 0) {
+ U2DataId rootId = groups.at(i).feature.rootFeatureId;
+ CHECK_TRUE(parentId == rootId, "Wrong groups sorting");
+ } else {
+ CHECK_TRUE(passedFeaturesList.contains(parentId), "Wrong groups sorting");
+ }
+ }
+}
+
} // namespace U2
diff --git a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h
index 039ba64..20b1057 100644
--- a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,6 +37,7 @@ class FeatureTestData {
public:
static U2FeatureDbi * getFeatureDbi( );
static U2SequenceDbi * getSequenceDbi( );
+ static U2FeatureDbi *getSubgroupDbi();
static U2Feature createTestFeature1( const U2Sequence &seq, U2OpStatus &os,
const U2Feature &parentFeature = U2Feature( ) );
@@ -53,8 +54,11 @@ private:
static void init( );
static TestDbiProvider dbiProvider;
+ static TestDbiProvider subgroupsDbiProvider;
static const QString featureDbiUrl;
+ static const QString subgroupDbiUrl;
static U2FeatureDbi *featureDbi;
+ static U2FeatureDbi *subgroupDbi;
static U2SequenceDbi *sequenceDbi;
};
@@ -88,6 +92,8 @@ DECLARE_TEST( FeatureDbiUnitTests, removeFeature );
DECLARE_TEST( FeatureDbiUnitTests, getFeaturesByRegion );
DECLARE_TEST( FeatureDbiUnitTests, getSubFeatures );
DECLARE_TEST( FeatureDbiUnitTests, getFeaturesBySequence );
+/** Testing properly sorting of annotation subgroups */
+DECLARE_TEST( FeatureDbiUnitTests, sortingSubgroups );
} // namespace U2
@@ -107,5 +113,6 @@ DECLARE_METATYPE( FeatureDbiUnitTests, removeFeature );
DECLARE_METATYPE( FeatureDbiUnitTests, getFeaturesByRegion );
DECLARE_METATYPE( FeatureDbiUnitTests, getSubFeatures );
DECLARE_METATYPE( FeatureDbiUnitTests, getFeaturesBySequence );
+DECLARE_METATYPE( FeatureDbiUnitTests, sortingSubgroups );
#endif // _U2_FEATURES_DBI_UNIT_TESTS_H_
diff --git a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
index ba7352c..55bce99 100644
--- a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
index bb571d0..470533c 100644
--- a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
index a192b31..5eaaf81 100644
--- a/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
index 9eb69ba..9605c53 100644
--- a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
index fa508ee..22c47cb 100644
--- a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.cpp b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.cpp
index 83ff6c9..7f2c11f 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.cpp
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.h b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.h
index dfe40ca..c0f823f 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.h
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceManualTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.cpp b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.cpp
index 6adb782..3f374d0 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.cpp
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.h b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.h
index 7972ebc..8f4970f 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.h
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/CInterfaceSasTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.cpp b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.cpp
index d31fae0..8a06cb9 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.cpp
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.h b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.h
index 5956374..9eda6dc 100644
--- a/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.h
+++ b/src/plugins/api_tests/src/core/external_script/base_scheme_interface/SchemeSimilarityUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp b/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
index e70233e..0cd0375 100644
--- a/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp b/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
index 7850664..f129f0d 100644
--- a/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp
index 62872df..74963ec 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h
index 3b4c6b7..4a6e98d 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h
+++ b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp
index a935429..989199f 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h
index 89ff49f..09bb93d 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h
+++ b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp
index e51ac8c..097bc55 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h
index caa37fe..7cf5918 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp
index bf5ff15..6ffd906 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h
index 607fc9e..3cd692e 100644
--- a/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h
+++ b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
index ea74565..ffad247 100644
--- a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
index 8388b14..a9770d7 100644
--- a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
index 4a1d2be..3823ebd 100644
--- a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
index a0d1278..b5564db 100644
--- a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
index 46ae748..b98182a 100644
--- a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
index d85343b..004bb70 100644
--- a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
+++ b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
index 3bc6ef4..f6d94d8 100644
--- a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
index 7e50ed7..0e5c8e6 100644
--- a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
index 1e73d2c..f716bb7 100644
--- a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
index 3dd6548..dcdbddf 100644
--- a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
index 70653a1..575a839 100644
--- a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
index 511b862..1ad14c6 100644
--- a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
index d859123..cf8fb9e 100644
--- a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
+++ b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
index afe0b44..8c0af3d 100644
--- a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
+++ b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
index d4479d1..fb4a90b 100644
--- a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
index 7b96ef4..330f91b 100644
--- a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
index 9971070..7c7ca21 100644
--- a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
index 5f72165..c217ea2 100644
--- a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
index a269fe6..46439f6 100644
--- a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
index 980e821..0935ba0 100644
--- a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/biostruct3d_view.pri b/src/plugins/biostruct3d_view/biostruct3d_view.pri
index 8fab118..9c4470b 100644
--- a/src/plugins/biostruct3d_view/biostruct3d_view.pri
+++ b/src/plugins/biostruct3d_view/biostruct3d_view.pri
@@ -1,6 +1,19 @@
# include (biostruct3d_view.pri)
-QT += opengl
+defineTest( use_deprecated_view ) {
+ !macx: return (true);
+ equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {
+ return (true)
+ }
+ lessThan(QT_MAJOR_VERSION, 5) {
+ return (true)
+ }
+ return (false)
+}
+
+use_deprecated_view() {
+ QT += opengl
+}
PLUGIN_ID=biostruct3d_view
PLUGIN_NAME=3D structure viewer
@@ -12,3 +25,6 @@ include( ../../ugene_plugin_common.pri )
win32-msvc2013 {
LIBS += opengl32.lib
}
+
+win32 : LIBS += -lGLU32
+unix_not_mac() : LIBS += -lGLU
diff --git a/src/plugins/biostruct3d_view/biostruct3d_view.pro b/src/plugins/biostruct3d_view/biostruct3d_view.pro
index 7251d8b..a667a66 100644
--- a/src/plugins/biostruct3d_view/biostruct3d_view.pro
+++ b/src/plugins/biostruct3d_view/biostruct3d_view.pro
@@ -1,54 +1,96 @@
include (biostruct3d_view.pri)
-# Input
-HEADERS += src/BallAndStickGLRenderer.h \
+use_deprecated_view() {
+
+HEADERS += src/deprecated/AnaglyphRenderer.h \
+ src/deprecated/BallAndStickGLRenderer.h \
+ src/deprecated/BioStruct3DColorScheme.h \
+ src/deprecated/BioStruct3DGLImageExportTask.h \
+ src/deprecated/BioStruct3DGLRender.h \
+ src/deprecated/BioStruct3DGLWidget.h \
+ src/deprecated/BioStruct3DSplitter.h \
+ src/deprecated/BioStruct3DSubsetEditor.h \
+ src/deprecated/BioStruct3DViewPlugin.h \
+ src/deprecated/GLFrameManager.h \
+ src/deprecated/GraphicUtils.h \
+ src/deprecated/MolecularSurfaceRenderer.h \
+ src/deprecated/SelectModelsDialog.h \
+ src/deprecated/SettingsDialog.h \
+ src/deprecated/StructuralAlignmentDialog.h \
+ src/deprecated/TubeGLRenderer.h \
+ src/deprecated/VanDerWaalsGLRenderer.h \
+ src/deprecated/WormsGLRenderer.h \
+ src/gl2ps/gl2ps.h
+
+SOURCES += src/deprecated/BioStruct3DColorScheme.cpp \
+ src/deprecated/BioStruct3DGLRender.cpp \
+ src/deprecated/BioStruct3DSplitter.cpp \
+ src/deprecated/BioStruct3DSubsetEditor.cpp \
+ src/deprecated/BioStruct3DViewPlugin.cpp \
+ src/deprecated/SelectModelsDialog.cpp \
+ src/deprecated/SettingsDialog.cpp \
+ src/deprecated/StructuralAlignmentDialog.cpp \
+ src/deprecated/AnaglyphRenderer.cpp \
+ src/deprecated/BallAndStickGLRenderer.cpp \
+ src/deprecated/BioStruct3DGLImageExportTask.cpp \
+ src/deprecated/BioStruct3DGLWidget.cpp \
+ src/deprecated/GLFrameManager.cpp \
+ src/deprecated/GraphicUtils.cpp \
+ src/deprecated/MolecularSurfaceRenderer.cpp \
+ src/deprecated/TubeGLRenderer.cpp \
+ src/deprecated/VanDerWaalsGLRenderer.cpp \
+ src/deprecated/WormsGLRenderer.cpp \
+ src/gl2ps/gl2ps.cpp
+
+} else {
+
+HEADERS += src/AnaglyphRenderer.h \
+ src/BallAndStickGLRenderer.h \
src/BioStruct3DColorScheme.h \
src/BioStruct3DGLImageExportTask.h \
src/BioStruct3DGLRender.h \
src/BioStruct3DGLWidget.h \
src/BioStruct3DSplitter.h \
+ src/BioStruct3DSubsetEditor.h \
src/BioStruct3DViewPlugin.h \
src/GLFrameManager.h \
src/GraphicUtils.h \
src/MolecularSurfaceRenderer.h \
+ src/SelectModelsDialog.h \
+ src/SettingsDialog.h \
+ src/StructuralAlignmentDialog.h \
src/TubeGLRenderer.h \
src/VanDerWaalsGLRenderer.h \
src/WormsGLRenderer.h \
- src/SettingsDialog.h \
- src/StructuralAlignmentDialog.h \
- src/gl2ps/gl2ps.h \
- src/BioStruct3DSubsetEditor.h \
- src/SelectModelsDialog.h \
- src/AnaglyphRenderer.h
+ src/gl2ps/gl2ps.h
-FORMS += src/ui/SettingsDialog.ui \
- src/ui/StructuralAlignmentDialog.ui \
- src/ui/BioStruct3DSubsetEditor.ui \
- src/ui/SelectModelsDialog.ui
-
-SOURCES += src/BallAndStickGLRenderer.cpp \
+SOURCES += src/AnaglyphRenderer.cpp \
+ src/BallAndStickGLRenderer.cpp \
src/BioStruct3DColorScheme.cpp \
src/BioStruct3DGLImageExportTask.cpp \
src/BioStruct3DGLRender.cpp \
src/BioStruct3DGLWidget.cpp \
src/BioStruct3DSplitter.cpp \
+ src/BioStruct3DSubsetEditor.cpp \
src/BioStruct3DViewPlugin.cpp \
src/GLFrameManager.cpp \
src/GraphicUtils.cpp \
src/MolecularSurfaceRenderer.cpp \
+ src/SelectModelsDialog.cpp \
+ src/SettingsDialog.cpp \
+ src/StructuralAlignmentDialog.cpp \
src/TubeGLRenderer.cpp \
src/VanDerWaalsGLRenderer.cpp \
src/WormsGLRenderer.cpp \
- src/SettingsDialog.cpp \
- src/StructuralAlignmentDialog.cpp \
- src/gl2ps/gl2ps.cpp \
- src/BioStruct3DSubsetEditor.cpp \
- src/SelectModelsDialog.cpp \
- src/AnaglyphRenderer.cpp
+ src/gl2ps/gl2ps.cpp
+}
+
+FORMS += src/ui/BioStruct3DSubsetEditor.ui \
+ src/ui/SelectModelsDialog.ui \
+ src/ui/SettingsDialog.ui \
+ src/ui/StructuralAlignmentDialog.ui
RESOURCES += biostruct3d_view.qrc
+
TRANSLATIONS += transl/english.ts \
transl/russian.ts
-
-win32 : LIBS += -lGLU32
-unix_not_mac() : LIBS += -lGLU
diff --git a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
index edd1190..d43000a 100644
--- a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,6 +19,8 @@
* MA 02110-1301, USA.
*/
+#include <QOpenGLFunctions_2_0>
+
#include "AnaglyphRenderer.h"
#include "BioStruct3DGLWidget.h"
@@ -66,17 +68,18 @@ void AnaglyphRenderer::resize(int _width, int _height) {
}
void AnaglyphRenderer::draw() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
CHECK_GL_ERROR
GLFrame *glFrame = renderer->getGLFrame();
float eyesShift = 5.0 * settings.eyesShift * glFrame->getCameraPosition().z / 200.0;
- glMatrixMode(GL_MODELVIEW);
+ f->glMatrixMode(GL_MODELVIEW);
// Prepare anaglyph textures
- glPushMatrix();
+ f->glPushMatrix();
//glTranslatef(eyesShift, 0, 0);
- glLoadIdentity();
+ f->glLoadIdentity();
gluLookAt(eyesShift, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
// at this moment buffer must be clean glClear omitted as a slow operation
@@ -85,88 +88,90 @@ void AnaglyphRenderer::draw() {
// isolate errors from main scene renderer
CHECK_GL_ERROR
renderer->draw();
- glGetError();
+ f->glGetError();
- glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureRight);
- glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
- glPopMatrix();
+ f->glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureRight);
+ f->glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
+ f->glPopMatrix();
- glPushMatrix();
+ f->glPushMatrix();
//glTranslatef(-eyesShift, 0, 0);
- glLoadIdentity();
+ f->glLoadIdentity();
gluLookAt(-eyesShift, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// isolate errors from main scene renderer
CHECK_GL_ERROR
renderer->draw();
- glGetError();
+ f->glGetError();
- glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureLeft);
- glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
- glPopMatrix();
+ f->glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureLeft);
+ f->glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
+ f->glPopMatrix();
// Draw anaglyph textures in ortho projection
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
+ f->glMatrixMode(GL_MODELVIEW);
+ f->glPushMatrix();
+ f->glLoadIdentity();
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
+ f->glMatrixMode(GL_PROJECTION);
+ f->glPushMatrix();
setOrthoProjection();
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
drawTexturesAnaglyph();
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
+ f->glMatrixMode(GL_PROJECTION);
+ f->glPopMatrix();
- glMatrixMode(GL_MODELVIEW);
- glPopMatrix();
+ f->glMatrixMode(GL_MODELVIEW);
+ f->glPopMatrix();
CHECK_GL_ERROR
}
void AnaglyphRenderer::setOrthoProjection() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
CHECK_GL_ERROR
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0, 1, 1, 0, -1, 1);
- glMatrixMode(GL_MODELVIEW);
+ f->glMatrixMode(GL_PROJECTION);
+ f->glLoadIdentity();
+ f->glOrtho(0, 1, 1, 0, -1, 1);
+ f->glMatrixMode(GL_MODELVIEW);
CHECK_GL_ERROR
}
void AnaglyphRenderer::createEmptyTextures() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
CHECK_GL_ERROR
if(anaglyphRenderTextureLeft != 0) {
- glDeleteTextures(1, &anaglyphRenderTextureLeft);
+ f->glDeleteTextures(1, &anaglyphRenderTextureLeft);
}
if(anaglyphRenderTextureRight != 0) {
- glDeleteTextures(1, &anaglyphRenderTextureRight);
+ f->glDeleteTextures(1, &anaglyphRenderTextureRight);
}
if(tempAnaglyphRenderTexture != 0) {
- glDeleteTextures(1, &tempAnaglyphRenderTexture);
+ f->glDeleteTextures(1, &tempAnaglyphRenderTexture);
}
// TODO : check for NPOT sizes
GLuint texwidth = width, texheight = height;
GLuint txtnumbers[3] = {0};
- glGenTextures(3, txtnumbers);
+ f->glGenTextures(3, txtnumbers);
char *txtdata = new char[texwidth * texheight * 4];
for (GLuint *txtnumber = txtnumbers; txtnumber < txtnumbers + 3; ++txtnumber) {
- glBindTexture(GL_TEXTURE_2D, *txtnumber);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, texwidth, texheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid*) txtdata);
+ f->glBindTexture(GL_TEXTURE_2D, *txtnumber);
+ f->glTexImage2D(GL_TEXTURE_2D, 0, 4, texwidth, texheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid*) txtdata);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+ f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+ f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
}
delete[] txtdata;
@@ -179,12 +184,13 @@ void AnaglyphRenderer::createEmptyTextures() {
}
void AnaglyphRenderer::drawTexturesAnaglyph() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
CHECK_GL_ERROR
drawTexture(anaglyphRenderTextureLeft, settings.rightEyeColor.red(), settings.rightEyeColor.green(), settings.rightEyeColor.blue(), 0.5f, false); // colored left image
- glBindTexture(GL_TEXTURE_2D, tempAnaglyphRenderTexture);
- glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0); // Copy Our ViewPort To The Blur Texture (From 0,0 To 128,128... No Border)
+ f->glBindTexture(GL_TEXTURE_2D, tempAnaglyphRenderTexture);
+ f->glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0); // Copy Our ViewPort To The Blur Texture (From 0,0 To 128,128... No Border)
drawTexture(anaglyphRenderTextureRight, settings.leftEyeColor.red(), settings.leftEyeColor.green(), settings.leftEyeColor.blue(), 0.5f, false); // colored right image
drawTexture(tempAnaglyphRenderTexture, 255, 255, 255, 1.0f, true);
@@ -194,38 +200,39 @@ void AnaglyphRenderer::drawTexturesAnaglyph() {
void AnaglyphRenderer::drawTexture(GLuint anaglyphRenderTexture, int red, int green, int blue, float alpha, bool alphaOnly)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
CHECK_GL_ERROR
- glEnable(GL_TEXTURE_2D);
+ f->glEnable(GL_TEXTURE_2D);
if (alphaOnly){
// the second image is this, it has needed alpha color
- glBlendFunc(GL_DST_ALPHA, GL_DST_ALPHA);
+ f->glBlendFunc(GL_DST_ALPHA, GL_DST_ALPHA);
}
else {
- glBlendFunc(GL_ONE, GL_ONE);
+ f->glBlendFunc(GL_ONE, GL_ONE);
}
- glBindTexture(GL_TEXTURE_2D, anaglyphRenderTexture);
+ f->glBindTexture(GL_TEXTURE_2D, anaglyphRenderTexture);
- glColor4ub(red, green, blue, (GLubyte) (alpha * 255.0));
- glBegin(GL_QUADS);
- glTexCoord2f(0, 1);
- glVertex2f(0,0);
+ f->glColor4ub(red, green, blue, (GLubyte) (alpha * 255.0));
+ f->glBegin(GL_QUADS);
+ f->glTexCoord2f(0, 1);
+ f->glVertex2f(0,0);
- glTexCoord2f(0, 0);
- glVertex2f(0, 1);
+ f->glTexCoord2f(0, 0);
+ f->glVertex2f(0, 1);
- glTexCoord2f(1, 0);
- glVertex2f(1, 1);
+ f->glTexCoord2f(1, 0);
+ f->glVertex2f(1, 1);
- glTexCoord2f(1, 1);
- glVertex2f(1, 0);
- glEnd();
+ f->glTexCoord2f(1, 1);
+ f->glVertex2f(1, 0);
+ f->glEnd();
// Unbind the blur texture
- glBindTexture(GL_TEXTURE_2D, 0);
- glDisable(GL_TEXTURE_2D);
+ f->glBindTexture(GL_TEXTURE_2D, 0);
+ f->glDisable(GL_TEXTURE_2D);
CHECK_GL_ERROR
}
diff --git a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
index d09c0a8..244be50 100644
--- a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
+++ b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -25,7 +25,6 @@
#include <U2Core/Log.h>
#include <QColor>
-#include <QtOpenGL>
// include this for proper cross-platform including of glu.h
#include "GraphicUtils.h"
diff --git a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
index 6156b8b..2819bbc 100644
--- a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,7 +19,6 @@
* MA 02110-1301, USA.
*/
-#include <QtOpenGL>
#include <time.h>
#include <U2Core/BioStruct3D.h>
@@ -45,9 +44,11 @@ BallAndStickGLRenderer::BallAndStickGLRenderer(const BioStruct3D& struc, const B
: BioStruct3DGLRenderer(struc,s,shownModels,settings)
{
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->initializeOpenGLFunctions();
QMutexLocker lock(&mutex);
if (dlIndexStorage.size() == 0) {
- dl = glGenLists(MAX_OPEN_VIEWS_NUMBER);
+ dl = f->glGenLists(MAX_OPEN_VIEWS_NUMBER);
for (GLuint idx = dl+1; idx <= dl + MAX_OPEN_VIEWS_NUMBER; ++idx) {
dlIndexStorage.push_back(idx);
}
@@ -61,8 +62,9 @@ BallAndStickGLRenderer::BallAndStickGLRenderer(const BioStruct3D& struc, const B
}
BallAndStickGLRenderer::~BallAndStickGLRenderer() {
- if (glIsList(dl)) {
- glDeleteLists(dl, 1);
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ if (f->glIsList(dl)) {
+ f->glDeleteLists(dl, 1);
}
QMutexLocker lock(&mutex);
@@ -75,7 +77,8 @@ void BallAndStickGLRenderer::create() {
}
void BallAndStickGLRenderer::drawBioStruct3D() {
- glCallList(dl);
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->glCallList(dl);
CHECK_GL_ERROR;
}
@@ -97,10 +100,11 @@ void BallAndStickGLRenderer::updateSettings() {
static void drawAtomsBonds(const Color4f &viewAtomColor, float renderDetailLevel, const Molecule3DModel &model, const BioStruct3DColorScheme* colorScheme)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
GLUquadricObj *pObj = gluNewQuadric();
gluQuadricNormals(pObj, GLU_SMOOTH);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, viewAtomColor.getConstData());
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, viewAtomColor.getConstData());
static float bondThickness = 0.15f;
float radius = 0.35f;
@@ -112,9 +116,9 @@ static void drawAtomsBonds(const Color4f &viewAtomColor, float renderDetailLevel
{
Vector3D pos = atom->coord3d;
//glPushMatrix();
- glTranslatef(pos.x, pos.y, pos.z);
+ f->glTranslatef(pos.x, pos.y, pos.z);
gluSphere(pObj, radius, numSlices, numSlices);
- glTranslatef(-pos.x, -pos.y, -pos.z);
+ f->glTranslatef(-pos.x, -pos.y, -pos.z);
//glPopMatrix();
}
}
@@ -153,15 +157,16 @@ static void drawAtomsBonds(const Color4f &viewAtomColor, float renderDetailLevel
void BallAndStickGLRenderer::createDisplayList()
{
- if (glIsList(dl)) {
- glDeleteLists(dl, 1);
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ if (f->glIsList(dl)) {
+ f->glDeleteLists(dl, 1);
}
float renderDetailLevel = settings->detailLevel;
QList<Color4f> colors;
- glNewList(dl, GL_COMPILE);
+ f->glNewList(dl, GL_COMPILE);
foreach (const SharedMolecule mol, bioStruct.moleculeMap) {
foreach (int index, shownModels) {
@@ -185,7 +190,7 @@ void BallAndStickGLRenderer::createDisplayList()
}
}
- glEndList();
+ f->glEndList();
CHECK_GL_ERROR;
}
diff --git a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
index 53afa4f..57c1ebe 100644
--- a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,6 @@
#define _U2_BIOSTRUCT3D_BALLANDSTICK_RENDERER_H_
#include "BioStruct3DGLRender.h"
-#include <QtOpenGL>
namespace U2 {
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
index 2606f0c..7763d6c 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -177,11 +177,13 @@ const QMap<int, QColor> ChainsColorScheme::getChainColors(const BioStruct3DObjec
SAFE_POINT(NULL != ao, "Invalid annotation table!", colorMap);
foreach (Annotation *a, ao->getAnnotationsByName(BioStruct3D::MoleculeAnnotationTag)) {
- bool ok = false;
- const int chainId = a->findFirstQualifierValue(BioStruct3D::ChainIdQualifierName).toInt(&ok);
- SAFE_POINT(ok && chainId != 0, "Invalid type conversion", colorMap);
- const QColor color = FeatureColors::genLightColor(QString("chain_%1").arg(chainId));
- colorMap.insert(chainId, color);
+ const QString chainQualifier = a->findFirstQualifierValue(BioStruct3D::ChainIdQualifierName);
+ SAFE_POINT(!chainQualifier.isEmpty(), "Invalid chain id qualifier", colorMap);
+ const char chainId = chainQualifier.toLatin1().at(0);
+ const int index = biostructObj->getBioStruct3D().getIndexByChainId(chainId);
+ SAFE_POINT(index >= 0, QString("Invalid chain id: %1").arg(chainId), colorMap);
+ const QColor color = FeatureColors::genLightColor(QString("chain_%1").arg(index));
+ colorMap.insert(index, color);
}
}
}
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
index ef31450..b25052e 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
index da2b45c..34af57a 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ void BioStruct3DImageExportToBitmapTask::run() {
setError(WRONG_FORMAT_MESSAGE.arg(settings.format).arg("BioStruct3DImageExportToBitmapTask")), );
glWidget->setImageRenderingMode(true);
- QPixmap image = glWidget->renderPixmap().scaled( settings.imageSize, Qt::KeepAspectRatio);
+ QPixmap image = glWidget->grab().scaled( settings.imageSize, Qt::KeepAspectRatio);
glWidget->setImageRenderingMode(false);
CHECK_EXT( image.save(settings.fileName, qPrintable(settings.format), settings.imageQuality),
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
index 5d07e11..142d123 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
index da44acb..9cc2197 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
index 6a4ca55..a746b61 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
index d4e956d..81f5934 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -25,8 +25,8 @@
#include <QImageWriter>
#include <QMessageBox>
#include <QMouseEvent>
+#include <QOpenGLFunctions_2_0>
#include <QTime>
-#include <QtOpenGL>
#include <U2Algorithm/MolecularSurfaceFactoryRegistry.h>
#include <U2Algorithm/StructuralAlignmentAlgorithm.h>
@@ -93,7 +93,7 @@ const QString BioStruct3DGLWidget::RENDER_DETAIL_LEVEL_NAME("RenderDetailLevel")
const QString BioStruct3DGLWidget::ANAGLYPH_STATUS_NAME("AnaglyphStatus");
BioStruct3DGLWidget::BioStruct3DGLWidget(BioStruct3DObject* obj, const AnnotatedDNAView *_dnaView, GLFrameManager* manager, QWidget *parent /* = 0*/)
- : QGLWidget(parent),
+ : QOpenGLWidget(parent),
dnaView(_dnaView), contexts(),
rendererSettings(DEFAULT_RENDER_DETAIL_LEVEL),
frameManager(manager), glFrame(new GLFrame(this)),
@@ -158,10 +158,6 @@ void BioStruct3DGLWidget::setupFrame() {
Vector3D pos = glFrame->getCameraPosition();
pos.z = camZ;
glFrame->setCameraPosition(pos);
-
- glFrame->makeCurrent();
- glFrame->updateViewPort();
- glFrame->updateGL();
}
float BioStruct3DGLWidget::getSceneRadius() const {
@@ -193,21 +189,23 @@ Vector3D BioStruct3DGLWidget::getSceneCenter() const {
}
void BioStruct3DGLWidget::initializeGL() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->initializeOpenGLFunctions();
setLightPosition(Vector3D(0, 0.0, 1.0));
GLfloat light_diffuse[] = { 0.8f, 0.8f, 0.8f, 1.0 };
GLfloat light_specular[] = { 0.6f, 0.6f, 0.6f, 1.0 };
GLfloat mat_specular[] = { 0.6f, 0.6f, 0.6f, 1.0 };
GLfloat mat_shininess[] = { 90.0 };
- qglClearColor(backgroundColor);
- glShadeModel (GL_SMOOTH);
- glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
- glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
- glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
- glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
- glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
- glEnable(GL_BLEND); // Enable Blending
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ f->glClearColor(backgroundColor.redF(), backgroundColor.greenF(), backgroundColor.blueF(), backgroundColor.alphaF());
+ f->glShadeModel (GL_SMOOTH);
+ f->glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
+ f->glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
+ f->glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
+ f->glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
+ f->glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+ f->glEnable(GL_BLEND); // Enable Blending
+ f->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
updateAllRenderers();
@@ -231,6 +229,7 @@ void BioStruct3DGLWidget::resizeGL(int width, int height) {
}
void BioStruct3DGLWidget::paintGL() {
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
if (!isVisible()) {
return;
}
@@ -239,10 +238,10 @@ void BioStruct3DGLWidget::paintGL() {
// Clear buffers, setup modelview matrix
// Scene render unable to do this since it used by anaglyph renderer
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
+ f->glMatrixMode(GL_MODELVIEW);
+ f->glLoadIdentity();
gluLookAt(0.0, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
@@ -261,53 +260,48 @@ void BioStruct3DGLWidget::paintGL() {
}
void BioStruct3DGLWidget::draw() {
- glEnable(GL_DEPTH_TEST);
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ f->glEnable(GL_DEPTH_TEST);
+ f->glEnable(GL_LIGHTING);
+ f->glEnable(GL_LIGHT0);
+
+ f->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Vector3D rotCenter = getSceneCenter();
- glTranslatef(glFrame->getCameraPosition().x, glFrame->getCameraPosition().y, 0);
+ f->glTranslatef(glFrame->getCameraPosition().x, glFrame->getCameraPosition().y, 0);
- glMultMatrixf(glFrame->getRotationMatrix());
- glTranslatef(-rotCenter.x ,-rotCenter.y, -rotCenter.z);
+ f->glMultMatrixf(glFrame->getRotationMatrix());
+ f->glTranslatef(-rotCenter.x ,-rotCenter.y, -rotCenter.z);
foreach (const BioStruct3DRendererContext &ctx, contexts) {
- glPushMatrix();
-
-#if defined(GL_VERSION_1_3) && (QT_VERSION < 0x050000)
- // glMultTransposeMatrixf is deprecated since Qt 5
- glMultTransposeMatrixf(ctx.biostruct->getTransform().data());
-#else
- // on OpenGL versions below 1.3 glMultTransposeMatrix not suported
- // see http://www.opengl.org/resources/faq/technical/extensions.htm
+ f->glPushMatrix();
+
Matrix44 colmt = ctx.biostruct->getTransform();
colmt.transpose();
- glMultMatrixf(colmt.data());
-#endif
+ f->glMultMatrixf(colmt.data());
ctx.renderer->drawBioStruct3D();
- glPopMatrix();
+ f->glPopMatrix();
}
if(!molSurface.isNull()) {
- glEnable(GL_CULL_FACE);
+ f->glEnable(GL_CULL_FACE);
- glCullFace(GL_FRONT);
+ f->glCullFace(GL_FRONT);
surfaceRenderer->drawSurface(*molSurface);
- glCullFace(GL_BACK);
+ f->glCullFace(GL_BACK);
surfaceRenderer->drawSurface(*molSurface);
- glDisable(GL_CULL_FACE);
+ f->glDisable(GL_CULL_FACE);
CHECK_GL_ERROR;
}
- glDisable(GL_LIGHTING);
- glDisable(GL_LIGHT0);
- glDisable(GL_DEPTH_TEST);
+ f->glDisable(GL_LIGHTING);
+ f->glDisable(GL_LIGHT0);
+ f->glDisable(GL_DEPTH_TEST);
}
Vector3D BioStruct3DGLWidget::getTrackballMapping(int x, int y)
@@ -431,7 +425,7 @@ void BioStruct3DGLWidget::setState( const QVariantMap& state )
}
resizeGL(width(), height());
- updateGL();
+ update();
}
void BioStruct3DGLWidget::setupColorScheme(const QString &name) {
@@ -480,8 +474,9 @@ void BioStruct3DGLWidget::updateAllRenderers() {
void BioStruct3DGLWidget::setBackgroundColor(QColor backgroundColor)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
this->backgroundColor=backgroundColor;
- qglClearColor(backgroundColor);
+ f->glClearColor(backgroundColor.redF(), backgroundColor.greenF(), backgroundColor.blueF(), backgroundColor.alphaF());
}
void BioStruct3DGLWidget::zoom( float delta )
@@ -569,12 +564,13 @@ void BioStruct3DGLWidget::sl_selectModels() {
ctx.renderer->setShownModelsIndexes(dlg->getSelectedModelsIndexes());
contexts.first().renderer->updateShownModels();
- updateGL();
+ update();
}
}
void BioStruct3DGLWidget::writeImage2DToFile( int format, int options, int nbcol, const char *fileName )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
FILE *fp = NULL;
const char* FOPEN_ARGS = "wb";
const QByteArray title(fileName);
@@ -589,7 +585,7 @@ void BioStruct3DGLWidget::writeImage2DToFile( int format, int options, int nbcol
return;
}
- glGetIntegerv(GL_VIEWPORT,viewport);
+ f->glGetIntegerv(GL_VIEWPORT,viewport);
if (format == GL2PS_EPS) {
// hack -> make widget aspect ratio 1:1
@@ -903,7 +899,7 @@ void BioStruct3DGLWidget::sl_acitvateSpin()
animationTimer->stop();
}
- updateGL();
+ update();
}
@@ -920,7 +916,7 @@ void BioStruct3DGLWidget::sl_updateAnnimation()
frame->rotateCamera(rotAxis, spinAngle);
frame->updateGL();
}
- updateGL();
+ update();
}
void BioStruct3DGLWidget::sl_selectGLRenderer(QAction* action)
@@ -971,7 +967,7 @@ void BioStruct3DGLWidget::sl_settings()
this->makeCurrent();
setBackgroundColor(backgroundColor);
- updateGL();
+ update();
}
else
{
@@ -1003,7 +999,7 @@ void BioStruct3DGLWidget::sl_hideSurface()
molSurface.reset();
makeCurrent();
- updateGL();
+ update();
}
void BioStruct3DGLWidget::sl_selectSurfaceRenderer(QAction* action)
@@ -1012,7 +1008,7 @@ void BioStruct3DGLWidget::sl_selectSurfaceRenderer(QAction* action)
surfaceRenderer.reset(MolecularSurfaceRendererRegistry::createMSRenderer(msRendererName));
makeCurrent();
- updateGL();
+ update();
}
void BioStruct3DGLWidget::sl_onTaskFinished( Task* task )
@@ -1024,7 +1020,7 @@ void BioStruct3DGLWidget::sl_onTaskFinished( Task* task )
molSurface.reset(surfaceCalcTask->getCalculatedSurface());
makeCurrent();
- updateGL();
+ update();
}
/** Convert modelId's list to modelIndexes list */
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
index 429be39..3a9fbf5 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,31 +22,23 @@
#ifndef _U2_OPENGL_WIDGET_H_
#define _U2_OPENGL_WIDGET_H_
-#include "BioStruct3DGLRender.h"
-#include "BioStruct3DColorScheme.h"
+#include <QAction>
+#include <QActionGroup>
+#include <QColor>
+#include <QMenu>
+#include <QOpenGLWidget>
+#include <QSharedPointer>
+#include <QTimer>
+
#include "AnaglyphRenderer.h"
+#include "BioStruct3DColorScheme.h"
+#include "BioStruct3DGLRender.h"
#include "MolecularSurfaceRenderer.h"
-#include <U2Core/Vector3D.h>
-#include <U2Core/BioStruct3DObject.h>
-
#include <U2Algorithm/MolecularSurface.h>
-#include <QtCore/QTimer>
-#include <QtCore/QSharedPointer>
-
-#if (QT_VERSION < 0x050000) //Qt 5
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
-#include <QtGui/QActionGroup>
-#else
-#include <QtWidgets/QAction>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QActionGroup>
-#endif
-#include <QtGui/QColor>
-
-#include <QtOpenGL/QGLWidget>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/Vector3D.h>
namespace U2 {
@@ -95,7 +87,7 @@ public:
*
* Also it includes actions for visualization control.
*/
-class BioStruct3DGLWidget : public QGLWidget
+class BioStruct3DGLWidget : public QOpenGLWidget
{
Q_OBJECT
static int widgetCount;
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
index 6dc0381..ea5c39b 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
index b2d89d1..2c73c5c 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
index 31e894b..9b683ce 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
index a92718f..068e784 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
index 1b9ff4d..90864c3 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
index eb2bbeb..9354891 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/GLFrameManager.cpp b/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
index 82d598c..3ffa0d0 100644
--- a/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
+++ b/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,6 +19,9 @@
* MA 02110-1301, USA.
*/
+#include <QOpenGLFunctions_2_0>
+#include <QOpenGLWidget>
+
#include <U2Core/Vector3D.h>
#include "GLFrameManager.h"
@@ -34,7 +37,7 @@ const GLfloat GLFrame::DEFAULT_ZOOM = 45.0f;
///////////////////////////////////////////////////////////////////////////////////////////
/// GLFrame
-GLFrame::GLFrame(QGLWidget* widget)
+GLFrame::GLFrame(QOpenGLWidget* widget)
: glWidget(widget), rotMatrix(),
cameraClipNear(0), cameraClipFar(0),
zoomFactor(DEFAULT_ZOOM), cameraPosition(0,0,0)
@@ -89,11 +92,12 @@ void GLFrame::setCameraClip(float clipNear, float clipFar) {
void GLFrame::rotateCamera(const Vector3D& rotAxis, float rotAngle )
{
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z );
- glMultMatrixf(rotMatrix.data());
- glGetFloatv( GL_MODELVIEW_MATRIX, rotMatrix.data());
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->glMatrixMode(GL_MODELVIEW);
+ f->glLoadIdentity();
+ f->glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z );
+ f->glMultMatrixf(rotMatrix.data());
+ f->glGetFloatv( GL_MODELVIEW_MATRIX, rotMatrix.data());
}
#define ZOOM_FACTOR_ID "ZOOM_FACTOR"
@@ -125,9 +129,10 @@ void GLFrame::writeStateToMap( QVariantMap& state )
void GLFrame::updateViewPort( int width, int height )
{
- glViewport(0, 0, width, height);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->glViewport(0, 0, width, height);
+ f->glMatrixMode(GL_PROJECTION);
+ f->glLoadIdentity();
// Set view settings
GLfloat aspect = GLfloat(width) / height;
gluPerspective(zoomFactor, aspect, cameraClipNear, cameraClipFar);
@@ -148,7 +153,7 @@ void GLFrameManager::addGLFrame( GLFrame* glFrame)
widgetFrameMap.insert(glFrame->getGLWidget(), glFrame);
}
-GLFrame* GLFrameManager::getGLWidgetFrame( QGLWidget* widget )
+GLFrame* GLFrameManager::getGLWidgetFrame(QOpenGLWidget *widget )
{
if (widgetFrameMap.contains(widget)) {
return widgetFrameMap.value(widget);
@@ -163,7 +168,7 @@ QList<GLFrame*> GLFrameManager::getGLFrames()
return widgetFrameMap.values();
}
-void GLFrameManager::setSyncLock( bool lockOn, QGLWidget* syncWidget )
+void GLFrameManager::setSyncLock(bool lockOn, QOpenGLWidget *syncWidget )
{
syncLock = lockOn;
if (lockOn) {
@@ -181,7 +186,7 @@ void GLFrameManager::setSyncLock( bool lockOn, QGLWidget* syncWidget )
}
}
-void GLFrameManager::removeGLWidgetFrame( QGLWidget* widget )
+void GLFrameManager::removeGLWidgetFrame( QOpenGLWidget* widget )
{
Q_ASSERT(widgetFrameMap.contains(widget));
widgetFrameMap.remove(widget);
diff --git a/src/plugins/biostruct3d_view/src/GLFrameManager.h b/src/plugins/biostruct3d_view/src/GLFrameManager.h
index 242993f..f7aca6e 100644
--- a/src/plugins/biostruct3d_view/src/GLFrameManager.h
+++ b/src/plugins/biostruct3d_view/src/GLFrameManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -24,9 +24,10 @@
#include <U2Core/Matrix44.h>
-#include <QtOpenGL/QGLWidget>
#include <QtCore/QVariantList>
+class QOpenGLWidget;
+
namespace U2 {
class Vector3D;
@@ -38,15 +39,15 @@ class GLFrame {
static const GLfloat DEFAULT_ZOOM;
//static const Vector3D DEFAULT_CAMERA;
public:
- GLFrame(QGLWidget* widget);
+ GLFrame(QOpenGLWidget* widget);
void setState(const QVariantMap& state);
void writeStateToMap(QVariantMap& states);
- QGLWidget* getGLWidget() { return glWidget; }
+ QOpenGLWidget* getGLWidget() { return glWidget; }
void makeCurrent() { glWidget->makeCurrent(); }
void updateViewPort(int width, int height);
void updateViewPort();
- void updateGL() { glWidget->updateGL(); }
+ void updateGL() { glWidget->update(); }
GLfloat getZoomFactor() const { return zoomFactor; }
float* getRotationMatrix() { return rotMatrix.data(); }
void rotateCamera(const Vector3D& rotAxis, float rotAngle);
@@ -61,7 +62,7 @@ public:
void performShift(float deltaX, float deltaY);
private:
- QGLWidget* glWidget;
+ QOpenGLWidget* glWidget;
Matrix44 rotMatrix;
float cameraClipNear, cameraClipFar;
@@ -70,17 +71,17 @@ private:
};
class GLFrameManager {
- QMap<QGLWidget*, GLFrame*> widgetFrameMap;
+ QMap<QOpenGLWidget*, GLFrame*> widgetFrameMap;
bool syncLock;
public:
GLFrameManager() : syncLock(false) {}
~GLFrameManager();
bool getSyncLock() const { return syncLock; }
- void setSyncLock(bool lockOn, QGLWidget* syncWidget);
+ void setSyncLock(bool lockOn, QOpenGLWidget* syncWidget);
void addGLFrame(GLFrame* frame);
- GLFrame* getGLWidgetFrame(QGLWidget* widget);
- void removeGLWidgetFrame(QGLWidget* widget);
+ GLFrame* getGLWidgetFrame(QOpenGLWidget* widget);
+ void removeGLWidgetFrame(QOpenGLWidget *widget);
void clear();
QList<GLFrame*> getGLFrames();
QList<GLFrame*> getActiveGLFrameList(GLFrame* currentFrame, bool syncModeOn);
diff --git a/src/plugins/biostruct3d_view/src/GraphicUtils.cpp b/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
index 9b0b773..e6a8a04 100644
--- a/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
+++ b/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,7 +19,6 @@
* MA 02110-1301, USA.
*/
-#include <QtOpenGL>
#include <U2Algorithm/GeomUtils.h>
#include <math.h>
#include "GraphicUtils.h"
@@ -91,6 +90,7 @@ bool Color4f::operator== (const Color4f &a) const
void glDrawCylinder(GLUquadric* pObj, const Vector3D& p1, const Vector3D& p2, double thickness, float renderDetailLevel)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
int numSlices = (8 * renderDetailLevel);
int numStacks = 1;
static Vector3D zAxis(0.0, 0.0, 1.0);
@@ -100,11 +100,11 @@ void glDrawCylinder(GLUquadric* pObj, const Vector3D& p1, const Vector3D& p2, do
float rotAngle = Rad2Deg* acos( vec.z / length );
Vector3D rotAxis = vector_cross(zAxis, vec);
- glPushMatrix();
- glTranslatef(p1.x, p1.y, p1.z);
- glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ f->glPushMatrix();
+ f->glTranslatef(p1.x, p1.y, p1.z);
+ f->glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
gluCylinder(pObj, thickness, thickness, length, numSlices, numStacks);
- glPopMatrix();
+ f->glPopMatrix();
}
/* class Helix3D : public Object3D */
@@ -123,30 +123,31 @@ Helix3D::Helix3D(const Color4f& cl, const Vector3D& c, const Vector3D& n, float
void Helix3D::draw(float renderDetailLevel)
{
- glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ f->glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
int numSlices = 10 * renderDetailLevel;
int numStacks = 1;
static float smallLength = 1.2f;
radius=1.0f;
- glPushMatrix();
- glTranslatef(cterm.x, cterm.y, cterm.z);
- glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
- glPushMatrix();
- glScalef(1,1,-1);
+ f->glPushMatrix();
+ f->glTranslatef(cterm.x, cterm.y, cterm.z);
+ f->glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ f->glPushMatrix();
+ f->glScalef(1,1,-1);
gluDisk(pObj, 0, radius, numSlices, numSlices);
- glPopMatrix();
+ f->glPopMatrix();
gluCylinder(pObj, radius, radius, length - smallLength, numSlices, numStacks);
- glTranslatef(0, 0, length - smallLength);
- glPushMatrix();
- glScalef(1,1,-1);
+ f->glTranslatef(0, 0, length - smallLength);
+ f->glPushMatrix();
+ f->glScalef(1,1,-1);
gluDisk(pObj, 0, radius*1.2f, numSlices, numSlices);
- glPopMatrix();
+ f->glPopMatrix();
gluCylinder(pObj, radius*1.2f, radius*0.4f, smallLength, numSlices, numStacks);
- glTranslatef(0, 0, smallLength);
+ f->glTranslatef(0, 0, smallLength);
gluDisk(pObj, 0, radius*0.4f, numSlices, numStacks);
- glPopMatrix();
+ f->glPopMatrix();
}
Helix3D::~Helix3D()
@@ -169,18 +170,19 @@ Strand3D::Strand3D( const Color4f& cl, const Vector3D& c, const Vector3D& n, con
void Strand3D::draw(float renderDetailLevel)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
Q_UNUSED(renderDetailLevel);
float width = 1.5f;
float height = 0.4f;
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
- glPushMatrix();
- glTranslatef(cterm.x, cterm.y, cterm.z);
- glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ f->glPushMatrix();
+ f->glTranslatef(cterm.x, cterm.y, cterm.z);
+ f->glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
glCreateArrowPrimitive(width, height, length);
- glPopMatrix();
+ f->glPopMatrix();
}
@@ -195,6 +197,7 @@ void glDrawHalfWorm(const Vector3D& p0, const Vector3D& p1,
double radius, bool cap1, bool cap2,
double tension, float renderDetailLevel)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
int i, j, k, m, offset=0;
Vector3D R1, R2, Qt, p, dQt, H, V;
double len, MG[4][3], T[4], t, prevlen=0.0, cosj, sinj;
@@ -352,42 +355,42 @@ void glDrawHalfWorm(const Vector3D& p0, const Vector3D& p1,
/* create triangles from points along this and previous circle */
if (i > 0) {
- glBegin(GL_TRIANGLE_STRIP);
+ f->glBegin(GL_TRIANGLE_STRIP);
for (j = 0; j < wormSides; ++j) {
k = j + offset;
if (k >= wormSides) k -= wormSides;
- glNormal3d(Nx[k], Ny[k], Nz[k]);
- glVertex3d(Cx[k], Cy[k], Cz[k]);
- glNormal3d(pNx[j], pNy[j], pNz[j]);
- glVertex3d(pCx[j], pCy[j], pCz[j]);
+ f->glNormal3d(Nx[k], Ny[k], Nz[k]);
+ f->glVertex3d(Cx[k], Cy[k], Cz[k]);
+ f->glNormal3d(pNx[j], pNy[j], pNz[j]);
+ f->glVertex3d(pCx[j], pCy[j], pCz[j]);
}
- glNormal3d(Nx[offset], Ny[offset], Nz[offset]);
- glVertex3d(Cx[offset], Cy[offset], Cz[offset]);
- glNormal3d(pNx[0], pNy[0], pNz[0]);
- glVertex3d(pCx[0], pCy[0], pCz[0]);
- glEnd();
+ f->glNormal3d(Nx[offset], Ny[offset], Nz[offset]);
+ f->glVertex3d(Cx[offset], Cy[offset], Cz[offset]);
+ f->glNormal3d(pNx[0], pNy[0], pNz[0]);
+ f->glVertex3d(pCx[0], pCy[0], pCz[0]);
+ f->glEnd();
}
/* put caps on the end */
if (cap1 && i == 0) {
dQt.normalize();
- glBegin(GL_POLYGON);
- glNormal3d(-dQt.x, -dQt.y, -dQt.z);
+ f->glBegin(GL_POLYGON);
+ f->glNormal3d(-dQt.x, -dQt.y, -dQt.z);
for (j = wormSides - 1; j >= 0; --j) {
- glVertex3d(Cx[j], Cy[j], Cz[j]);
+ f->glVertex3d(Cx[j], Cy[j], Cz[j]);
}
- glEnd();
+ f->glEnd();
}
else if (cap2 && i == wormSegments) {
dQt.normalize();
- glBegin(GL_POLYGON);
- glNormal3d(dQt.x, dQt.y, dQt.z);
+ f->glBegin(GL_POLYGON);
+ f->glNormal3d(dQt.x, dQt.y, dQt.z);
for (j = 0; j < wormSides; ++j) {
k = j + offset;
if (k >= wormSides) k -= wormSides;
- glVertex3d(Cx[k], Cy[k], Cz[k]);
+ f->glVertex3d(Cx[k], Cy[k], Cz[k]);
}
- glEnd();
+ f->glEnd();
}
/* store this circle as previous for next round; instead of copying
@@ -413,11 +416,12 @@ void glDrawHalfBond( GLUquadric *pObj, const Vector3D& p1, const Vector3D&p2, do
void glDrawAtom( GLUquadric* pObj, const Vector3D& pos, double r, float renderDetailLevel)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
int numSlices = 10 * renderDetailLevel;
- glPushMatrix();
- glTranslatef(pos.x, pos.y, pos.z);
+ f->glPushMatrix();
+ f->glTranslatef(pos.x, pos.y, pos.z);
gluSphere(pObj, r, numSlices, numSlices);
- glPopMatrix();
+ f->glPopMatrix();
}
/*
@@ -487,6 +491,7 @@ Vector3D projectPointOnAxis( const Vector3D& point, const Vector3D& axisUnitVect
void glCreateArrowPrimitive( float width, float height, float length )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
float widthOffset = 1;
float heightOffset = 1;
@@ -516,77 +521,77 @@ void glCreateArrowPrimitive( float width, float height, float length )
static GLfloat n07[3] = { 0.7071f, 0, 0.7071f } ;
- glBegin(GL_QUADS);
+ f->glBegin(GL_QUADS);
// Draw arrow body as brick
- glNormal3fv(n02);
- glVertex3fv(b05);
- glVertex3fv(b06); //glNormal3fv(n02);
- glVertex3fv(b02); //glNormal3fv(n02);
- glVertex3fv(b01); //glNormal3fv(n02);
-
- glNormal3fv(n01);
- glVertex3fv(b04);
- glVertex3fv(b05); //glNormal3fv(n01);
- glVertex3fv(b01); //glNormal3fv(n01);
- glVertex3fv(b00); //glNormal3fv(n01);
-
- glNormal3fv(n03);
- glVertex3fv(b07);
- glVertex3fv(b04); //glNormal3fv(n03);
- glVertex3fv(b00); //glNormal3fv(n03);
- glVertex3fv(b03); //glNormal3fv(n03);
-
- glNormal3fv(n00);
- glVertex3fv(b06);
- glVertex3fv(b07); //glNormal3fv(n00);
- glVertex3fv(b03); //glNormal3fv(n00);
- glVertex3fv(b02); //glNormal3fv(n00);
-
- glNormal3fv(n05);
- glVertex3fv(b00);
- glVertex3fv(b01); //glNormal3fv(n05);
- glVertex3fv(b02); //glNormal3fv(n05);
- glVertex3fv(b03); //glNormal3fv(n05);
+ f->glNormal3fv(n02);
+ f->glVertex3fv(b05);
+ f->glVertex3fv(b06); //glNormal3fv(n02);
+ f->glVertex3fv(b02); //glNormal3fv(n02);
+ f->glVertex3fv(b01); //glNormal3fv(n02);
+
+ f->glNormal3fv(n01);
+ f->glVertex3fv(b04);
+ f->glVertex3fv(b05); //glNormal3fv(n01);
+ f->glVertex3fv(b01); //glNormal3fv(n01);
+ f->glVertex3fv(b00); //glNormal3fv(n01);
+
+ f->glNormal3fv(n03);
+ f->glVertex3fv(b07);
+ f->glVertex3fv(b04); //glNormal3fv(n03);
+ f->glVertex3fv(b00); //glNormal3fv(n03);
+ f->glVertex3fv(b03); //glNormal3fv(n03);
+
+ f->glNormal3fv(n00);
+ f->glVertex3fv(b06);
+ f->glVertex3fv(b07); //glNormal3fv(n00);
+ f->glVertex3fv(b03); //glNormal3fv(n00);
+ f->glVertex3fv(b02); //glNormal3fv(n00);
+
+ f->glNormal3fv(n05);
+ f->glVertex3fv(b00);
+ f->glVertex3fv(b01); //glNormal3fv(n05);
+ f->glVertex3fv(b02); //glNormal3fv(n05);
+ f->glVertex3fv(b03); //glNormal3fv(n05);
// Draw arrow head
- glNormal3fv(n05);
- glVertex3fv(b09);
- glVertex3fv(b08);
- glVertex3fv(b10);
- glVertex3fv(b11);
+ f->glNormal3fv(n05);
+ f->glVertex3fv(b09);
+ f->glVertex3fv(b08);
+ f->glVertex3fv(b10);
+ f->glVertex3fv(b11);
- glNormal3fv(n06);
- glVertex3fv(b08);
- glVertex3fv(b09);
- glVertex3fv(b13);
- glVertex3fv(b12);
+ f->glNormal3fv(n06);
+ f->glVertex3fv(b08);
+ f->glVertex3fv(b09);
+ f->glVertex3fv(b13);
+ f->glVertex3fv(b12);
- glNormal3fv(n07);
- glVertex3fv(b12);
- glVertex3fv(b13);
- glVertex3fv(b11);
- glVertex3fv(b10);
+ f->glNormal3fv(n07);
+ f->glVertex3fv(b12);
+ f->glVertex3fv(b13);
+ f->glVertex3fv(b11);
+ f->glVertex3fv(b10);
- glEnd();
+ f->glEnd();
- glBegin(GL_TRIANGLES);
+ f->glBegin(GL_TRIANGLES);
// Continue arrow head
- glNormal3fv(n02);
- glVertex3fv(b08);
- glVertex3fv(b12); //glNormal3fv(n02);
- glVertex3fv(b10); //glNormal3fv(n02);
+ f->glNormal3fv(n02);
+ f->glVertex3fv(b08);
+ f->glVertex3fv(b12); //glNormal3fv(n02);
+ f->glVertex3fv(b10); //glNormal3fv(n02);
- glNormal3fv(n03);
- glVertex3fv(b13);
- glVertex3fv(b09); //glNormal3fv(n03);
- glVertex3fv(b11); //glNormal3fv(n03);
+ f->glNormal3fv(n03);
+ f->glVertex3fv(b13);
+ f->glVertex3fv(b09); //glNormal3fv(n03);
+ f->glVertex3fv(b11); //glNormal3fv(n03);
- glEnd();
+ f->glEnd();
}
@@ -595,23 +600,24 @@ void accFrustum(GLdouble left, GLdouble right, GLdouble bottom,
GLdouble pixdy, GLdouble eyedx, GLdouble eyedy,
GLdouble focus)
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
GLdouble xwsize, ywsize;
GLdouble dx, dy;
GLint viewport[4];
- glGetIntegerv (GL_VIEWPORT, viewport);
+ f->glGetIntegerv (GL_VIEWPORT, viewport);
xwsize = right - left;
ywsize = top - bottom;
dx = -( pixdx*xwsize / (GLdouble) viewport[2] + eyedx * _near / focus );
dy = -(pixdy*ywsize/(GLdouble) viewport[3] + eyedy * _near/ focus);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glFrustum (left + dx, right + dx, bottom + dy, top + dy, _near, _far);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- glTranslatef (-eyedx, -eyedy, 0.0);
+ f->glMatrixMode(GL_PROJECTION);
+ f->glLoadIdentity();
+ f->glFrustum (left + dx, right + dx, bottom + dy, top + dy, _near, _far);
+ f->glMatrixMode(GL_MODELVIEW);
+ f->glLoadIdentity();
+ f->glTranslatef (-eyedx, -eyedy, 0.0);
}
void accPerspective(GLdouble fovy, GLdouble aspect,
diff --git a/src/plugins/biostruct3d_view/src/GraphicUtils.h b/src/plugins/biostruct3d_view/src/GraphicUtils.h
index 546343a..174890e 100644
--- a/src/plugins/biostruct3d_view/src/GraphicUtils.h
+++ b/src/plugins/biostruct3d_view/src/GraphicUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,9 +22,11 @@
#ifndef _U2_GRAPHIC_UTILS_H_
#define _U2_GRAPHIC_UTILS_H_
+#include <QOpenGLFunctions_2_0>
+
#include <U2Core/Vector3D.h>
#include <U2Core/Log.h>
-#include <QtOpenGL>
+
#if defined(Q_OS_MAC)
# include <OpenGL/glu.h>
#else
@@ -143,7 +145,8 @@ QPair<Vector3D,Vector3D> calcBestAxisThroughPoints(const QVector<Vector3D>& poin
#define CHECK_GL_ERROR do { checkGlError(__FILE__, __LINE__); } while (0);
inline void checkGlError(const char *file, int line) {
- GLenum error = glGetError();
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
+ GLenum error = f->glGetError();
if (error != GL_NO_ERROR) {
QString where = QString("%1:%2: ").arg(file).arg(line);
QString msg = QString("OpenGL error (%1): %2").arg(error).arg((char*)gluErrorString(error));
diff --git a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
index 3f387e9..74c1cc5 100644
--- a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
#include "MolecularSurfaceRenderer.h"
#include <GraphicUtils.h>
#include <U2Algorithm/MolecularSurface.h>
-#include <QtOpenGL>
namespace U2 {
@@ -71,13 +70,14 @@ const QString ConvexMapRenderer::ID(QObject::tr("Convex Map"));
/* class DotsRenderer : public MolecularSurfaceRenderer */
void DotsRenderer::drawSurface( MolecularSurface& surface )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
GLboolean ligting = glIsEnabled(GL_LIGHTING);
- glDisable(GL_LIGHTING);
+ f->glDisable(GL_LIGHTING);
- glPointSize(1.0f);
- glColor3f(1.0f, 1.0f, 1.0f);
+ f->glPointSize(1.0f);
+ f->glColor3f(1.0f, 1.0f, 1.0f);
- glBegin(GL_POINTS);
+ f->glBegin(GL_POINTS);
foreach(const Face& face, surface.getFaces()) {
float vct[3][3] = {
{
@@ -96,15 +96,15 @@ void DotsRenderer::drawSurface( MolecularSurface& surface )
static_cast<float>(face.v[2].z),
},
};
- glVertex3fv(vct[0]);
- glVertex3fv(vct[1]);
- glVertex3fv(vct[2]);
+ f->glVertex3fv(vct[0]);
+ f->glVertex3fv(vct[1]);
+ f->glVertex3fv(vct[2]);
/*glVertex3f(face.v[0].x, face.v[0].y, face.v[0].z);
glVertex3f(face.v[1].x, face.v[1].y, face.v[1].z);
glVertex3f(face.v[2].x, face.v[2].y, face.v[2].z);*/
}
- glEnd();
+ f->glEnd();
if (ligting) glEnable(GL_LIGHTING);
CHECK_GL_ERROR;
@@ -114,19 +114,20 @@ void DotsRenderer::drawSurface( MolecularSurface& surface )
/* class ConvexMapRenderer : public MolecularSurfaceRenderer */
void ConvexMapRenderer::drawSurface( MolecularSurface& surface )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
static GLfloat wall_mat[] = {1.f, 1.f, 1.f, 0.3f};
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, wall_mat);
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, wall_mat);
- glBegin(GL_TRIANGLES);
+ f->glBegin(GL_TRIANGLES);
foreach(const Face& face, surface.getFaces()) {
- glNormal3f(face.n[0].x, face.n[0].y, face.n[0].z);
- glVertex3f(face.v[0].x, face.v[0].y, face.v[0].z);
- glNormal3f(face.n[1].x, face.n[1].y, face.n[1].z);
- glVertex3f(face.v[1].x, face.v[1].y, face.v[1].z);
- glNormal3f(face.n[2].x, face.n[2].y, face.n[2].z);
- glVertex3f(face.v[2].x, face.v[2].y, face.v[2].z);
+ f->glNormal3f(face.n[0].x, face.n[0].y, face.n[0].z);
+ f->glVertex3f(face.v[0].x, face.v[0].y, face.v[0].z);
+ f->glNormal3f(face.n[1].x, face.n[1].y, face.n[1].z);
+ f->glVertex3f(face.v[1].x, face.v[1].y, face.v[1].z);
+ f->glNormal3f(face.n[2].x, face.n[2].y, face.n[2].z);
+ f->glVertex3f(face.v[2].x, face.v[2].y, face.v[2].z);
}
- glEnd( );
+ f->glEnd( );
CHECK_GL_ERROR;
}
diff --git a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
index ab2945d..d5fbc0f 100644
--- a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
+++ b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp b/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
index 48e1787..368f155 100644
--- a/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ SelectModelsDialog::SelectModelsDialog(const QList<int> &_modelIds, const QList<
: QDialog(parent), Ui::SelectModelsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466048");
+ new HelpButton(this, buttonBox, "17467595");
buttonBox_1->button(QDialogButtonBox::Cancel)->setText(::U2::SelectModelsDialog::tr("All"));
buttonBox_1->button(QDialogButtonBox::No)->setText(::U2::SelectModelsDialog::tr("Invert"));
buttonBox->button(QDialogButtonBox::Ok)->setText(::U2::SelectModelsDialog::tr("OK"));
diff --git a/src/plugins/biostruct3d_view/src/SelectModelsDialog.h b/src/plugins/biostruct3d_view/src/SelectModelsDialog.h
index b8af13a..9e4483c 100644
--- a/src/plugins/biostruct3d_view/src/SelectModelsDialog.h
+++ b/src/plugins/biostruct3d_view/src/SelectModelsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/SettingsDialog.cpp b/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
index 4fb57a3..e0403b4 100644
--- a/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ BioStruct3DSettingsDialog::BioStruct3DSettingsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466045");
+ new HelpButton(this, buttonBox, "17467592");
glWidget = NULL;
initColorSchemes();
diff --git a/src/plugins/biostruct3d_view/src/SettingsDialog.h b/src/plugins/biostruct3d_view/src/SettingsDialog.h
index b639679..11a1096 100644
--- a/src/plugins/biostruct3d_view/src/SettingsDialog.h
+++ b/src/plugins/biostruct3d_view/src/SettingsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
index 2494002..0694578 100644
--- a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ StructuralAlignmentDialog::StructuralAlignmentDialog(const BioStruct3DObject *fi
: QDialog(parent), task(0)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466051");
+ new HelpButton(this, buttonBox, "17467598");
StructuralAlignmentAlgorithmRegistry *reg = AppContext::getStructuralAlignmentAlgorithmRegistry();
foreach (const QString &id, reg->getFactoriesIds()) {
diff --git a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h
index 6c64c95..5034e26 100644
--- a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h
+++ b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp b/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
index 5507af2..434b39a 100644
--- a/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,20 +19,18 @@
* MA 02110-1301, USA.
*/
-#include <QtOpenGL>
-
#include "GraphicUtils.h"
#include "BioStruct3DColorScheme.h"
#include "BioStruct3DGLWidget.h"
#include "TubeGLRenderer.h"
-
namespace U2 {
const QString TubeGLRenderer::ID(QObject::tr("Tubes"));
void TubeGLRenderer::drawTubes( const BioStruct3DColorScheme* colorScheme )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
GLUquadricObj *pObj; // Quadric Object
pObj = gluNewQuadric();
@@ -47,7 +45,7 @@ void TubeGLRenderer::drawTubes( const BioStruct3DColorScheme* colorScheme )
foreach(const SharedAtom atom, tubeAtoms) {
Color4f atomColor = colorScheme->getAtomColor(atom);
Vector3D pos = atom.constData()->coord3d;
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
glDrawAtom(pObj, pos, ribbonThickness, settings->detailLevel);
if (!firstPass) {
@@ -58,7 +56,7 @@ void TubeGLRenderer::drawTubes( const BioStruct3DColorScheme* colorScheme )
Vector3D bufPos = bufAtom.constData()->coord3d;
Color4f bufAtomColor = colorScheme->getAtomColor(bufAtom);
glDrawHalfBond(pObj, bufPos, pos, ribbonThickness, settings->detailLevel);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, bufAtomColor.getConstData());
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, bufAtomColor.getConstData());
glDrawHalfBond(pObj, pos, bufPos, ribbonThickness, settings->detailLevel);
}
}
diff --git a/src/plugins/biostruct3d_view/src/TubeGLRenderer.h b/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
index 232c93e..57d4f2c 100644
--- a/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
index ff5563c..03b6d97 100644
--- a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -19,7 +19,6 @@
* MA 02110-1301, USA.
*/
-#include <QtOpenGL>
#include <time.h>
#include <U2Core/BioStruct3D.h>
@@ -47,6 +46,7 @@ void VanDerWaalsGLRenderer::drawBioStruct3D( )
void VanDerWaalsGLRenderer::drawAtoms( const BioStruct3DColorScheme* colorScheme )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
static float tolerance = 0.45f;
int numSlices = 10 * settings->detailLevel;
GLUquadricObj *pObj = gluNewQuadric();
@@ -62,11 +62,11 @@ void VanDerWaalsGLRenderer::drawAtoms( const BioStruct3DColorScheme* colorScheme
float radius = AtomConstants::getAtomCovalentRadius(atom->atomicNumber);
Vector3D pos = atom->coord3d;
Color4f atomColor = colorScheme->getAtomColor(atom);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
- glPushMatrix();
- glTranslatef(pos.x, pos.y, pos.z);
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
+ f->glPushMatrix();
+ f->glTranslatef(pos.x, pos.y, pos.z);
gluSphere(pObj, radius + tolerance, numSlices, numSlices);
- glPopMatrix();
+ f->glPopMatrix();
}
}
}
diff --git a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
index f9eb1e1..1bd9192 100644
--- a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,11 +32,11 @@ protected:
public:
void drawBioStruct3D();
- virtual void create() {};
+ virtual void create() {}
- virtual void updateColorScheme() {};
- virtual void updateShownModels() {};
- virtual void updateSettings() {};
+ virtual void updateColorScheme() {}
+ virtual void updateShownModels() {}
+ virtual void updateSettings() {}
private:
void drawAtoms(const BioStruct3DColorScheme* s);
diff --git a/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
index 2f43cc7..1b3e978 100644
--- a/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -21,7 +21,6 @@
#include <U2Core/BioStruct3D.h>
#include <U2Core/U2SafePoints.h>
-#include <QtOpenGL>
#include "GraphicUtils.h"
#include "BioStruct3DColorScheme.h"
@@ -78,6 +77,7 @@ void WormsGLRenderer::create() {
void WormsGLRenderer::drawWorms( )
{
+ QOpenGLFunctions_2_0 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>();
GLUquadricObj *pObj; // Quadric Object
// Draw atoms as spheres
@@ -104,9 +104,9 @@ void WormsGLRenderer::drawWorms( )
continue;
}
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a1));
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a1));
glDrawHalfWorm(a0->coord3d, a1->coord3d, a2->coord3d, a3->coord3d, ribbonThickness, false, false, tension, settings->detailLevel);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a2));
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a2));
glDrawHalfWorm(a3->coord3d, a2->coord3d, a1->coord3d, a0->coord3d, ribbonThickness, false, false, tension, settings->detailLevel);
}
@@ -116,7 +116,7 @@ void WormsGLRenderer::drawWorms( )
const SharedAtom a1 = wormCoords.at(1);
const SharedAtom a2 = wormCoords.at(2);
Vector3D atomCoordFirst = model.openingAtom;
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a0));
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a0));
glDrawHalfWorm(atomCoordFirst, a0->coord3d, a1->coord3d, a2->coord3d, ribbonThickness, true, false, tension, settings->detailLevel);
glDrawHalfWorm(a2->coord3d, a1->coord3d, a0->coord3d, atomCoordFirst, ribbonThickness, false, false, tension, settings->detailLevel);
// Draw worm ending
@@ -124,7 +124,7 @@ void WormsGLRenderer::drawWorms( )
const SharedAtom aN2 = wormCoords.at(size - 2);
const SharedAtom aN3 = wormCoords.at(size - 3);
Vector3D atomCoordLast = model.closingAtom;
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(aN1));
+ f->glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(aN1));
glDrawHalfWorm(atomCoordLast, aN1->coord3d, aN2->coord3d, aN3->coord3d, ribbonThickness, true, false, tension, settings->detailLevel);
glDrawHalfWorm(aN3->coord3d, aN2->coord3d, aN1->coord3d, atomCoordLast, ribbonThickness, false, false, tension, settings->detailLevel);
}
diff --git a/src/plugins/biostruct3d_view/src/WormsGLRenderer.h b/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
index b27c6a9..8d60be2 100644
--- a/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp
new file mode 100644
index 0000000..3f2d367
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp
@@ -0,0 +1,256 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "AnaglyphRenderer.h"
+
+#include "BioStruct3DGLWidget.h"
+#include "GLFrameManager.h"
+#include "GraphicUtils.h"
+
+namespace U2 {
+
+static const QString EYES_SHIFT_NAME("EyesShift");
+static const QString LEFT_EYE_COLOR_NAME("LeftEyeColor");
+static const QString RIGHT_EYE_COLOR_NAME("RightEyeColor");
+
+QVariantMap AnaglyphSettings::toMap(QVariantMap &map) const {
+ map[EYES_SHIFT_NAME] = qVariantFromValue(eyesShift);
+ map[LEFT_EYE_COLOR_NAME] = qVariantFromValue(leftEyeColor);
+ map[RIGHT_EYE_COLOR_NAME] = qVariantFromValue(rightEyeColor);
+
+ return map;
+}
+
+AnaglyphSettings AnaglyphSettings::fromMap(const QVariantMap &map) {
+ float eyesShift = map[EYES_SHIFT_NAME].value<float>();
+ QColor leftEyeColor = map[LEFT_EYE_COLOR_NAME].value<QColor>();
+ QColor rightEyeColor= map[RIGHT_EYE_COLOR_NAME].value<QColor>();
+
+ return AnaglyphSettings(eyesShift, leftEyeColor, rightEyeColor);
+}
+
+void AnaglyphRenderer::init() {
+ createEmptyTextures();
+}
+
+void AnaglyphRenderer::resize(int _width, int _height) {
+ CHECK_GL_ERROR
+
+ width = _width, height = _height;
+
+ if ( !(width > 0 && height > 0) ) {
+ return;
+ }
+
+ createEmptyTextures();
+
+ CHECK_GL_ERROR
+}
+
+void AnaglyphRenderer::draw() {
+ CHECK_GL_ERROR
+
+ GLFrame *glFrame = renderer->getGLFrame();
+ float eyesShift = 5.0 * settings.eyesShift * glFrame->getCameraPosition().z / 200.0;
+
+ glMatrixMode(GL_MODELVIEW);
+
+ // Prepare anaglyph textures
+ glPushMatrix();
+ //glTranslatef(eyesShift, 0, 0);
+ glLoadIdentity();
+ gluLookAt(eyesShift, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
+
+ // at this moment buffer must be clean glClear omitted as a slow operation
+ //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ // isolate errors from main scene renderer
+ CHECK_GL_ERROR
+ renderer->draw();
+ glGetError();
+
+ glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureRight);
+ glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
+ glPopMatrix();
+
+ glPushMatrix();
+ //glTranslatef(-eyesShift, 0, 0);
+ glLoadIdentity();
+ gluLookAt(-eyesShift, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ // isolate errors from main scene renderer
+ CHECK_GL_ERROR
+ renderer->draw();
+ glGetError();
+
+ glBindTexture(GL_TEXTURE_2D, anaglyphRenderTextureLeft);
+ glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
+ glPopMatrix();
+
+ // Draw anaglyph textures in ortho projection
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+
+ setOrthoProjection();
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ drawTexturesAnaglyph();
+
+ glMatrixMode(GL_PROJECTION);
+ glPopMatrix();
+
+ glMatrixMode(GL_MODELVIEW);
+ glPopMatrix();
+
+ CHECK_GL_ERROR
+}
+
+void AnaglyphRenderer::setOrthoProjection() {
+ CHECK_GL_ERROR
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(0, 1, 1, 0, -1, 1);
+ glMatrixMode(GL_MODELVIEW);
+
+ CHECK_GL_ERROR
+}
+
+void AnaglyphRenderer::createEmptyTextures() {
+ CHECK_GL_ERROR
+
+ if(anaglyphRenderTextureLeft != 0) {
+ glDeleteTextures(1, &anaglyphRenderTextureLeft);
+ }
+ if(anaglyphRenderTextureRight != 0) {
+ glDeleteTextures(1, &anaglyphRenderTextureRight);
+ }
+ if(tempAnaglyphRenderTexture != 0) {
+ glDeleteTextures(1, &tempAnaglyphRenderTexture);
+ }
+
+ // TODO : check for NPOT sizes
+ GLuint texwidth = width, texheight = height;
+
+ GLuint txtnumbers[3] = {0};
+ glGenTextures(3, txtnumbers);
+
+ char *txtdata = new char[texwidth * texheight * 4];
+
+ for (GLuint *txtnumber = txtnumbers; txtnumber < txtnumbers + 3; ++txtnumber) {
+ glBindTexture(GL_TEXTURE_2D, *txtnumber);
+ glTexImage2D(GL_TEXTURE_2D, 0, 4, texwidth, texheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid*) txtdata);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+ }
+
+ delete[] txtdata;
+
+ anaglyphRenderTextureLeft = txtnumbers[0];
+ anaglyphRenderTextureRight = txtnumbers[1];
+ tempAnaglyphRenderTexture = txtnumbers[2];
+
+ CHECK_GL_ERROR
+}
+
+void AnaglyphRenderer::drawTexturesAnaglyph() {
+ CHECK_GL_ERROR
+
+ drawTexture(anaglyphRenderTextureLeft, settings.rightEyeColor.red(), settings.rightEyeColor.green(), settings.rightEyeColor.blue(), 0.5f, false); // colored left image
+
+ glBindTexture(GL_TEXTURE_2D, tempAnaglyphRenderTexture);
+ glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0); // Copy Our ViewPort To The Blur Texture (From 0,0 To 128,128... No Border)
+
+ drawTexture(anaglyphRenderTextureRight, settings.leftEyeColor.red(), settings.leftEyeColor.green(), settings.leftEyeColor.blue(), 0.5f, false); // colored right image
+ drawTexture(tempAnaglyphRenderTexture, 255, 255, 255, 1.0f, true);
+
+ CHECK_GL_ERROR
+}
+
+void AnaglyphRenderer::drawTexture(GLuint anaglyphRenderTexture, int red, int green, int blue, float alpha, bool alphaOnly)
+{
+ CHECK_GL_ERROR
+
+ glEnable(GL_TEXTURE_2D);
+
+ if (alphaOnly){
+ // the second image is this, it has needed alpha color
+ glBlendFunc(GL_DST_ALPHA, GL_DST_ALPHA);
+ }
+ else {
+ glBlendFunc(GL_ONE, GL_ONE);
+ }
+
+ glBindTexture(GL_TEXTURE_2D, anaglyphRenderTexture);
+
+ glColor4ub(red, green, blue, (GLubyte) (alpha * 255.0));
+ glBegin(GL_QUADS);
+ glTexCoord2f(0, 1);
+ glVertex2f(0,0);
+
+ glTexCoord2f(0, 0);
+ glVertex2f(0, 1);
+
+ glTexCoord2f(1, 0);
+ glVertex2f(1, 1);
+
+ glTexCoord2f(1, 1);
+ glVertex2f(1, 0);
+ glEnd();
+
+ // Unbind the blur texture
+ glBindTexture(GL_TEXTURE_2D, 0);
+ glDisable(GL_TEXTURE_2D);
+
+ CHECK_GL_ERROR
+}
+
+AnaglyphRenderer::AnaglyphRenderer(BioStruct3DGLWidget *_renderer, const AnaglyphSettings &_settings) :
+ renderer(_renderer),
+ settings(_settings),
+ width(1),
+ height(1),
+ anaglyphRenderTextureLeft(0),
+ anaglyphRenderTextureRight(0),
+ tempAnaglyphRenderTexture(0),
+ hasErrors(false)
+{
+
+}
+
+AnaglyphRenderer::~AnaglyphRenderer() {
+
+}
+
+bool AnaglyphRenderer::isAvailable() {
+ draw();
+ return !hasErrors;
+}
+
+} // namespace U2
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h
new file mode 100644
index 0000000..729dc28
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h
@@ -0,0 +1,112 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_ANAGLYPH_RENDERER_H_
+#define _U2_ANAGLYPH_RENDERER_H_
+
+#include <U2Core/Log.h>
+
+#include <QColor>
+#include <QtOpenGL>
+// include this for proper cross-platform including of glu.h
+#include "GraphicUtils.h"
+
+namespace U2 {
+
+class BioStruct3DGLWidget;
+
+enum AnaglyphStatus {NOT_AVAILABLE = -1, DISABLED = 0, ENABLED = 1};
+
+class AnaglyphSettings {
+public:
+ AnaglyphSettings(float _eyesShift, const QColor &_leftEyeColor, const QColor &_rightEyeColor)
+ : eyesShift(_eyesShift), leftEyeColor(_leftEyeColor), rightEyeColor(_rightEyeColor)
+ {}
+
+ float eyesShift;
+ QColor leftEyeColor, rightEyeColor;
+
+public:
+ static AnaglyphSettings defaultSettings() {
+ return AnaglyphSettings(1.6f, QColor(0, 255, 255), QColor(255, 0, 0));
+ }
+
+public:
+ QVariantMap toMap(QVariantMap &map) const;
+ static AnaglyphSettings fromMap(const QVariantMap &map);
+};
+
+
+/** Anaglyph effect renderer */
+class AnaglyphRenderer {
+public:
+ /** Construct anaglyph renderer over scene renderer */
+ AnaglyphRenderer(BioStruct3DGLWidget *_renderer, const AnaglyphSettings &_settings);
+ virtual ~AnaglyphRenderer();
+
+ /** Checks if possible to enable anaglyph. Performs test rendering */
+ virtual bool isAvailable();
+
+ virtual void init();
+ virtual void resize(int w, int h);
+ virtual void draw();
+
+ const AnaglyphSettings& getSettings() const { return settings; }
+ void setSettings(const AnaglyphSettings &_settings) { settings = _settings; }
+
+private:
+ /** Set up an ortho projection. For textures rendering */
+ void setOrthoProjection();
+
+ /** Creates empty textures sized width*height */
+ void createEmptyTextures();
+
+ void drawTexturesAnaglyph();
+ void drawTexture(GLuint anaglyphRenderTexture, int red, int green, int blue, float alpha, bool alphaOnly);
+
+private:
+ // this will redefine CHECK_GL_ERROR macro
+ inline void checkGlError(const char *file, int line);
+
+private:
+ BioStruct3DGLWidget *renderer;
+ AnaglyphSettings settings;
+ int width, height;
+
+private:
+ GLuint anaglyphRenderTextureLeft, anaglyphRenderTextureRight, tempAnaglyphRenderTexture;
+ bool hasErrors;
+};
+
+inline void AnaglyphRenderer::checkGlError(const char *file, int line) {
+ GLenum error = glGetError();
+ if (error != GL_NO_ERROR) {
+ QString where = QString("%1:%2: ").arg(file).arg(line);
+ QString msg = QString("OpenGL error (%1): %2").arg(error).arg((char*)gluErrorString(error));
+ uiLog.trace(where + msg);
+
+ hasErrors = true;
+ }
+}
+
+} // namespace U2
+
+#endif // #ifndef _U2_ANAGLYPH_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp
new file mode 100644
index 0000000..7343417
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp
@@ -0,0 +1,193 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QtOpenGL>
+#include <time.h>
+
+#include <U2Core/BioStruct3D.h>
+#include <U2Formats/PDBFormat.h>
+
+#include "GraphicUtils.h"
+#include "BioStruct3DGLWidget.h"
+#include "BioStruct3DColorScheme.h"
+#include "BallAndStickGLRenderer.h"
+
+#include <U2Core/Log.h>
+
+namespace U2 {
+
+
+const QString BallAndStickGLRenderer::ID(QObject::tr("Ball-and-Stick"));
+QList<GLuint> BallAndStickGLRenderer::dlIndexStorage;
+QMutex BallAndStickGLRenderer::mutex;
+
+#define MAX_OPEN_VIEWS_NUMBER 8086
+
+BallAndStickGLRenderer::BallAndStickGLRenderer(const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings)
+ : BioStruct3DGLRenderer(struc,s,shownModels,settings)
+{
+ {
+ QMutexLocker lock(&mutex);
+ if (dlIndexStorage.size() == 0) {
+ dl = glGenLists(MAX_OPEN_VIEWS_NUMBER);
+ for (GLuint idx = dl+1; idx <= dl + MAX_OPEN_VIEWS_NUMBER; ++idx) {
+ dlIndexStorage.push_back(idx);
+ }
+ } else {
+ dl = dlIndexStorage.takeFirst();
+ }
+
+ }
+
+ create();
+}
+
+BallAndStickGLRenderer::~BallAndStickGLRenderer() {
+ if (glIsList(dl)) {
+ glDeleteLists(dl, 1);
+ }
+
+ QMutexLocker lock(&mutex);
+ dlIndexStorage.push_back(dl);
+
+}
+
+void BallAndStickGLRenderer::create() {
+ createDisplayList();
+}
+
+void BallAndStickGLRenderer::drawBioStruct3D() {
+ glCallList(dl);
+ CHECK_GL_ERROR;
+}
+
+void BallAndStickGLRenderer::update() {
+ createDisplayList();
+}
+
+void BallAndStickGLRenderer::updateColorScheme() {
+ createDisplayList();
+}
+
+void BallAndStickGLRenderer::updateShownModels() {
+ createDisplayList();
+}
+
+void BallAndStickGLRenderer::updateSettings() {
+ createDisplayList();
+}
+
+static void drawAtomsBonds(const Color4f &viewAtomColor, float renderDetailLevel, const Molecule3DModel &model, const BioStruct3DColorScheme* colorScheme)
+{
+ GLUquadricObj *pObj = gluNewQuadric();
+ gluQuadricNormals(pObj, GLU_SMOOTH);
+
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, viewAtomColor.getConstData());
+
+ static float bondThickness = 0.15f;
+ float radius = 0.35f;
+ int numSlices = 8 * renderDetailLevel;
+
+ foreach(const SharedAtom atom, model.atoms) {
+ Color4f atomColor = colorScheme->getAtomColor(atom);
+ if (viewAtomColor==atomColor)
+ {
+ Vector3D pos = atom->coord3d;
+ //glPushMatrix();
+ glTranslatef(pos.x, pos.y, pos.z);
+ gluSphere(pObj, radius, numSlices, numSlices);
+ glTranslatef(-pos.x, -pos.y, -pos.z);
+ //glPopMatrix();
+ }
+ }
+
+ foreach (Bond bond, model.bonds) {
+ const SharedAtom a1 = bond.getAtom1();
+ const SharedAtom a2 = bond.getAtom2();
+
+ const Color4f &a1Color = colorScheme->getAtomColor(a1);
+ const Color4f &a2Color = colorScheme->getAtomColor(a2);
+
+ Vector3D middle = (a1->coord3d + a2->coord3d) / 2;
+
+ if (a1Color==viewAtomColor)
+ {
+ if (a1Color==a2Color)
+ {
+ //glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, a1Color);
+ glDrawCylinder(pObj, a1->coord3d, a2->coord3d, bondThickness, renderDetailLevel);
+ }
+ else
+ {
+ //glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, a1Color);
+ glDrawCylinder(pObj, a1->coord3d, middle, bondThickness, renderDetailLevel);
+ }
+ }
+ if (a2Color == viewAtomColor)
+ {
+ //glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, a2Color);
+ glDrawCylinder(pObj, middle, a2->coord3d, bondThickness, renderDetailLevel);
+ }
+ }
+
+ gluDeleteQuadric(pObj);
+}
+
+void BallAndStickGLRenderer::createDisplayList()
+{
+ if (glIsList(dl)) {
+ glDeleteLists(dl, 1);
+ }
+
+ float renderDetailLevel = settings->detailLevel;
+
+ QList<Color4f> colors;
+
+ glNewList(dl, GL_COMPILE);
+
+ foreach (const SharedMolecule mol, bioStruct.moleculeMap) {
+ foreach (int index, shownModels) {
+ const Molecule3DModel& model = mol->models.value(index);
+
+ colors.clear();
+
+ foreach(const SharedAtom atom, model.atoms) {
+ Color4f atomColor = colorScheme->getAtomColor(atom);
+
+ if (colors.contains(atomColor))
+ {
+ continue; // Atom and bonds with this color has been already viewed
+ }
+ else
+ {
+ drawAtomsBonds(atomColor, renderDetailLevel, model, colorScheme);
+ colors.push_back(atomColor);
+ }
+ }
+ }
+ }
+
+ glEndList();
+
+ CHECK_GL_ERROR;
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h
new file mode 100644
index 0000000..6453ac3
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h
@@ -0,0 +1,59 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_BALLANDSTICK_RENDERER_H_
+#define _U2_BIOSTRUCT3D_BALLANDSTICK_RENDERER_H_
+
+#include "BioStruct3DGLRender.h"
+#include <QtOpenGL>
+
+namespace U2 {
+
+class BallAndStickGLRenderer : public BioStruct3DGLRenderer {
+protected:
+ BallAndStickGLRenderer(const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings);
+
+public:
+ virtual ~BallAndStickGLRenderer();
+
+ void drawBioStruct3D();
+
+ virtual void create();
+
+ virtual void update();
+ virtual void updateColorScheme();
+ virtual void updateShownModels();
+ virtual void updateSettings();
+
+private:
+ void createDisplayList();
+
+private:
+ GLuint dl;
+ static QList<GLuint> dlIndexStorage;
+ static QMutex mutex;
+
+ RENDERER_FACTORY(BallAndStickGLRenderer)
+};
+
+} //namespace
+
+#endif // _U2_BIOSTRUCT3D_BALLANDSTICK_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp
new file mode 100644
index 0000000..ffcd187
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp
@@ -0,0 +1,313 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "BioStruct3DColorScheme.h"
+
+#include <U2Core/AppContext.h>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/AnnotationSettings.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/AnnotationTableObject.h>
+#include <U2Core/FeatureColors.h>
+#include <U2Core/U2SafePoints.h>
+#include <U2Core/GObjectRelationRoles.h>
+#include <U2Core/GObjectUtils.h>
+
+#include <QtCore/QObject>
+#include <QtAlgorithms>
+
+namespace U2 {
+
+/* class BioStruct3DColorSchemeRegistry */
+const QString BioStruct3DColorSchemeRegistry::defaultFactoryName() {
+ return SecStructColorScheme::schemeName;
+}
+
+const QList<QString> BioStruct3DColorSchemeRegistry::factoriesNames() {
+ return getInstance()->factories.keys();
+}
+
+const BioStruct3DColorSchemeFactory* BioStruct3DColorSchemeRegistry::getFactory(const QString &name) {
+ return getInstance()->factories.value(name, 0);
+}
+
+BioStruct3DColorScheme* BioStruct3DColorSchemeRegistry::createColorScheme(const QString &name, const BioStruct3DObject *biostruct) {
+ const BioStruct3DColorSchemeFactory *fact = getFactory(name);
+
+ if (fact) {
+ return fact->createInstance(biostruct);
+ }
+
+ return 0;
+}
+
+BioStruct3DColorSchemeRegistry::BioStruct3DColorSchemeRegistry() {
+ registerFactories();
+}
+
+BioStruct3DColorSchemeRegistry* BioStruct3DColorSchemeRegistry::getInstance() {
+ static BioStruct3DColorSchemeRegistry *reg = new BioStruct3DColorSchemeRegistry();
+ return reg;
+}
+
+#define REGISTER_FACTORY(c) factories.insert(c::schemeName, new c::Factory)
+void BioStruct3DColorSchemeRegistry::registerFactories() {
+ REGISTER_FACTORY(ChainsColorScheme);
+ REGISTER_FACTORY(SecStructColorScheme);
+ REGISTER_FACTORY(ChemicalElemColorScheme);
+ REGISTER_FACTORY(SimpleColorScheme);
+}
+
+
+const QString ChainsColorScheme::schemeName(QObject::tr("Molecular Chains"));
+const QString ChemicalElemColorScheme::schemeName(QObject::tr("Chemical Elements"));
+const QString SecStructColorScheme::schemeName(QObject::tr("Secondary Structure"));
+const QString SimpleColorScheme::schemeName(QObject::tr("Simple colors"));
+
+
+
+/*class BioStruct3DColorScheme */
+
+BioStruct3DColorScheme::BioStruct3DColorScheme(const BioStruct3DObject *biostruct)
+ : defaultAtomColor(0.25f, 0.25f, 0.25f), selectionColor(1.0f, 1.0f, 0),
+ selection(biostruct->getBioStruct3D()),
+ unselectedShading(0.0)
+{}
+
+Color4f BioStruct3DColorScheme::getAtomColor(const SharedAtom& atom) const {
+ Color4f c;
+
+ if (isInSelection(atom)) {
+ c = selectionColor;
+ }
+ else {
+ c = getSchemeAtomColor(atom);
+ if (!selection.isEmpty() && unselectedShading > 0.0) { // dim unselected
+ c[3] *= (1.0 - unselectedShading);
+ }
+ }
+
+ return c;
+}
+
+void BioStruct3DColorScheme::setSelectionColor(QColor color) {
+ this->selectionColor = color;
+}
+
+void BioStruct3DColorScheme::setUnselectedShadingLevel(float shading) {
+ assert(shading >= 0.0 && shading <= 1.0);
+ unselectedShading = shading;
+}
+
+void BioStruct3DColorScheme::updateSelectionRegion(int chainId, const QVector<U2Region>& added, const QVector<U2Region>& removed) {
+ selection.update(chainId, added, removed);
+}
+
+bool BioStruct3DColorScheme::isInSelection(const SharedAtom &atom) const {
+ return selection.inSelection(atom->chainIndex, atom->residueIndex.toInt());
+}
+
+Color4f BioStruct3DColorScheme::getSchemeAtomColor(const SharedAtom&) const {
+ return defaultAtomColor;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// ChemicalElemColorScheme
+
+Color4f ChemicalElemColorScheme::getSchemeAtomColor( const SharedAtom& a ) const
+{
+ Color4f color;
+ if (elementColorMap.contains(a->atomicNumber)) {
+ return elementColorMap.value(a->atomicNumber);
+ } else {
+ return defaultAtomColor;
+ }
+
+}
+
+ChemicalElemColorScheme::ChemicalElemColorScheme(const BioStruct3DObject *biostruct)
+ : BioStruct3DColorScheme(biostruct)
+{
+ //CPK colors
+
+ elementColorMap.insert(1, Color4f(1.0f, 1.0f, 1.0f));
+ elementColorMap.insert(6, Color4f(0.8f, 0.8f, 0.8f));
+ elementColorMap.insert(7, Color4f(0.7f, 0.7f, 1.0f));
+ elementColorMap.insert(8, Color4f(0.95f, 0.0f , 0.0f));
+ elementColorMap.insert(11, Color4f(0.0f, 0.0f , 1.0f));
+ elementColorMap.insert(12, Color4f(0.16f, 0.5f , 0.16f));
+ elementColorMap.insert(15, Color4f(1.0f, 0.63f , 0.0f));
+ elementColorMap.insert(16, Color4f(1.0f, 0.8f , 0.2f));
+ elementColorMap.insert(17, Color4f(0.0f, 1.0f , 0.0f));
+ elementColorMap.insert(20, Color4f(0.5f, 0.5f , 0.5f));
+ elementColorMap.insert(26, Color4f(1.0f, 0.63f , 0.0f));
+ elementColorMap.insert(30, Color4f(0.63f, 0.2f , 0.2f));
+ elementColorMap.insert(35, Color4f(0.63f, 0.2f , 0.2f));
+
+}
+
+
+/* class ChainsColorScheme : public BioStruct3DColorScheme */
+
+const QMap<int, QColor> ChainsColorScheme::getChainColors(const BioStruct3DObject *biostructObj) {
+ QMap<int, QColor> colorMap;
+
+ if (NULL != biostructObj->getDocument()) {
+ QList<GObject *> aObjs = GObjectUtils::selectRelationsFromParentDoc(biostructObj, GObjectTypes::ANNOTATION_TABLE, ObjectRole_AnnotationTable);
+ foreach (GObject* obj, aObjs ) {
+ AnnotationTableObject* ao = qobject_cast<AnnotationTableObject *>(obj);
+ SAFE_POINT(NULL != ao, "Invalid annotation table!", colorMap);
+
+ foreach (Annotation *a, ao->getAnnotationsByName(BioStruct3D::MoleculeAnnotationTag)) {
+ QString chainQualifier = a->findFirstQualifierValue(BioStruct3D::ChainIdQualifierName);
+ SAFE_POINT(chainQualifier.size() == 1, "Invalid chain id qualifier", colorMap);
+ const char chainId = chainQualifier.toLatin1().at(0);
+ const int index = biostructObj->getBioStruct3D().getIndexByChainId(chainId);
+ SAFE_POINT(index >= 0, QString("Invalid chain id: %1").arg(chainId), colorMap);
+ const QColor color = FeatureColors::genLightColor(QString("chain_%1").arg(index));
+ colorMap.insert(index, color);
+ }
+ }
+ }
+
+ return colorMap;
+}
+
+ChainsColorScheme::ChainsColorScheme(const BioStruct3DObject *biostruct)
+ : BioStruct3DColorScheme(biostruct)
+{
+ const QMap<int, QColor> chainColors = getChainColors(biostruct);
+ if (!chainColors.empty()) {
+ QMapIterator<int, QColor> i(chainColors);
+ while (i.hasNext()) {
+ i.next();
+ chainColorMap.insert(i.key(), Color4f(i.value()));
+ }
+ }
+}
+
+Color4f ChainsColorScheme::getSchemeAtomColor(const SharedAtom& atom) const
+{
+ Color4f color;
+ if (chainColorMap.contains(atom->chainIndex)) {
+ return chainColorMap.value(atom->chainIndex);
+ } else {
+ return defaultAtomColor;
+ }
+}
+
+/* class SecStructColorScheme : public BioStruct3DColorScheme */
+
+const QMap<QString, QColor> SecStructColorScheme::getSecStructAnnotationColors(const BioStruct3DObject *biostruct) {
+ QMap<QString, QColor> colors;
+ AnnotationSettingsRegistry* asr = AppContext::getAnnotationsSettingsRegistry();
+
+ Document *doc = biostruct->getDocument();
+ if (doc) {
+ QList<GObject *> targetAnnotations = GObjectUtils::selectRelationsFromParentDoc(biostruct, GObjectTypes::ANNOTATION_TABLE, ObjectRole_AnnotationTable);
+ foreach (GObject* obj, targetAnnotations) {
+ AnnotationTableObject *ao = qobject_cast<AnnotationTableObject *>(obj);
+ SAFE_POINT(NULL != ao, "Invalid annotation table!", colors);
+
+ foreach (Annotation *a, ao->getAnnotationsByName(BioStruct3D::SecStructAnnotationTag)) {
+ QString ssName = a->getQualifiers().first().value;
+ AnnotationSettings* as = asr->getAnnotationSettings(ssName);
+ colors.insert(ssName, as->color);
+ }
+ }
+ }
+
+ return colors;
+}
+
+SecStructColorScheme::SecStructColorScheme(const BioStruct3DObject *biostruct)
+ : BioStruct3DColorScheme(biostruct)
+{
+ defaultAtomColor = Color4f(0.5f,0.9f,0.9f);
+ const QMap<QString, QColor> secStrucColors = getSecStructAnnotationColors(biostruct);
+ if (!secStrucColors.isEmpty()) {
+ QMapIterator<QString, QColor> i(secStrucColors);
+ while (i.hasNext()) {
+ i.next();
+ secStrucColorMap.insert(i.key().toLatin1(), Color4f(i.value()));
+ }
+
+ foreach (const SharedSecondaryStructure& struc, biostruct->getBioStruct3D().secondaryStructures) {
+ for (int index = struc->startSequenceNumber; index <= struc->endSequenceNumber; ++index ) {
+ QByteArray type = BioStruct3D::getSecStructTypeName(struc->type).toLatin1();
+ Q_ASSERT( secStrucColorMap.contains(type));
+ Q_ASSERT( struc->chainIndex != 0);
+ molMap[struc->chainIndex].strucResidueTable.insert(index, type);
+ }
+ }
+
+ #ifdef _DEBUG
+ // Verify indices with biostruct3d
+ const BioStruct3D& bioStruc = biostruct->getBioStruct3D();
+ QMapIterator<int,MolStructs> iter(molMap);
+ while (iter.hasNext()) {
+ iter.next();
+ assert(bioStruc.moleculeMap.contains(iter.key()));
+ }
+ #endif
+ }
+}
+
+Color4f SecStructColorScheme::getSchemeAtomColor( const SharedAtom& atom ) const
+{
+ Color4f c = defaultAtomColor;
+ int residueIndex = atom->residueIndex.toInt();
+
+ if (molMap.contains(atom->chainIndex)) {
+ const QHash<int, QByteArray>& residueTable = molMap.value(atom->chainIndex).strucResidueTable;
+ if (residueTable.contains(residueIndex)) {
+ QByteArray type = residueTable.value(residueIndex);
+ c = secStrucColorMap.value(type);
+ }
+ }
+
+ return c;
+}
+
+/* class SimpleColorScheme : public BioStruct3DColorScheme */
+QVector<Color4f> SimpleColorScheme::colors;
+
+void SimpleColorScheme::createColors() {
+ if (colors.isEmpty()) {
+ // rainbow colors
+ colors.append( Color4f(QColor(0xff,0x00,0x00)) );
+ colors.append( Color4f(QColor(0xff,0x7f,0x00)) );
+ colors.append( Color4f(QColor(0xff,0xff,0x00)) );
+ colors.append( Color4f(QColor(0x00,0xff,0x00)) );
+ colors.append( Color4f(QColor(0x00,0xff,0xff)) );
+ colors.append( Color4f(QColor(0x00,0x00,0xff)) );
+ colors.append( Color4f(QColor(0x8b,0x00,0xff)) );
+ }
+}
+
+SimpleColorScheme::SimpleColorScheme(const BioStruct3DObject *biostruct) : BioStruct3DColorScheme(biostruct)
+{
+ createColors();
+ static int idx = 0;
+ defaultAtomColor = colors[(idx++) % colors.size()];
+}
+
+} // namespace U2
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h
new file mode 100644
index 0000000..b25052e
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h
@@ -0,0 +1,176 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_COLORSCHEME_H
+#define _U2_BIOSTRUCT3D_COLORSCHEME_H
+
+#include <U2Core/BioStruct3D.h>
+#include <QtGui/QColor>
+#include <QtCore/QMap>
+#include <QtCore/QHash>
+#include <QtCore/QPair>
+#include <QtCore/QLinkedList>
+
+#include "GraphicUtils.h"
+
+namespace U2 {
+
+class BioStruct3DObject;
+class BioStruct3DColorScheme;
+class BioStruct3DColorSchemeFactory;
+class LRegionsSelection;
+class U2Region;
+
+//! Singleton regisrtry for color scheme fabrics.
+class BioStruct3DColorSchemeRegistry {
+public:
+ //! @return Default colo scheme factory name.
+ static const QString defaultFactoryName();
+
+ //! @return List of all factories names.
+ static const QList<QString> factoriesNames();
+
+ //! @return Concreete factory by name.
+ static const BioStruct3DColorSchemeFactory* getFactory(const QString &name);
+
+ //! @return Constructed color scheme by factory name.
+ static BioStruct3DColorScheme* createColorScheme(const QString &name, const BioStruct3DObject *biostruct);
+
+private:
+ //! Hidden constructor. Called by getInstance()
+ BioStruct3DColorSchemeRegistry();
+
+ //! Returns singleton instance of registry.
+ static BioStruct3DColorSchemeRegistry* getInstance();
+
+ //! Registers all render factories.
+ void registerFactories();
+
+private:
+ QMap<QString, BioStruct3DColorSchemeFactory*> factories;
+}; // class BioStruct3DColorSchemeRegistry
+
+
+//! Abstract factory for BioStruct3DColorScheme
+class BioStruct3DColorSchemeFactory {
+public:
+ virtual BioStruct3DColorScheme* createInstance(const BioStruct3DObject *biostruct) const = 0;
+ //! Method creates factories
+};
+
+#define COLOR_SCHEME_FACTORY(c) \
+public: \
+ static const QString schemeName; \
+ class Factory : public BioStruct3DColorSchemeFactory { \
+ public: \
+ BioStruct3DColorScheme* createInstance(const BioStruct3DObject *biostructObj) const { return new c(biostructObj); } \
+ };
+
+//! Abstract BioStruct3DColorScheme
+/*!
+* Color scheme determines 3d structure coloring style. For example, we could use colors to mark chemical
+* elements or secondary structure.
+*/
+class BioStruct3DColorScheme {
+protected:
+ BioStruct3DColorScheme(const BioStruct3DObject *biostruct);
+
+public:
+ virtual ~BioStruct3DColorScheme() {};
+
+ Color4f getAtomColor(const SharedAtom& atom) const;
+
+ void updateSelectionRegion(int chainID, const QVector<U2Region>& added, const QVector<U2Region>& removed);
+ bool isInSelection(const SharedAtom& atom) const;
+
+ void setSelectionColor(QColor color);
+ void setUnselectedShadingLevel(float shading);
+
+protected:
+ virtual Color4f getSchemeAtomColor(const SharedAtom& atom) const;
+
+protected:
+ Color4f defaultAtomColor;
+ Color4f selectionColor;
+
+ BioStruct3DChainSelection selection;
+
+private:
+ float unselectedShading;
+}; // class BioStruct3DColorScheme
+
+
+class ChemicalElemColorScheme : public BioStruct3DColorScheme {
+ QHash<int, Color4f> elementColorMap;
+ ChemicalElemColorScheme(const BioStruct3DObject *biostruct);
+ virtual Color4f getSchemeAtomColor(const SharedAtom& atom) const;
+
+public:
+ COLOR_SCHEME_FACTORY(ChemicalElemColorScheme)
+}; // class ChemicalElemColorScheme
+
+
+class ChainsColorScheme : public BioStruct3DColorScheme {
+ QMap<int, Color4f> chainColorMap;
+ ChainsColorScheme(const BioStruct3DObject *biostruct);
+ virtual Color4f getSchemeAtomColor(const SharedAtom& atom) const;
+
+private:
+ //! @return Molecular chain colors for biostruct object.
+ static const QMap<int, QColor> getChainColors(const BioStruct3DObject *biostruct);
+
+public:
+ COLOR_SCHEME_FACTORY(ChainsColorScheme)
+}; // class ChainsColorScheme
+
+
+class SecStructColorScheme : public BioStruct3DColorScheme {
+ struct MolStructs {
+ QHash<int, QByteArray> strucResidueTable;
+ };
+ QMap<QByteArray, Color4f> secStrucColorMap;
+ QMap<int, MolStructs> molMap;
+ SecStructColorScheme(const BioStruct3DObject *biostruct);
+ virtual Color4f getSchemeAtomColor(const SharedAtom& atom) const;
+
+private:
+ //! @return Secondary structure annotation colors for biostruct object.
+ static const QMap<QString, QColor> getSecStructAnnotationColors(const BioStruct3DObject *biostruct);
+
+public:
+ COLOR_SCHEME_FACTORY(SecStructColorScheme)
+}; // class SecStructColorScheme
+
+/** One color scheme for debug purposes */
+class SimpleColorScheme : public BioStruct3DColorScheme {
+ SimpleColorScheme(const BioStruct3DObject *biostruct);
+
+private:
+ static QVector<Color4f> colors;
+ static void createColors();
+
+public:
+ COLOR_SCHEME_FACTORY(SimpleColorScheme)
+}; // class SimpleColorScheme
+
+} // namespace U2
+
+#endif //_U2_BIOSTRUCT3D_COLORSCHEME_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp
new file mode 100644
index 0000000..c83a6fc
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp
@@ -0,0 +1,76 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "BioStruct3DGLImageExportTask.h"
+#include "BioStruct3DGLWidget.h"
+#include "gl2ps/gl2ps.h"
+#include <U2Core/U2SafePoints.h>
+
+
+namespace U2 {
+
+void BioStruct3DImageExportToSVGTask::run() {
+ SAFE_POINT_EXT( settings.isSVGFormat(),
+ setError(WRONG_FORMAT_MESSAGE.arg(settings.format).arg("BioStruct3DImageExportToSVGTask")), );
+
+ int opt = GL2PS_NONE;
+ glWidget->writeImage2DToFile(GL2PS_SVG, opt, 2, qPrintable(settings.fileName));
+ //TODO: need check on error
+}
+
+void BioStruct3DImageExportToPDFTask::run() {
+ SAFE_POINT_EXT( settings.isPDFFormat(),
+ setError(WRONG_FORMAT_MESSAGE.arg(settings.format).arg("BioStruct3DImageExportToPDFTask")), );
+
+ int opt = GL2PS_NONE;
+
+ if (settings.format == "ps"){
+ glWidget->writeImage2DToFile(GL2PS_PS, opt, 2, qPrintable(settings.fileName));
+ return; //TODO: need check on error
+ } else if (settings.format == "pdf"){
+ glWidget->writeImage2DToFile(GL2PS_PDF, opt, 2, qPrintable(settings.fileName));
+ return; //TODO: need check on error
+ }
+ setError(EXPORT_FAIL_MESSAGE.arg(settings.fileName));
+}
+
+void BioStruct3DImageExportToBitmapTask::run() {
+ SAFE_POINT_EXT( settings.isBitmapFormat(),
+ setError(WRONG_FORMAT_MESSAGE.arg(settings.format).arg("BioStruct3DImageExportToBitmapTask")), );
+
+ glWidget->setImageRenderingMode(true);
+ QPixmap image = glWidget->renderPixmap().scaled( settings.imageSize, Qt::KeepAspectRatio);
+ glWidget->setImageRenderingMode(false);
+
+ CHECK_EXT( image.save(settings.fileName, qPrintable(settings.format), settings.imageQuality),
+ setError(EXPORT_FAIL_MESSAGE.arg(settings.fileName)), );
+}
+
+int BioStruct3DImageExportController::getImageWidth() const {
+ return glWidget->width();
+}
+
+int BioStruct3DImageExportController::getImageHeight() const {
+ return glWidget->height();
+}
+
+} // namespace
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h
new file mode 100644
index 0000000..142d123
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h
@@ -0,0 +1,90 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIO_STRUCT_3DGL_IMAGE_EXPORT_TASK_H_
+#define _U2_BIO_STRUCT_3DGL_IMAGE_EXPORT_TASK_H_
+
+#include <U2Gui/ImageExportTask.h>
+
+namespace U2 {
+
+class BioStruct3DGLWidget;
+
+class BioStruct3DImageExportTask : public ImageExportTask {
+public:
+ BioStruct3DImageExportTask(BioStruct3DGLWidget* widget, const ImageExportTaskSettings &settings)
+ : ImageExportTask(settings),
+ glWidget(widget) {}
+ virtual void run() = 0;
+protected:
+ BioStruct3DGLWidget* glWidget;
+};
+
+class BioStruct3DImageExportToSVGTask : public BioStruct3DImageExportTask {
+public:
+ BioStruct3DImageExportToSVGTask(BioStruct3DGLWidget* widget, const ImageExportTaskSettings &settings)
+ : BioStruct3DImageExportTask(widget, settings) {}
+ void run();
+};
+
+class BioStruct3DImageExportToPDFTask : public BioStruct3DImageExportTask {
+public:
+ BioStruct3DImageExportToPDFTask(BioStruct3DGLWidget* widget, const ImageExportTaskSettings &settings)
+ : BioStruct3DImageExportTask(widget, settings) {}
+ void run();
+};
+
+class BioStruct3DImageExportToBitmapTask : public BioStruct3DImageExportTask {
+public:
+ BioStruct3DImageExportToBitmapTask(BioStruct3DGLWidget* widget, const ImageExportTaskSettings &settings)
+ : BioStruct3DImageExportTask(widget, settings) {}
+ void run();
+};
+
+class BioStruct3DImageExportController : public ImageExportController {
+public:
+ BioStruct3DImageExportController(BioStruct3DGLWidget* widget)
+ : ImageExportController(ExportImageFormatPolicy_SupportAll),
+ glWidget(widget) {}
+
+ int getImageWidth() const;
+ int getImageHeight() const;
+
+protected:
+ void initSettingsWidget() {}
+
+ Task* getExportToSvgTask(const ImageExportTaskSettings &settings) const {
+ return new BioStruct3DImageExportToSVGTask(glWidget, settings);
+ }
+ Task* getExportToPdfTask(const ImageExportTaskSettings &settings) const {
+ return new BioStruct3DImageExportToPDFTask(glWidget, settings);
+ }
+ Task* getExportToBitmapTask(const ImageExportTaskSettings &settings) const {
+ return new BioStruct3DImageExportToBitmapTask(glWidget, settings);
+ }
+
+private:
+ BioStruct3DGLWidget* glWidget;
+};
+
+} // namespace
+
+#endif // _U2_BIO_STRUCT_3DGL_IMAGE_EXPORT_TASK_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp
new file mode 100644
index 0000000..9cc2197
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp
@@ -0,0 +1,102 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "BioStruct3DColorScheme.h"
+#include "BioStruct3DGLRender.h"
+#include "BallAndStickGLRenderer.h"
+#include "TubeGLRenderer.h"
+#include "VanDerWaalsGLRenderer.h"
+#include "WormsGLRenderer.h"
+
+namespace U2 {
+
+/* class BioStruct3DGLRendererRegistry */
+const QString BioStruct3DGLRendererRegistry::defaultFactoryName() {
+ return WormsGLRenderer::ID;
+}
+
+const QList<QString> BioStruct3DGLRendererRegistry::factoriesNames() {
+ return getInstance()->factories.keys();
+}
+
+const BioStruct3DGLRendererFactory* BioStruct3DGLRendererRegistry::getFactory(const QString &name) {
+ return getInstance()->factories.value(name, 0);
+}
+
+BioStruct3DGLRenderer* BioStruct3DGLRendererRegistry::createRenderer(const QString &name, const BioStruct3D &bs, const BioStruct3DColorScheme* s, const QList<int> &sm, const BioStruct3DRendererSettings *settings) {
+ const BioStruct3DGLRendererFactory *fact = getFactory(name);
+
+ if (fact) {
+ return fact->createInstance(bs,s,sm,settings);
+ }
+
+ return 0;
+}
+
+BioStruct3DGLRendererRegistry::BioStruct3DGLRendererRegistry() {
+ registerFactories();
+}
+
+BioStruct3DGLRendererRegistry* BioStruct3DGLRendererRegistry::getInstance() {
+ static BioStruct3DGLRendererRegistry *reg = new BioStruct3DGLRendererRegistry();
+ return reg;
+}
+
+bool BioStruct3DGLRendererRegistry::isAvailableFor(const QString &name, const BioStruct3D &biostruct) {
+ const BioStruct3DGLRendererFactory *fact = getFactory(name);
+ return fact->isAvailableFor(biostruct);
+}
+
+QList<QString> BioStruct3DGLRendererRegistry::getRenderersAvailableFor(const BioStruct3D &biostruct) {
+ BioStruct3DGLRendererRegistry *reg = getInstance();
+
+ QList<QString> ret;
+ foreach (const BioStruct3DGLRendererFactory *fact, reg->factories) {
+ if (fact->isAvailableFor(biostruct)) {
+ ret.append(fact->getName());
+ }
+ }
+
+ return ret;
+}
+
+
+#define REGISTER_FACTORY(c) factories.insert(c::ID, new c::Factory(c::ID))
+void BioStruct3DGLRendererRegistry::registerFactories() {
+ REGISTER_FACTORY(BallAndStickGLRenderer);
+ REGISTER_FACTORY(VanDerWaalsGLRenderer);
+ REGISTER_FACTORY(TubeGLRenderer);
+ REGISTER_FACTORY(WormsGLRenderer);
+}
+
+
+/* class BioStruct3DGLRenderer */
+BioStruct3DGLRenderer::BioStruct3DGLRenderer( const BioStruct3D& _bioStruct, const BioStruct3DColorScheme* _s, const QList<int> &_shownModels, const BioStruct3DRendererSettings *_settings)
+ : bioStruct(_bioStruct), colorScheme(_s), shownModels(_shownModels), settings(_settings)
+{}
+
+void BioStruct3DGLRenderer::setColorScheme( const BioStruct3DColorScheme* s )
+{
+ colorScheme = s;
+ updateColorScheme();
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h
new file mode 100644
index 0000000..a746b61
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h
@@ -0,0 +1,182 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_RENDERER_H_
+#define _U2_BIOSTRUCT3D_RENDERER_H_
+
+#include <QtCore/QString>
+#include <QtCore/QMap>
+
+namespace U2 {
+
+class BioStruct3D;
+class BioStruct3DGLRenderer;
+class BioStruct3DGLRendererFactory;
+class BioStruct3DColorScheme;
+class BioStruct3DRendererSettings;
+
+//! Singleton regisrtry for renderers fabrics.
+class BioStruct3DGLRendererRegistry {
+public:
+ //! @return Default renderer factory name.
+ static const QString defaultFactoryName();
+
+ //! @return List of all factories names.
+ static const QList<QString> factoriesNames();
+
+ //! @return Concreete factory by name.
+ static const BioStruct3DGLRendererFactory* getFactory(const QString &name);
+
+ //! @return Constructed renderer by factory name.
+ static BioStruct3DGLRenderer* createRenderer(const QString &name, const BioStruct3D&,
+ const BioStruct3DColorScheme*,
+ const QList<int>&,
+ const BioStruct3DRendererSettings*);
+
+ /** Check if biostruct can be drawn with renderer */
+ static bool isAvailableFor(const QString &name, const BioStruct3D &biostruct);
+
+ /** @returns List of renderer names available for biostruct */
+ static QList<QString> getRenderersAvailableFor(const BioStruct3D &biostruct);
+
+private:
+ //! Hidden constructor. Called by getInstance()
+ BioStruct3DGLRendererRegistry();
+
+ //! Returns singleton instance of registry.
+ static BioStruct3DGLRendererRegistry* getInstance();
+
+ //! Registers all render factories.
+ void registerFactories();
+
+private:
+ QMap<QString, BioStruct3DGLRendererFactory*> factories;
+}; // class BioStruct3DGLRendererRegistry
+
+
+/** BioStruct3DGLRenderer abstract factory */
+class BioStruct3DGLRendererFactory {
+public:
+ BioStruct3DGLRendererFactory(const QString &_name) : name(_name) {}
+
+ /** @returns Factory name */
+ const QString getName() const { return name; }
+
+ /** Check if biostruct can be drawn with renderer */
+ virtual bool isAvailableFor(const BioStruct3D &biostruct) const = 0;
+
+ /** @returns Contructed renderer */
+ virtual BioStruct3DGLRenderer* createInstance(const BioStruct3D&, const BioStruct3DColorScheme*, const
+ QList<int> &shownModels, const BioStruct3DRendererSettings*) const = 0;
+
+private:
+ QString name;
+
+};
+
+/** Macro helper for factories defining */
+#define RENDERER_FACTORY(c) \
+public: \
+ static const QString ID; \
+ \
+class Factory : public BioStruct3DGLRendererFactory { \
+public: \
+ Factory(const QString &name) : BioStruct3DGLRendererFactory(name) {} \
+ \
+ virtual BioStruct3DGLRenderer* createInstance(const BioStruct3D &biostruct, const BioStruct3DColorScheme *cscheme, \
+ const QList<int> &shownModels, const BioStruct3DRendererSettings *settings) const { \
+ return new c(biostruct, cscheme, shownModels, settings); \
+ } \
+ \
+ virtual bool isAvailableFor(const BioStruct3D &biostruct) const { \
+ return c::isAvailableFor(biostruct); \
+ } \
+};
+
+/** Settings common for all renderers */
+class BioStruct3DRendererSettings {
+public:
+ BioStruct3DRendererSettings(float _detailLevel)
+ : detailLevel(_detailLevel) {}
+
+ float detailLevel;
+};
+
+//! Abstract biological 3D structure OpenGL renderer
+class BioStruct3DGLRenderer {
+protected:
+ BioStruct3DGLRenderer(const BioStruct3D &biostruct, const BioStruct3DColorScheme *scheme, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings);
+
+public:
+ virtual ~BioStruct3DGLRenderer() {}
+
+ /** Create and initialize all stuff.
+ Can be called for full reinialization */
+ virtual void create() = 0;
+
+ //! Visualizes macromolecule.
+ virtual void drawBioStruct3D() = 0;
+
+ //! Used to completely update model, for ex to recreate display lists.
+ virtual void update() {}
+
+ //! Used to update current color scheme, whenever it is changed.
+ virtual void updateColorScheme() = 0;
+
+ //! Used to update shown models list, whenever it is changed.
+ virtual void updateShownModels() = 0;
+
+ /** Used for settings updating */
+ virtual void updateSettings() = 0;
+
+ //! Sets new color scheme.
+ void setColorScheme(const BioStruct3DColorScheme* s);
+
+ //! @returns current color scheme.
+ const BioStruct3DColorScheme *getColorScheme() const { return colorScheme; }
+
+ /** @returns shown models indexes list reference.
+ * indexes are just index numbers of models, NOT modelIds
+ */
+ const QList<int>& getShownModelsIndexes() const { return shownModels; }
+
+ /** Sets shown models models list. */
+ void setShownModelsIndexes(const QList<int> &_shownModels) { shownModels = _shownModels; }
+
+public:
+ /** Check if biostruct can be visualized by renderer */
+ static bool isAvailableFor(const BioStruct3D &) { return true; }
+
+protected:
+ const BioStruct3D& bioStruct;
+ const BioStruct3DColorScheme* colorScheme;
+
+protected:
+ QList<int> shownModels;
+
+protected:
+ const BioStruct3DRendererSettings* settings;
+};
+
+
+} //namespace
+
+#endif // _U2_BIOSTRUCT3D_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp
new file mode 100644
index 0000000..fd983fe
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp
@@ -0,0 +1,1120 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <time.h>
+
+#include <QColorDialog>
+#include <QImageWriter>
+#include <QMessageBox>
+#include <QMouseEvent>
+#include <QTime>
+#include <QtOpenGL>
+
+#include <U2Algorithm/MolecularSurfaceFactoryRegistry.h>
+#include <U2Algorithm/StructuralAlignmentAlgorithm.h>
+
+#include <U2Core/AnnotationSelection.h>
+#include <U2Core/AnnotationSettings.h>
+#include <U2Core/AnnotationTableObject.h>
+#include <U2Core/AppContext.h>
+#include <U2Core/AppContext.h>
+#include <U2Core/BioStruct3D.h>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/Counter.h>
+#include <U2Core/DNASequenceObject.h>
+#include <U2Core/DNASequenceSelection.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/GObjectRelationRoles.h>
+#include <U2Core/Log.h>
+#include <U2Core/ProjectModel.h>
+#include <U2Core/TaskSignalMapper.h>
+#include <U2Core/U2SafePoints.h>
+
+#include <U2Gui/ExportImageDialog.h>
+#include <U2Core/QObjectScopedPointer.h>
+
+#include <U2View/ADVSequenceObjectContext.h>
+#include <U2View/AnnotatedDNAView.h>
+
+#include "BioStruct3DColorScheme.h"
+#include "BioStruct3DGLImageExportTask.h"
+#include "BioStruct3DGLRender.h"
+#include "BioStruct3DGLWidget.h"
+#include "GLFrameManager.h"
+#include "SelectModelsDialog.h"
+#include "SettingsDialog.h"
+#include "StructuralAlignmentDialog.h"
+#include "gl2ps/gl2ps.h"
+
+// disable "unsafe functions" deprecation warnings on MS VS
+#ifdef Q_OS_WIN
+#pragma warning(disable : 4996)
+#endif
+
+namespace U2 {
+
+int BioStruct3DGLWidget::widgetCount = 0;
+
+static QColor DEFAULT_BACKGROUND_COLOR = Qt::black;
+static QColor DEFAULT_SELECTION_COLOR = Qt::yellow;
+
+static float DEFAULT_RENDER_DETAIL_LEVEL = 1.0;
+static int DEFAULT_SHADING_LEVEL = 50;
+
+const QString BioStruct3DGLWidget::BACKGROUND_COLOR_NAME("BackgroundColor");
+const QString BioStruct3DGLWidget::PRODUCT_NAME("Unipro Ugene");
+const QString BioStruct3DGLWidget::PLUGIN_NAME("BioStruct3D Viewer Plugin");
+const QString BioStruct3DGLWidget::COLOR_SCHEME_NAME("ColorScheme");
+const QString BioStruct3DGLWidget::RENDERER_NAME("GLRenderer");
+const QString BioStruct3DGLWidget::OBJECT_ID_NAME("OBJECT_ID");
+
+const QString BioStruct3DGLWidget::SELECTION_COLOR_NAME("SelectionColor");
+const QString BioStruct3DGLWidget::SHADING_LEVEL_NAME("Shading Unselected Regions Level");
+const QString BioStruct3DGLWidget::RENDER_DETAIL_LEVEL_NAME("RenderDetailLevel");
+const QString BioStruct3DGLWidget::ANAGLYPH_STATUS_NAME("AnaglyphStatus");
+
+BioStruct3DGLWidget::BioStruct3DGLWidget(BioStruct3DObject* obj, const AnnotatedDNAView *_dnaView, GLFrameManager* manager, QWidget *parent /* = 0*/)
+ : QGLWidget(parent),
+ dnaView(_dnaView), contexts(),
+ rendererSettings(DEFAULT_RENDER_DETAIL_LEVEL),
+ frameManager(manager), glFrame(new GLFrame(this)),
+ molSurface(0), surfaceRenderer(), surfaceCalcTask(0),
+ anaglyphStatus(DISABLED),
+ anaglyph(new AnaglyphRenderer(this, AnaglyphSettings::defaultSettings())),
+
+ defaultsSettings(), currentColorSchemeName(), currentGLRendererName(),
+ rotAngle(0), spinAngle(0), rotAxis(), lastPos(),
+ backgroundColor(DEFAULT_BACKGROUND_COLOR),
+ selectionColor(DEFAULT_SELECTION_COLOR), animationTimer(0),
+ unselectedShadingLevel(DEFAULT_SHADING_LEVEL), imageRenderingMode(false),
+
+ spinAction(0), settingsAction(0), closeAction(0), exportImageAction(0), selectModelsAction(0), alignWithAction(0),
+ resetAlignmentAction(0), colorSchemeActions(0), rendererActions(0), molSurfaceRenderActions(0),
+ molSurfaceTypeActions(0), selectColorSchemeMenu(0), selectRendererMenu(0), displayMenu(0)
+{
+ lightPosition[0] = lightPosition[1] = lightPosition[2] = lightPosition[3] = 0;
+ GCOUNTER( cvar, tvar, "BioStruct3DGLWidget" );
+
+ QString currentModelID = obj->getBioStruct3D().pdbId;
+ setObjectName(QString("%1-%2").arg(++widgetCount).arg(currentModelID));
+
+ setWindowIcon(GObjectTypes::getTypeInfo(GObjectTypes::BIOSTRUCTURE_3D).icon);
+
+ connectExternalSignals();
+
+ currentColorSchemeName = BioStruct3DColorSchemeRegistry::defaultFactoryName();
+ currentGLRendererName = BioStruct3DGLRendererRegistry::defaultFactoryName();
+
+ QList<QString> availableRenders = BioStruct3DGLRendererRegistry::getRenderersAvailableFor(obj->getBioStruct3D());
+ if (!availableRenders.contains(currentGLRendererName)) {
+ currentGLRendererName = availableRenders.first();
+ }
+
+ addBiostruct(obj);
+
+ createActions();
+ createMenus();
+
+ loadColorSchemes();
+ loadGLRenderers(availableRenders);
+
+ frameManager->addGLFrame(glFrame.data());
+ saveDefaultSettings();
+}
+
+BioStruct3DGLWidget::~BioStruct3DGLWidget() {
+ uiLog.trace("Biostruct3DGLWdiget "+objectName()+" deleted");
+}
+
+void BioStruct3DGLWidget::setupFrame() {
+ const float scaleFactor = 2.5;
+ float radius = getSceneRadius();
+ float camZ = scaleFactor * radius;
+
+ float cameraClipNear = (camZ - radius) * 0.66f;
+ float cameraClipFar = (camZ + radius) * 1.2f;
+
+ glFrame->setCameraClip(cameraClipNear, cameraClipFar);
+
+ Vector3D pos = glFrame->getCameraPosition();
+ pos.z = camZ;
+ glFrame->setCameraPosition(pos);
+
+ glFrame->makeCurrent();
+ glFrame->updateViewPort();
+ glFrame->updateGL();
+}
+
+float BioStruct3DGLWidget::getSceneRadius() const {
+ // good idea: ask renderer for radius instead of asking biostruct
+ float maxRadius = 0;
+ const Vector3D sceneCenter = getSceneCenter();
+
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ Vector3D center = ctx.biostruct->getCenter();
+ float radius = (center - sceneCenter).length() + ctx.biostruct->getRadius();
+ if (maxRadius < radius) {
+ maxRadius = radius;
+ }
+ }
+
+ return maxRadius;
+}
+
+Vector3D BioStruct3DGLWidget::getSceneCenter() const {
+ // good idea: ask renderer for center instead of asking biostruct
+ Vector3D c;
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ // TODO: transform should be applied in BioStruct
+ Vector3D tmp = ctx.biostruct->getCenter();
+ c += tmp.dot(ctx.biostruct->getTransform());
+ }
+
+ return c / float(contexts.length());
+}
+
+void BioStruct3DGLWidget::initializeGL() {
+ setLightPosition(Vector3D(0, 0.0, 1.0));
+ GLfloat light_diffuse[] = { 0.8f, 0.8f, 0.8f, 1.0 };
+ GLfloat light_specular[] = { 0.6f, 0.6f, 0.6f, 1.0 };
+ GLfloat mat_specular[] = { 0.6f, 0.6f, 0.6f, 1.0 };
+ GLfloat mat_shininess[] = { 90.0 };
+
+ qglClearColor(backgroundColor);
+ glShadeModel (GL_SMOOTH);
+ glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
+ glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
+ glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
+ glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+ glEnable(GL_BLEND); // Enable Blending
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ updateAllRenderers();
+
+
+ QString videoAdapterString(QLatin1String (reinterpret_cast<const char*>(glGetString(GL_VENDOR))));
+ if(videoAdapterString.contains("intel", Qt::CaseInsensitive)) {
+ anaglyphStatus = NOT_AVAILABLE;
+ } else if (!imageRenderingMode) {
+ anaglyph->init();
+ if (!anaglyph->isAvailable()) {
+ anaglyphStatus = NOT_AVAILABLE;
+ }
+ }
+}
+
+void BioStruct3DGLWidget::resizeGL(int width, int height) {
+ glFrame->updateViewPort(width, height);
+ if (anaglyphStatus == ENABLED) {
+ anaglyph->resize(width, height);
+ }
+}
+
+void BioStruct3DGLWidget::paintGL() {
+ if (!isVisible()) {
+ return;
+ }
+
+ clock_t frameStart = clock();
+
+ // Clear buffers, setup modelview matrix
+ // Scene render unable to do this since it used by anaglyph renderer
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+
+ gluLookAt(0.0, 0.0, glFrame->getCameraPosition().z, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
+
+ if (anaglyphStatus == ENABLED && !imageRenderingMode) {
+ // draw using anaglyph renderer
+ anaglyph->draw();
+ }
+ else {
+ // draw using default scene renderer (this)
+ draw();
+ }
+
+ clock_t frameEnd = clock();
+ double frameTime = (frameEnd - frameStart) / (double)CLOCKS_PER_SEC;
+ perfLog.trace( QString("BioStruct3DView frame rendering time %1 s").arg(frameTime) );
+}
+
+void BioStruct3DGLWidget::draw() {
+ glEnable(GL_DEPTH_TEST);
+ glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHT0);
+
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ Vector3D rotCenter = getSceneCenter();
+
+ glTranslatef(glFrame->getCameraPosition().x, glFrame->getCameraPosition().y, 0);
+
+ glMultMatrixf(glFrame->getRotationMatrix());
+ glTranslatef(-rotCenter.x ,-rotCenter.y, -rotCenter.z);
+
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ glPushMatrix();
+
+#if defined(GL_VERSION_1_3) && (QT_VERSION < 0x050000)
+ // glMultTransposeMatrixf is deprecated since Qt 5
+ glMultTransposeMatrixf(ctx.biostruct->getTransform().data());
+#else
+ // on OpenGL versions below 1.3 glMultTransposeMatrix not suported
+ // see http://www.opengl.org/resources/faq/technical/extensions.htm
+ Matrix44 colmt = ctx.biostruct->getTransform();
+ colmt.transpose();
+ glMultMatrixf(colmt.data());
+#endif
+
+ ctx.renderer->drawBioStruct3D();
+ glPopMatrix();
+ }
+
+ if(!molSurface.isNull()) {
+ glEnable(GL_CULL_FACE);
+
+ glCullFace(GL_FRONT);
+ surfaceRenderer->drawSurface(*molSurface);
+
+ glCullFace(GL_BACK);
+ surfaceRenderer->drawSurface(*molSurface);
+
+ glDisable(GL_CULL_FACE);
+ CHECK_GL_ERROR;
+ }
+
+ glDisable(GL_LIGHTING);
+ glDisable(GL_LIGHT0);
+ glDisable(GL_DEPTH_TEST);
+}
+
+Vector3D BioStruct3DGLWidget::getTrackballMapping(int x, int y)
+{
+ Vector3D pos;
+ /* project x,y onto a hemisphere centered within width, height */
+ pos.x = (2.0f*x - width()) / width();
+ pos.y = (height() - 2.0f*y) / height();
+ pos.z = 0;
+ float d = pos.length();
+ d = (d < 1.0) ? d : 1.0;
+ pos.z = sqrtf(1.0f - d*d);
+ pos.normalize();
+
+ return pos;
+}
+
+void BioStruct3DGLWidget::contextMenuEvent(QContextMenuEvent *event) {
+ QMenu menu;
+ foreach(QAction* action, getDisplayMenu()->actions()) {
+ menu.addAction(action);
+ }
+
+ menu.addAction(closeAction);
+
+ menu.exec(event->globalPos());
+}
+
+void BioStruct3DGLWidget::setLightPosition( const Vector3D& pos )
+{
+ lightPosition[0] = pos.x;
+ lightPosition[1] = pos.y;
+ lightPosition[2] = pos.z;
+ lightPosition[3] = 1.0;
+}
+
+static int getSequenceChainId(const U2SequenceObject* seqObj) {
+ QVariantMap info = seqObj->getSequenceInfo();
+ SAFE_POINT(info.contains(DNAInfo::CHAIN_ID), "Sequence does not have the CHAIN_ID attribute", -1);
+ return seqObj->getIntegerAttribute(DNAInfo::CHAIN_ID);
+}
+
+void BioStruct3DGLWidget::sl_onSequenceSelectionChanged(LRegionsSelection *s, const QVector<U2Region> &added, const QVector<U2Region> &removed) {
+ if (!isVisible())
+ return;
+
+ DNASequenceSelection* selection = qobject_cast<DNASequenceSelection*>(s);
+ const U2SequenceObject* seqObj = selection->getSequenceObject();
+ assert(seqObj);
+
+ const BioStruct3DRendererContext &ctx = contexts.first();
+
+ // check that biostruct and sequence objects are from the same document
+ // appropriate relation check must be here
+ if (seqObj->getDocument() == ctx.obj->getDocument()) {
+ int chainId = getSequenceChainId(seqObj);
+ assert(ctx.biostruct->moleculeMap.contains(chainId));
+
+ ctx.colorScheme->updateSelectionRegion(chainId, added, removed);
+
+ updateAllColorSchemes();
+ update();
+ }
+}
+
+QVariantMap BioStruct3DGLWidget::getState()
+{
+ QVariantMap state;
+ glFrame->writeStateToMap(state);
+ anaglyph->getSettings().toMap(state);
+
+ state[ANAGLYPH_STATUS_NAME] = qVariantFromValue((int)anaglyphStatus);
+
+ state[COLOR_SCHEME_NAME] = QVariant::fromValue(currentColorSchemeName);
+ state[RENDERER_NAME] = QVariant::fromValue(currentGLRendererName);
+ state[OBJECT_ID_NAME] = QVariant::fromValue(getBioStruct3DObjectName());
+
+ state[BACKGROUND_COLOR_NAME] = QVariant::fromValue(backgroundColor);
+ state[SELECTION_COLOR_NAME] = QVariant::fromValue(selectionColor);
+
+ state[RENDER_DETAIL_LEVEL_NAME] = QVariant::fromValue(rendererSettings.detailLevel);
+ state[SHADING_LEVEL_NAME] = QVariant::fromValue(unselectedShadingLevel);
+
+ return state;
+}
+
+void BioStruct3DGLWidget::setState( const QVariantMap& state )
+{
+ // bug-2859: correct save/restore current selection.
+ if (state.isEmpty()) {
+ return;
+ }
+ glFrame->makeCurrent();
+ glFrame->setState(state);
+
+ anaglyphStatus = (AnaglyphStatus) state.value(ANAGLYPH_STATUS_NAME).value<int>();
+ anaglyph->setSettings(AnaglyphSettings::fromMap(state));
+
+ backgroundColor = state.value(BACKGROUND_COLOR_NAME, DEFAULT_BACKGROUND_COLOR).value<QColor>();
+ setBackgroundColor(backgroundColor);
+
+ selectionColor = state.value(SELECTION_COLOR_NAME, DEFAULT_SELECTION_COLOR).value<QColor>();
+
+ rendererSettings.detailLevel = state.value(RENDER_DETAIL_LEVEL_NAME, DEFAULT_RENDER_DETAIL_LEVEL).value<float>();
+
+ QString previousColorSchemeName = currentColorSchemeName;
+ QString previousGLRendererName = currentGLRendererName;
+
+ currentColorSchemeName = state.value(COLOR_SCHEME_NAME, BioStruct3DColorSchemeRegistry::defaultFactoryName()).value<QString>();
+ currentGLRendererName = state.value(RENDERER_NAME, BioStruct3DGLRendererRegistry::defaultFactoryName()).value<QString>();
+
+ if (previousColorSchemeName != currentColorSchemeName){
+ setupColorScheme(currentColorSchemeName);
+ }
+
+ unselectedShadingLevel = state.value(SHADING_LEVEL_NAME, DEFAULT_SHADING_LEVEL).value<int>();
+ setUnselectedShadingLevel(unselectedShadingLevel);
+
+ if (previousGLRendererName != currentGLRendererName) {
+ setupRenderer(currentGLRendererName);
+ }
+
+ resizeGL(width(), height());
+ updateGL();
+}
+
+void BioStruct3DGLWidget::setupColorScheme(const QString &name) {
+ QList<BioStruct3DRendererContext>::iterator i = contexts.begin();
+ for (; i != contexts.end(); ++i) {
+ BioStruct3DRendererContext &ctx = *(i);
+
+ // TODO: this situation may be potentialy dangerous
+ // if renderer starts draw right now, maybe SharedPointer will be good solution
+ BioStruct3DColorScheme *scheme = BioStruct3DColorSchemeRegistry::createColorScheme(name, ctx.obj);
+ assert(scheme);
+
+ scheme->setSelectionColor(selectionColor);
+ scheme->setUnselectedShadingLevel((double)unselectedShadingLevel/100.0);
+
+ ctx.colorScheme = QSharedPointer<BioStruct3DColorScheme>(scheme);
+ ctx.renderer->setColorScheme(scheme);
+ }
+}
+
+void BioStruct3DGLWidget::setupRenderer(const QString &name) {
+ QList<BioStruct3DRendererContext>::iterator i = contexts.begin();
+ for (; i != contexts.end(); ++i) {
+ BioStruct3DRendererContext &ctx = *(i);
+
+ // TODO: this situation may be potentialy dangerous
+ // if renderer starts draw right now, maybe SharedPointer will be good solution
+ const QList<int> &shownModelsIndexes = ctx.renderer->getShownModelsIndexes();
+ BioStruct3DGLRenderer *rend = BioStruct3DGLRendererRegistry::createRenderer(name, *ctx.biostruct, ctx.colorScheme.data(), shownModelsIndexes, &rendererSettings);
+ assert(rend);
+ ctx.renderer = QSharedPointer<BioStruct3DGLRenderer>(rend);
+ }
+}
+
+void BioStruct3DGLWidget::updateAllColorSchemes() {
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ ctx.renderer->updateColorScheme();
+ }
+}
+
+void BioStruct3DGLWidget::updateAllRenderers() {
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ ctx.renderer->update();
+ }
+}
+
+void BioStruct3DGLWidget::setBackgroundColor(QColor backgroundColor)
+{
+ this->backgroundColor=backgroundColor;
+ qglClearColor(backgroundColor);
+}
+
+void BioStruct3DGLWidget::zoom( float delta )
+{
+ bool syncLock = isSyncModeOn();
+ QList<GLFrame*> frames = frameManager->getActiveGLFrameList(glFrame.data(), syncLock);
+ foreach( GLFrame* frame, frames) {
+ frame->makeCurrent();
+ frame->performZoom(delta);
+ frame->updateViewPort();
+ frame->updateGL();
+ }
+}
+
+void BioStruct3DGLWidget::shift( float deltaX, float deltaY)
+{
+ bool syncLock = isSyncModeOn();
+ QList<GLFrame*> frames = frameManager->getActiveGLFrameList(glFrame.data(), syncLock);
+ foreach( GLFrame* frame, frames) {
+ frame->makeCurrent();
+ frame->performShift(deltaX, deltaY);
+ frame->updateViewPort();
+ frame->updateGL();
+ }
+}
+
+void BioStruct3DGLWidget::saveDefaultSettings()
+{
+ glFrame->writeStateToMap(defaultsSettings);
+ defaultsSettings[COLOR_SCHEME_NAME] = QVariant::fromValue(currentColorSchemeName);
+ defaultsSettings[RENDERER_NAME] = QVariant::fromValue(currentGLRendererName);
+}
+
+void BioStruct3DGLWidget::restoreDefaultSettigns()
+{
+ assert(!defaultsSettings.isEmpty());
+ bool syncLock = isSyncModeOn();
+ QList<GLFrame*> frames = frameManager->getActiveGLFrameList(glFrame.data(), syncLock);
+ foreach( GLFrame* frame, frames) {
+ frame->makeCurrent();
+ frame->setState(defaultsSettings);
+ frame->updateViewPort();
+ frame->updateGL();
+ }
+}
+
+void BioStruct3DGLWidget::showModel(int modelId, bool show) {
+ BioStruct3DRendererContext &ctx = contexts.first();
+
+ // this function uses modelId - key from BioStruct3D::modelMap
+ int idx = ctx.biostruct->modelMap.keys().indexOf(modelId);
+ assert(idx != -1);
+
+ QList<int> shownModelsIndexes = ctx.renderer->getShownModelsIndexes();
+
+ if (show && !shownModelsIndexes.contains(idx)) {
+ shownModelsIndexes.append(idx);
+ }
+ else if (!show) {
+ shownModelsIndexes.removeAll(idx);
+ }
+ ctx.renderer->setShownModelsIndexes(shownModelsIndexes);
+}
+
+void BioStruct3DGLWidget::showAllModels(bool show) {
+ BioStruct3DRendererContext &ctx = contexts.first();
+
+ QList<int> shownModelsIndexes;
+ if (show) {
+ int numModels = ctx.biostruct->modelMap.size();
+ for (int i = 0; i < numModels; ++i) {
+ shownModelsIndexes.append(i);
+ }
+ }
+ ctx.renderer->setShownModelsIndexes(shownModelsIndexes);
+}
+
+void BioStruct3DGLWidget::sl_selectModels() {
+ BioStruct3DRendererContext &ctx = contexts.first();
+ QObjectScopedPointer<SelectModelsDialog> dlg = new SelectModelsDialog(ctx.biostruct->getModelsNames(), ctx.renderer->getShownModelsIndexes(), this);
+ dlg->exec();
+ CHECK(!dlg.isNull(), );
+
+ if (dlg->result() == QDialog::Accepted) {
+ ctx.renderer->setShownModelsIndexes(dlg->getSelectedModelsIndexes());
+
+ contexts.first().renderer->updateShownModels();
+ updateGL();
+ }
+}
+
+void BioStruct3DGLWidget::writeImage2DToFile( int format, int options, int nbcol, const char *fileName )
+{
+ FILE *fp = NULL;
+ const char* FOPEN_ARGS = "wb";
+ const QByteArray title(fileName);
+ int state = GL2PS_OVERFLOW, buffsize = 0;
+ GLint viewport[4];
+ int sort = GL2PS_SIMPLE_SORT;
+
+ fp = fopen(fileName, FOPEN_ARGS);
+
+ if(!fp){
+ QMessageBox::warning(this, tr("Error"),tr("Unable to open file %1 for writing").arg(fileName));
+ return;
+ }
+
+ glGetIntegerv(GL_VIEWPORT,viewport);
+
+ if (format == GL2PS_EPS) {
+ // hack -> make widget aspect ratio 1:1
+ if (width() > height()) {
+ int size = height();
+ resize(size, size);
+ }
+ }
+
+ while(state == GL2PS_OVERFLOW){
+ buffsize += 2048*2048;
+ gl2psBeginPage(title.constData(), "Unipro UGENE BioStruct3D Viewer plugin", viewport, format, sort, options,
+ GL_RGBA, 0, NULL, nbcol, nbcol, nbcol, buffsize, fp, fileName);
+ paintGL();
+ state = gl2psEndPage();
+ }
+
+ fclose(fp);
+
+ if (format == GL2PS_EPS) {
+ // restore sizes
+ updateGeometry();
+ }
+
+}
+
+void BioStruct3DGLWidget::loadColorSchemes()
+{
+ currentColorSchemeName = BioStruct3DColorSchemeRegistry::defaultFactoryName();
+
+ // highlight default color scheme in menu
+ QList<QAction*>::iterator iter;
+ QList<QAction*> schemeActions = colorSchemeActions->actions();
+ for (iter = schemeActions.begin(); iter != schemeActions.end(); ++iter) {
+ if ((*iter)->text() == currentColorSchemeName) {
+ (*iter)->setChecked(true);
+ break;
+ }
+ }
+ assert(iter != schemeActions.end());
+}
+
+void BioStruct3DGLWidget::loadGLRenderers(const QList<QString> &availableRenderers)
+{
+ // highlight current renderer in menu
+
+ foreach (QAction *ac, rendererActions->actions()) {
+ // disable all unavailable renderers in menu
+ if (!availableRenderers.contains(ac->text())) {
+ ac->setDisabled(true);
+ }
+
+ if (ac->text() == currentGLRendererName) {
+ ac->setChecked(true);
+ }
+ }
+
+ QString surfaceRendererName = ConvexMapRenderer::ID;
+ surfaceRenderer.reset(MolecularSurfaceRendererRegistry::createMSRenderer(surfaceRendererName));
+}
+
+bool BioStruct3DGLWidget::isSyncModeOn()
+{
+ Qt::KeyboardModifiers km = QApplication::keyboardModifiers();
+ bool synchronizationMode = km.testFlag(Qt::ShiftModifier) || frameManager->getSyncLock();
+ synchronizationMode &= frameManager->getGLFrames().count() > 1 ;
+ return synchronizationMode;
+}
+
+void BioStruct3DGLWidget::setUnselectedShadingLevel(int shading) {
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ ctx.colorScheme->setUnselectedShadingLevel((double)shading/100.0);
+ }
+ updateAllColorSchemes();
+}
+
+QMenu* BioStruct3DGLWidget::getDisplayMenu()
+{
+ assert(displayMenu != NULL);
+ return displayMenu;
+}
+
+void BioStruct3DGLWidget::mousePressEvent(QMouseEvent *event)
+{
+ lastPos = getTrackballMapping(event->x(), event->y());
+}
+
+void BioStruct3DGLWidget::mouseMoveEvent(QMouseEvent *event)
+{
+ if (event->buttons() & Qt::LeftButton) {
+ Vector3D curPos = getTrackballMapping(event->x(), event->y());
+ Vector3D delta = curPos - lastPos;
+
+ if (delta.x || delta.y || delta.z) {
+ rotAngle = 90.0f*delta.length();
+ rotAxis = vector_cross(lastPos,curPos);
+
+ bool syncLock = isSyncModeOn();
+ QList<GLFrame*> frames = frameManager->getActiveGLFrameList(glFrame.data(), syncLock);
+ foreach( GLFrame* frame, frames) {
+ frame->makeCurrent();
+
+ if (event->modifiers() & Qt::CTRL)
+ frame->performShift(delta.x, delta.y);
+ else
+ frame->rotateCamera(rotAxis, rotAngle);
+
+ frame->updateGL();
+ }
+ }
+
+ lastPos = curPos;
+ }
+}
+
+void BioStruct3DGLWidget::wheelEvent ( QWheelEvent * event )
+{
+ float numDegrees = event->delta() / 8;
+ zoom(numDegrees / 10);
+}
+
+void BioStruct3DGLWidget::createActions()
+{
+ QAction* action = NULL;
+
+ animationTimer = new QTimer(this);
+ animationTimer->setInterval(20); // fixed interval
+ connect(animationTimer, SIGNAL(timeout()), this, SLOT(sl_updateAnnimation()));
+
+ rendererActions = new QActionGroup(this);
+ connect(rendererActions, SIGNAL(triggered(QAction *)), this, SLOT(sl_selectGLRenderer(QAction *)));
+
+ foreach(const QString &key, BioStruct3DGLRendererRegistry::factoriesNames()) {
+ action = new QAction(key, rendererActions);
+ action->setCheckable(true);
+ action->setObjectName(action->text());
+ }
+
+ colorSchemeActions = new QActionGroup(this);
+ connect(colorSchemeActions, SIGNAL(triggered(QAction *)), this, SLOT(sl_selectColorScheme(QAction *)));
+ foreach(const QString &key, BioStruct3DColorSchemeRegistry::factoriesNames()) {
+ action = new QAction(key, colorSchemeActions);
+ action->setCheckable(true);
+ action->setObjectName(key);
+ }
+
+ molSurfaceRenderActions = new QActionGroup(this);
+ connect(molSurfaceRenderActions, SIGNAL(triggered(QAction *)), this, SLOT(sl_selectSurfaceRenderer(QAction*)));
+ foreach(const QString &key, MolecularSurfaceRendererRegistry::factoriesNames()) {
+ action = new QAction(key, molSurfaceRenderActions);
+ action->setCheckable(true);
+ if (key == ConvexMapRenderer::ID) {
+ action->setChecked(true);
+ }
+ }
+
+ molSurfaceTypeActions = new QActionGroup(this);
+ foreach(QString key, AppContext::getMolecularSurfaceFactoryRegistry()->getSurfNameList())
+ {
+ action = new QAction(key, molSurfaceTypeActions);
+ action->setObjectName(key);
+ connect(action, SIGNAL(triggered()), this, SLOT(sl_showSurface()));
+ action->setCheckable(true);
+ bool hasConstraints = AppContext::getMolecularSurfaceFactoryRegistry()->getSurfaceFactory(key)->hasConstraints(*contexts.first().biostruct);
+ action->setEnabled(!hasConstraints);
+
+ }
+ action = new QAction(tr("Off"), molSurfaceTypeActions);
+ connect(action, SIGNAL(triggered()), this, SLOT(sl_hideSurface()));
+ action->setCheckable(true);
+ action->setChecked(true);
+
+ selectModelsAction = 0;
+ if (!contexts.isEmpty() && contexts.first().biostruct->getModelsNames().size() > 1) {
+ selectModelsAction = new QAction(tr("Models.."), this);
+ connect(selectModelsAction, SIGNAL(triggered()), this, SLOT(sl_selectModels()));
+ }
+
+ spinAction = new QAction(tr("Spin"), this);
+ spinAction->setCheckable(true);
+ connect(spinAction, SIGNAL(triggered()), this, SLOT(sl_acitvateSpin()));
+
+ settingsAction = new QAction(tr("Settings..."), this);
+ connect(settingsAction, SIGNAL(triggered()), this, SLOT(sl_settings()));
+
+ closeAction = new QAction(tr("Close"), this);
+ connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
+
+ exportImageAction = new QAction(tr("Export Image..."), this);
+ connect(exportImageAction, SIGNAL(triggered()), this, SLOT(sl_exportImage()));
+
+ createStrucluralAlignmentActions();
+
+ connect(AppContext::getTaskScheduler(), SIGNAL(si_stateChanged(Task*)), SLOT(sl_onTaskFinished(Task*)));
+}
+
+void BioStruct3DGLWidget::createStrucluralAlignmentActions() {
+ alignWithAction = new QAction(tr("Align With..."), this);
+ alignWithAction->setObjectName("align_with");
+ connect(alignWithAction, SIGNAL(triggered()), this, SLOT(sl_alignWith()));
+
+ resetAlignmentAction = new QAction(tr("Reset"), this);
+ connect(resetAlignmentAction, SIGNAL(triggered()), this, SLOT(sl_resetAlignment()));
+}
+
+void BioStruct3DGLWidget::createMenus()
+{
+ // Renderer selection
+ selectRendererMenu = new QMenu(tr("Render Style"));
+ selectRendererMenu->addActions(rendererActions->actions());
+ selectRendererMenu->menuAction()->setObjectName("Render Style");
+
+ // Color scheme selection
+ selectColorSchemeMenu = new QMenu(tr("Coloring Scheme"));
+ selectColorSchemeMenu->addActions(colorSchemeActions->actions());
+ selectColorSchemeMenu->menuAction()->setObjectName("Coloring Scheme");
+
+ // Molecular surface
+ QMenu* surfaceMenu = new QMenu(tr("Molecular Surface Render Style"));
+ surfaceMenu->addActions(molSurfaceRenderActions->actions());
+ surfaceMenu->menuAction()->setObjectName("Molecular Surface Render Style");
+
+ QMenu *surfaceTypeMenu = new QMenu(tr("Molecular Surface"));
+ surfaceTypeMenu->addActions(molSurfaceTypeActions->actions());
+ surfaceTypeMenu->menuAction()->setObjectName("Molecular Surface");
+
+ // Display (context) menu
+ displayMenu = new QMenu(this);
+ displayMenu->addMenu(selectRendererMenu);
+ displayMenu->addMenu(selectColorSchemeMenu);
+
+ displayMenu->addMenu(surfaceMenu);
+ displayMenu->addMenu(surfaceTypeMenu);
+
+ if (selectModelsAction) {
+ displayMenu->addAction(selectModelsAction);
+ }
+
+ displayMenu->addAction(spinAction);
+ displayMenu->addAction(settingsAction);
+ displayMenu->addAction(exportImageAction);
+
+ QMenu *saMenu = createStructuralAlignmentMenu();
+ displayMenu->addMenu(saMenu);
+}
+
+QMenu* BioStruct3DGLWidget::createStructuralAlignmentMenu() {
+ QMenu *saMenu = new QMenu(tr("Structural Alignment"));
+ saMenu->menuAction()->setObjectName("Structural Alignment");
+
+ saMenu->addAction(alignWithAction);
+ saMenu->addAction(resetAlignmentAction);
+
+ return saMenu;
+}
+
+void BioStruct3DGLWidget::connectExternalSignals() {
+ AnnotationSettingsRegistry* asr = AppContext::getAnnotationsSettingsRegistry();
+ connect(asr, SIGNAL(si_annotationSettingsChanged(const QStringList& )), this, SLOT(sl_updateRenderSettings(const QStringList& )) );
+
+ const QList<ADVSequenceObjectContext*> seqContexts = dnaView->getSequenceContexts();
+
+ foreach (ADVSequenceObjectContext* ctx, seqContexts) {
+ connect(ctx->getSequenceSelection(),
+ SIGNAL(si_selectionChanged(LRegionsSelection*, const QVector<U2Region>&, const QVector<U2Region>&)),
+ SLOT(sl_onSequenceSelectionChanged(LRegionsSelection*, const QVector<U2Region>& , const QVector<U2Region>&)));
+ }
+
+ connect(dnaView,
+ SIGNAL(si_sequenceAdded(ADVSequenceObjectContext*)),
+ SLOT(sl_onSequenceAddedToADV(ADVSequenceObjectContext*)));
+
+ connect(dnaView,
+ SIGNAL(si_sequenceRemoved(ADVSequenceObjectContext*)),
+ SLOT(sl_onSequenceRemovedFromADV(ADVSequenceObjectContext*)));
+}
+
+void BioStruct3DGLWidget::sl_onSequenceAddedToADV(ADVSequenceObjectContext *ctx) {
+ connect(ctx->getSequenceSelection(),
+ SIGNAL(si_selectionChanged(LRegionsSelection*, const QVector<U2Region>&, const QVector<U2Region>&)),
+ SLOT(sl_onSequenceSelectionChanged(LRegionsSelection*, const QVector<U2Region>& , const QVector<U2Region>&)));
+}
+
+void BioStruct3DGLWidget::sl_onSequenceRemovedFromADV(ADVSequenceObjectContext *ctx) {
+ disconnect(ctx->getSequenceSelection(), SIGNAL(si_selectionChanged(LRegionsSelection*, const QVector<U2Region>&, const QVector<U2Region>&)),
+ this, SLOT(sl_onSequenceSelectionChanged(LRegionsSelection*, const QVector<U2Region>& , const QVector<U2Region>&)));
+}
+
+void BioStruct3DGLWidget::sl_selectColorScheme(QAction* action) {
+ QString schemeName = action->text();
+
+ currentColorSchemeName = schemeName;
+ setupColorScheme(schemeName);
+
+ GLFrame* frame = frameManager->getGLWidgetFrame(this);
+ frame->makeCurrent();
+ frame->updateGL();
+}
+
+void BioStruct3DGLWidget::sl_updateRenderSettings(const QStringList& list )
+{
+ Q_UNUSED(list);
+ sl_selectColorScheme(colorSchemeActions->checkedAction());
+}
+
+void BioStruct3DGLWidget::sl_acitvateSpin()
+{
+ if (spinAction->isChecked()) {
+ animationTimer->start();
+ } else {
+ animationTimer->stop();
+ }
+
+ updateGL();
+
+}
+
+void BioStruct3DGLWidget::sl_updateAnnimation()
+{
+ static float velocity = 0.05f;
+ spinAngle = velocity* animationTimer->interval();
+ Vector3D rotAxis(0,1,0);
+ bool syncLock = isSyncModeOn();
+ QList<GLFrame*> frames = frameManager->getActiveGLFrameList(glFrame.data(), syncLock);
+
+ foreach( GLFrame* frame, frames) {
+ frame->makeCurrent();
+ frame->rotateCamera(rotAxis, spinAngle);
+ frame->updateGL();
+ }
+ updateGL();
+}
+
+void BioStruct3DGLWidget::sl_selectGLRenderer(QAction* action)
+{
+ QString rendererName = action->text();
+ currentGLRendererName = rendererName;
+ setupRenderer(currentGLRendererName);
+
+ GLFrame* frame = frameManager->getGLWidgetFrame(this);
+ frame->makeCurrent();
+ frame->updateGL();
+}
+
+void BioStruct3DGLWidget::sl_settings()
+{
+ QObjectScopedPointer<BioStruct3DSettingsDialog> dialog = new BioStruct3DSettingsDialog();
+
+ dialog->setWidget(this);
+
+ dialog->setBackgroundColor(backgroundColor);
+ dialog->setSelectionColor(selectionColor);
+ dialog->setRenderDetailLevel(rendererSettings.detailLevel);
+ dialog->setShadingLevel(unselectedShadingLevel);
+
+ dialog->setAnaglyphStatus(anaglyphStatus);
+ dialog->setAnaglyphSettings(anaglyph->getSettings());
+
+ QVariantMap previousState = getState();
+
+ dialog->exec();
+ CHECK(!dialog.isNull(), );
+
+ if (QDialog::Accepted == dialog->result()) {
+ backgroundColor = dialog->getBackgroundColor();
+ selectionColor = dialog->getSelectionColor();
+ unselectedShadingLevel = dialog->getShadingLevel();
+
+ foreach (const BioStruct3DRendererContext &ctx, contexts) {
+ ctx.colorScheme->setSelectionColor(selectionColor);
+ }
+ setUnselectedShadingLevel(unselectedShadingLevel);
+
+ rendererSettings.detailLevel = dialog->getRenderDetailLevel();
+
+ anaglyphStatus = dialog->getAnaglyphStatus();
+ anaglyph->setSettings(dialog->getAnaglyphSettings());
+
+ this->makeCurrent();
+ setBackgroundColor(backgroundColor);
+
+ updateGL();
+ }
+ else
+ {
+ setState(previousState);
+ }
+}
+
+void BioStruct3DGLWidget::sl_exportImage()
+{
+ BioStruct3DImageExportController factory(this);
+ QObjectScopedPointer<ExportImageDialog> dialog = new ExportImageDialog(&factory, ExportImageDialog::MolView,
+ ExportImageDialog::SupportScaling, this);
+ dialog->exec();
+}
+
+void BioStruct3DGLWidget::sl_showSurface()
+{
+ QList<SharedAtom> atoms;
+ BioStruct3DRendererContext ctx = contexts.first();
+ atoms = ctx.biostruct->getAllAtoms();
+
+ QString surfaceType = qobject_cast<QAction *>( sender() )->text();
+ surfaceCalcTask = new MolecularSurfaceCalcTask(surfaceType, atoms);
+ AppContext::getTaskScheduler()->registerTopLevelTask(surfaceCalcTask);
+}
+
+void BioStruct3DGLWidget::sl_hideSurface()
+{
+ molSurface.reset();
+
+ makeCurrent();
+ updateGL();
+}
+
+void BioStruct3DGLWidget::sl_selectSurfaceRenderer(QAction* action)
+{
+ QString msRendererName = action->text();
+ surfaceRenderer.reset(MolecularSurfaceRendererRegistry::createMSRenderer(msRendererName));
+
+ makeCurrent();
+ updateGL();
+}
+
+void BioStruct3DGLWidget::sl_onTaskFinished( Task* task )
+{
+ if ( surfaceCalcTask != task || surfaceCalcTask->getState()!= Task::State_Finished) {
+ return;
+ }
+
+ molSurface.reset(surfaceCalcTask->getCalculatedSurface());
+
+ makeCurrent();
+ updateGL();
+}
+
+/** Convert modelId's list to modelIndexes list */
+static QList<int> modelIdsToModelIdx(const BioStruct3D &bs, const QList<int> &modelsIds) {
+ QList<int> modelsIdx;
+ foreach (int modelId, modelsIds) {
+ int idx = bs.getModelsNames().indexOf(modelId);
+ assert(idx != -1 && "No such modelId in biostruct");
+ modelsIdx << idx;
+ }
+
+ return modelsIdx;
+}
+
+void BioStruct3DGLWidget::addBiostruct(const BioStruct3DObject *obj, const QList<int> &shownModels /* = QList<int>()*/) {
+ assert(contexts.size() < 2 && "Multiple models in one view is unsupported now");
+ BioStruct3DRendererContext ctx(obj);
+
+ QList<int> shownModelsIdx = modelIdsToModelIdx(*ctx.biostruct, shownModels);
+
+ // show only first model if model list is empty
+ if (shownModelsIdx.isEmpty()) {
+ shownModelsIdx << 0;
+ }
+
+ BioStruct3DColorScheme *colorScheme = BioStruct3DColorSchemeRegistry::createColorScheme(currentColorSchemeName, ctx.obj);
+ assert(colorScheme);
+ ctx.colorScheme = QSharedPointer<BioStruct3DColorScheme>(colorScheme);
+ ctx.colorScheme->setSelectionColor(selectionColor);
+ ctx.colorScheme->setUnselectedShadingLevel((double)unselectedShadingLevel/100.0);
+
+ BioStruct3DGLRenderer *renderer = BioStruct3DGLRendererRegistry::createRenderer(currentGLRendererName, *ctx.biostruct, ctx.colorScheme.data(), shownModelsIdx, &rendererSettings);
+ assert(renderer);
+ ctx.renderer = QSharedPointer<BioStruct3DGLRenderer>(renderer);
+
+ contexts.append(ctx);
+ setupRenderer(currentGLRendererName);
+
+ setupFrame();
+}
+
+void BioStruct3DGLWidget::sl_alignWith() {
+ const BioStruct3DRendererContext &ctx = contexts.first();
+ int currentModelId = ctx.biostruct->getModelsNames().at(ctx.renderer->getShownModelsIndexes().first());
+
+ QObjectScopedPointer<StructuralAlignmentDialog> dlg = new StructuralAlignmentDialog(contexts.first().obj, currentModelId);
+ const int dialogResult = dlg->execIfAlgorithmAvailable();
+ CHECK(!dlg.isNull(), );
+
+ if (QDialog::Accepted == dialogResult) {
+ sl_resetAlignment();
+
+ Task *task = dlg->getTask();
+ assert(task && "If dialog accepded it must return valid task");
+
+ TaskSignalMapper *taskMapper = new TaskSignalMapper(task);
+ connect(taskMapper, SIGNAL(si_taskFinished(Task*)), this, SLOT(sl_onAlignmentDone(Task*)));
+
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+ }
+}
+
+void BioStruct3DGLWidget::sl_resetAlignment() {
+ assert(contexts.size() < 3 && "Multiple models in one view is unsupported now");
+ if (contexts.size() == 2) {
+ contexts.removeLast();
+ setupFrame();
+
+ glFrame->makeCurrent();
+ update();
+ }
+}
+
+void BioStruct3DGLWidget::sl_onAlignmentDone(Task *task) {
+ if (!task->hasError()) {
+ StructuralAlignmentTask *saTask = qobject_cast<StructuralAlignmentTask*> (task);
+ assert(saTask && "Task shoud have type StructuralAlignmentTask");
+
+ StructuralAlignment result = saTask->getResult();
+ StructuralAlignmentTaskSettings settings = saTask->getSettings();
+
+ const Matrix44 &mt = result.transform;
+ const_cast<BioStruct3D*>(&settings.alt.obj->getBioStruct3D())->setTransform(mt);
+
+ addBiostruct(settings.alt.obj, QList<int>() << settings.alt.modelId);
+
+ glFrame->makeCurrent();
+ update();
+ }
+}
+
+} // namespace U2
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h
new file mode 100644
index 0000000..bbbb82b
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h
@@ -0,0 +1,376 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_OPENGL_WIDGET_H_
+#define _U2_OPENGL_WIDGET_H_
+
+#include "BioStruct3DGLRender.h"
+#include "BioStruct3DColorScheme.h"
+#include "AnaglyphRenderer.h"
+#include "MolecularSurfaceRenderer.h"
+
+#include <U2Core/Vector3D.h>
+#include <U2Core/BioStruct3DObject.h>
+
+#include <U2Algorithm/MolecularSurface.h>
+
+#include <QtCore/QTimer>
+#include <QtCore/QSharedPointer>
+
+#if (QT_VERSION < 0x050000) //Qt 5
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QActionGroup>
+#else
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QActionGroup>
+#endif
+#include <QtGui/QColor>
+
+#include <QtOpenGL/QGLWidget>
+
+namespace U2 {
+
+class ADVSequenceObjectContext;
+class AnnotatedDNAView;
+class Annotation;
+class AnnotationSelection;
+class AnnotationTableObject;
+class BioStruct3D;
+class BioStruct3DColorSchemeFactory;
+class BioStruct3DGLRendererFactory;
+class Document;
+class GLFrame;
+class GLFrameManager;
+class LRegionsSelection;
+class MolecularSurfaceCalcTask;
+class MolecularSurfaceRendererFactory;
+class Task;
+class U2Region;
+class U2SequenceObject;
+
+/** Each biostruct added to scene should be represented by context */
+class BioStruct3DRendererContext {
+public:
+ BioStruct3DRendererContext(const BioStruct3DObject *obj)
+ : obj(obj), biostruct(&obj->getBioStruct3D())
+ {}
+
+ const BioStruct3DObject *obj;
+ const BioStruct3D *biostruct;
+
+ QSharedPointer<BioStruct3DGLRenderer> renderer;
+ QSharedPointer<BioStruct3DColorScheme> colorScheme;
+};
+
+/*!
+* @class BioStruct3DGLWidget BioStruct3DGLWidget.h
+* @brief Class for BioStruct3DObject visualization.
+*
+* This widget provides a 3D graphical view of a macromolecular structure. In terms
+* of the Model-View architecture we consider
+* the BioStruct3D the model and GLWidget a view of this model.
+*
+* The widget relies on various GLRenderer and ColorScheme subclasses to handle the
+* rendering of the 3d objects.
+*
+* Also it includes actions for visualization control.
+*/
+class BioStruct3DGLWidget : public QGLWidget
+{
+ Q_OBJECT
+ static int widgetCount;
+
+public:
+ /*!
+ * Constructor.
+ * @param bsObj BioStruct3DObject contains 3d model for visualization
+ * @param view DnaView context for connecting structure 3D representation and sequence view
+ * @param manager GlFrameManager is required for OpenGL frame manipulation
+ * @param parent Parent widget
+ */
+ BioStruct3DGLWidget(BioStruct3DObject* bsObj, const AnnotatedDNAView* view, GLFrameManager* manager, QWidget *parent);
+
+ //! Destructor.
+ ~BioStruct3DGLWidget();
+
+ //! @return BioStruct3D const reference.
+ const BioStruct3D& getBioStruct3D() const { return *(contexts.first().biostruct); }
+
+ //! @return BioStruct3D Protein Data Bank id.
+ const QString getPDBId() const { return contexts.first().biostruct->pdbId; }
+
+ //! @return BioStruct3DObject name.
+ const QString getBioStruct3DObjectName() const { return contexts.first().obj->getGObjectName(); }
+
+ /*!
+ * @return Menu containing display actions: renderers, color schemes etc.
+ */
+ QMenu* getDisplayMenu();
+ /*!
+ * Records widget active settings (part of UGENE architecture).
+ * @return Current widgets settings.
+ */
+ QVariantMap getState();
+ /*!
+ * Restores widget settings with given (part of UGENE architecture).
+ * @param state Widgets settings.
+ */
+ void setState(const QVariantMap& state);
+ /*!
+ * Restores default widget settings (viewMatrix, glRenderer, color scheme)
+ */
+ void restoreDefaultSettigns();
+ /*!
+ * @param delta Positive value: zoom in, negative value: zoom out.
+ */
+ void zoom(float delta);
+ void shift(float deltaX, float deltaY);
+ /*!
+ * Creates 2d vector image of BioStruct3DGLWidget contents using gl2ps.
+ */
+ void writeImage2DToFile(int format, int options, int nbcol, const char *fileName);
+
+ void setBackgroundColor(QColor backgroundColor);
+
+ /** @returns This widget GLFrame */
+ GLFrame *getGLFrame() { return glFrame.data(); }
+
+ /** Draws scene without setting camera */
+ void draw();
+
+ /** @returns scene rotation center */
+ Vector3D getSceneCenter() const;
+
+ /** @returns scene bounding sphere radius */
+ float getSceneRadius() const;
+
+ void setImageRenderingMode(bool status) { imageRenderingMode = status; }
+
+protected:
+ /*!
+ * QGlWidget virtual function, initializes OpenGL params. See, Qt docs "QGLWidget" for details.
+ */
+ void initializeGL();
+ /*!
+ * QGlWidget virtual function, sets viewport
+ * @param width GLWidget width
+ * @param height GLWidget height
+ */
+ void resizeGL(int width, int height);
+ /*!
+ * QGlWidget virtual function, draw GL scene.
+ */
+ void paintGL();
+ /*!
+ * QWidget virtual function, mouse button down event handler.
+ */
+ void mousePressEvent(QMouseEvent *event);
+ /*!
+ * QWidget virtual function, mouse move event handler.
+ */
+ void mouseMoveEvent(QMouseEvent *event);
+ /*!
+ * QWidget virtual function, mouse wheel event handler.
+ */
+ void wheelEvent ( QWheelEvent * event );
+ /*!
+ * QWidget virtual function, executes context menu.
+ */
+ void contextMenuEvent(QContextMenuEvent *_event);
+
+private:
+ //! Sets unselected regions shading level
+ void setUnselectedShadingLevel(int shading);
+
+ /*!
+ * Sets light position.
+ * @param pos New light source position. Directional light is being used.
+ */
+ void setLightPosition(const Vector3D& pos);
+
+ // controller logic
+ //! Creates actions for existing GLRenderers, loads default renderer.
+ void loadGLRenderers(const QList<QString> &availableRenderers);
+ //! Creates actions for existing ColorSchemes, loads default color scheme.
+ void loadColorSchemes();
+
+ //! Creates actions for structural alignment
+ void createStrucluralAlignmentActions();
+
+ //! Creates menu for structural alignment
+ QMenu* createStructuralAlignmentMenu();
+
+ void createActions();
+ void createMenus();
+
+ // view logic
+ /** Adds biostruct object to scene.
+ * @param shownModels is a modelId list (same as in PDB)
+ */
+ void addBiostruct(const BioStruct3DObject *biostruct, const QList<int> &shownModels = QList<int>());
+
+ //! Creates renderers for all biostructs.
+ void setupRenderer(const QString &name);
+
+ //! Creates color scheme for all biostructs.
+ void setupColorScheme(const QString &name);
+
+ //! Updates color scheme for all renderers.
+ void updateAllColorSchemes();
+
+ /** Updates all renderers.
+ * Should be called from initializeGL for display list recreation
+ */
+ void updateAllRenderers();
+
+ //! Show/hide selected model for first biostruct
+ //! @param modelId - key from BioStruct3D::modelMap
+ void showModel(int modelId, bool show);
+
+ //! Show/hide all models for first biostruct
+ void showAllModels(bool show);
+
+ /** Setup frame settings: camera clip, camera position */
+ void setupFrame();
+
+ void saveDefaultSettings();
+
+ void connectExternalSignals();
+
+ Vector3D getTrackballMapping(int x, int y);
+ static int getWidgetCount(QString objectName);
+ bool isSyncModeOn();
+
+private:
+ // related sequences view
+ const AnnotatedDNAView* dnaView;
+
+ QList<BioStruct3DRendererContext> contexts;
+
+ // Settings common for all renderers, such as detail level
+ BioStruct3DRendererSettings rendererSettings;
+
+ GLFrameManager* frameManager;
+ QScopedPointer<GLFrame> glFrame;
+
+ QScopedPointer<MolecularSurface> molSurface;
+ QScopedPointer<MolecularSurfaceRenderer> surfaceRenderer;
+
+ MolecularSurfaceCalcTask* surfaceCalcTask;
+
+ AnaglyphStatus anaglyphStatus;
+ QScopedPointer<AnaglyphRenderer> anaglyph;
+
+ QVariantMap defaultsSettings;
+
+ // controller logic
+ QString currentColorSchemeName;
+ QString currentGLRendererName;
+
+ // camera
+ GLfloat rotAngle, spinAngle;
+ Vector3D rotAxis, lastPos;
+
+ // light
+ GLfloat lightPosition[4];
+
+ QColor backgroundColor;
+ QColor selectionColor;
+ QTimer* animationTimer;
+
+ int unselectedShadingLevel;
+ // Should be true when painting an image
+ bool imageRenderingMode;
+
+ // controller logic
+ QAction *spinAction;
+ QAction *settingsAction;
+ QAction *closeAction;
+ QAction *exportImageAction;
+
+ // actions for selecting/deselecting shown models
+ QAction *selectModelsAction;
+
+ // structural alignment related actions
+ QAction *alignWithAction;
+ QAction *resetAlignmentAction;
+
+ QActionGroup *colorSchemeActions;
+ QActionGroup *rendererActions;
+ QActionGroup *molSurfaceRenderActions;
+ QActionGroup *molSurfaceTypeActions;
+
+ QMenu *selectColorSchemeMenu;
+ QMenu *selectRendererMenu;
+ QMenu *displayMenu;
+
+private slots:
+ void sl_selectColorScheme(QAction* action);
+ void sl_selectGLRenderer(QAction* action);
+ void sl_updateRenderSettings(const QStringList& list);
+ void sl_acitvateSpin();
+ void sl_updateAnnimation();
+ void sl_settings();
+ void sl_exportImage();
+
+ // structural alignment relalated slots
+ void sl_alignWith();
+ void sl_resetAlignment();
+ void sl_onAlignmentDone(Task*);
+
+ // slots for handling sequence selection
+ void sl_onSequenceAddedToADV(ADVSequenceObjectContext *ctx);
+ void sl_onSequenceRemovedFromADV(ADVSequenceObjectContext *ctx);
+ void sl_onSequenceSelectionChanged(LRegionsSelection* s, const QVector<U2Region>& added, const QVector<U2Region>& removed);
+
+ // slots for select/deselect shown models actions
+ // they affects only first biostruct
+ void sl_selectModels();
+
+ // slots for surface renderers
+ void sl_showSurface();
+ void sl_hideSurface();
+ void sl_selectSurfaceRenderer(QAction* surfaceRenderer);
+
+ // used only for handling MolecularSurfaceCalcTask
+ // should be in special MolecularSurfaceProxy
+ void sl_onTaskFinished(Task* task);
+
+public:
+ static const QString BACKGROUND_COLOR_NAME;
+
+ static const QString PRODUCT_NAME;
+ static const QString PLUGIN_NAME;
+ static const QString COLOR_SCHEME_NAME;
+ static const QString RENDERER_NAME;
+ static const QString OBJECT_ID_NAME;
+
+ static const QString SELECTION_COLOR_NAME;
+ static const QString RENDER_DETAIL_LEVEL_NAME;
+ static const QString SHADING_LEVEL_NAME;
+ static const QString ANAGLYPH_STATUS_NAME;
+};
+
+} // namespace U2
+
+#endif // _U2_OPENGL_WIDGET_H
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp
new file mode 100644
index 0000000..ea5c39b
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp
@@ -0,0 +1,855 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
+#include <QtGui/QPixmap>
+
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QUrl>
+
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QSpinBox>
+#include <QToolButton>
+#include <QVBoxLayout>
+
+#include <U2Core/AppContext.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/GObject.h>
+#include <U2Core/Log.h>
+#include <U2Core/ProjectModel.h>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/GObjectTypes.h>
+#include <U2Core/LoadDocumentTask.h>
+
+#include <U2Gui/OrderedToolbar.h>
+#include <U2Gui/ProjectTreeItemSelectorDialog.h>
+#include <U2Gui/ProjectTreeController.h>
+#include <U2Gui/WidgetWithLocalToolbar.h>
+
+#include <U2View/AnnotatedDNAView.h>
+
+#include "BioStruct3DSplitter.h"
+#include "BioStruct3DGLWidget.h"
+#include "GLFrameManager.h"
+
+
+namespace U2 {
+
+#define HEADER_HEIGHT 24
+#define MAX_SPLITTER_HEIGHT 1000
+
+BioStruct3DSplitter::BioStruct3DSplitter(QAction* _closeAction, AnnotatedDNAView* view)
+ : ADVSplitWidget(view),
+ glFrameManager(new GLFrameManager),
+ parentSplitter(NULL)
+{
+ closeAction = _closeAction;
+
+ layout = new QVBoxLayout;
+ layout->setSpacing(0);
+ layout->setContentsMargins(0,0,3,0);
+ splitter = new QSplitter(Qt::Horizontal);
+ splitterHeight = 400;
+ setMinimumHeight(HEADER_HEIGHT);
+ setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ setAcceptDrops(true);
+
+ widgetWithToolbar = new WidgetWithLocalToolbar(this);
+ QLayout* l = new QVBoxLayout();
+ l->setMargin(0);
+ l->setSpacing(0);
+ l->addWidget(splitter);
+ widgetWithToolbar->setContentLayout(l);
+
+ header = new SplitterHeaderWidget(this);
+
+ layout->addWidget(header);
+ layout->addWidget(widgetWithToolbar);
+
+ isViewCollapsed = false;
+
+ setLayout(layout);
+}
+
+bool BioStruct3DSplitter::acceptsGObject( GObject* obj )
+{
+ if (obj->getGObjectType() == GObjectTypes::BIOSTRUCTURE_3D) {
+ return true;
+ } else {
+ return false;
+ }
+
+}
+
+BioStruct3DGLWidget* BioStruct3DSplitter::addBioStruct3DGLWidget( BioStruct3DObject* bioStructObj )
+{
+ if (isViewCollapsed) {
+ adaptSize(1);
+ }
+
+ BioStruct3DGLWidget* glWidget = new BioStruct3DGLWidget(bioStructObj, dnaView, getGLFrameManager(), this);
+ glWidget->installEventFilter(this);
+ // Add widget to splitter
+ biostrucViewMap.insert(bioStructObj, glWidget);
+ splitter->addWidget(glWidget);
+ emit si_bioStruct3DGLWidgetAdded(glWidget);
+
+ return glWidget;
+}
+
+
+void BioStruct3DSplitter::removeBioStruct3DGLWidget( BioStruct3DGLWidget* glw )
+{
+ // safe to remove widgets from map - it will be deleted later when
+ // splitter is deleted
+ QMutableMapIterator<BioStruct3DObject*, BioStruct3DGLWidget*> i(biostrucViewMap);
+ while (i.hasNext()) {
+ if (i.next().value() == glw) {
+ i.remove();
+ break;
+ }
+
+ }
+
+ glFrameManager->removeGLWidgetFrame(glw);
+ emit si_bioStruct3DGLWidgetRemoved(glw);
+
+ glw->deleteLater();
+}
+
+
+
+bool BioStruct3DSplitter::eventFilter(QObject* o, QEvent* e) {
+ Q_UNUSED(o); Q_UNUSED(e);
+ BioStruct3DGLWidget* glw = qobject_cast<BioStruct3DGLWidget*>(o);
+#ifdef Q_WS_X11
+ //first variant of fix of QT4 bug: GL widget is frozen after minimize/maximize
+ if (e->type() == QEvent::Hide) {
+ glw->makeCurrent(); //these 2 lines can be removed
+ glFinish();
+ return true;
+ }
+ //second variant of fix of QT4 bug: GL widget is frozen after minimize/maximize
+ if (e->type() == QEvent::WindowActivate) {
+ // ((QGLContext*)glw->context())->create();
+ }
+#endif
+ if (e->type() == QEvent::Close && glw != NULL) {
+ removeBioStruct3DGLWidget(glw);
+ if (biostrucViewMap.isEmpty()) {
+ closeAction->trigger();
+ }
+ }
+ return false;
+}
+
+void BioStruct3DSplitter::addObject(BioStruct3DObject* bioStructObj) {
+ if (!biostrucViewMap.contains(bioStructObj)) {
+ setVisible(true);
+ addBioStruct3DGLWidget(bioStructObj);
+ }
+}
+
+bool BioStruct3DSplitter::removeObject(BioStruct3DObject* obj) {
+ QList<BioStruct3DGLWidget*> toDelete = biostrucViewMap.values(obj);
+ foreach(BioStruct3DGLWidget* glw, toDelete) {
+ removeBioStruct3DGLWidget(glw);
+ }
+ biostrucViewMap.remove(obj);
+ bool isEmpty = biostrucViewMap.isEmpty();
+ return isEmpty;
+}
+
+
+void BioStruct3DSplitter::dragEnterEvent(QDragEnterEvent *event)
+{
+ const QMimeData* md = event->mimeData();
+ const GObjectMimeData* gomd = qobject_cast<const GObjectMimeData*>(md);
+ if (gomd != NULL) {
+ GObject* obj = gomd->objPtr.data();
+ if (obj->getGObjectType() == GObjectTypes::BIOSTRUCTURE_3D) {
+ BioStruct3DObject* bioStrucObj = qobject_cast<BioStruct3DObject*>(gomd->objPtr.data());
+ if (biostrucViewMap.contains(bioStrucObj))
+ event->acceptProposedAction();
+ }
+ }
+}
+
+void BioStruct3DSplitter::dropEvent(QDropEvent *event)
+{
+ const GObjectMimeData* gomd = qobject_cast<const GObjectMimeData*>(event->mimeData());
+ BioStruct3DObject* bioStrucObj = qobject_cast<BioStruct3DObject*>(gomd->objPtr.data());
+ Q_ASSERT(bioStrucObj != NULL);
+ addBioStruct3DGLWidget(bioStrucObj);
+
+}
+
+void BioStruct3DSplitter::addActionToLocalToolBar(QAction *action) {
+ widgetWithToolbar->addActionToLocalToolbar(action);
+}
+
+#define SPLITTER_STATE_MAP_NAME "BIOSTRUCT3DSPLITTER_MAP"
+#define WIDGET_STATE_LIST_NAME "WIDGET_STATE_MAP"
+#define OBJECT_ID_NAME "OBJECT_ID"
+
+BioStruct3DSplitter::~BioStruct3DSplitter() {
+ uiLog.trace("BioStruct3DSplitter deleted");
+}
+
+void BioStruct3DSplitter::saveState( QVariantMap& m )
+{
+ QVariantMap splitterStateMap = m.value(SPLITTER_STATE_MAP_NAME).toMap();
+ QVariantList glWidgetStateList = m.value(WIDGET_STATE_LIST_NAME).toList();
+
+ foreach (BioStruct3DGLWidget* glWidget, biostrucViewMap) {
+ QVariantMap widgetState = glWidget->getState();
+ glWidgetStateList.append(widgetState);
+ }
+
+ splitterStateMap[WIDGET_STATE_LIST_NAME] = glWidgetStateList;
+ m[SPLITTER_STATE_MAP_NAME] = splitterStateMap;
+
+}
+
+
+void BioStruct3DSplitter::updateState( const QVariantMap& m )
+{
+ const QVariantMap splitterStateMap = m.value(SPLITTER_STATE_MAP_NAME).toMap();
+ const QVariantList glWidgetStateList = splitterStateMap.value(WIDGET_STATE_LIST_NAME).toList();
+
+ // do nothing if the widget was closed
+ if (glWidgetStateList.isEmpty()) {
+ return;
+ }
+
+ foreach (BioStruct3DGLWidget* widget, biostrucViewMap.values()) {
+ widget->hide();
+ removeBioStruct3DGLWidget(widget);
+ }
+
+ assert(biostrucViewMap.isEmpty());
+
+ setVisible(true);
+ QListIterator<QVariant> iter(glWidgetStateList);
+ iter.toBack();
+ while (iter.hasPrevious()) {
+ QVariantMap state = iter.previous().toMap();
+ QString objName = state.value(OBJECT_ID_NAME).value<QString>();
+ BioStruct3DObject* obj = findBioStruct3DObjByName(objName);
+ if (obj == NULL)
+ continue;
+ BioStruct3DGLWidget* glWidget = addBioStruct3DGLWidget(obj);
+ if (!dnaView->getObjects().contains(obj)) {
+ dnaView->addObject(obj);
+ }
+ glWidget->setState(state);
+ }
+
+ splitter->update();
+
+}
+
+
+BioStruct3DObject* BioStruct3DSplitter::findBioStruct3DObjByName( const QString& objName )
+{
+ // TODO: optimize this by caching objects
+ QList<Document*> docs = AppContext::getProject()->getDocuments();
+ foreach (Document* doc, docs) {
+ QList<GObject*> biostructObjs = doc->findGObjectByType(GObjectTypes::BIOSTRUCTURE_3D);
+ if (!biostructObjs.empty()) {
+ Q_ASSERT(biostructObjs.size() == 1);
+ BioStruct3DObject* obj = qobject_cast<BioStruct3DObject*>(biostructObjs.first());
+ Q_ASSERT(obj != NULL);
+ if (obj->getGObjectName() == objName) {
+ return obj;
+ }
+ }
+ }
+
+ return NULL;
+}
+
+QSplitter* BioStruct3DSplitter::getParentSplitter()
+{
+ if (parentSplitter == NULL) {
+ QWidget* widget = parentWidget();
+ Q_ASSERT(widget != NULL);
+ parentSplitter = qobject_cast<QSplitter* > (widget);
+ }
+
+ return parentSplitter;
+}
+
+void BioStruct3DSplitter::adaptSize( int numVisibleWidgets )
+{
+ if (numVisibleWidgets > 0) {
+ isViewCollapsed = false;
+ setMaximumHeight(1000);
+ getParentSplitter();
+ // TODO: Simplify resizing
+ int index = parentSplitter->indexOf(this);
+ QList<int> sizes = parentSplitter->sizes();
+ for(int i = 0; i < sizes.count(); ++i) {
+ if (sizes.at(i) >= splitterHeight) {
+ sizes[i] = sizes.at(i) - splitterHeight;
+ break;
+ }
+ }
+ sizes[index] = splitterHeight;
+ parentSplitter->setSizes(sizes);
+ } else {
+ splitterHeight = splitter->height();
+ setFixedHeight(HEADER_HEIGHT);
+ isViewCollapsed = true;
+ }
+}
+
+const QList<QAction* > BioStruct3DSplitter::getSettingsMenuActions() const
+{
+ QList<QAction*> actions;
+
+ return actions;
+}
+
+QList<BioStruct3DGLWidget*> BioStruct3DSplitter::getChildWidgets()
+{
+ return biostrucViewMap.values();
+}
+
+int BioStruct3DSplitter::getNumVisibleWidgets()
+{
+ int numVisibleWidgets = 0;
+ foreach (BioStruct3DGLWidget* widget, biostrucViewMap) {
+ if (widget->isVisible()) {
+ ++numVisibleWidgets;
+ }
+ }
+ return numVisibleWidgets;
+}
+
+void BioStruct3DSplitter::addModelFromObject( BioStruct3DObject* obj )
+{
+ QList<GObject*> objects = dnaView->getObjects();
+ if (objects.contains(obj)) {
+ addBioStruct3DGLWidget(obj);
+ } else {
+ dnaView->addObject(obj);
+ }
+}
+
+GLFrameManager* BioStruct3DSplitter::getGLFrameManager()
+{
+ return glFrameManager.data();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Header widget
+
+SplitterHeaderWidget::SplitterHeaderWidget(BioStruct3DSplitter* sp) : splitter(sp)
+{
+ setFixedHeight(HEADER_HEIGHT);
+ setMinimumHeight(HEADER_HEIGHT);
+ setBackgroundRole(QPalette::Window);
+ setAutoFillBackground(true);
+ registerWebUrls();
+ QHBoxLayout *layout = new QHBoxLayout();
+ layout->setContentsMargins(10,0,0,0);
+ layout->setSpacing(10);
+
+ connect(splitter, SIGNAL(si_bioStruct3DGLWidgetAdded(BioStruct3DGLWidget* )),
+ SLOT(sl_bioStruct3DGLWidgetAdded(BioStruct3DGLWidget*)));
+
+ connect(splitter, SIGNAL(si_bioStruct3DGLWidgetRemoved(BioStruct3DGLWidget* )),
+ SLOT(sl_bioStruct3DGLWidgetRemoved(BioStruct3DGLWidget*)));
+
+
+ // Menu toolbar
+ toolbar = new OrderedToolbar(this);
+ toolbar->layout()->setSpacing(10);
+ toolbar->layout()->setMargin(0);
+
+ QLabel* pixLabel= new QLabel(this);
+ QFont f = pixLabel->font();
+ if (f.pixelSize() > HEADER_HEIGHT) {
+ f.setPixelSize(HEADER_HEIGHT-8);
+ }
+ QIcon objIcon(":biostruct3d_view/images/logo.png");
+ Q_ASSERT(!objIcon.isNull());
+ QPixmap pix = objIcon.pixmap(QSize(32, 32), QIcon::Active);
+ pixLabel->setPixmap(pix);
+ pixLabel->setFont(f);
+
+
+ layout->addWidget(pixLabel);
+ layout->addWidget(new QLabel(tr("3D Structure Viewer")));
+ layout->addStretch();
+ layout->addWidget(toolbar);
+ setLayout(layout);
+
+ // Build header menu
+
+ QLabel* activeWidgetLabel = new QLabel(this);
+ activeWidgetLabel->setText(tr("Active view:"));
+ toolbar->addWidget(activeWidgetLabel);
+
+ activeWidgetBox = new QComboBox(this);
+ toolbar->addWidget(activeWidgetBox);
+
+ restoreDefaultsAction = new QAction(this);
+ restoreDefaultsAction->setText(tr("Restore Default View"));
+ restoreDefaultsAction->setIcon(QIcon(":biostruct3d_view/images/restore.png"));
+ connect(restoreDefaultsAction, SIGNAL(triggered()), SLOT(sl_restoreDefaults()));
+
+ zoomInAction = new QAction(this);
+ zoomInAction->setText(tr("Zoom In"));
+ zoomInAction->setIcon(QIcon(":core/images/zoom_in.png"));
+ connect(zoomInAction, SIGNAL(triggered()), SLOT(sl_zoomIn()));
+
+ zoomOutAction = new QAction(this);
+ zoomOutAction->setIcon(QIcon(":core/images/zoom_out.png"));
+ zoomOutAction->setText(tr("Zoom Out"));
+ connect(zoomOutAction, SIGNAL(triggered()), SLOT(sl_zoomOut()));
+
+ syncLockAction = new QAction(this);
+ syncLockAction->setIcon(QIcon(":biostruct3d_view/images/lock.png"));
+ syncLockAction->setText(tr("Synchronize 3D Structure Views"));
+ syncLockAction->setCheckable(true);
+ connect(syncLockAction, SIGNAL(triggered(bool)), SLOT(sl_toggleSyncLock(bool)));
+
+ displayMenuAction = new QAction(this);
+ displayMenuAction->setText(tr("Display"));
+ connect(displayMenuAction, SIGNAL(triggered()), SLOT(sl_showDisplayMenu()));
+ addToolbarAction(displayMenuAction);
+
+ if (webActionMap.count() != 0) {
+ webMenuAction = new QAction(this);
+ webMenuAction->setText(tr("Links"));
+ connect(webMenuAction, SIGNAL(triggered()), SLOT(sl_showWebMenu()));
+ addToolbarAction(webMenuAction);
+ }
+
+ addModelAction = new QAction(this);
+ addModelAction->setIcon(QIcon(":core/images/add_gobject.png"));
+ addModelAction->setText(tr("Add"));
+ connect(addModelAction, SIGNAL(triggered()), SLOT(sl_addModel()));
+
+ // TODO: add settings functionality
+ // Note: do not use widgets on the toolbar, use actions instead
+ //settingsMenuButton = new QToolButton(this);
+ //settingsMenuButton->setText(tr("settings"));
+ // toolbar->addWidget(settingsMenuButton);
+
+ widgetStateMenuAction = new QAction(this);
+ widgetStateMenuAction->setIcon(QIcon(":core/images/adv_widget_menu.png"));
+ widgetStateMenuAction->setText(tr("Toggle view"));
+ widgetStateMenuAction->setToolTip(tr("Toggle view"));
+ connect(widgetStateMenuAction, SIGNAL(triggered()), this, SLOT(sl_showStateMenu()));
+ addToolbarAction(widgetStateMenuAction);
+
+ splitter->addActionToLocalToolBar(zoomInAction);
+ splitter->addActionToLocalToolBar(zoomOutAction);
+ splitter->addActionToLocalToolBar(restoreDefaultsAction);
+ splitter->addActionToLocalToolBar(addModelAction);
+ splitter->addActionToLocalToolBar(syncLockAction);
+}
+
+void SplitterHeaderWidget::sl_showStateMenu()
+{
+ QPointer<QAbstractButton> widgetStateMenuButtonPtr(qobject_cast<QAbstractButton*>(toolbar->widgetForAction(widgetStateMenuAction)));
+
+ QMenu m;
+
+
+ foreach(QAction* action, toggleActions) {
+ m.addAction(action);
+ }
+
+ m.addAction(splitter->getCloseSplitterAction());
+ m.exec(QCursor::pos());
+
+ if (!widgetStateMenuButtonPtr.isNull()) { //if not self closed
+ widgetStateMenuButtonPtr->setDown(false);
+ }
+}
+
+void SplitterHeaderWidget::sl_showDisplayMenu()
+{
+ QPointer<QAbstractButton> displayMenuButtonPtr(qobject_cast<QAbstractButton*>(toolbar->widgetForAction(displayMenuAction)));
+
+ BioStruct3DGLWidget* activeWidget = getActiveWidget();
+
+ QMenu* displayMenu = activeWidget->getDisplayMenu();
+ displayMenu->exec(QCursor::pos());
+
+ if (!displayMenuButtonPtr.isNull()) { //if not self closed
+ displayMenuButtonPtr->setDown(false);
+ }
+}
+
+#define ZOOM_DELTA 2.0f
+
+void SplitterHeaderWidget::sl_zoomIn()
+{
+ BioStruct3DGLWidget* w = getActiveWidget();
+ w->zoom(-ZOOM_DELTA);
+}
+
+void SplitterHeaderWidget::sl_zoomOut()
+{
+ BioStruct3DGLWidget* w = getActiveWidget();
+ w->zoom(ZOOM_DELTA);
+}
+
+// TODO: add settings functionality
+//void SplitterHeaderWidget::sl_showSettingsMenu()
+//{
+// QPointer<QToolButton> settingsMenuButtonPtr(settingsMenuButton);
+
+// QMenu m;
+
+// const QList<QAction* > settingsMenuActions = splitter->getSettingsMenuActions();
+// foreach (QAction* action, settingsMenuActions) {
+// m.addAction(action);
+// }
+// m.exec(QCursor::pos());
+
+// if (!settingsMenuButtonPtr.isNull()) { //if not self closed
+// settingsMenuButtonPtr->setDown(false);
+// }
+
+
+//}
+
+void SplitterHeaderWidget::sl_restoreDefaults()
+{
+ BioStruct3DGLWidget* w = getActiveWidget();
+ w->restoreDefaultSettigns();
+}
+
+void SplitterHeaderWidget::sl_bioStruct3DGLWidgetAdded( BioStruct3DGLWidget* glWidget )
+{
+ int index = activeWidgetBox->count() + 1;
+ const char* pdbId = glWidget->getBioStruct3D().pdbId.constData();
+
+ QString name = QString("%1: %2").arg(index).arg(pdbId) ;
+ activeWidgetBox->addItem(name);
+ activeWidgetBox->setCurrentIndex(index - 1);
+ glWidget->installEventFilter(this);
+
+ // Add show widget action
+ QString actionName( tr("Show %1").arg(pdbId) );
+ QAction* action = new QAction(actionName, glWidget);
+ action->setCheckable(true);
+ action->setChecked(true);
+ connect(action, SIGNAL(triggered(bool)), SLOT(sl_toggleBioStruct3DWidget(bool)));
+ toggleActions.append(action);
+
+ enableToolbar();
+}
+
+void SplitterHeaderWidget::sl_bioStruct3DGLWidgetRemoved( BioStruct3DGLWidget* glWidget )
+{
+ glWidget->disconnect(this);
+ updateActiveWidgetBox();
+ updateToolbar();
+ foreach (QAction* action, toggleActions) {
+ if (action->parent() == glWidget) {
+ toggleActions.removeOne(action);
+ }
+ }
+}
+
+bool SplitterHeaderWidget::eventFilter(QObject *obj, QEvent *event)
+{
+
+ if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::Wheel) {
+ BioStruct3DGLWidget* glWidget = qobject_cast<BioStruct3DGLWidget*>(obj);
+ if (glWidget) {
+ setActiveView(glWidget);
+ }
+ }
+
+ return QObject::eventFilter(obj, event);
+}
+
+
+
+BioStruct3DGLWidget* SplitterHeaderWidget::getActiveWidget()
+{
+ int idx = activeWidgetBox->currentIndex();
+ GLFrameManager* manager = splitter->getGLFrameManager();
+ GLFrame* frame = manager->getGLFrames().at(idx);
+ frame->makeCurrent();
+
+ return qobject_cast<BioStruct3DGLWidget*>(frame->getGLWidget());
+}
+
+void SplitterHeaderWidget::addToolbarAction(QAction* action) {
+ if (!toolbar || !action) {
+ return;
+ }
+
+ toolbar->addAction(action);
+ QPointer<QAbstractButton> buttonPtr(qobject_cast<QAbstractButton*>(toolbar->widgetForAction(action)));
+ if (!buttonPtr.isNull()) {
+ buttonPtr->setObjectName(action->objectName());
+ if (!action->icon().isNull()) {
+ buttonPtr->setFixedWidth(20);
+ }
+ }
+}
+
+
+void SplitterHeaderWidget::enableToolbar() {
+ activeWidgetBox->setEnabled(true);
+ restoreDefaultsAction->setEnabled(true);
+ zoomInAction->setEnabled(true);
+ zoomOutAction->setEnabled(true);
+ displayMenuAction->setEnabled(true);
+ widgetStateMenuAction->setEnabled(true);
+ syncLockAction->setEnabled(splitter->getGLFrameManager()->getGLFrames().count() > 1);
+}
+
+
+void SplitterHeaderWidget::updateActiveWidgetBox() {
+ activeWidgetBox->clear();
+ int index = 0;
+ QList<BioStruct3DGLWidget*> widgets = splitter->getChildWidgets();
+ foreach(BioStruct3DGLWidget* widget, widgets) {
+ ++index;
+ const char* pdbId = widget->getBioStruct3D().pdbId.constData();
+ QString name = QString("%1: %2").arg(index).arg(pdbId);
+ activeWidgetBox->addItem(name);
+ }
+
+
+}
+
+void SplitterHeaderWidget::updateToolbar() {
+ int numVisibleWidgets = splitter->getNumVisibleWidgets();
+
+ activeWidgetBox->setEnabled(true);
+ restoreDefaultsAction->setEnabled(true);
+ zoomInAction->setEnabled(true);
+ zoomOutAction->setEnabled(true);
+ syncLockAction->setEnabled(numVisibleWidgets > 1);
+ displayMenuAction->setEnabled(true);
+ widgetStateMenuAction->setEnabled(!splitter->getChildWidgets().isEmpty());
+}
+
+void SplitterHeaderWidget::sl_toggleBioStruct3DWidget( bool show )
+{
+ BioStruct3DGLWidget* glWidget = qobject_cast<BioStruct3DGLWidget*> (sender()->parent());
+ Q_ASSERT(glWidget != NULL);
+
+ glWidget->setVisible(show);
+
+ int numVisibleWidgets = splitter->getNumVisibleWidgets();
+
+ if ( (show == true && numVisibleWidgets == 1) ||
+ (show == false && numVisibleWidgets == 0) ) {
+ splitter->adaptSize(numVisibleWidgets);
+ }
+
+ updateToolbar();
+
+}
+
+void SplitterHeaderWidget::sl_addModel()
+{
+ QPointer<QAbstractButton> addModelButtonPtr(qobject_cast<QAbstractButton*>(toolbar->widgetForAction(addModelAction)));
+
+ if (!addModelButtonPtr.isNull()) { //if not self closed
+ addModelButtonPtr->setDown(false);
+ }
+
+ ProjectTreeControllerModeSettings settings;
+ settings.objectTypesToShow.insert(GObjectTypes::BIOSTRUCTURE_3D);
+ settings.allowSelectUnloaded = true;
+ QList<GObject*> objects = ProjectTreeItemSelectorDialog::selectObjects(settings, this);
+
+ if (!objects.isEmpty()) {
+ foreach(GObject* obj, objects) {
+ Task* t = new AddModelToSplitterTask(obj, splitter);
+ AppContext::getTaskScheduler()->registerTopLevelTask(t);
+ }
+ }
+
+}
+
+void SplitterHeaderWidget::sl_showWebMenu()
+{
+ QPointer<QAbstractButton> webMenuButtonPtr(qobject_cast<QAbstractButton*>(toolbar->widgetForAction(webMenuAction)));
+
+ QMenu m;
+ QString pdbId(getActiveWidget()->getBioStruct3D().pdbId);
+
+ const QList<QAction* >& webMenuActions = webActionMap.keys();
+ foreach (QAction* action, webMenuActions) {
+ QString wikiName = action->text().split(": ", QString::SkipEmptyParts).last();
+ action->setText(pdbId+": "+wikiName);
+ m.addAction(action);
+ }
+ m.exec(QCursor::pos());
+
+ if (!webMenuButtonPtr.isNull()) { //if not self closed
+ webMenuButtonPtr->setDown(false);
+ }
+
+
+}
+
+void SplitterHeaderWidget::registerWebUrls()
+{
+
+ DBLinksFile linksFile;
+ if (!linksFile.load()) {
+ return;
+ }
+
+ QList<DBLink> links = linksFile.getLinks();
+ foreach (const DBLink& link, links) {
+ QAction* webAction = new QAction(link.name,this);
+ webActionMap.insert(webAction, link.url);
+ connect(webAction, SIGNAL(triggered(bool)), this, SLOT(sl_openBioStructUrl()));
+ }
+
+}
+
+void SplitterHeaderWidget::sl_openBioStructUrl()
+{
+ QAction* webAction = qobject_cast<QAction*>(QObject::sender());
+ if (webAction == NULL)
+ return;
+ const QString& urlHeader = webActionMap.value(webAction);
+ QString pdbId(getActiveWidget()->getBioStruct3D().pdbId.toLower());
+ QString urlName = urlHeader.arg(pdbId);
+ QUrl url(urlName);
+ QDesktopServices::openUrl(urlName);
+
+}
+
+void SplitterHeaderWidget::setActiveView( BioStruct3DGLWidget* glWidget )
+{
+ int index = 0;
+ QList<GLFrame*> frames = splitter->getGLFrameManager()->getGLFrames();
+ foreach (GLFrame* frame, frames) {
+ if ( frame->getGLWidget() == glWidget ) {
+ frame->makeCurrent();
+ activeWidgetBox->setCurrentIndex(index);
+ break;
+ }
+ ++index;
+ }
+
+}
+
+void SplitterHeaderWidget::sl_toggleSyncLock( bool toggle )
+{
+ QList<BioStruct3DGLWidget*> widgets = splitter->getChildWidgets();
+ splitter->getGLFrameManager()->setSyncLock(toggle, widgets[0]);
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// DBLinksFile
+
+#define DB_LINKS_FILE_NAME "biostruct3d_plugin/BioStruct3DLinks.txt"
+
+bool DBLinksFile::load()
+{
+ QFile file( QString(PATH_PREFIX_DATA)+ ":" + DB_LINKS_FILE_NAME );
+ if(!file.exists() || !file.open(QIODevice::ReadOnly)){
+ ioLog.error(SplitterHeaderWidget::tr("File not found: %1").arg(DB_LINKS_FILE_NAME));
+ return false;
+ }
+
+ QTextStream in(&file);
+ while (!in.atEnd()) {
+ QString line = in.readLine();
+ if(line.length()==0 || line.startsWith("#")) {
+ continue;
+ }
+ QStringList fields = line.split("|");
+ if (fields.size() != 2) {
+ ioLog.error(SplitterHeaderWidget::tr("Illegal entry: %1").arg(line));
+ continue;
+ }
+ DBLink linkInfo(fields[0], fields[1].trimmed());
+ links.append(linkInfo);
+
+ }
+ file.close();
+
+ return true;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// AddModelToSplitterTask
+
+AddModelToSplitterTask::AddModelToSplitterTask( GObject* o, BioStruct3DSplitter* s ) :
+ Task("", TaskFlags_FOSCOE), doc(NULL), obj(o), bObj(NULL), splitter(s)
+{
+ setTaskName(tr("Add 3d model '%1' to BioStruct3DSplitter").arg(o->getGObjectName()));
+}
+
+void AddModelToSplitterTask::prepare()
+{
+ if (obj->isUnloaded()) {
+ doc = obj->getDocument();
+ addSubTask(new LoadUnloadedDocumentTask(doc));
+ }
+}
+
+void AddModelToSplitterTask::run()
+{
+ if (doc == NULL) {
+ bObj = qobject_cast<BioStruct3DObject*> (obj);
+ } else {
+ Q_ASSERT(doc->isLoaded());
+ QList<GObject*> lst = doc->findGObjectByType(GObjectTypes::BIOSTRUCTURE_3D);
+ Q_ASSERT(!lst.isEmpty());
+ bObj = qobject_cast<BioStruct3DObject*> (lst.first());
+ }
+
+
+}
+
+Task::ReportResult AddModelToSplitterTask::report()
+{
+ if ( (bObj == NULL) || ( propagateSubtaskError() == true) ) {
+ stateInfo.setError(tr("Model %1 wasn't added").arg(obj->getGObjectName()));
+ } else {
+ splitter->addModelFromObject(bObj);
+ }
+
+ return ReportResult_Finished;
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h
new file mode 100644
index 0000000..2c73c5c
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h
@@ -0,0 +1,239 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <U2Core/Task.h>
+#include <U2View/ADVSplitWidget.h>
+
+#include <QAction>
+#include <QComboBox>
+#include <QSplitter>
+#include <QToolBar>
+#include <QToolButton>
+
+namespace U2 {
+
+class BioStruct3DObject;
+class BioStruct3DGLWidget;
+class AnnotatedDNAView;
+class GObject;
+class GObjectView;
+class SplitterHeaderWidget;
+class Document;
+class GLFrameManager;
+class OrderedToolbar;
+class WidgetWithLocalToolbar;
+
+/*!
+* @class BioStruct3DSplitter BioStruct3DSplitter.h
+* @brief Class for multiple BioStruct3DWidget layout.
+*
+* This widget provides insertion of BioStruct3DGLWidgets into active UGENE view. There
+* could be one or more glWidgets controlled by the splitter. One can add new glWidgets using
+* the splitter.
+*/
+class BioStruct3DSplitter : public ADVSplitWidget {
+
+ Q_OBJECT
+
+public:
+ /*!
+ * Constructor.
+ * @param closeAction QAction provided for correct widget closing
+ * @param view DnaView context for connecting structure 3D representation and sequence view
+ */
+ BioStruct3DSplitter(QAction* closeAction, AnnotatedDNAView* view);
+ /*!
+ * Destructor.
+ */
+ ~BioStruct3DSplitter();
+ /*!
+ * @return True, if GObject has type BioStruct3D and could be added to splitter.
+ */
+ virtual bool acceptsGObject(GObject* obj);
+ /*!
+ * Creates BioStruct3DWidget for object visualization and adds it to the splitter.
+ */
+ BioStruct3DGLWidget* addBioStruct3DGLWidget(BioStruct3DObject* obj);
+ /*!
+ * @return First found BioStruct3DObject with corresponding name, NULL if nothing is found.
+ */
+ BioStruct3DObject* findBioStruct3DObjByName(const QString& objName);
+ virtual void saveState(QVariantMap& m);
+ virtual void updateState(const QVariantMap& m);
+ /*!
+ * @return List of splitter children widgets.
+ */
+ QList<BioStruct3DGLWidget*> getChildWidgets();
+ /*!
+ * @return Current active view.
+ */
+ const QList<QAction* > getSettingsMenuActions() const;
+ /*!
+ * @return ADVDNAView splitter, parent widget for BioStruct3DSplitter.
+ */
+ int getNumVisibleWidgets();
+ /*!
+ * @return If number of visible children is null, sets splitter view collapsed, else restores it.
+ */
+ void adaptSize(int numVisibleWidgets);
+ /*!
+ * @return GLFrameManager for splitter child widgets.
+ */
+ GLFrameManager* getGLFrameManager();
+ /*!
+ *Removes widgets, updates context
+ */
+ void removeBioStruct3DGLWidget(BioStruct3DGLWidget* widget);
+ /*!
+ * This is used to close 3D split widget from toolbar
+ */
+ QAction* getCloseSplitterAction() { return closeAction; }
+ /*!
+ * QWidget virtual function, returns preferred widget size.
+ */
+ virtual QSize sizeHint () const {return QSize(0, 400);}
+ /*!
+ * Adds object and its new view.
+ */
+ void addObject(BioStruct3DObject* obj);
+ /*!
+ * AddModelTask helper function.
+ */
+ void addModelFromObject(BioStruct3DObject* obj);
+ /*!
+ * Removes object and its views.
+ */
+ bool removeObject(BioStruct3DObject* obj);
+ /*!
+ * Adds action button to the toolbar on the left
+ */
+ void addActionToLocalToolBar(QAction* action);
+
+signals:
+ void si_bioStruct3DGLWidgetAdded(BioStruct3DGLWidget* widget);
+ void si_bioStruct3DGLWidgetRemoved(BioStruct3DGLWidget* widget);
+
+protected:
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dropEvent(QDropEvent *event);
+ bool eventFilter(QObject* o, QEvent* e);
+
+private:
+ QSplitter* getParentSplitter();
+ QMultiMap<BioStruct3DObject*, BioStruct3DGLWidget*> biostrucViewMap;
+ QScopedPointer<GLFrameManager> glFrameManager;
+ QSplitter* splitter;
+ QSplitter* parentSplitter;
+ QAction* closeAction;
+ QLayout* layout;
+ QList<QAction*> toggleActions;
+ int splitterHeight;
+ bool isViewCollapsed;
+ WidgetWithLocalToolbar* widgetWithToolbar;
+
+ SplitterHeaderWidget* header;
+};
+
+
+struct DBLink {
+ DBLink(const QString& _name, QString _url) : name(_name), url(_url) { }
+ QString name;
+ QString url;
+};
+
+class DBLinksFile {
+ QList<DBLink> links;
+public:
+ bool load();
+ QList<DBLink> getLinks() { return links; }
+};
+
+
+// Implemented as Task for unloaded documents support
+class AddModelToSplitterTask : public Task {
+ Q_OBJECT
+public:
+ AddModelToSplitterTask(GObject* o, BioStruct3DSplitter* s);
+ virtual void prepare();
+ virtual void run();
+ virtual ReportResult report();
+private:
+ Document* doc;
+ GObject* obj;
+ BioStruct3DObject* bObj;
+ BioStruct3DSplitter* splitter;
+};
+
+
+class SplitterHeaderWidget : public QWidget {
+ Q_OBJECT
+
+public:
+ SplitterHeaderWidget(BioStruct3DSplitter* splitter);
+
+private:
+ BioStruct3DSplitter* splitter;
+ QAction* widgetStateMenuAction;
+ QAction* addModelAction;
+ QAction* webMenuAction;
+ QAction* displayMenuAction;
+ QAction* restoreDefaultsAction;
+ QAction* zoomInAction;
+ QAction* zoomOutAction;
+ QAction* syncLockAction;
+ QComboBox* activeWidgetBox;
+ QMap<QAction*,QString> webActionMap;
+ QList<QAction*> toggleActions;
+
+ OrderedToolbar* toolbar;
+
+protected:
+ bool eventFilter(QObject *obj, QEvent *event);
+
+private slots:
+
+ void sl_bioStruct3DGLWidgetAdded(BioStruct3DGLWidget* glWidget);
+ void sl_bioStruct3DGLWidgetRemoved(BioStruct3DGLWidget* glWidget);
+ void sl_toggleBioStruct3DWidget(bool visible);
+ void sl_toggleSyncLock(bool on);
+ void sl_addModel();
+ void sl_showStateMenu();
+ void sl_showDisplayMenu();
+// void sl_showSettingsMenu(); // TODO: add settings functionality
+ void sl_showWebMenu();
+ void sl_zoomIn();
+ void sl_zoomOut();
+ void sl_restoreDefaults();
+ void sl_openBioStructUrl();
+
+
+private:
+ BioStruct3DGLWidget* getActiveWidget();
+ void addToolbarAction(QAction *action);
+ void updateToolbar();
+ void updateActiveWidgetBox();
+ void enableToolbar();
+ void registerWebUrls();
+ void setActiveView(BioStruct3DGLWidget* glWidget);
+
+};
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp
new file mode 100644
index 0000000..9b683ce
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp
@@ -0,0 +1,181 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "BioStruct3DSubsetEditor.h"
+
+#include <U2Algorithm/StructuralAlignmentAlgorithm.h>
+#include <U2Core/BioStruct3DObject.h>
+
+namespace U2 {
+
+static const QString ALL_CHAINS("All chains");
+
+BioStruct3DSubsetEditor::BioStruct3DSubsetEditor(const QList<BioStruct3DObject*> &biostructs, const BioStruct3DObject *selected /* = 0*/, int selectedModel /* = -1*/, QWidget *parent /* = 0*/)
+ : QWidget(parent)
+{
+ setupUi(this);
+
+ foreach (BioStruct3DObject *bs, biostructs) {
+ objectCombo->addItem(bs->getGObjectName(), qVariantFromValue((void*)bs));
+ }
+
+ if (selected) {
+ int idx = objectCombo->findData(qVariantFromValue((void*)selected));
+ assert(idx != -1 && "Selected object must present in biostructs");
+ objectCombo->setCurrentIndex(idx);
+ }
+
+ fillChainCombo();
+ fillRegionEdit();
+
+ fillModelCombo();
+
+ if (selectedModel != -1) {
+ int idx = modelCombo->findData(qVariantFromValue(selectedModel));
+ assert(idx != -1 && "Selected model must present in biostruct");
+ modelCombo->setCurrentIndex(idx);
+ }
+
+ connect(objectCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(sl_onBiostructChanged(int)));
+ connect(chainCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(sl_onChainChanged(int)));
+}
+
+void BioStruct3DSubsetEditor::fillChainCombo() {
+ BioStruct3DObject *bso = static_cast<BioStruct3DObject*>( objectCombo->itemData(objectCombo->currentIndex()).value<void*>() );
+ chainCombo->clear();
+ chainCombo->addItem(ALL_CHAINS);
+
+ foreach (const int chainIndex, bso->getBioStruct3D().moleculeMap.keys()) {
+ char chainId = bso->getBioStruct3D().getChainIdByIndex(chainIndex);
+ if (chainId > 0) {
+ chainCombo->addItem(QString(chainId), qVariantFromValue(chainIndex));
+ } else {
+ chainCombo->addItem(QString::number(chainIndex), qVariantFromValue(chainIndex));
+ }
+ }
+}
+
+void BioStruct3DSubsetEditor::fillModelCombo() {
+ BioStruct3DObject *bso = static_cast<BioStruct3DObject*>( objectCombo->itemData(objectCombo->currentIndex()).value<void*>() );
+ modelCombo->clear();
+ foreach (const int modelId, bso->getBioStruct3D().modelMap.keys()) {
+ modelCombo->addItem(QString::number(modelId), qVariantFromValue(modelId));
+ }
+}
+
+void BioStruct3DSubsetEditor::fillRegionEdit() {
+ if (chainCombo->currentText() != ALL_CHAINS) {
+ BioStruct3DObject *bso = static_cast<BioStruct3DObject*>( objectCombo->itemData(objectCombo->currentIndex()).value<void*>() );
+ int chainId = chainCombo->itemData(chainCombo->currentIndex()).value<int>();
+ int length = bso->getBioStruct3D().moleculeMap.value(chainId)->residueMap.size();
+
+ setRegion(U2Region(0, length));
+ regionEdit->setEnabled(true);
+ }
+ else {
+ regionEdit->setText("");
+ regionEdit->setDisabled(true);
+ }
+}
+
+void BioStruct3DSubsetEditor::sl_onBiostructChanged(int) {
+ fillModelCombo();
+ fillChainCombo();
+ fillRegionEdit();
+}
+
+void BioStruct3DSubsetEditor::sl_onChainChanged(int idx) {
+ if (idx != -1) {
+ // reject chainCombo->clear() event from fillChainCombo() method
+ fillRegionEdit();
+ }
+}
+
+BioStruct3DReference BioStruct3DSubsetEditor::getSubset() {
+ assert(validate().isEmpty() && "validate first!");
+
+ BioStruct3DObject *obj = static_cast<BioStruct3DObject*> ( objectCombo->itemData(objectCombo->currentIndex()).value<void*>() );
+ int modelId = modelCombo->itemData(modelCombo->currentIndex()).value<int>();
+
+ if (chainCombo->currentText() == ALL_CHAINS) {
+ QList<int> chains = obj->getBioStruct3D().moleculeMap.keys();
+ return BioStruct3DReference(obj, chains, modelId);
+ }
+ else {
+ int chainId = chainCombo->itemData(chainCombo->currentIndex()).value<int>();
+ U2Region chainRegion = getRegion();
+ return BioStruct3DReference(obj, chainId, chainRegion, modelId);
+ }
+}
+
+QString BioStruct3DSubsetEditor::validate() {
+ if (regionEdit->isEnabled()) {
+ QString regionText = regionEdit->text();
+ if (!QRegExp("[0-9]*\\.\\.[0-9]*").exactMatch(regionText)) {
+ return QString("invalid region spec %1").arg(regionText);
+ }
+
+ BioStruct3DObject *bso = static_cast<BioStruct3DObject*>( objectCombo->itemData(objectCombo->currentIndex()).value<void*>() );
+ int chainId = chainCombo->itemData(chainCombo->currentIndex()).value<int>();
+ int length = bso->getBioStruct3D().moleculeMap.value(chainId)->residueMap.size();
+
+ U2Region region = getRegion();
+
+ if (region.startPos < 0 || region.startPos >= region.endPos() || region.endPos() > length) {
+ return QString("region values out of range %1..%2 (%3..%4)").arg(region.startPos + 1).arg(region.endPos()).arg(1).arg(length);
+ }
+ }
+
+ return QString("");
+}
+
+U2Region BioStruct3DSubsetEditor::getRegion() {
+ U2Region ret;
+
+ QString text = regionEdit->text();
+ QStringList broken = text.split("..", QString::SkipEmptyParts);
+ if (broken.size() != 2) return ret;
+
+ bool ok = false;
+ int start = broken.at(0).toInt(&ok);
+ if (!ok) return ret;
+
+ int end = broken.at(1).toInt(&ok);
+ if (!ok) return ret;
+
+ ret = U2Region(start - 1, end - start + 1);
+ return ret;
+}
+
+void BioStruct3DSubsetEditor::setRegion(const U2Region ®ion) {
+ QString text = QString("%1..%2").arg(region.startPos + 1).arg(region.endPos());
+ regionEdit->setText(text);
+}
+
+void BioStruct3DSubsetEditor::setBiostructDisabled() {
+ objectCombo->setDisabled(true);
+}
+
+void BioStruct3DSubsetEditor::setModelDisabled() {
+ modelCombo->setDisabled(true);
+}
+
+} // namespace U2
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h
new file mode 100644
index 0000000..068e784
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h
@@ -0,0 +1,81 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_SUBSET_EDITOR_H_
+#define _U2_BIOSTRUCT3D_SUBSET_EDITOR_H_
+
+#include "ui_BioStruct3DSubsetEditor.h"
+
+#include <QWidget>
+
+namespace U2 {
+
+class U2Region;
+class BioStruct3DObject;
+class BioStruct3DReference;
+
+class BioStruct3DSubsetEditor : public QWidget, public Ui::BioStruct3DSubsetEditor
+{
+ Q_OBJECT
+
+public:
+ /** @param biostructs List of biostruct objects in which user can select
+ * @param selected Pre selected biostruct
+ * @param selectedModel Pre selected model
+ */
+ BioStruct3DSubsetEditor(const QList<BioStruct3DObject*> &biostructs, const BioStruct3DObject *selected = 0, int selectedModel = -1, QWidget *parent = 0);
+
+ /** Fill model ComboBox respectively with current biostruct */
+ void fillModelCombo();
+
+ /** Fill chain ComboBox respectively with current biostruct */
+ void fillChainCombo();
+
+ /** Fill region Edit respectively with current chain */
+ void fillRegionEdit();
+
+ /** Validate the subset.
+ * @returns "" on 0k, error message on fail
+ */
+ QString validate();
+
+ /** Fill and @return choosen subset */
+ BioStruct3DReference getSubset();
+
+ void setBiostructDisabled();
+ void setModelDisabled();
+
+private:
+ /** Convert text from region Edit to U2Region */
+ U2Region getRegion();
+
+ /** Set text in region Edit from U2Region */
+ void setRegion(const U2Region ®ion);
+
+private slots:
+ void sl_onBiostructChanged(int);
+ void sl_onChainChanged(int);
+
+};
+
+} // namespace U2
+
+#endif // #ifndef _U2_BIOSTRUCT3D_SUBSET_EDITOR_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp
new file mode 100644
index 0000000..90864c3
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp
@@ -0,0 +1,213 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "BioStruct3DViewPlugin.h"
+#include "BioStruct3DSplitter.h"
+#include "BioStruct3DGLWidget.h"
+
+#include <U2Core/GObject.h>
+#include <U2Core/BaseDocumentFormats.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/GObjectTypes.h>
+#include <U2Core/GObjectUtils.h>
+#include <U2Core/DNASequenceObject.h>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/DocumentSelection.h>
+#include <U2Core/LoadRemoteDocumentTask.h>
+#include <U2Core/U2SafePoints.h>
+
+#include <U2Gui/MainWindow.h>
+#include <U2Gui/GUIUtils.h>
+
+#include <U2View/AnnotatedDNAView.h>
+#include <U2View/ADVSequenceObjectContext.h>
+#include <U2View/ADVConstants.h>
+#include <U2View/ADVSingleSequenceWidget.h>
+
+#if (QT_VERSION < 0x050000) //Qt 5
+#include <QtGui/QMessageBox>
+#include <QtGui/QMenu>
+#else
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QMenu>
+#endif
+
+namespace U2 {
+
+/*!
+* \mainpage BioStruct3D Viewer Plugin Documentation
+*
+* \section viewer Introduction
+*
+* BioStruct3D Viewer is a macromolecular viewing / editing tool.
+* It is activated whenever UGENE loads document that contains BioStruct3DObject.
+*
+*
+* \subsection main Main Classes
+*
+* plugin classes:
+* - BioStruct3DGLWidget : Widget for rendering 3d representations of macromolecular structure.
+* - BioStruct3DSplitter : Multiple glWidgets layout and manipulation
+* - GLFrame : Class for manipulating the 3d viewpoint
+*
+* plugin interfaces:
+* - BioStruct3DGLRenderer : General interface for structure 3d graphical styles
+* - BioStruct3DColorScheme : Interface for coloring atoms, bonds, etc.
+*
+*
+*/
+
+extern "C" Q_DECL_EXPORT Plugin* U2_PLUGIN_INIT_FUNC() {
+ if (AppContext::getMainWindow()) {
+ BioStruct3DViewPlugin* plug = new BioStruct3DViewPlugin();
+ return plug;
+ }
+ return NULL;
+}
+
+BioStruct3DViewPlugin::BioStruct3DViewPlugin()
+ : Plugin(tr("3D Structure Viewer"), tr("Visualizes 3D structures of biological molecules."))
+{
+ // Init plugin view context
+ viewContext = new BioStruct3DViewContext(this);
+ viewContext->init();
+}
+
+BioStruct3DViewPlugin::~BioStruct3DViewPlugin()
+{
+
+}
+BioStruct3DViewContext::BioStruct3DViewContext(QObject* p)
+ : GObjectViewWindowContext(p, ANNOTATED_DNA_VIEW_FACTORY_ID)
+{
+
+}
+
+void BioStruct3DViewContext::initViewContext(GObjectView* v) {
+ AnnotatedDNAView* av = qobject_cast<AnnotatedDNAView*>(v);
+ U2SequenceObject* dna = av->getSequenceInFocus()->getSequenceObject();
+
+ QList<GObject *> allBiostructs = GObjectUtils::findAllObjects(UOF_LoadedOnly, GObjectTypes::BIOSTRUCTURE_3D);
+ QList<GObject *> targetBiostructs = GObjectUtils::findObjectsRelatedToObjectByRole(dna,
+ GObjectTypes::BIOSTRUCTURE_3D, ObjectRole_Sequence, allBiostructs, UOF_LoadedOnly);
+ CHECK(!targetBiostructs.isEmpty(), );
+
+ QList<ADVSequenceWidget*> seqWidgets = av->getSequenceWidgets();
+ foreach(ADVSequenceWidget* w, seqWidgets) {
+ ADVSingleSequenceWidget* aw = qobject_cast<ADVSingleSequenceWidget*>(w);
+ if (aw!=NULL) {
+ aw->setDetViewCollapsed(true);
+ aw->setOverviewCollapsed(true);
+ }
+ }
+ foreach(GObject* obj, targetBiostructs) {
+ v->addObject(obj);
+ }
+}
+
+bool BioStruct3DViewContext::canHandle(GObjectView* v, GObject* o) {
+ Q_UNUSED(v);
+ bool res = qobject_cast<BioStruct3DObject*>(o) != NULL;
+ return res;
+}
+
+void BioStruct3DViewContext::onObjectAdded(GObjectView* view, GObject* obj) {
+ //todo: add sequence & all objects associated with sequence to the view?
+
+ BioStruct3DObject* obj3d = qobject_cast<BioStruct3DObject*>(obj);
+ if (obj3d == NULL || view == NULL) {
+ return;
+ }
+
+ AnnotatedDNAView* av = qobject_cast<AnnotatedDNAView*>(view);
+ BioStruct3DSplitter* splitter = NULL;
+ if (splitterMap.contains(view)) {
+ splitter = splitterMap.value(view);
+ } else {
+ splitter = new BioStruct3DSplitter(getClose3DViewAction(view), av);
+ }
+
+ av->insertWidgetIntoSplitter(splitter);
+ splitter->addObject(obj3d);
+ splitterMap.insert(view,splitter);
+}
+
+void BioStruct3DViewContext::onObjectRemoved(GObjectView* v, GObject* obj) {
+ BioStruct3DObject* obj3d = qobject_cast<BioStruct3DObject*>(obj);
+ if (obj3d == NULL) {
+ return;
+ }
+ BioStruct3DSplitter* splitter = splitterMap.value(v);
+ bool close = splitter->removeObject(obj3d);
+ if (close) {
+ splitter->close();
+ //unregister3DView(v,splitter);
+ }
+}
+
+void BioStruct3DViewContext::unregister3DView(GObjectView* view, BioStruct3DSplitter* splitter) {
+ assert(splitter->getChildWidgets().isEmpty());
+ splitter->close();
+ AnnotatedDNAView* av = qobject_cast<AnnotatedDNAView*>(view);
+ av->unregisterSplitWidget(splitter);
+ splitterMap.remove(view);
+ splitter->deleteLater();
+}
+
+QAction* BioStruct3DViewContext::getClose3DViewAction(GObjectView* view) {
+ QList<QObject*> resources = viewResources.value(view);
+ foreach(QObject* r, resources) {
+ GObjectViewAction* a= qobject_cast<GObjectViewAction*>(r);
+ if (a!=NULL) {
+ return a;
+ }
+ }
+ QAction* a = new GObjectViewAction(this, view, tr("Close 3D Structure Viewer"));
+ connect(a, SIGNAL(triggered()), SLOT(sl_close3DView()));
+ resources.append(a);
+ return a;
+}
+
+void BioStruct3DViewContext::sl_close3DView() {
+ GObjectViewAction* action = qobject_cast<GObjectViewAction*>(sender());
+ GObjectView* ov = action->getObjectView();
+ QList<GObject*> objects = ov->getObjects();
+ foreach(GObject* obj, objects) {
+ if (obj->getGObjectType() == GObjectTypes::BIOSTRUCTURE_3D) {
+ ov->removeObject(obj);
+ }
+ }
+}
+
+void BioStruct3DViewContext::sl_windowClosing(MWMDIWindow* w) {
+ GObjectViewWindow *gvw = qobject_cast<GObjectViewWindow*>(w);
+ if (gvw) {
+ GObjectView *view = gvw->getObjectView();
+ // safe to remove: splitter will be deleted with ADV
+ splitterMap.remove(view);
+ }
+
+ GObjectViewWindowContext::sl_windowClosing(w);
+}
+
+
+
+}//namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h
new file mode 100644
index 0000000..9354891
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h
@@ -0,0 +1,77 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_VIEW_PLUGIN_H_
+#define _U2_BIOSTRUCT3D_VIEW_PLUGIN_H_
+
+#include <U2Core/PluginModel.h>
+#include <U2Core/AppContext.h>
+#include <U2Gui/ObjectViewModel.h>
+
+#include <QtCore/QMap>
+#if (QT_VERSION < 0x050000) //Qt 5
+#include <QtGui/QAction>
+#else
+#include <QtWidgets/QAction>
+#endif
+
+namespace U2 {
+
+class BioStruct3DSplitter;
+class BioStruct3DObject;
+
+class BioStruct3DViewPlugin : public Plugin {
+ Q_OBJECT
+public:
+ BioStruct3DViewPlugin();
+ ~BioStruct3DViewPlugin();
+private:
+ GObjectViewWindowContext* viewContext;
+};
+
+class BioStruct3DViewContext: public GObjectViewWindowContext {
+ Q_OBJECT
+ QMap<GObjectView*, BioStruct3DSplitter*> splitterMap;
+public:
+ BioStruct3DViewContext(QObject* p);
+
+ virtual bool canHandle(GObjectView* v, GObject* o);
+
+ virtual void onObjectAdded(GObjectView* v, GObject* obj);
+ virtual void onObjectRemoved(GObjectView* v, GObject* obj);
+
+protected:
+ virtual void initViewContext(GObjectView* view);
+
+ void unregister3DView(GObjectView* view, BioStruct3DSplitter* view3d);
+
+ QAction* getClose3DViewAction(GObjectView* view);
+
+
+protected slots:
+ void sl_close3DView();
+ virtual void sl_windowClosing(MWMDIWindow*);
+
+};
+
+} //namespace
+
+#endif
diff --git a/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp
new file mode 100644
index 0000000..ab717f1
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp
@@ -0,0 +1,206 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <U2Core/Vector3D.h>
+
+#include "GLFrameManager.h"
+#include <U2Core/Log.h>
+// include this for proper cross-platform including of glu.h
+#include "GraphicUtils.h"
+
+namespace U2 {
+
+const GLfloat GLFrame::DEFAULT_ZOOM = 45.0f;
+//const Vector3D GLFrame::DEFAULT_CAMERA = Vector3D(0, 0, 0);
+
+///////////////////////////////////////////////////////////////////////////////////////////
+/// GLFrame
+
+GLFrame::GLFrame(QGLWidget* widget)
+ : glWidget(widget), rotMatrix(),
+ cameraClipNear(0), cameraClipFar(0),
+ zoomFactor(DEFAULT_ZOOM), cameraPosition(0,0,0)
+{
+ rotMatrix.loadIdentity();
+}
+
+void GLFrame::performZoom( float delta )
+{
+ static const float maxZoom = 150.0;
+ static const float minZoom = 2.0;
+ zoomFactor += delta;
+ if (zoomFactor < minZoom) {
+ zoomFactor = minZoom;
+ return;
+ }
+
+ if (zoomFactor > maxZoom) {
+ zoomFactor = maxZoom;
+ return;
+ }
+}
+
+void GLFrame::performShift(float deltaX, float deltaY)
+{
+ static float defaultWidth=1092;
+ Vector3D shiftVector;
+ float frameFactor = glWidget->width()/defaultWidth;
+
+ shiftVector.set(deltaX*zoomFactor*frameFactor, deltaY*zoomFactor*frameFactor, 0);
+ cameraPosition+=shiftVector;
+}
+
+const Vector3D GLFrame::getCameraPosition()const
+{
+ return cameraPosition;
+}
+
+void GLFrame::setCameraPosition(float x, float y, float z)
+{
+ cameraPosition.set(x, y, z);
+}
+
+void GLFrame::setCameraPosition(const Vector3D &v) {
+ cameraPosition = v;
+}
+
+void GLFrame::setCameraClip(float clipNear, float clipFar) {
+ cameraClipNear = clipNear;
+ cameraClipFar = clipFar;
+}
+
+void GLFrame::rotateCamera(const Vector3D& rotAxis, float rotAngle )
+{
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z );
+ glMultMatrixf(rotMatrix.data());
+ glGetFloatv( GL_MODELVIEW_MATRIX, rotMatrix.data());
+}
+
+#define ZOOM_FACTOR_ID "ZOOM_FACTOR"
+#define CAMERA_STATE_POSITION_X_ID "CAMERA_STATE_POSITION_X"
+#define CAMERA_STATE_POSITION_Y_ID "CAMERA_STATE_POSITION_Y"
+#define ROTATION_MATRIX_ID "ROTATION_MATRIX"
+
+void GLFrame::setState( const QVariantMap& state )
+{
+ cameraPosition.x = state.value(CAMERA_STATE_POSITION_X_ID, 0).value<float>();
+ cameraPosition.y = state.value(CAMERA_STATE_POSITION_Y_ID, 0).value<float>();
+
+ zoomFactor = state.value(ZOOM_FACTOR_ID, DEFAULT_ZOOM).value<float>();
+ QVariantList rotML = state.value(ROTATION_MATRIX_ID).value<QVariantList>();
+ if (!rotML.isEmpty()) {
+ rotMatrix.load(rotML);
+ }
+}
+
+void GLFrame::writeStateToMap( QVariantMap& state )
+{
+ state[CAMERA_STATE_POSITION_X_ID] = QVariant::fromValue(cameraPosition.x);
+ state[CAMERA_STATE_POSITION_Y_ID] = QVariant::fromValue(cameraPosition.y);
+
+ state[ZOOM_FACTOR_ID] = QVariant::fromValue(zoomFactor);
+ state[ROTATION_MATRIX_ID] = rotMatrix.store();
+}
+
+
+void GLFrame::updateViewPort( int width, int height )
+{
+ glViewport(0, 0, width, height);
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ // Set view settings
+ GLfloat aspect = GLfloat(width) / height;
+ gluPerspective(zoomFactor, aspect, cameraClipNear, cameraClipFar);
+}
+
+void GLFrame::updateViewPort()
+{
+ updateViewPort(glWidget->width(), glWidget->height());
+}
+
+GLFrameManager::~GLFrameManager()
+{
+
+}
+
+void GLFrameManager::addGLFrame( GLFrame* glFrame)
+{
+ widgetFrameMap.insert(glFrame->getGLWidget(), glFrame);
+}
+
+GLFrame* GLFrameManager::getGLWidgetFrame( QGLWidget* widget )
+{
+ if (widgetFrameMap.contains(widget)) {
+ return widgetFrameMap.value(widget);
+ } else {
+ return NULL;
+ }
+
+}
+
+QList<GLFrame*> GLFrameManager::getGLFrames()
+{
+ return widgetFrameMap.values();
+}
+
+void GLFrameManager::setSyncLock( bool lockOn, QGLWidget* syncWidget )
+{
+ syncLock = lockOn;
+ if (lockOn) {
+ GLFrame* syncFrame = getGLWidgetFrame(syncWidget);
+ QVariantMap state;
+ syncFrame->writeStateToMap(state);
+ foreach(GLFrame* frame, widgetFrameMap.values()) {
+ if (frame != syncFrame) {
+ frame->makeCurrent();
+ frame->setState(state);
+ frame->updateViewPort();
+ frame->updateGL();
+ }
+ }
+ }
+}
+
+void GLFrameManager::removeGLWidgetFrame( QGLWidget* widget )
+{
+ Q_ASSERT(widgetFrameMap.contains(widget));
+ widgetFrameMap.remove(widget);
+}
+
+QList<GLFrame*> GLFrameManager::getActiveGLFrameList( GLFrame* currentFrame, bool syncModeOn )
+{
+ if (syncModeOn) {
+ return widgetFrameMap.values();
+ } else {
+ QList<GLFrame*> lst;
+ lst.append(currentFrame);
+ return lst;
+ }
+}
+
+void GLFrameManager::clear()
+{
+ widgetFrameMap.clear();
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h
new file mode 100644
index 0000000..54ce3d4
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h
@@ -0,0 +1,95 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_GL_FRAME_MANAGER_H_
+#define _U2_GL_FRAME_MANAGER_H_
+
+#include <U2Core/Matrix44.h>
+
+#include <QtOpenGL/QGLWidget>
+#include <QtCore/QVariantList>
+
+namespace U2 {
+
+class Vector3D;
+
+/*!
+* @brief Class for OpenGL 3d scene manipulation
+*/
+class GLFrame {
+ static const GLfloat DEFAULT_ZOOM;
+ //static const Vector3D DEFAULT_CAMERA;
+public:
+ GLFrame(QGLWidget* widget);
+
+ void setState(const QVariantMap& state);
+ void writeStateToMap(QVariantMap& states);
+ QGLWidget* getGLWidget() { return glWidget; }
+ void makeCurrent() { glWidget->makeCurrent(); }
+ void updateViewPort(int width, int height);
+ void updateViewPort();
+ void updateGL() { glWidget->updateGL(); }
+ GLfloat getZoomFactor() const { return zoomFactor; }
+ float* getRotationMatrix() { return rotMatrix.data(); }
+ void rotateCamera(const Vector3D& rotAxis, float rotAngle);
+
+ void setCameraClip(float clipNear, float clipFar);
+
+ const Vector3D getCameraPosition() const;
+ void setCameraPosition(const Vector3D &v);
+ void setCameraPosition(float x, float y, float z);
+
+ void performZoom(float delta);
+ void performShift(float deltaX, float deltaY);
+
+private:
+ QGLWidget* glWidget;
+ Matrix44 rotMatrix;
+ float cameraClipNear, cameraClipFar;
+
+ GLfloat zoomFactor;
+ Vector3D cameraPosition;
+};
+
+class GLFrameManager {
+ QMap<QGLWidget*, GLFrame*> widgetFrameMap;
+ bool syncLock;
+
+public:
+ GLFrameManager() : syncLock(false) {}
+ ~GLFrameManager();
+ bool getSyncLock() const { return syncLock; }
+ void setSyncLock(bool lockOn, QGLWidget* syncWidget);
+ void addGLFrame(GLFrame* frame);
+ GLFrame* getGLWidgetFrame(QGLWidget* widget);
+ void removeGLWidgetFrame(QGLWidget* widget);
+ void clear();
+ QList<GLFrame*> getGLFrames();
+ QList<GLFrame*> getActiveGLFrameList(GLFrame* currentFrame, bool syncModeOn);
+
+};
+
+} // namespace
+
+
+#endif // _U2_GL_FRAME_MANAGER_H_
+
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp
new file mode 100644
index 0000000..2de0ba2
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp
@@ -0,0 +1,632 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QtOpenGL>
+#include <U2Algorithm/GeomUtils.h>
+#include <math.h>
+#include "GraphicUtils.h"
+#include <U2Core/Log.h>
+
+#include <U2Core/BioStruct3D.h>
+#include "BioStruct3DColorScheme.h"
+
+
+namespace U2 {
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+/// Color4f
+
+Color4f::Color4f()
+{
+ color[0] = 0;
+ color[1] = 0;
+ color[2] = 0;
+ color[3] = 1.0;
+}
+
+Color4f::Color4f(float r, float g, float b, float a)
+{
+ color[0] = r;
+ color[1] = g;
+ color[2] = b;
+ color[3] = a;
+}
+
+Color4f::Color4f( const QColor& qc)
+{
+ color[0] = qc.redF();
+ color[1] = qc.greenF();
+ color[2] = qc.blueF();
+ color[3] = qc.alphaF();
+}
+
+Color4f::Color4f(const Color4f &c) {
+ for (int i = 0; i < 4; ++i) {
+ color[i] = c.color[i];
+ }
+}
+
+float Color4f::operator[] (unsigned int i ) const
+{
+ assert(i < 4);
+ return color[i];
+}
+
+float& Color4f::operator[] (unsigned int i) {
+ assert(i < 4);
+ return color[i];
+}
+
+bool Color4f::operator== (const Color4f &a) const
+{
+ //Do not affect alpha channel
+ if (color[0]==a.color[0] && color[1]==a.color[1] && color[2]==a.color[2])
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+void glDrawCylinder(GLUquadric* pObj, const Vector3D& p1, const Vector3D& p2, double thickness, float renderDetailLevel)
+{
+ int numSlices = (8 * renderDetailLevel);
+ int numStacks = 1;
+ static Vector3D zAxis(0.0, 0.0, 1.0);
+
+ Vector3D vec(p2 - p1);
+ float length = vec.length();
+ float rotAngle = Rad2Deg* acos( vec.z / length );
+ Vector3D rotAxis = vector_cross(zAxis, vec);
+
+ glPushMatrix();
+ glTranslatef(p1.x, p1.y, p1.z);
+ glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ gluCylinder(pObj, thickness, thickness, length, numSlices, numStacks);
+ glPopMatrix();
+}
+
+/* class Helix3D : public Object3D */
+Helix3D::Helix3D(const Color4f& cl, const Vector3D& c, const Vector3D& n, float r )
+ : Object3D(cl), cterm(c), nterm(n), radius(r)
+{
+ pObj = gluNewQuadric();
+ gluQuadricNormals(pObj, GLU_SMOOTH);
+ Vector3D vec(nterm - cterm);
+ length = vec.length();
+ rotAngle = Rad2Deg* acos( vec.z / length );
+ Vector3D zAxis(0.0, 0.0, 1.0);
+ rotAxis = vector_cross(zAxis, vec);
+}
+
+
+void Helix3D::draw(float renderDetailLevel)
+{
+ glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
+ int numSlices = 10 * renderDetailLevel;
+ int numStacks = 1;
+ static float smallLength = 1.2f;
+
+ radius=1.0f;
+
+ glPushMatrix();
+ glTranslatef(cterm.x, cterm.y, cterm.z);
+ glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ glPushMatrix();
+ glScalef(1,1,-1);
+ gluDisk(pObj, 0, radius, numSlices, numSlices);
+ glPopMatrix();
+ gluCylinder(pObj, radius, radius, length - smallLength, numSlices, numStacks);
+ glTranslatef(0, 0, length - smallLength);
+ glPushMatrix();
+ glScalef(1,1,-1);
+ gluDisk(pObj, 0, radius*1.2f, numSlices, numSlices);
+ glPopMatrix();
+ gluCylinder(pObj, radius*1.2f, radius*0.4f, smallLength, numSlices, numStacks);
+ glTranslatef(0, 0, smallLength);
+ gluDisk(pObj, 0, radius*0.4f, numSlices, numStacks);
+ glPopMatrix();
+}
+
+Helix3D::~Helix3D()
+{
+ gluDeleteQuadric(pObj);
+}
+
+/* class Strand3D : public Object3D */
+Strand3D::Strand3D( const Color4f& cl, const Vector3D& c, const Vector3D& n, const Vector3D& up )
+ : Object3D(cl), cterm(c), nterm(n), upVector(up)
+{
+
+ Vector3D vec(nterm - cterm);
+ length = vec.length();
+ rotAngle = Rad2Deg* acos( vec.z / length );
+ Vector3D zAxis(0.0, 0.0, 1.0);
+ rotAxis = vector_cross(zAxis, vec);
+
+}
+
+void Strand3D::draw(float renderDetailLevel)
+{
+ Q_UNUSED(renderDetailLevel);
+
+ float width = 1.5f;
+ float height = 0.4f;
+
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color.getConstData());
+
+ glPushMatrix();
+ glTranslatef(cterm.x, cterm.y, cterm.z);
+ glRotatef(rotAngle, rotAxis.x, rotAxis.y, rotAxis.z);
+ glCreateArrowPrimitive(width, height, length);
+ glPopMatrix();
+
+}
+
+Strand3D::~Strand3D()
+{
+
+}
+
+
+void glDrawHalfWorm(const Vector3D& p0, const Vector3D& p1,
+ const Vector3D& p2, const Vector3D& p3,
+ double radius, bool cap1, bool cap2,
+ double tension, float renderDetailLevel)
+{
+ int i, j, k, m, offset=0;
+ Vector3D R1, R2, Qt, p, dQt, H, V;
+ double len, MG[4][3], T[4], t, prevlen=0.0, cosj, sinj;
+ GLfloat *Nx=NULL, *Ny=NULL, *Nz=NULL, *Cx=NULL, *Cy=NULL, *Cz=NULL,
+ *pNx=NULL, *pNy=NULL, *pNz=NULL, *pCx=NULL, *pCy=NULL, *pCz=NULL, *tmp;
+
+ /*
+ * The Hermite matrix Mh.
+ */
+ static double Mh[4][4] = {
+ { 2, -2, 1, 1},
+ {-3, 3, -2, -1},
+ { 0, 0, 1, 0},
+ { 1, 0, 0, 0}
+ };
+
+ /*
+ * Variables that affect the curve shape
+ * a=b=0 = Catmull-Rom
+ */
+ double a = tension, /* tension (adjustable) */
+ c = 0, /* continuity (should be 0) */
+ b = 0; /* bias (should be 0) */
+
+ int wormSegments = 10 * renderDetailLevel;
+ int wormSides = 10 * renderDetailLevel;
+
+ /*
+ if (wormSides % 2) {
+ WARNINGMSG("worm sides must be an even number");
+ ++wormSides;
+ }
+ */
+
+ GLfloat *fblock = NULL;
+
+ /* First, calculate the coordinate points of the center of the worm,
+ * using the Kochanek-Bartels variant of the Hermite curve.
+ */
+ R1 = 0.5 * (1 - a) * (1 + b) * (1 + c) * (p1 - p0) + 0.5 * (1 - a) * (1 - b) * (1 - c) * ( p2 - p1);
+ R2 = 0.5 * (1 - a) * (1 + b) * (1 - c) * (p2 - p1) + 0.5 * (1 - a) * (1 - b) * (1 + c) * (p3 - p2);
+
+ /*
+ * Multiply MG=Mh.Gh, where Gh = [ P(1) P(2) R(1) R(2) ]. This
+ * 4x1 matrix of vectors is constant for each segment.
+ */
+ for (i = 0; i < 4; ++i) { /* calculate Mh.Gh */
+ MG[i][0] = Mh[i][0] * p1.x + Mh[i][1] * p2.x + Mh[i][2] * R1.x + Mh[i][3] * R2.x;
+ MG[i][1] = Mh[i][0] * p1.y + Mh[i][1] * p2.y + Mh[i][2] * R1.y + Mh[i][3] * R2.y;
+ MG[i][2] = Mh[i][0] * p1.z + Mh[i][1] * p2.z + Mh[i][2] * R1.z + Mh[i][3] * R2.z;
+ }
+
+ for (i = 0; i <= wormSegments; ++i) {
+
+ /* t goes from [0,1] from P(1) to P(2) (and we want to go halfway only),
+ and the function Q(t) defines the curve of this segment. */
+ t = (0.5 / wormSegments) * i;
+ /*
+ * Q(t)=T.(Mh.Gh), where T = [ t^3 t^2 t 1 ]
+ */
+ T[0] = t * t * t;
+ T[1] = t * t;
+ T[2] = t;
+ //T[3] = 1;
+ Qt.x = T[0] * MG[0][0] + T[1] * MG[1][0] + T[2] * MG[2][0] + MG[3][0] /* *T[3] */ ;
+ Qt.y = T[0] * MG[0][1] + T[1] * MG[1][1] + T[2] * MG[2][1] + MG[3][1] /* *T[3] */ ;
+ Qt.z = T[0] * MG[0][2] + T[1] * MG[1][2] + T[2] * MG[2][2] + MG[3][2] /* *T[3] */ ;
+
+ if (radius == 0.0) {
+ if (i > 0) {
+ glBegin(GL_LINES);
+ glVertex3d(p.x, p.y, p.z);
+ glVertex3d(Qt.x, Qt.y, Qt.z);
+ glEnd();
+ }
+ /* save to use as previous point for connecting points together */
+ p = Qt;
+
+ } else {
+ /* construct a circle of points centered at and
+ in a plane normal to the curve at t - these points will
+ be used to construct the "thick" worm */
+
+ /* allocate single block of storage for two circles of points */
+ if (!Nx) {
+ fblock = new GLfloat[12 * wormSides];
+ Nx = fblock;
+ Ny = &Nx[wormSides];
+ Nz = &Nx[wormSides * 2];
+ Cx = &Nx[wormSides * 3];
+ Cy = &Nx[wormSides * 4];
+ Cz = &Nx[wormSides * 5];
+ pNx = &Nx[wormSides * 6];
+ pNy = &Nx[wormSides * 7];
+ pNz = &Nx[wormSides * 8];
+ pCx = &Nx[wormSides * 9];
+ pCy = &Nx[wormSides * 10];
+ pCz = &Nx[wormSides * 11];
+ }
+
+ /*
+ * The first derivative of Q(t), d(Q(t))/dt, is the slope
+ * (tangent) at point Q(t); now T = [ 3t^2 2t 1 0 ]
+ */
+ T[0] = t * t * 3;
+ T[1] = t * 2;
+ //T[2] = 1;
+ //T[3] = 0;
+ dQt.x = T[0] * MG[0][0] + T[1] * MG[1][0] + MG[2][0] /* *T[2] + T[3]*MG[3][0] */ ;
+ dQt.y = T[0] * MG[0][1] + T[1] * MG[1][1] + MG[2][1] /* *T[2] + T[3]*MG[3][1] */ ;
+ dQt.z = T[0] * MG[0][2] + T[1] * MG[1][2] + MG[2][2] /* *T[2] + T[3]*MG[3][2] */ ;
+
+ /* use cross product of [1,0,0] x normal as horizontal */
+ H.set(0.0, -dQt.z, dQt.y);
+ if (H.length() < 0.000001) /* nearly colinear - use [1,0.1,0] instead */
+ H.set(0.1 * dQt.z, -dQt.z, dQt.y - 0.1 * dQt.x);
+ H.normalize();
+
+ /* and a vertical vector = normal x H */
+ V = vector_cross(dQt, H);
+ V.normalize();
+
+ /* finally, the worm circumference points (C) and normals (N) are
+ simple trigonometric combinations of H and V */
+ for (j = 0; j < wormSides; ++j) {
+ cosj = cos(2 * PI * j / wormSides);
+ sinj = sin(2 * PI * j / wormSides);
+ Nx[j] = H.x * cosj + V.x * sinj;
+ Ny[j] = H.y * cosj + V.y * sinj;
+ Nz[j] = H.z * cosj + V.z * sinj;
+ Cx[j] = Qt.x + Nx[j] * radius;
+ Cy[j] = Qt.y + Ny[j] * radius;
+ Cz[j] = Qt.z + Nz[j] * radius;
+ }
+
+ /* figure out which points on the previous circle "match" best
+ with these, to minimize envelope twisting */
+ if (i > 0) {
+ for (m = 0; m < wormSides; ++m) {
+ len = 0.0;
+ for (j = 0; j < wormSides; ++j) {
+ k = j + m;
+ if (k >= wormSides)
+ k -= wormSides;
+ len += (Cx[k] - pCx[j]) * (Cx[k] - pCx[j]) +
+ (Cy[k] - pCy[j]) * (Cy[k] - pCy[j]) +
+ (Cz[k] - pCz[j]) * (Cz[k] - pCz[j]);
+ }
+ if (m == 0 || len < prevlen) {
+ prevlen = len;
+ offset = m;
+ }
+ }
+ }
+
+ /* create triangles from points along this and previous circle */
+ if (i > 0) {
+ glBegin(GL_TRIANGLE_STRIP);
+ for (j = 0; j < wormSides; ++j) {
+ k = j + offset;
+ if (k >= wormSides) k -= wormSides;
+ glNormal3d(Nx[k], Ny[k], Nz[k]);
+ glVertex3d(Cx[k], Cy[k], Cz[k]);
+ glNormal3d(pNx[j], pNy[j], pNz[j]);
+ glVertex3d(pCx[j], pCy[j], pCz[j]);
+ }
+ glNormal3d(Nx[offset], Ny[offset], Nz[offset]);
+ glVertex3d(Cx[offset], Cy[offset], Cz[offset]);
+ glNormal3d(pNx[0], pNy[0], pNz[0]);
+ glVertex3d(pCx[0], pCy[0], pCz[0]);
+ glEnd();
+ }
+
+ /* put caps on the end */
+ if (cap1 && i == 0) {
+ dQt.normalize();
+ glBegin(GL_POLYGON);
+ glNormal3d(-dQt.x, -dQt.y, -dQt.z);
+ for (j = wormSides - 1; j >= 0; --j) {
+ glVertex3d(Cx[j], Cy[j], Cz[j]);
+ }
+ glEnd();
+ }
+ else if (cap2 && i == wormSegments) {
+ dQt.normalize();
+ glBegin(GL_POLYGON);
+ glNormal3d(dQt.x, dQt.y, dQt.z);
+ for (j = 0; j < wormSides; ++j) {
+ k = j + offset;
+ if (k >= wormSides) k -= wormSides;
+ glVertex3d(Cx[k], Cy[k], Cz[k]);
+ }
+ glEnd();
+ }
+
+ /* store this circle as previous for next round; instead of copying
+ all values, just swap pointers */
+#define SWAPPTR(p1,p2) tmp=(p1); (p1)=(p2); (p2)=tmp
+ SWAPPTR(Nx, pNx);
+ SWAPPTR(Ny, pNy);
+ SWAPPTR(Nz, pNz);
+ SWAPPTR(Cx, pCx);
+ SWAPPTR(Cy, pCy);
+ SWAPPTR(Cz, pCz);
+ }
+ }
+
+ delete[] fblock;
+}
+
+void glDrawHalfBond( GLUquadric *pObj, const Vector3D& p1, const Vector3D&p2, double thickness, float renderDetailLevel)
+{
+ Vector3D middle = (p1 + p2) / 2;
+ glDrawCylinder(pObj, p2, middle, thickness, renderDetailLevel);
+}
+
+void glDrawAtom( GLUquadric* pObj, const Vector3D& pos, double r, float renderDetailLevel)
+{
+ int numSlices = 10 * renderDetailLevel;
+ glPushMatrix();
+ glTranslatef(pos.x, pos.y, pos.z);
+ gluSphere(pObj, r, numSlices, numSlices);
+ glPopMatrix();
+}
+
+/*
+/ This function and helix drawing approach are taken from VMD (www.ks.uiuc.edu/Research/vmd/)
+/ Find x = a*i + b where i = 0..n-1
+*/
+static void least_squares(int n, const float *x, float *a, float *b) {
+ float sum = 0;
+ int i;
+ for (i=0; i<n; i++) { // find the sum of x
+ sum += x[i];
+ }
+ float d = (float(n)-1.0f) / 2.0f;
+ float t, sum_t2 = 0.0f;
+ *a = 0.0f;
+ for (i=0; i<n; i++) {
+ t = (i - d);
+ sum_t2 += t*t;
+ *a += t*x[i];
+ }
+ *a /= sum_t2;
+ *b = (sum/float(n) - d*(*a));
+}
+
+
+
+QPair<Vector3D,Vector3D> calcBestAxisThroughPoints( const QVector<Vector3D>& points )
+{
+ float a[3], b[3];
+ int n = points.count();
+ QVector<float> buf;
+ buf.resize(3*n);
+ for (int i = 0; i < n; i++) {
+ buf[i] = points[i].x;
+ buf[n + i] = points[i].y;
+ buf[2*n + i] = points[i].z;
+ }
+
+ least_squares(n, buf.data(), a, b);
+ least_squares(n, buf.data() + n, a + 1, b + 1);
+ least_squares(n, buf.data() + 2*n, a + 2, b + 2);
+
+ Vector3D pointA(b[0], b[1], b[2]);
+ Vector3D pointB(a[0]*(n-1) + b[0], a[1]*(n-1) + b[1], a[2]*(n-1) + b[2]);
+
+ return QPair<Vector3D,Vector3D>(pointA, pointB);
+}
+
+Vector3D calcMiddlePoint( const QVector<Vector3D>& points )
+{
+ Vector3D point(0,0,0);
+ foreach (Vector3D v, points) {
+ point += v;
+ }
+ return (point / points.count());
+}
+
+Vector3D projectPointOnAxis( const Vector3D& point, const Vector3D& axisUnitVector, const Vector3D& axisPoint )
+{
+ Vector3D projection(point - axisPoint);
+ float projectedLength = vector_dot(projection,axisUnitVector);
+ projection = projectedLength*axisUnitVector + axisPoint;
+
+ return projection;
+
+}
+
+void glCreateArrowPrimitive( float width, float height, float length )
+{
+ float widthOffset = 1;
+ float heightOffset = 1;
+
+ GLfloat b00[3] = {-width / 2, -height / 2, 0 };
+ GLfloat b01[3] = {-width / 2, height / 2, 0 };
+ GLfloat b02[3] = {width / 2, height / 2, 0 };
+ GLfloat b03[3] = {width / 2, -height / 2 , 0 };
+ GLfloat b04[3] = {-width / 2, -height / 2, length };
+ GLfloat b05[3] = {-width / 2, height / 2, length };
+ GLfloat b06[3] = {width / 2, height / 2, length };
+ GLfloat b07[3] = {width / 2, -height / 2, length };
+ GLfloat b08[3] = {- (width + widthOffset) / 2, height / 2, length };
+ GLfloat b09[3] = {- (width + widthOffset) / 2, -height / 2, length };
+ GLfloat b10[3] = { (width + widthOffset) / 2, height / 2, length };
+ GLfloat b11[3] = {(width + widthOffset) / 2, -height / 2, length };
+ GLfloat b12[3] = {0, height / 2, length + heightOffset };
+ GLfloat b13[3] = {0, -height / 2, length + heightOffset };
+
+
+
+ static GLfloat n00[3] = { 1, 0, 0 } ;
+ static GLfloat n01[3] = { -1, 0, 0 } ;
+ static GLfloat n02[3] = { 0, 1, 0 } ;
+ static GLfloat n03[3] = { 0, -1, 0 } ;
+ static GLfloat n05[3] = { 0, 0, -1 } ;
+ static GLfloat n06[3] = { -0.7071f, 0, 0.7071f } ;
+ static GLfloat n07[3] = { 0.7071f, 0, 0.7071f } ;
+
+
+ glBegin(GL_QUADS);
+
+ // Draw arrow body as brick
+
+ glNormal3fv(n02);
+ glVertex3fv(b05);
+ glVertex3fv(b06); //glNormal3fv(n02);
+ glVertex3fv(b02); //glNormal3fv(n02);
+ glVertex3fv(b01); //glNormal3fv(n02);
+
+ glNormal3fv(n01);
+ glVertex3fv(b04);
+ glVertex3fv(b05); //glNormal3fv(n01);
+ glVertex3fv(b01); //glNormal3fv(n01);
+ glVertex3fv(b00); //glNormal3fv(n01);
+
+ glNormal3fv(n03);
+ glVertex3fv(b07);
+ glVertex3fv(b04); //glNormal3fv(n03);
+ glVertex3fv(b00); //glNormal3fv(n03);
+ glVertex3fv(b03); //glNormal3fv(n03);
+
+ glNormal3fv(n00);
+ glVertex3fv(b06);
+ glVertex3fv(b07); //glNormal3fv(n00);
+ glVertex3fv(b03); //glNormal3fv(n00);
+ glVertex3fv(b02); //glNormal3fv(n00);
+
+ glNormal3fv(n05);
+ glVertex3fv(b00);
+ glVertex3fv(b01); //glNormal3fv(n05);
+ glVertex3fv(b02); //glNormal3fv(n05);
+ glVertex3fv(b03); //glNormal3fv(n05);
+
+ // Draw arrow head
+
+ glNormal3fv(n05);
+ glVertex3fv(b09);
+ glVertex3fv(b08);
+ glVertex3fv(b10);
+ glVertex3fv(b11);
+
+ glNormal3fv(n06);
+ glVertex3fv(b08);
+ glVertex3fv(b09);
+ glVertex3fv(b13);
+ glVertex3fv(b12);
+
+ glNormal3fv(n07);
+ glVertex3fv(b12);
+ glVertex3fv(b13);
+ glVertex3fv(b11);
+ glVertex3fv(b10);
+
+ glEnd();
+
+ glBegin(GL_TRIANGLES);
+
+ // Continue arrow head
+
+ glNormal3fv(n02);
+ glVertex3fv(b08);
+ glVertex3fv(b12); //glNormal3fv(n02);
+ glVertex3fv(b10); //glNormal3fv(n02);
+
+ glNormal3fv(n03);
+ glVertex3fv(b13);
+ glVertex3fv(b09); //glNormal3fv(n03);
+ glVertex3fv(b11); //glNormal3fv(n03);
+
+ glEnd();
+
+}
+
+void accFrustum(GLdouble left, GLdouble right, GLdouble bottom,
+ GLdouble top, GLdouble _near, GLdouble _far, GLdouble pixdx,
+ GLdouble pixdy, GLdouble eyedx, GLdouble eyedy,
+ GLdouble focus)
+{
+ GLdouble xwsize, ywsize;
+ GLdouble dx, dy;
+ GLint viewport[4];
+
+ glGetIntegerv (GL_VIEWPORT, viewport);
+
+ xwsize = right - left;
+ ywsize = top - bottom;
+ dx = -( pixdx*xwsize / (GLdouble) viewport[2] + eyedx * _near / focus );
+ dy = -(pixdy*ywsize/(GLdouble) viewport[3] + eyedy * _near/ focus);
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glFrustum (left + dx, right + dx, bottom + dy, top + dy, _near, _far);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glTranslatef (-eyedx, -eyedy, 0.0);
+}
+
+void accPerspective(GLdouble fovy, GLdouble aspect,
+ GLdouble _near, GLdouble _far, GLdouble pixdx, GLdouble pixdy,
+ GLdouble eyedx, GLdouble eyedy, GLdouble focus)
+{
+ GLdouble fov2,left,right,bottom,top;
+ fov2 = ((fovy*PI) / 180.0) / 2.0;
+
+ top = _near / (cos(fov2) / sin(fov2));
+ bottom = -top;
+ right = top * aspect;
+ left = -right;
+
+ accFrustum (left, right, bottom, top, _near, _far, pixdx, pixdy, eyedx, eyedy, focus);
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h
new file mode 100644
index 0000000..8c27860
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h
@@ -0,0 +1,157 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_GRAPHIC_UTILS_H_
+#define _U2_GRAPHIC_UTILS_H_
+
+#include <U2Core/Vector3D.h>
+#include <U2Core/Log.h>
+#include <QtOpenGL>
+#if defined(Q_OS_MAC)
+# include <OpenGL/glu.h>
+#else
+# include <GL/glu.h>
+#endif
+
+class GLUquadric;
+
+namespace U2 {
+
+class BioStruct3D;
+class BioStruct3DColorScheme;
+class Molecule3DModel;
+
+//! Color
+/*!
+ This class is convenient for OpenGL rendering purposes, connected with QColor
+*/
+class Color4f {
+private:
+ float color[4];
+
+public:
+ Color4f();
+ Color4f(float r, float g, float b, float a = 1.0);
+ Color4f(const Color4f &c);
+ Color4f(const QColor &qc);
+
+ float operator[] (unsigned int i) const;
+ float& operator[] (unsigned int i);
+
+ bool operator == (const Color4f &a) const;
+ const float* getConstData() const { return color; }
+};
+
+//! OpenGL drawable object
+class Object3D {
+protected:
+ Color4f color;
+
+public:
+ Object3D(const Color4f& color_) : color(color_) {}
+ virtual void draw(float renderDetailLevel) = 0;
+ virtual ~Object3D() {}
+
+ const Color4f& getColor() const { return color; }
+ void setColor(const Color4f &c) { color = Color4f(c); }
+
+}; // class Strand3D
+
+//! Alpha Helix 3D representation
+class Helix3D : public Object3D {
+ GLUquadric* pObj;
+ Vector3D cterm;
+ Vector3D nterm;
+ Vector3D rotAxis;
+ float radius,length,rotAngle;
+
+public:
+ Helix3D(const Color4f& color, const Vector3D& c, const Vector3D& n, float r);
+ virtual ~Helix3D();
+
+ virtual void draw(float renderDetailLevel);
+}; // class Helix3D
+
+//! Beta Strand 3D representation
+class Strand3D : public Object3D {
+ Vector3D cterm;
+ Vector3D nterm;
+ Vector3D upVector;
+ Vector3D rotAxis;
+ float length, rotAngle;
+public:
+ Strand3D(const Color4f& color, const Vector3D& c, const Vector3D& n, const Vector3D& up = Vector3D() );
+ virtual ~Strand3D();
+
+ virtual void draw(float renderDetailLevel);
+}; // class Strand3D
+
+
+//! Draw arrow
+void glCreateArrowPrimitive(float width, float height, float length);
+//! Draw atom as sphere with center = pos and radius = r
+void glDrawAtom(GLUquadric* pObj, const Vector3D& pos, double r, float renderDetailLevel);
+
+//! Draw cylinder from one point to another
+void glDrawCylinder(GLUquadric* pObj, const Vector3D& p1, const Vector3D& p2, double thickness, float renderDetailLevel);
+
+//! Draw a spline (worm)
+/*! Function straight from CN3D Viewer, uses Catmull-Rom interpolation
+add a thick splined curve from point 1 *halfway* to point 2 */
+void glDrawHalfWorm(const Vector3D& p0, const Vector3D& p1, const Vector3D& p2, const Vector3D& p3,
+ double radius, bool cap1, bool cap2, double tension, float renderDetailLevel);
+
+void glDrawHalfBond(GLUquadric *pObj, const Vector3D& p1, const Vector3D&p2, double thickness, float renderDetailLevel);
+
+//! Project point on axis
+Vector3D projectPointOnAxis(const Vector3D& point, const Vector3D& axisUnitVector, const Vector3D& axisPoint);
+
+//! Calculates average point
+Vector3D calcMiddlePoint(const QVector<Vector3D>& points);
+
+void accPerspective(double fovy, double aspect,
+ double near, double far, double pixdx, double pixdy,
+ double eyedx, double eyedy, double focus);
+void accFrustum(double left, double right, double bottom,
+ double top, double near, double far, double pixdx,
+ double pixdy, double eyedx, double eyedy,
+ double focus);
+
+
+//! Calculates axis through points using least linear square method
+QPair<Vector3D,Vector3D> calcBestAxisThroughPoints(const QVector<Vector3D>& points);
+
+//! Checks for OpenGL errors and reports them to log
+#define CHECK_GL_ERROR do { checkGlError(__FILE__, __LINE__); } while (0);
+
+inline void checkGlError(const char *file, int line) {
+ GLenum error = glGetError();
+ if (error != GL_NO_ERROR) {
+ QString where = QString("%1:%2: ").arg(file).arg(line);
+ QString msg = QString("OpenGL error (%1): %2").arg(error).arg((char*)gluErrorString(error));
+ uiLog.trace(where + msg);
+ }
+}
+
+} //namespace
+
+#endif // _U2_GRAPHIC_UTILS_H_
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp
new file mode 100644
index 0000000..a49d539
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp
@@ -0,0 +1,133 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "MolecularSurfaceRenderer.h"
+#include "GraphicUtils.h"
+#include <U2Algorithm/MolecularSurface.h>
+#include <QtOpenGL>
+
+namespace U2 {
+
+/* class MolecularSurfaceRendererRegistry */
+const QString MolecularSurfaceRendererRegistry::defaultFactoryName() {
+ return ConvexMapRenderer::ID;
+}
+
+const QList<QString> MolecularSurfaceRendererRegistry::factoriesNames() {
+ return getInstance()->factories.keys();
+}
+
+const MolecularSurfaceRendererFactory* MolecularSurfaceRendererRegistry::getFactory(const QString &name) {
+ return getInstance()->factories.value(name, 0);
+}
+
+MolecularSurfaceRenderer* MolecularSurfaceRendererRegistry::createMSRenderer(const QString &name) {
+ const MolecularSurfaceRendererFactory *fact = getFactory(name);
+
+ if (fact) {
+ return fact->createInstance();
+ }
+
+ return 0;
+}
+
+MolecularSurfaceRendererRegistry::MolecularSurfaceRendererRegistry() {
+ registerFactories();
+}
+
+MolecularSurfaceRendererRegistry* MolecularSurfaceRendererRegistry::getInstance() {
+ static MolecularSurfaceRendererRegistry *reg = new MolecularSurfaceRendererRegistry();
+ return reg;
+}
+
+#define REGISTER_FACTORY(c) factories.insert(c::ID, new c::Factory)
+void MolecularSurfaceRendererRegistry::registerFactories() {
+ REGISTER_FACTORY(DotsRenderer);
+ REGISTER_FACTORY(ConvexMapRenderer);
+}
+
+
+const QString DotsRenderer::ID(QObject::tr("Dots"));
+const QString ConvexMapRenderer::ID(QObject::tr("Convex Map"));
+
+/* class DotsRenderer : public MolecularSurfaceRenderer */
+void DotsRenderer::drawSurface( MolecularSurface& surface )
+{
+ GLboolean ligting = glIsEnabled(GL_LIGHTING);
+ glDisable(GL_LIGHTING);
+
+ glPointSize(1.0f);
+ glColor3f(1.0f, 1.0f, 1.0f);
+
+ glBegin(GL_POINTS);
+ foreach(const Face& face, surface.getFaces()) {
+ float vct[3][3] = {
+ {
+ static_cast<float>(face.v[0].x),
+ static_cast<float>(face.v[0].y),
+ static_cast<float>(face.v[0].z),
+ },
+ {
+ static_cast<float>(face.v[1].x),
+ static_cast<float>(face.v[1].y),
+ static_cast<float>(face.v[1].z),
+ },
+ {
+ static_cast<float>(face.v[2].x),
+ static_cast<float>(face.v[2].y),
+ static_cast<float>(face.v[2].z),
+ },
+ };
+ glVertex3fv(vct[0]);
+ glVertex3fv(vct[1]);
+ glVertex3fv(vct[2]);
+
+ /*glVertex3f(face.v[0].x, face.v[0].y, face.v[0].z);
+ glVertex3f(face.v[1].x, face.v[1].y, face.v[1].z);
+ glVertex3f(face.v[2].x, face.v[2].y, face.v[2].z);*/
+ }
+ glEnd();
+
+ if (ligting) glEnable(GL_LIGHTING);
+ CHECK_GL_ERROR;
+}
+
+
+/* class ConvexMapRenderer : public MolecularSurfaceRenderer */
+void ConvexMapRenderer::drawSurface( MolecularSurface& surface )
+{
+ static GLfloat wall_mat[] = {1.f, 1.f, 1.f, 0.3f};
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, wall_mat);
+
+ glBegin(GL_TRIANGLES);
+ foreach(const Face& face, surface.getFaces()) {
+ glNormal3f(face.n[0].x, face.n[0].y, face.n[0].z);
+ glVertex3f(face.v[0].x, face.v[0].y, face.v[0].z);
+ glNormal3f(face.n[1].x, face.n[1].y, face.n[1].z);
+ glVertex3f(face.v[1].x, face.v[1].y, face.v[1].z);
+ glNormal3f(face.n[2].x, face.n[2].y, face.n[2].z);
+ glVertex3f(face.v[2].x, face.v[2].y, face.v[2].z);
+ }
+ glEnd( );
+ CHECK_GL_ERROR;
+}
+
+} // namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h
new file mode 100644
index 0000000..d5fbc0f
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h
@@ -0,0 +1,109 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_MOLECULAR_SURFACE_RENDERER_H_
+#define _U2_MOLECULAR_SURFACE_RENDERER_H_
+
+#include <QtCore/QString>
+#include <QtCore/QMap>
+
+namespace U2 {
+
+class MolecularSurface;
+class MolecularSurfaceRenderer;
+class MolecularSurfaceRendererFactory;
+
+//! Singleton regisrtry for molecular surface(ms) renderers fabrics.
+class MolecularSurfaceRendererRegistry {
+public:
+ //! @return Default ms renderer factory name.
+ static const QString defaultFactoryName();
+
+ //! @return List of all factories names.
+ static const QList<QString> factoriesNames();
+
+ //! @return Concreete factory by name.
+ static const MolecularSurfaceRendererFactory* getFactory(const QString &name);
+
+ //! @return Constructed ms renderer by factory name.
+ static MolecularSurfaceRenderer* createMSRenderer(const QString &name);
+
+private:
+ //! Hidden constructor. Called by getInstance()
+ MolecularSurfaceRendererRegistry();
+
+ //! Returns singleton instance of registry.
+ static MolecularSurfaceRendererRegistry* getInstance();
+
+ //! Registers all ms render factories.
+ void registerFactories();
+
+private:
+ QMap<QString, MolecularSurfaceRendererFactory*> factories;
+}; // class MolecularSurfaceRendererRegistry
+
+
+//! MolecularSurfaceRenderer abstract factory
+class MolecularSurfaceRendererFactory {
+public:
+ virtual MolecularSurfaceRenderer* createInstance() const = 0;
+}; // class MolecularSurfaceRendererFactory
+
+#define SURF_RENDERER_FACTORY(c) \
+public: \
+ static const QString ID; \
+class Factory : public MolecularSurfaceRendererFactory { \
+public: \
+ MolecularSurfaceRenderer* createInstance() const { return new c; } \
+};
+
+class MolecularSurfaceRenderer {
+protected:
+ MolecularSurfaceRenderer() {};
+
+public:
+ virtual ~MolecularSurfaceRenderer() {};
+
+ virtual void drawSurface(MolecularSurface& surface) = 0;
+};
+
+class DotsRenderer : public MolecularSurfaceRenderer {
+private:
+ DotsRenderer() : MolecularSurfaceRenderer() {}
+
+public:
+ virtual void drawSurface(MolecularSurface& surface);
+ SURF_RENDERER_FACTORY(DotsRenderer)
+};
+
+class ConvexMapRenderer : public MolecularSurfaceRenderer {
+public:
+ ConvexMapRenderer() {}
+ virtual void drawSurface(MolecularSurface& surface);
+ SURF_RENDERER_FACTORY(ConvexMapRenderer)
+};
+
+
+
+} //namespace
+
+#endif //_U2_MOLECULAR_SURFACE_RENDERER_H_
+
diff --git a/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp
new file mode 100644
index 0000000..368f155
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp
@@ -0,0 +1,104 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "SelectModelsDialog.h"
+#include <QMessageBox>
+#include <cassert>
+#include "SettingsDialog.h"
+#if (QT_VERSION < 0x050000) //Qt 5
+#include <QtGui/QPushButton>
+#else
+#include <QtWidgets/QPushButton>
+#endif
+#include <U2Gui/HelpButton.h>
+
+namespace U2 {
+
+SelectModelsDialog::SelectModelsDialog(const QList<int> &_modelIds, const QList<int> &_selectedItems, QWidget *parent /* = 0*/)
+: QDialog(parent), Ui::SelectModelsDialog()
+{
+ setupUi(this);
+ new HelpButton(this, buttonBox, "17467595");
+ buttonBox_1->button(QDialogButtonBox::Cancel)->setText(::U2::SelectModelsDialog::tr("All"));
+ buttonBox_1->button(QDialogButtonBox::No)->setText(::U2::SelectModelsDialog::tr("Invert"));
+ buttonBox->button(QDialogButtonBox::Ok)->setText(::U2::SelectModelsDialog::tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(::U2::SelectModelsDialog::tr("Cancel"));
+
+
+ QVector<int> modelIds = _modelIds.toVector();
+ QSet<int> selectedItems = _selectedItems.toSet();
+
+ for (int i = 0; i < modelIds.size(); ++i) {
+ int modelId = modelIds[i];
+ QListWidgetItem *it = new QListWidgetItem(QString::number(modelId));
+
+ it->setCheckState((selectedItems.contains(i)) ? Qt::Checked : Qt::Unchecked);
+
+ modelsList->addItem(it);
+ }
+
+ connect(modelsList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(sl_onItemDoubleClicked(QListWidgetItem*)));
+
+ QPushButton* allButton = buttonBox_1->button(QDialogButtonBox::Cancel);
+ QPushButton* invertButton = buttonBox_1->button(QDialogButtonBox::No);
+
+ connect(allButton, SIGNAL(clicked()), this, SLOT(sl_onSlectAll()));
+ connect(invertButton, SIGNAL(clicked()), this, SLOT(sl_onInvertSelection()));
+}
+
+/** Toggle item by double click */
+void SelectModelsDialog::sl_onItemDoubleClicked(QListWidgetItem *item) {
+ item->setCheckState((item->checkState() == Qt::Unchecked) ? Qt::Checked : Qt::Unchecked);
+}
+
+void SelectModelsDialog::sl_onSlectAll() {
+ for (int i = 0; i < modelsList->count(); ++i) {
+ modelsList->item(i)->setCheckState(Qt::Checked);
+ }
+}
+
+void SelectModelsDialog::sl_onInvertSelection() {
+ for (int i = 0; i < modelsList->count(); ++i) {
+ QListWidgetItem *item = modelsList->item(i);
+ item->setCheckState((item->checkState() == Qt::Unchecked) ? Qt::Checked : Qt::Unchecked);
+ }
+}
+
+void SelectModelsDialog::accept() {
+ for (int i = 0; i < modelsList->count(); ++i) {
+ QListWidgetItem *item = modelsList->item(i);
+ if (item->checkState() == Qt::Checked) {
+ selectedModelsIndexes << i;
+ }
+ }
+
+ if (selectedModelsIndexes.isEmpty()) {
+ QMessageBox::warning(this, tr("Error"), tr("At least one model shoud be selected."));
+ return;
+ }
+
+ QDialog::accept();
+}
+
+SelectModelsDialog::~SelectModelsDialog()
+{}
+
+} // namespace U2
diff --git a/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h
new file mode 100644
index 0000000..9e4483c
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h
@@ -0,0 +1,54 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef U2_SELECTMODELSDIALOG_H
+#define U2_SELECTMODELSDIALOG_H
+
+#include "ui_SelectModelsDialog.h"
+#include <QDialog>
+
+namespace U2 {
+
+class SelectModelsDialog : public QDialog, public Ui::SelectModelsDialog
+{
+ Q_OBJECT
+
+public:
+ SelectModelsDialog(const QList<int> &modelIds, const QList<int> &selectedItems, QWidget *parent = 0);
+ ~SelectModelsDialog();
+
+ const QList<int> &getSelectedModelsIndexes() const { return selectedModelsIndexes; }
+
+public slots:
+ virtual void accept();
+
+ void sl_onItemDoubleClicked(QListWidgetItem *item);
+
+ void sl_onSlectAll();
+ void sl_onInvertSelection();
+
+private:
+ QList<int> selectedModelsIndexes;
+};
+
+} // namespace U2
+
+#endif // #ifndef U2_SELECTMODELSDIALOG_H
diff --git a/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp
new file mode 100644
index 0000000..e0403b4
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp
@@ -0,0 +1,266 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+
+#include "SettingsDialog.h"
+#include <U2Core/Log.h>
+#include <U2Gui/HelpButton.h>
+
+namespace U2 {
+
+
+BioStruct3DSettingsDialog::BioStruct3DSettingsDialog()
+ : anaglyphStatus(NOT_AVAILABLE), anaglyphSettings(AnaglyphSettings::defaultSettings())
+{
+ setupUi(this);
+
+ new HelpButton(this, buttonBox, "17467592");
+
+ glWidget = NULL;
+ initColorSchemes();
+}
+
+void BioStruct3DSettingsDialog::setWidget(BioStruct3DGLWidget *glWidget)
+{
+ this->glWidget = glWidget;
+
+ state = glWidget->getState();
+}
+
+void BioStruct3DSettingsDialog::initColorSchemes()
+{
+ glassesColorSchemes.insert(0, GlassesColorScheme(QString(tr("Custom")), QColor(0, 0, 0), QColor(0, 0, 0)));
+
+ glassesColorSchemes.append(GlassesColorScheme(QString(tr("Red - Blue")), QColor(255, 0, 0), QColor(0, 0, 255)));
+ glassesColorSchemes.append(GlassesColorScheme(QString(tr("Cyan - Red")), QColor(0, 255, 255), QColor(255, 0, 0)));
+ glassesColorSchemes.append(GlassesColorScheme(QString(tr("Red - Dark Cyan")), QColor(255, 0, 0), QColor(0, 139, 139)));
+ glassesColorSchemes.append(GlassesColorScheme(QString(tr("Red - Green")), QColor(255, 0, 0), QColor(0, 150, 0)));
+ glassesColorSchemes.append(GlassesColorScheme(QString(tr("Magenta - Green")), QColor(255, 0, 150), QColor(0, 150, 0)));
+
+ foreach (const GlassesColorScheme &scheme, glassesColorSchemes)
+ BioStruct3DSettingsDialog::glassesColorSchemeComboBox->addItem(scheme.name);
+}
+
+
+void BioStruct3DSettingsDialog::sl_setBackgroundColor()
+{
+ backgroundColor=QColorDialog::getColor(backgroundColor,this);
+
+ state[glWidget->BACKGROUND_COLOR_NAME] = QVariant::fromValue(backgroundColor);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setSelectionColor()
+{
+ selectionColor=QColorDialog::getColor(selectionColor,this);
+
+ state[glWidget->SELECTION_COLOR_NAME] = QVariant::fromValue(selectionColor);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setRenderDetailLevel()
+{
+ renderDetailLevel=renderDetailLevelSlider->sliderPosition();
+
+ state[glWidget->RENDER_DETAIL_LEVEL_NAME] = QVariant::fromValue((float) renderDetailLevel/100.0);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setShadingLevel()
+{
+ shadingLevel = shadingSlider->sliderPosition();
+ state[glWidget->SHADING_LEVEL_NAME] = QVariant::fromValue(shadingLevel);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setAnaglyph() {
+ anaglyphStatus = (anaglyphViewGroupBox->isChecked()) ? ENABLED : DISABLED;
+
+ state[glWidget->ANAGLYPH_STATUS_NAME] = qVariantFromValue((int)anaglyphStatus);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setEyesShift() {
+ anaglyphSettings.eyesShift = (float) eyesShiftSlider->sliderPosition() / 100.0;
+
+ anaglyphSettings.toMap(state);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::sl_setGlassesColorScheme() {
+ int itemNum = glassesColorSchemeComboBox->currentIndex();
+ setGlassesColorScheme(itemNum);
+}
+
+void BioStruct3DSettingsDialog::sl_setLeftEyeColor() {
+ QColor changed(QColorDialog::getColor(anaglyphSettings.leftEyeColor, this));
+
+ if (changed.red()!=0 || changed.green()!=0 || changed.blue()!=0) {
+ setGlassesColorScheme(changed, anaglyphSettings.rightEyeColor);
+ }
+}
+
+void BioStruct3DSettingsDialog::sl_setRightEyeColor() {
+ QColor changed(QColorDialog::getColor(anaglyphSettings.rightEyeColor, this));
+
+ if (changed.red()!=0 || changed.green()!=0 || changed.blue()!=0) {
+ setGlassesColorScheme(anaglyphSettings.leftEyeColor, changed);
+ }
+}
+
+void BioStruct3DSettingsDialog::sl_swapColors() {
+ QColor right(anaglyphSettings.rightEyeColor);
+ QColor left(anaglyphSettings.leftEyeColor);
+
+ setGlassesColorScheme(right, left);
+}
+
+QColor BioStruct3DSettingsDialog::getBackgroundColor()const
+{
+ return backgroundColor;
+}
+
+QColor BioStruct3DSettingsDialog::getSelectionColor()const
+{
+ return selectionColor;
+}
+
+float BioStruct3DSettingsDialog::getRenderDetailLevel()const
+{
+ return renderDetailLevel / 100.0;
+}
+
+void BioStruct3DSettingsDialog::setGlassesColorScheme(QColor &leftEyeColor, QColor &rightEyeColor)
+{
+ setLeftEyeColor(leftEyeColor);
+ setRightEyeColor(rightEyeColor);
+
+ int currentNumber=0;
+ foreach(const GlassesColorScheme& scheme, glassesColorSchemes)
+ {
+ if (scheme.leftEyeColor==leftEyeColor && scheme.rightEyeColor==rightEyeColor)
+ {
+ glassesColorSchemeComboBox->setCurrentIndex(currentNumber);
+ return;
+ }
+ currentNumber++;
+ }
+
+ glassesColorSchemeComboBox->setCurrentIndex(0);
+}
+
+void BioStruct3DSettingsDialog::setGlassesColorScheme(int num)
+{
+ if (num<=0 || num>glassesColorSchemes.size())
+ return;
+
+ GlassesColorScheme need(glassesColorSchemes.at(num));
+
+ setLeftEyeColor(need.leftEyeColor);
+ setRightEyeColor(need.rightEyeColor);
+}
+
+void BioStruct3DSettingsDialog::setBackgroundColor(QColor color)
+{
+ this->backgroundColor=color;
+}
+
+void BioStruct3DSettingsDialog::setSelectionColor(QColor color)
+{
+ this->selectionColor=color;
+}
+
+void BioStruct3DSettingsDialog::setRenderDetailLevel(float renderDetailLevel_)
+{
+ renderDetailLevel = renderDetailLevel_ * 100;
+ renderDetailLevelSlider->setSliderPosition(renderDetailLevel);
+}
+
+static const QString COLOR_STYLE("QPushButton { background-color : %1;}");// color : %2;
+
+void BioStruct3DSettingsDialog::setLeftEyeColor(QColor leftEyecolor)
+{
+ anaglyphSettings.leftEyeColor = leftEyecolor;
+ leftEyeColorChangeButton->setStyleSheet(COLOR_STYLE.arg(anaglyphSettings.leftEyeColor.name()));
+
+ anaglyphSettings.toMap(state);
+ glWidget->setState(state);
+}
+
+void BioStruct3DSettingsDialog::setRightEyeColor(QColor rightEyecolor)
+{
+ anaglyphSettings.rightEyeColor = rightEyecolor;
+ rightEyeColorChangeButton->setStyleSheet(COLOR_STYLE.arg(anaglyphSettings.rightEyeColor.name()));
+
+ anaglyphSettings.toMap(state);
+ glWidget->setState(state);
+}
+
+int BioStruct3DSettingsDialog::getShadingLevel() const {
+ return shadingLevel;
+}
+
+void BioStruct3DSettingsDialog::setShadingLevel(int shading) {
+ shadingLevel = shading;
+ shadingSlider->setSliderPosition(shading);
+}
+
+// anaglyph related settings
+AnaglyphStatus BioStruct3DSettingsDialog::getAnaglyphStatus() const {
+ return anaglyphStatus;
+}
+
+const AnaglyphSettings& BioStruct3DSettingsDialog::getAnaglyphSettings() const {
+ return anaglyphSettings;
+}
+
+void BioStruct3DSettingsDialog::setAnaglyphStatus(AnaglyphStatus status) {
+ anaglyphStatus = status;
+
+ if (anaglyphStatus == NOT_AVAILABLE) {
+ anaglyphViewGroupBox->setDisabled(true);
+
+ QString anaglyphTitile = anaglyphViewGroupBox->title();
+ anaglyphViewGroupBox->setTitle(anaglyphTitile + QString(" ") + QString(tr("(not supported by your videocard)")));
+ }
+ else if (anaglyphStatus == DISABLED) {
+ anaglyphViewGroupBox->setEnabled(true);
+ anaglyphViewGroupBox->setChecked(false);
+ }
+ else if (anaglyphStatus == ENABLED) {
+ anaglyphViewGroupBox->setEnabled(true);
+ anaglyphViewGroupBox->setChecked(true);
+ }
+ else {
+ assert(!"Invalid AnaglyphStatus value");
+ }
+}
+
+void BioStruct3DSettingsDialog::setAnaglyphSettings(const AnaglyphSettings &settings) {
+ anaglyphSettings = settings;
+
+ setLeftEyeColor(anaglyphSettings.leftEyeColor);
+ setRightEyeColor(anaglyphSettings.rightEyeColor);
+
+ eyesShiftSlider->setSliderPosition(anaglyphSettings.eyesShift * 100.0);
+}
+
+} // namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h
new file mode 100644
index 0000000..11a1096
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h
@@ -0,0 +1,133 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_SETTINGSDIALOG_H_
+#define _U2_SETTINGSDIALOG_H_
+
+#include "BioStruct3DGLWidget.h"
+#include "ui_SettingsDialog.h"
+#include "AnaglyphRenderer.h"
+
+#if (QT_VERSION < 0x050000) //Qt 5
+#include <QtGui/QColorDialog>
+#else
+#include <QtWidgets/QColorDialog>
+#endif
+
+namespace U2 {
+
+
+class GlassesColorScheme
+{
+public:
+ QColor leftEyeColor;
+ QColor rightEyeColor;
+
+ QString name;
+
+ GlassesColorScheme()
+ {
+ name="";
+ leftEyeColor=QColor(0, 0, 0);
+ rightEyeColor = leftEyeColor;
+ }
+
+ GlassesColorScheme(QString name, QColor leftEyeColor, QColor rightEyeColor)
+ {
+ this->name = name;
+ this->leftEyeColor = leftEyeColor;
+ this->rightEyeColor = rightEyeColor;
+ }
+};
+
+
+class BioStruct3DSettingsDialog : public QDialog, private Ui::SettingsDialog
+{
+ Q_OBJECT
+
+public:
+ BioStruct3DSettingsDialog();
+
+private slots:
+ void sl_setBackgroundColor();
+ void sl_setSelectionColor();
+ void sl_setShadingLevel();
+ void sl_setRenderDetailLevel();
+ void sl_setAnaglyph();
+
+ void sl_setEyesShift();
+
+ void sl_setGlassesColorScheme();
+ void sl_setLeftEyeColor();
+ void sl_setRightEyeColor();
+ void sl_swapColors();
+
+
+public:
+ // anaglyph related settings
+ AnaglyphStatus getAnaglyphStatus() const;
+ const AnaglyphSettings& getAnaglyphSettings() const;
+
+ void setAnaglyphStatus(AnaglyphStatus status);
+ void setAnaglyphSettings(const AnaglyphSettings &settings);
+
+ void setRightEyeColor(QColor rightEyecolor);
+ void setLeftEyeColor(QColor leftEyecolor);
+
+ QColor getBackgroundColor()const;
+ QColor getSelectionColor()const;
+
+ float getRenderDetailLevel()const;
+ int getShadingLevel()const;
+
+ void setBackgroundColor(QColor color);
+ void setSelectionColor(QColor color);
+
+ void setGlassesColorScheme(QColor &leftEyeColor, QColor &rightEyeColor);
+ void setGlassesColorScheme(int num);
+
+ void setRenderDetailLevel(float renderDetailLevel);
+ void setShadingLevel(int shading);
+
+ void setWidget(BioStruct3DGLWidget *glWidget);
+
+private:
+ QVariantMap state;
+
+ BioStruct3DGLWidget *glWidget;
+ QList<GlassesColorScheme> glassesColorSchemes;
+
+ void initColorSchemes();
+
+ QColor backgroundColor;
+ QColor selectionColor;
+
+
+ int renderDetailLevel;
+ int shadingLevel;
+
+ AnaglyphStatus anaglyphStatus;
+ AnaglyphSettings anaglyphSettings;
+};
+
+} // namespace
+
+#endif // _U2_SETTINGSDIALOG_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp
new file mode 100644
index 0000000..0694578
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp
@@ -0,0 +1,147 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QMessageBox>
+
+#include <U2Algorithm/StructuralAlignmentAlgorithm.h>
+#include <U2Algorithm/StructuralAlignmentAlgorithmFactory.h>
+#include <U2Algorithm/StructuralAlignmentAlgorithmRegistry.h>
+
+#include <U2Core/AppContext.h>
+#include <U2Core/BioStruct3DObject.h>
+#include <U2Core/GObject.h>
+#include <U2Core/GObjectUtils.h>
+#include <U2Core/U2DbiRegistry.h>
+#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2SafePoints.h>
+
+#include <U2Gui/HelpButton.h>
+
+#include "BioStruct3DSubsetEditor.h"
+#include "StructuralAlignmentDialog.h"
+
+namespace U2 {
+
+static QList<BioStruct3DObject*> findAvailableBioStructs() {
+ QList<GObject*> objs = GObjectUtils::findAllObjects(UOF_LoadedOnly, GObjectTypes::BIOSTRUCTURE_3D);
+ QList<BioStruct3DObject*> biostructs;
+ foreach (GObject *obj, objs) {
+ BioStruct3DObject *bso = qobject_cast<BioStruct3DObject*> (obj);
+ assert(bso);
+ biostructs << bso;
+ }
+
+ return biostructs;
+}
+
+StructuralAlignmentDialog::StructuralAlignmentDialog(const BioStruct3DObject *fixedRef/* = 0*/, int fixedRefModel/* = -1*/, QWidget *parent/* = 0*/)
+ : QDialog(parent), task(0)
+{
+ setupUi(this);
+ new HelpButton(this, buttonBox, "17467598");
+
+ StructuralAlignmentAlgorithmRegistry *reg = AppContext::getStructuralAlignmentAlgorithmRegistry();
+ foreach (const QString &id, reg->getFactoriesIds()) {
+ algorithmCombo->addItem(id, qVariantFromValue(id));
+ }
+
+ QList<BioStruct3DObject*> biostructs = findAvailableBioStructs();
+ ref = new BioStruct3DSubsetEditor(biostructs, fixedRef, fixedRefModel);
+ mob = new BioStruct3DSubsetEditor(biostructs);
+
+ if (fixedRef) {
+ ref->setBiostructDisabled();
+ }
+ if (fixedRefModel != -1) {
+ ref->setModelDisabled();
+ }
+
+ QVBoxLayout *refBox = new QVBoxLayout();
+ refBox->addWidget(ref);
+ refGroup->setLayout(refBox);
+
+ QVBoxLayout *altBox = new QVBoxLayout();
+ altBox->addWidget(mob);
+ altGroup->setLayout(altBox);
+
+ updateGeometry();
+}
+
+void StructuralAlignmentDialog::accept() {
+ if (algorithmCombo->count() < 1) {
+ return;
+ }
+
+ QString msg, err;
+ err = ref->validate();
+ if (!err.isEmpty()) {
+ msg += QString("Reference: ") + err + "\n";
+ }
+ err = mob->validate();
+ if (!err.isEmpty()) {
+ msg += QString("Mobile: ") + err + "\n";
+ }
+ if (!msg.isEmpty()) {
+ QMessageBox::warning(this, "Error", msg);
+ return;
+ }
+
+ BioStruct3DReference refSubset(ref->getSubset());
+ BioStruct3DReference mobSubset(mob->getSubset());
+
+ // Since we unable to change mob structure we clone the GObject
+ // TODO: clone live-range?
+ U2OpStatus2Log os;
+ const U2DbiRef dbiRef = AppContext::getDbiRegistry( )->getSessionTmpDbiRef( os );
+ BioStruct3DObject *mobClone = qobject_cast<BioStruct3DObject*> (mobSubset.obj->clone(dbiRef, os));
+ mobSubset.obj = mobClone;
+
+ StructuralAlignmentTaskSettings settings(refSubset, mobSubset);
+
+ StructuralAlignmentAlgorithmRegistry *reg = AppContext::getStructuralAlignmentAlgorithmRegistry();
+
+ QString algorithmId = algorithmCombo->itemData(algorithmCombo->currentIndex()).value<QString>();
+ StructuralAlignmentAlgorithm *algorithm = reg->createStructuralAlignmentAlgorithm(algorithmId);
+
+ err = algorithm->validate(settings);
+ if (!err.isEmpty()) {
+ msg = QString("%1 validate failed: %2").arg(algorithmId).arg(err);
+ QMessageBox::warning(this, "Error", msg);
+ return;
+ }
+
+ task = new StructuralAlignmentTask(algorithm, settings);
+
+ QDialog::accept();
+}
+
+int StructuralAlignmentDialog::execIfAlgorithmAvailable() {
+ StructuralAlignmentAlgorithmRegistry *reg = AppContext::getStructuralAlignmentAlgorithmRegistry();
+ if (reg->getFactoriesIds().isEmpty()) {
+ QMessageBox::warning(this, "Error", "No available algorithms, make sure that apropriate plugin loaded (for ex. PTools)");
+ return Rejected;
+ }
+ else {
+ return exec();
+ }
+}
+
+} // namespace U2
diff --git a/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h
new file mode 100644
index 0000000..5034e26
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h
@@ -0,0 +1,57 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_STRUCTURAL_ALIGNMENT_DIALOG_H_
+#define _U2_STRUCTURAL_ALIGNMENT_DIALOG_H_
+
+#include "ui_StructuralAlignmentDialog.h"
+
+namespace U2 {
+
+class StructuralAlignmentTask;
+class BioStruct3DObject;
+class BioStruct3DSubsetEditor;
+
+class StructuralAlignmentDialog : public QDialog, public Ui::StructuralAlignmentDialog
+{
+ Q_OBJECT
+
+public:
+ StructuralAlignmentDialog(const BioStruct3DObject *fixedRef = 0, int fixedRefModel = -1, QWidget *parent = 0);
+
+ /** Check if algorithm available and ::exec() */
+ int execIfAlgorithmAvailable();
+
+ /** @returns set up StructuralAlignmentTask */
+ StructuralAlignmentTask* getTask() { return task; }
+
+public slots:
+ virtual void accept();
+
+private:
+ StructuralAlignmentTask *task;
+ BioStruct3DSubsetEditor *ref, *mob;
+
+};
+
+} // namespace U2
+
+#endif // #ifndef _U2_STRUCTURAL_ALIGNMENT_DIALOG_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp
new file mode 100644
index 0000000..c0239f4
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp
@@ -0,0 +1,131 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QtOpenGL>
+
+#include "GraphicUtils.h"
+#include "BioStruct3DColorScheme.h"
+#include "BioStruct3DGLWidget.h"
+#include "TubeGLRenderer.h"
+
+
+namespace U2 {
+
+const QString TubeGLRenderer::ID(QObject::tr("Tubes"));
+
+void TubeGLRenderer::drawTubes( const BioStruct3DColorScheme* colorScheme )
+{
+ GLUquadricObj *pObj; // Quadric Object
+
+ pObj = gluNewQuadric();
+ gluQuadricNormals(pObj, GLU_SMOOTH);
+ bool firstPass = true;
+ static float ribbonThickness = 0.3f;
+ SharedAtom bufAtom;
+
+ foreach (Tube tube, tubeMap) {
+ foreach (int index, shownModels) {
+ const AtomsVector& tubeAtoms = tube.modelsMap.value(index);
+ foreach(const SharedAtom atom, tubeAtoms) {
+ Color4f atomColor = colorScheme->getAtomColor(atom);
+ Vector3D pos = atom.constData()->coord3d;
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
+ glDrawAtom(pObj, pos, ribbonThickness, settings->detailLevel);
+
+ if (!firstPass) {
+ // Draw bonds only between atoms of the same molecular chain
+ if (atom.constData()->chainIndex == bufAtom.constData()->chainIndex) {
+ // ... and when they are sequential
+ if (atom.constData()->residueIndex.toInt() - bufAtom.constData()->residueIndex.toInt() == 1) {
+ Vector3D bufPos = bufAtom.constData()->coord3d;
+ Color4f bufAtomColor = colorScheme->getAtomColor(bufAtom);
+ glDrawHalfBond(pObj, bufPos, pos, ribbonThickness, settings->detailLevel);
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, bufAtomColor.getConstData());
+ glDrawHalfBond(pObj, pos, bufPos, ribbonThickness, settings->detailLevel);
+ }
+ }
+ } else {
+ firstPass = false;
+ }
+
+ bufAtom = atom;
+ }
+ }
+ }
+
+ gluDeleteQuadric(pObj);
+}
+
+
+void TubeGLRenderer::drawBioStruct3D()
+{
+
+ drawTubes(colorScheme);
+}
+
+
+TubeGLRenderer::TubeGLRenderer( const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings )
+ : BioStruct3DGLRenderer(struc,s,shownModels,settings)
+{
+ create();
+}
+
+bool TubeGLRenderer::isAvailableFor(const BioStruct3D &bioStruct) {
+ bool available = false;
+
+ const char* alphaCarbonTag = "CA";
+ const char* phosporTag = "P";
+
+ foreach (const SharedMolecule mol, bioStruct.moleculeMap) {
+ foreach (const Molecule3DModel& model, mol->models.values()) {
+ foreach (const SharedAtom atom, model.atoms) {
+ if ( (atom->name.trimmed() == alphaCarbonTag) || (atom->name.trimmed() == phosporTag)) {
+ available = true;
+ }
+ }
+ }
+ }
+
+ return available;
+}
+
+void TubeGLRenderer::create() {
+ assert(isAvailableFor(bioStruct) && "Availability must be checked first!");
+
+ tubeMap.clear();
+
+ const char* alphaCarbonTag = "CA";
+ const char* phosporTag = "P";
+
+ foreach (const SharedMolecule mol, bioStruct.moleculeMap) {
+ foreach (int modelId, mol->models.keys()) {
+ const Molecule3DModel& model = mol->models.value(modelId);
+ foreach (const SharedAtom atom, model.atoms) {
+ if ( (atom->name.trimmed() == alphaCarbonTag) || (atom->name.trimmed() == phosporTag)) {
+ tubeMap[atom->chainIndex].modelsMap[modelId].append(atom);
+ }
+ }
+ }
+ }
+}
+
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h
new file mode 100644
index 0000000..57d4f2c
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h
@@ -0,0 +1,67 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_TUBE_RENDERER_H_
+#define _U2_BIOSTRUCT3D_TUBE_RENDERER_H_
+
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QVector>
+#include <U2Core/BioStruct3D.h>
+
+#include "BioStruct3DGLRender.h"
+
+
+namespace U2 {
+
+
+class TubeGLRenderer : public BioStruct3DGLRenderer {
+
+ typedef QVector< SharedAtom > AtomsVector;
+
+ struct Tube {
+ QMap<int, AtomsVector> modelsMap;
+ };
+
+
+ QMap<int, Tube> tubeMap;
+
+ void drawTubes(const BioStruct3DColorScheme* colorScheme);
+
+protected:
+ TubeGLRenderer(const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings);
+
+public:
+ void drawBioStruct3D();
+
+ virtual void create();
+ virtual void updateColorScheme() {};
+ virtual void updateShownModels() {};
+ virtual void updateSettings() {};
+
+public:
+ static bool isAvailableFor(const BioStruct3D &);
+
+ RENDERER_FACTORY(TubeGLRenderer)
+};
+
+} //namespace
+
+#endif // _U2_BIOSTRUCT3D_TUBE_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp
new file mode 100644
index 0000000..b34680c
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp
@@ -0,0 +1,83 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <QtOpenGL>
+#include <time.h>
+
+#include <U2Core/BioStruct3D.h>
+#include <U2Core/Log.h>
+#include <U2Algorithm/MolecularSurface.h>
+
+#include "GraphicUtils.h"
+#include "BioStruct3DGLWidget.h"
+#include "BioStruct3DColorScheme.h"
+#include "VanDerWaalsGLRenderer.h"
+
+
+namespace U2 {
+
+const QString VanDerWaalsGLRenderer::ID(QObject::tr("Space Fill"));
+
+//unsigned int DisplayLists::atomDL = -1;
+
+
+void VanDerWaalsGLRenderer::drawBioStruct3D( )
+{
+ drawAtoms(colorScheme);
+}
+
+
+void VanDerWaalsGLRenderer::drawAtoms( const BioStruct3DColorScheme* colorScheme )
+{
+ static float tolerance = 0.45f;
+ int numSlices = 10 * settings->detailLevel;
+ GLUquadricObj *pObj = gluNewQuadric();
+ gluQuadricNormals(pObj, GLU_SMOOTH);
+
+
+ // Draw atoms as spheres
+
+ foreach (const SharedMolecule mol, bioStruct.moleculeMap) {
+ foreach (int index, shownModels) {
+ const Molecule3DModel& model = mol->models.value(index);
+ foreach(const SharedAtom atom, model.atoms) {
+ float radius = AtomConstants::getAtomCovalentRadius(atom->atomicNumber);
+ Vector3D pos = atom->coord3d;
+ Color4f atomColor = colorScheme->getAtomColor(atom);
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, atomColor.getConstData());
+ glPushMatrix();
+ glTranslatef(pos.x, pos.y, pos.z);
+ gluSphere(pObj, radius + tolerance, numSlices, numSlices);
+ glPopMatrix();
+ }
+ }
+ }
+ gluDeleteQuadric(pObj);
+
+}
+
+VanDerWaalsGLRenderer::VanDerWaalsGLRenderer( const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings)
+ : BioStruct3DGLRenderer(struc,s,shownModels,settings)
+{
+ create();
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h
new file mode 100644
index 0000000..f257784
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h
@@ -0,0 +1,49 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_VANDERWAALS_RENDERER_H_
+#define _U2_BIOSTRUCT3D_VANDERWAALS_RENDERER_H_
+
+#include "BioStruct3DGLRender.h"
+
+namespace U2 {
+
+class VanDerWaalsGLRenderer : public BioStruct3DGLRenderer {
+protected:
+ VanDerWaalsGLRenderer(const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings);
+
+public:
+ void drawBioStruct3D();
+ virtual void create() {};
+
+ virtual void updateColorScheme() {};
+ virtual void updateShownModels() {};
+ virtual void updateSettings() {};
+
+private:
+ void drawAtoms(const BioStruct3DColorScheme* s);
+
+ RENDERER_FACTORY(VanDerWaalsGLRenderer)
+};
+
+} //namespace
+
+#endif // _U2_BIOSTRUCT3D_VANDERWAALS_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp
new file mode 100644
index 0000000..7122e24
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp
@@ -0,0 +1,383 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <U2Core/BioStruct3D.h>
+#include <U2Core/U2SafePoints.h>
+#include <QtOpenGL>
+
+#include "GraphicUtils.h"
+#include "BioStruct3DColorScheme.h"
+#include "BioStruct3DGLWidget.h"
+#include "WormsGLRenderer.h"
+
+
+namespace U2 {
+
+const QString WormsGLRenderer::ID(QObject::tr("Worms"));
+
+
+WormsGLRenderer::WormsGLRenderer( const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings)
+ : BioStruct3DGLRenderer(struc,s,shownModels,settings)
+{
+ create();
+}
+
+bool WormsGLRenderer::isAvailableFor(const BioStruct3D &bioStruct) {
+ // Try to construct objects to draw
+ QMap<int, BioPolymer > bioPolymerMap;
+ createBioPolymerMap(bioStruct.moleculeMap, bioPolymerMap);
+
+ // Find objects to draw
+ foreach (const SharedSecondaryStructure ss, bioStruct.secondaryStructures) {
+ int startId = ss->startSequenceNumber;
+ int endId = ss->endSequenceNumber;
+ int chainId = ss->chainIndex;
+ Q_ASSERT( chainId != 0 );
+ if (bioPolymerMap.contains(chainId)) {
+ const BioPolymer& bpolymer = bioPolymerMap.value(chainId);
+ foreach (const BioPolymerModel& bpModel, bpolymer.bpModels.values() ) {
+ if (bpModel.monomerMap.contains(startId) && bpModel.monomerMap.contains(endId)) {
+ if (ss->type == SecondaryStructure::Type_AlphaHelix ) {
+ return true;
+ } else if (ss->type == SecondaryStructure::Type_BetaStrand) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+
+ return false;
+}
+
+void WormsGLRenderer::create() {
+ assert(isAvailableFor(bioStruct) && "Availability must be checked first!");
+
+ createBioPolymerMap(bioStruct.moleculeMap, bioPolymerMap);
+ createWorms();
+}
+
+
+void WormsGLRenderer::drawWorms( )
+{
+ GLUquadricObj *pObj; // Quadric Object
+
+ // Draw atoms as spheres
+ pObj = gluNewQuadric();
+ gluQuadricNormals(pObj, GLU_SMOOTH);
+ static float ribbonThickness = 0.3f;
+ static float tension = 0.01f;
+
+ foreach (int chainId, wormMap.keys()) {
+ const Worm worm = wormMap.value(chainId);
+ foreach (int index, shownModels) {
+ const WormModel& model = worm.models.at(index);
+ //Draw worm bodies (let the bodies set the scene!!!)
+ const AtomsVector wormCoords = model.atoms;
+ int size = wormCoords.size();
+ Color4f atomColor;
+ for (int i = 0; i + 3 < size; ++i) {
+ const SharedAtom a0 = wormCoords.at(i);
+ const SharedAtom a1 = wormCoords.at(i+1);
+ const SharedAtom a2 = wormCoords.at(i+2);
+ const SharedAtom a3 = wormCoords.at(i+3);
+ // draw worms only between sequential residues
+ if (a2->residueIndex.toInt() - a1->residueIndex.toInt() != 1) {
+ continue;
+ }
+
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a1));
+ glDrawHalfWorm(a0->coord3d, a1->coord3d, a2->coord3d, a3->coord3d, ribbonThickness, false, false, tension, settings->detailLevel);
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a2));
+ glDrawHalfWorm(a3->coord3d, a2->coord3d, a1->coord3d, a0->coord3d, ribbonThickness, false, false, tension, settings->detailLevel);
+ }
+
+ if (wormCoords.size() >= 3) {
+ // Draw worm opening
+ const SharedAtom a0 = wormCoords.at(0);
+ const SharedAtom a1 = wormCoords.at(1);
+ const SharedAtom a2 = wormCoords.at(2);
+ Vector3D atomCoordFirst = model.openingAtom;
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(a0));
+ glDrawHalfWorm(atomCoordFirst, a0->coord3d, a1->coord3d, a2->coord3d, ribbonThickness, true, false, tension, settings->detailLevel);
+ glDrawHalfWorm(a2->coord3d, a1->coord3d, a0->coord3d, atomCoordFirst, ribbonThickness, false, false, tension, settings->detailLevel);
+ // Draw worm ending
+ const SharedAtom aN1 = wormCoords.at(size - 1);
+ const SharedAtom aN2 = wormCoords.at(size - 2);
+ const SharedAtom aN3 = wormCoords.at(size - 3);
+ Vector3D atomCoordLast = model.closingAtom;
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, getAtomColor(aN1));
+ glDrawHalfWorm(atomCoordLast, aN1->coord3d, aN2->coord3d, aN3->coord3d, ribbonThickness, true, false, tension, settings->detailLevel);
+ glDrawHalfWorm(aN3->coord3d, aN2->coord3d, aN1->coord3d, atomCoordLast, ribbonThickness, false, false, tension, settings->detailLevel);
+ }
+
+ //Draw 3d objects
+ if (shownModels.count() == 1) {
+ foreach( Object3D* obj, model.objects) {
+ obj->draw(settings->detailLevel);
+ }
+ }
+
+ }
+ }
+
+ gluDeleteQuadric(pObj);
+}
+
+
+void WormsGLRenderer::drawBioStruct3D()
+{
+ drawWorms();
+}
+
+void WormsGLRenderer::updateColorScheme()
+{
+ foreach (int id, wormMap.keys() ) {
+ Worm& worm = wormMap[id];
+ int numModels = worm.models.count();
+ for (int i= 0; i < numModels; ++i) {
+ WormModel& model = worm.models[i];
+ qDeleteAll(model.objects);
+ model.objects.clear();
+ }
+ }
+
+ //TODO: optimization -> don't have to create everything again
+ createObjects3D();
+}
+
+void WormsGLRenderer::updateShownModels() {
+ updateColorScheme();
+}
+
+void WormsGLRenderer::updateSettings() {
+ updateColorScheme();
+}
+
+void WormsGLRenderer::createObjects3D()
+{
+ foreach (const SharedSecondaryStructure ss, bioStruct.secondaryStructures) {
+ int startId = ss->startSequenceNumber;
+ int endId = ss->endSequenceNumber;
+ int chainId = ss->chainIndex;
+ Q_ASSERT( chainId != 0 );
+ if (bioPolymerMap.contains(chainId)) {
+ const BioPolymer& bpolymer = bioPolymerMap.value(chainId);
+ int modelId = 0;
+ foreach (const BioPolymerModel& bpModel, bpolymer.bpModels.values() ) {
+ if (bpModel.monomerMap.contains(startId) && bpModel.monomerMap.contains(endId)) {
+ Object3D* obj = NULL;
+ if (ss->type == SecondaryStructure::Type_AlphaHelix ) {
+ obj = createHelix3D(startId, endId, bpModel);
+ } else if (ss->type == SecondaryStructure::Type_BetaStrand) {
+ obj = createStrand3D(startId, endId, bpModel);
+ }
+ if (obj != NULL) {
+ wormMap[chainId].models[modelId].objects.append(obj);
+ }
+ }
+ ++modelId;
+ }
+ }
+ }
+}
+
+void WormsGLRenderer::createWorms()
+{
+ // Create worms coordinates
+ QMapIterator<int, BioPolymer> i(bioPolymerMap);
+ while (i.hasNext()) {
+ i.next();
+ Worm worm;
+ const BioPolymer& bioPolymer = i.value();
+ foreach (const BioPolymerModel& bpModel, bioPolymer.bpModels.values()) {
+ const QMap<int,Monomer> monomers = bpModel.monomerMap;
+ SAFE_POINT(monomers.size() != 0, "Cannot create worms - no monomers!", );
+
+ const bool atLeast2MonomersExist = ( 1 < monomers.size( ) );
+ QMap<int,Monomer>::const_iterator iter(monomers.constBegin());
+ // Calculate opening atom coords
+ Vector3D r1( iter.value().alphaCarbon.constData()->coord3d );
+ Vector3D r2( ( atLeast2MonomersExist ? ++iter : iter ).value().alphaCarbon.constData()
+ ->coord3d );
+
+ Vector3D a( r1 );
+ Vector3D b( (r2 - r1) / 100.f );
+
+ WormModel wormModel;
+ wormModel.openingAtom = a + b*(-10.f);
+ // Calculate closing atom coords
+ iter = bpModel.monomerMap.constEnd();
+ r1 = (--iter).value().alphaCarbon.constData()->coord3d;
+ r2 = ( atLeast2MonomersExist ? --iter : iter ).value().alphaCarbon.constData()->coord3d;
+ a = r1;
+ b = (r2 - r1) / 100.f;
+ wormModel.closingAtom = a + b * (-10.f);
+ // Add worm-building atom coords
+ foreach (const Monomer& monomer, monomers) {
+ const SharedAtom& atom = monomer.alphaCarbon;
+ wormModel.atoms.append(atom);
+ }
+ worm.models.append(wormModel);
+ }
+ const int chainID = i.key();
+ wormMap.insert(chainID, worm);
+ }
+ createObjects3D();
+
+}
+
+void WormsGLRenderer::createBioPolymerMap(const QMap<int, SharedMolecule> &moleculeMap, QMap<int, BioPolymer> &bioPolymerMap) {
+ const char* alphaCarbonTag = "CA";
+ const char* phosophorTag = "P";
+ const char* carbonylOxygenTag = "O";
+
+ QMapIterator<int, SharedMolecule> i(moleculeMap);
+ while (i.hasNext()) {
+ i.next();
+ const SharedMolecule mol = i.value();
+ BioPolymer bioPolymer;
+ foreach (int modelId, mol->models.keys()) {
+ const Molecule3DModel& model = mol->models.value(modelId);
+ BioPolymerModel& bpModel = bioPolymer.bpModels[modelId];
+ QMap<int, QPair<bool, bool> > checkList;
+ foreach (const SharedAtom atom, model.atoms) {
+ int residueIdx = atom->residueIndex.toInt();
+ if ((atom->name.trimmed() == alphaCarbonTag) || (atom->name.trimmed() == phosophorTag)) {
+
+ if (checkList.contains(residueIdx)) {
+ QPair<bool, bool> check = checkList.value(residueIdx);
+ if (check.first == false) {
+ SAFE_POINT(check.second == true, "Invalid checklist state", );
+ bpModel.monomerMap[residueIdx].alphaCarbon = atom;
+ checkList.remove(residueIdx);
+ } else {
+ FAIL("Reapeated alpha carbon atom in the same residue", );
+ }
+ } else {
+ checkList[residueIdx] = QPair<bool, bool>(true, false);
+ bpModel.monomerMap[residueIdx].alphaCarbon = atom;
+ }
+ }
+ if ( (atom->name.trimmed() == carbonylOxygenTag)) {
+ if (checkList.contains(residueIdx)) {
+ QPair<bool, bool> check = checkList.value(residueIdx);
+ if (check.second == false) {
+ SAFE_POINT(check.first == true, "", );
+ bpModel.monomerMap[residueIdx].carbonylOxygen = atom;
+ checkList.remove(residueIdx);
+ } else {
+ FAIL("Reapeated carbonyl oxygen atom in the same residue", );
+ }
+
+ } else {
+ checkList[residueIdx] = QPair<bool, bool>(false, true);
+ bpModel.monomerMap[residueIdx].carbonylOxygen = atom;
+ }
+ }
+ }
+ foreach (int residueIdx, checkList.keys()) {
+ QPair<bool, bool> check = checkList[residueIdx];
+ if (check.first == false && check.second == true) {
+ bpModel.monomerMap.remove(residueIdx);
+ }
+ }
+
+ if (bpModel.monomerMap.isEmpty()) {
+ bioPolymer.bpModels.remove(modelId);
+ }
+ }
+ if (!bioPolymer.bpModels.isEmpty()) {
+ bioPolymerMap.insert(i.key(), bioPolymer);
+ }
+ }
+}
+
+
+WormsGLRenderer::~WormsGLRenderer()
+{
+ foreach (Worm worm, wormMap) {
+ foreach (WormModel model, worm.models) {
+ qDeleteAll(model.objects);
+ }
+ }
+}
+
+const float* WormsGLRenderer::getAtomColor(const SharedAtom& atom)
+{
+ atomColor = colorScheme->getAtomColor(atom);
+ return atomColor.getConstData();
+}
+
+Object3D* WormsGLRenderer::createHelix3D( int startId, int endId, const BioPolymerModel &bpModel )
+{
+ static float radius = 1.5f;
+ QVector<Vector3D> helixPoints;
+ Color4f color(0,0,0,0);
+
+ for (int i = startId; i <= endId; ++i) {
+ if (!bpModel.monomerMap.contains(i))
+ continue;
+ helixPoints.append(bpModel.monomerMap.value(i).alphaCarbon->coord3d);
+
+ // getting "average" color
+ const Color4f c = colorScheme->getAtomColor(bpModel.monomerMap.value(i).alphaCarbon);
+ for (int i = 0; i < 4; ++i) {
+ color[i] += c[i];
+ }
+ }
+ QPair<Vector3D, Vector3D> axis = calcBestAxisThroughPoints(helixPoints);
+
+ // getting "average" color
+ for (int i = 0; i < 4; ++i) {
+ color[i] /= (endId - startId + 1);
+ }
+
+ return new Helix3D(color, axis.first, axis.second, radius);
+}
+
+Object3D* WormsGLRenderer::createStrand3D( int startId, int endId, const BioPolymerModel &bpModel )
+{
+ QVector<Vector3D> arrowPoints;
+ Color4f color(0,0,0,0);
+
+ for (int i = startId; i <= endId; ++i) {
+ if (!bpModel.monomerMap.contains(i))
+ continue;
+ arrowPoints.append(bpModel.monomerMap.value(i).alphaCarbon->coord3d);
+
+ // getting "average" color
+ const Color4f c = colorScheme->getAtomColor(bpModel.monomerMap.value(i).alphaCarbon);
+ for (int i = 0; i < 4; ++i) {
+ color[i] += c[i];
+ }
+ }
+ QPair<Vector3D, Vector3D> axis = calcBestAxisThroughPoints(arrowPoints);
+
+ // getting "average" color
+ for (int i = 0; i < 4; ++i) {
+ color[i] /= (endId - startId + 1);
+ }
+
+ return new Strand3D(color, axis.first, axis.second);
+}
+
+} //namespace
diff --git a/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h
new file mode 100644
index 0000000..8d60be2
--- /dev/null
+++ b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h
@@ -0,0 +1,118 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_BIOSTRUCT3D_WORMS_RENDERER_H_
+#define _U2_BIOSTRUCT3D_WORMS_RENDERER_H_
+
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+
+#include <U2Core/Vector3D.h>
+#include "BioStruct3DGLRender.h"
+#include "GraphicUtils.h"
+
+class Object3D;
+class AtomData;
+
+namespace U2 {
+
+class WormsGLRenderer : public BioStruct3DGLRenderer {
+
+
+ // BioPolymer molecule
+
+ struct Monomer
+ {
+ Monomer() : alphaCarbon(NULL), carbonylOxygen(NULL) {}
+ QSharedDataPointer<AtomData> alphaCarbon;
+ QSharedDataPointer<AtomData> carbonylOxygen;
+ };
+
+ struct BioPolymerModel
+ {
+ QMap<int,Monomer> monomerMap;
+ };
+
+ struct BioPolymer
+ {
+ // multiple models
+ QMap<int, BioPolymerModel> bpModels;
+ };
+
+ QMap<int, BioPolymer > bioPolymerMap;
+
+
+ // Worm Model
+
+ typedef QVector<SharedAtom> AtomsVector;
+
+ struct WormModel {
+ //! These coords required to draw worms endings correctly
+ Vector3D openingAtom, closingAtom;
+ // Worm building atom coords
+ AtomsVector atoms;
+ // Objects representing secondary structure
+ QVector<Object3D*> objects;
+ };
+
+ struct Worm {
+ QVector<WormModel> models;
+ };
+
+ QMap<int, Worm> wormMap;
+ Color4f atomColor;
+
+
+ void createObjects3D();
+ Object3D* createStrand3D( int startId, int endId, const BioPolymerModel &bpModel );
+ Object3D* createHelix3D( int startId, int endId, const BioPolymerModel &bpModel );
+ void createWorms();
+ void drawWorms();
+ void drawSecondaryStructure();
+ const float* getAtomColor(const SharedAtom& atom);
+
+private:
+ static void createBioPolymerMap(const QMap <int, SharedMolecule>& moleculeMap, QMap<int, BioPolymer>& bioPolymerMap);
+
+protected:
+ WormsGLRenderer(const BioStruct3D& struc, const BioStruct3DColorScheme* s, const QList<int> &shownModels, const BioStruct3DRendererSettings *settings);
+
+public:
+ virtual ~WormsGLRenderer();
+
+ virtual void create();
+ virtual void drawBioStruct3D();
+
+ virtual void updateColorScheme();
+ virtual void updateShownModels();
+ virtual void updateSettings();
+
+public:
+ static bool isAvailableFor(const BioStruct3D &);
+
+ RENDERER_FACTORY(WormsGLRenderer)
+};
+
+} //namespace
+
+#endif // _U2_BIOSTRUCT3D_WORMS_RENDERER_H_
diff --git a/src/plugins/biostruct3d_view/transl/english.ts b/src/plugins/biostruct3d_view/transl/english.ts
index 068554a..666f3cc 100644
--- a/src/plugins/biostruct3d_view/transl/english.ts
+++ b/src/plugins/biostruct3d_view/transl/english.ts
@@ -32,52 +32,62 @@
<context>
<name>QObject</name>
<message>
- <location filename="../src/TubeGLRenderer.cpp" line="32"/>
+ <location filename="../src/TubeGLRenderer.cpp" line="29"/>
+ <location filename="../src/deprecated/TubeGLRenderer.cpp" line="32"/>
<source>Tubes</source>
<translation>Model</translation>
</message>
<message>
- <location filename="../src/WormsGLRenderer.cpp" line="34"/>
+ <location filename="../src/WormsGLRenderer.cpp" line="33"/>
+ <location filename="../src/deprecated/WormsGLRenderer.cpp" line="34"/>
<source>Worms</source>
<translation>Worms</translation>
</message>
<message>
- <location filename="../src/VanDerWaalsGLRenderer.cpp" line="37"/>
+ <location filename="../src/VanDerWaalsGLRenderer.cpp" line="36"/>
+ <location filename="../src/deprecated/VanDerWaalsGLRenderer.cpp" line="37"/>
<source>Space Fill</source>
<translation>Space Fill</translation>
</message>
<message>
- <location filename="../src/MolecularSurfaceRenderer.cpp" line="68"/>
+ <location filename="../src/MolecularSurfaceRenderer.cpp" line="67"/>
+ <location filename="../src/deprecated/MolecularSurfaceRenderer.cpp" line="68"/>
<source>Dots</source>
<translation>Dots</translation>
</message>
<message>
- <location filename="../src/MolecularSurfaceRenderer.cpp" line="69"/>
+ <location filename="../src/MolecularSurfaceRenderer.cpp" line="68"/>
+ <location filename="../src/deprecated/MolecularSurfaceRenderer.cpp" line="69"/>
<source>Convex Map</source>
<translation>Convex Map</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="80"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="80"/>
<source>Molecular Chains</source>
<translation>Molecular Chains</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="81"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="81"/>
<source>Chemical Elements</source>
<translation>Chemical Elements</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="82"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="82"/>
<source>Secondary Structure</source>
<translation>Secondary Structure</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="83"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="83"/>
<source>Simple colors</source>
<translation>Simple colors</translation>
</message>
<message>
- <location filename="../src/BallAndStickGLRenderer.cpp" line="38"/>
+ <location filename="../src/BallAndStickGLRenderer.cpp" line="37"/>
+ <location filename="../src/deprecated/BallAndStickGLRenderer.cpp" line="38"/>
<source>Ball-and-Stick</source>
<translation>Ball-and-Stick</translation>
</message>
@@ -175,11 +185,13 @@
<name>U2::AddModelToSplitterTask</name>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="819"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="819"/>
<source>Add 3d model '%1' to BioStruct3DSplitter</source>
<translation>Add 3d model '%1' to BioStruct3DSplitter</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="847"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="847"/>
<source>Model %1 wasn't added</source>
<translation>Model %1 wasn't added</translation>
</message>
@@ -187,77 +199,92 @@
<context>
<name>U2::BioStruct3DGLWidget</name>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="771"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="767"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="771"/>
<source>Spin</source>
<translation>Spin</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="760"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="756"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="760"/>
<source>Off</source>
<translation>Off</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="767"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="763"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="767"/>
<source>Models..</source>
<translation>Models..</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="775"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="771"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="775"/>
<source>Settings...</source>
<translation>Settings...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="778"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="774"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="778"/>
<source>Close</source>
<translation>Close</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="781"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="777"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="781"/>
<source>Export Image...</source>
<translation>Export Image...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="790"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="786"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="790"/>
<source>Align With...</source>
<translation>Align With...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="794"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="790"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="794"/>
<source>Reset</source>
<translation>Reset</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="801"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="797"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="801"/>
<source>Render Style</source>
<translation>Render Style</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="806"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="802"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="806"/>
<source>Coloring Scheme</source>
<translation>Coloring Scheme</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="811"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="807"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="811"/>
<source>Molecular Surface Render Style</source>
<translation>Molecular Surface Render Style</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="815"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="811"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="815"/>
<source>Molecular Surface</source>
<translation>Molecular Surface</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="840"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="836"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="840"/>
<source>Structural Alignment</source>
<translation>Structural Alignment</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="588"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="584"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="588"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="588"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="584"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="588"/>
<source>Unable to open file %1 for writing</source>
<translation>Unable to open file %1 for writing</translation>
</message>
@@ -266,36 +293,43 @@
<name>U2::BioStruct3DSettingsDialog</name>
<message>
<location filename="../src/SettingsDialog.cpp" line="50"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="50"/>
<source>Custom</source>
<translation>Custom</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="52"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="52"/>
<source>Red - Blue</source>
<translation>Red - Blue</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="53"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="53"/>
<source>Cyan - Red</source>
<translation>Cyan - Red</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="54"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="54"/>
<source>Red - Dark Cyan</source>
<translation>Red - Dark Cyan</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="55"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="55"/>
<source>Red - Green</source>
<translation>Red - Green</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="56"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="56"/>
<source>Magenta - Green</source>
<translation>Magenta - Green</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="242"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="242"/>
<source>(not supported by your videocard)</source>
<translation>(not supported by your videocard)</translation>
</message>
@@ -304,6 +338,7 @@
<name>U2::BioStruct3DViewContext</name>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="183"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="183"/>
<source>Close 3D Structure Viewer</source>
<translation>Close 3D Structure Viewer</translation>
</message>
@@ -312,11 +347,13 @@
<name>U2::BioStruct3DViewPlugin</name>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="87"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="87"/>
<source>3D Structure Viewer</source>
<translation>3D Structure Viewer</translation>
</message>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="87"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="87"/>
<source>Visualizes 3D structures of biological molecules.</source>
<translation>Visualizes 3D structures of biological molecules.</translation>
</message>
@@ -325,31 +362,37 @@
<name>U2::SelectModelsDialog</name>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="40"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="40"/>
<source>All</source>
<translation>All</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="41"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="41"/>
<source>Invert</source>
<translation>Invert</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="42"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="42"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="43"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="43"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="94"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="94"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="94"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="94"/>
<source>At least one model shoud be selected.</source>
<translation>At least one model shoud be selected.</translation>
</message>
@@ -358,67 +401,81 @@
<name>U2::SplitterHeaderWidget</name>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="408"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="408"/>
<source>3D Structure Viewer</source>
<translation>3D Structure Viewer</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="416"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="416"/>
<source>Active view:</source>
<translation>Active view:</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="423"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="423"/>
<source>Restore Default View</source>
<translation>Restore Default View</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="428"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="428"/>
<source>Zoom In</source>
<translation>Zoom In</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="434"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="434"/>
<source>Zoom Out</source>
<translation>Zoom Out</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="439"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="439"/>
<source>Synchronize 3D Structure Views</source>
<translation>Synchronize 3D Structure Views</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="444"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="444"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="468"/>
<location filename="../src/BioStruct3DSplitter.cpp" line="469"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="468"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="469"/>
<source>Toggle view</source>
<translation>Toggle view</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="564"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="564"/>
<source>Show %1</source>
<translation>Show %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="788"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="788"/>
<source>File not found: %1</source>
<translation>File not found: %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="800"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="800"/>
<source>Illegal entry: %1</source>
<translation>Illegal entry: %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="450"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="450"/>
<source>Links</source>
<translation>Links</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="457"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="457"/>
<source>Add</source>
<translation>Add</translation>
</message>
diff --git a/src/plugins/biostruct3d_view/transl/russian.ts b/src/plugins/biostruct3d_view/transl/russian.ts
index 708de20..e2102b4 100644
--- a/src/plugins/biostruct3d_view/transl/russian.ts
+++ b/src/plugins/biostruct3d_view/transl/russian.ts
@@ -32,52 +32,62 @@
<context>
<name>QObject</name>
<message>
- <location filename="../src/TubeGLRenderer.cpp" line="32"/>
+ <location filename="../src/TubeGLRenderer.cpp" line="29"/>
+ <location filename="../src/deprecated/TubeGLRenderer.cpp" line="32"/>
<source>Tubes</source>
<translation>Трубки</translation>
</message>
<message>
- <location filename="../src/WormsGLRenderer.cpp" line="34"/>
+ <location filename="../src/WormsGLRenderer.cpp" line="33"/>
+ <location filename="../src/deprecated/WormsGLRenderer.cpp" line="34"/>
<source>Worms</source>
<translation>Каркас</translation>
</message>
<message>
- <location filename="../src/VanDerWaalsGLRenderer.cpp" line="37"/>
+ <location filename="../src/VanDerWaalsGLRenderer.cpp" line="36"/>
+ <location filename="../src/deprecated/VanDerWaalsGLRenderer.cpp" line="37"/>
<source>Space Fill</source>
<translation>Заполнение</translation>
</message>
<message>
- <location filename="../src/MolecularSurfaceRenderer.cpp" line="68"/>
+ <location filename="../src/MolecularSurfaceRenderer.cpp" line="67"/>
+ <location filename="../src/deprecated/MolecularSurfaceRenderer.cpp" line="68"/>
<source>Dots</source>
<translation>Точки</translation>
</message>
<message>
- <location filename="../src/MolecularSurfaceRenderer.cpp" line="69"/>
+ <location filename="../src/MolecularSurfaceRenderer.cpp" line="68"/>
+ <location filename="../src/deprecated/MolecularSurfaceRenderer.cpp" line="69"/>
<source>Convex Map</source>
<translation>Выпуклая структура</translation>
</message>
<message>
- <location filename="../src/BallAndStickGLRenderer.cpp" line="38"/>
+ <location filename="../src/BallAndStickGLRenderer.cpp" line="37"/>
+ <location filename="../src/deprecated/BallAndStickGLRenderer.cpp" line="38"/>
<source>Ball-and-Stick</source>
<translation>Шаростержневая модель</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="80"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="80"/>
<source>Molecular Chains</source>
<translation>Молекулярные цепи</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="81"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="81"/>
<source>Chemical Elements</source>
<translation>Химические элементы</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="82"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="82"/>
<source>Secondary Structure</source>
<translation>Вторичная структура</translation>
</message>
<message>
<location filename="../src/BioStruct3DColorScheme.cpp" line="83"/>
+ <location filename="../src/deprecated/BioStruct3DColorScheme.cpp" line="83"/>
<source>Simple colors</source>
<translation>Простые цвета</translation>
</message>
@@ -175,11 +185,13 @@
<name>U2::AddModelToSplitterTask</name>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="819"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="819"/>
<source>Add 3d model '%1' to BioStruct3DSplitter</source>
<translation>Добавить 3D модель '%1' в BioStruct3DSplitter</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="847"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="847"/>
<source>Model %1 wasn't added</source>
<translation>Модель %1 не была добавлена</translation>
</message>
@@ -187,77 +199,92 @@
<context>
<name>U2::BioStruct3DGLWidget</name>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="771"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="767"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="771"/>
<source>Spin</source>
<translation>Вращение</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="760"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="756"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="760"/>
<source>Off</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="767"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="763"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="767"/>
<source>Models..</source>
<translation>Модели..</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="790"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="786"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="790"/>
<source>Align With...</source>
<translation>Выровнять с...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="811"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="807"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="811"/>
<source>Molecular Surface Render Style</source>
<translation>Стиль отрисовки поверхности</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="815"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="811"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="815"/>
<source>Molecular Surface</source>
<translation>Молекулярная поверхность</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="588"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="584"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="588"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="588"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="584"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="588"/>
<source>Unable to open file %1 for writing</source>
<translation>Невозможно открыть файл %1 для записи</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="775"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="771"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="775"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="778"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="774"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="778"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="781"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="777"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="781"/>
<source>Export Image...</source>
<translation>Экспортировать изображение...</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="794"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="790"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="794"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="801"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="797"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="801"/>
<source>Render Style</source>
<translation>Стиль отрисовки</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="806"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="802"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="806"/>
<source>Coloring Scheme</source>
<translation>Цветовая схема</translation>
</message>
<message>
- <location filename="../src/BioStruct3DGLWidget.cpp" line="840"/>
+ <location filename="../src/BioStruct3DGLWidget.cpp" line="836"/>
+ <location filename="../src/deprecated/BioStruct3DGLWidget.cpp" line="840"/>
<source>Structural Alignment</source>
<translation>Структурное выравнивание</translation>
</message>
@@ -266,36 +293,43 @@
<name>U2::BioStruct3DSettingsDialog</name>
<message>
<location filename="../src/SettingsDialog.cpp" line="50"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="50"/>
<source>Custom</source>
<translation>Выбранные</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="52"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="52"/>
<source>Red - Blue</source>
<translation>Красный - Синий</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="53"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="53"/>
<source>Cyan - Red</source>
<translation>Голубой - Красный</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="54"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="54"/>
<source>Red - Dark Cyan</source>
<translation>Красный - Темно-голубой</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="55"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="55"/>
<source>Red - Green</source>
<translation>Красный - Зеленый</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="56"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="56"/>
<source>Magenta - Green</source>
<translation>Пурпурный - Зеленый</translation>
</message>
<message>
<location filename="../src/SettingsDialog.cpp" line="242"/>
+ <location filename="../src/deprecated/SettingsDialog.cpp" line="242"/>
<source>(not supported by your videocard)</source>
<translation>(не поддерживается видеокартой)</translation>
</message>
@@ -304,6 +338,7 @@
<name>U2::BioStruct3DViewContext</name>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="183"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="183"/>
<source>Close 3D Structure Viewer</source>
<translation>Закрыть визуализатор 3D структур</translation>
</message>
@@ -312,11 +347,13 @@
<name>U2::BioStruct3DViewPlugin</name>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="87"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="87"/>
<source>3D Structure Viewer</source>
<translation>Визуализатор 3D структур</translation>
</message>
<message>
<location filename="../src/BioStruct3DViewPlugin.cpp" line="87"/>
+ <location filename="../src/deprecated/BioStruct3DViewPlugin.cpp" line="87"/>
<source>Visualizes 3D structures of biological molecules.</source>
<translation>Визуализирует 3D структуры биологических молекул.</translation>
</message>
@@ -325,31 +362,37 @@
<name>U2::SelectModelsDialog</name>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="40"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="40"/>
<source>All</source>
<translation>Все</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="41"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="41"/>
<source>Invert</source>
<translation>Инвертировать</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="42"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="42"/>
<source>OK</source>
<translation>Применить</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="43"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="43"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="94"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="94"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../src/SelectModelsDialog.cpp" line="94"/>
+ <location filename="../src/deprecated/SelectModelsDialog.cpp" line="94"/>
<source>At least one model shoud be selected.</source>
<translation>Выберите как минимум одну модель.</translation>
</message>
@@ -358,67 +401,81 @@
<name>U2::SplitterHeaderWidget</name>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="408"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="408"/>
<source>3D Structure Viewer</source>
<translation>Визуализатор 3D структур</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="416"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="416"/>
<source>Active view:</source>
<translation>Активная:</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="423"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="423"/>
<source>Restore Default View</source>
<translation>Восстановить вид по умолчанию</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="428"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="428"/>
<source>Zoom In</source>
<translation>Увеличить</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="434"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="434"/>
<source>Zoom Out</source>
<translation>Уменьшить</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="439"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="439"/>
<source>Synchronize 3D Structure Views</source>
<translation>Синхронизировать изображения</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="444"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="444"/>
<source>Display</source>
<translation>Изображение</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="468"/>
<location filename="../src/BioStruct3DSplitter.cpp" line="469"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="468"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="469"/>
<source>Toggle view</source>
<translation>Переключить вид</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="564"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="564"/>
<source>Show %1</source>
<translation>Показывать %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="788"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="788"/>
<source>File not found: %1</source>
<translation>Файл не найден: %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="800"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="800"/>
<source>Illegal entry: %1</source>
<translation>Некорректные входные данные: %1</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="450"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="450"/>
<source>Links</source>
<translation>Ссылки</translation>
</message>
<message>
<location filename="../src/BioStruct3DSplitter.cpp" line="457"/>
+ <location filename="../src/deprecated/BioStruct3DSplitter.cpp" line="457"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
diff --git a/src/plugins/browser_support/src/BrowserSupportPlugin.cpp b/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
index 2a327ab..6a86b01 100644
--- a/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
+++ b/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/browser_support/src/BrowserSupportPlugin.h b/src/plugins/browser_support/src/BrowserSupportPlugin.h
index 07f5704..9ffc99d 100644
--- a/src/plugins/browser_support/src/BrowserSupportPlugin.h
+++ b/src/plugins/browser_support/src/BrowserSupportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/chroma_view/src/ChromaViewPlugin.cpp b/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
index ee2e7e9..e0a34e7 100644
--- a/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
+++ b/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/chroma_view/src/ChromaViewPlugin.h b/src/plugins/chroma_view/src/ChromaViewPlugin.h
index f52830d..bed3230 100644
--- a/src/plugins/chroma_view/src/ChromaViewPlugin.h
+++ b/src/plugins/chroma_view/src/ChromaViewPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/chroma_view/src/ChromatogramView.cpp b/src/plugins/chroma_view/src/ChromatogramView.cpp
index 06e65a5..ea3f595 100644
--- a/src/plugins/chroma_view/src/ChromatogramView.cpp
+++ b/src/plugins/chroma_view/src/ChromatogramView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -303,6 +303,7 @@ void ChromatogramView::sl_onAddExistingSequenceObject() {
s.objectConstraints.insert(&ac);
ac.alphabetType = ctx->getSequenceObject()->getAlphabet()->getType();
s.groupMode = ProjectTreeGroupMode_ByDocument;
+ s.ignoreRemoteObjects = true;
foreach (GObject* o, ctx->getAnnotatedDNAView()->getObjects()) {
s.excludeObjectList.append(o);
}
diff --git a/src/plugins/chroma_view/src/ChromatogramView.h b/src/plugins/chroma_view/src/ChromatogramView.h
index 7ce28e7..9467b1e 100644
--- a/src/plugins/chroma_view/src/ChromatogramView.h
+++ b/src/plugins/chroma_view/src/ChromatogramView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/chroma_view/transl/english.ts b/src/plugins/chroma_view/transl/english.ts
index 85cac8a..48483cf 100644
--- a/src/plugins/chroma_view/transl/english.ts
+++ b/src/plugins/chroma_view/transl/english.ts
@@ -56,7 +56,7 @@
</message>
<message>
<location filename="../src/ChromatogramView.cpp" line="219"/>
- <location filename="../src/ChromatogramView.cpp" line="354"/>
+ <location filename="../src/ChromatogramView.cpp" line="355"/>
<source>The sequence is locked</source>
<translation>The sequence is locked</translation>
</message>
@@ -77,12 +77,12 @@
<context>
<name>U2::ChromatogramViewRenderArea</name>
<message>
- <location filename="../src/ChromatogramView.cpp" line="510"/>
+ <location filename="../src/ChromatogramView.cpp" line="511"/>
<source>Chromatogram view (zoom in to see base calls)</source>
<translation>Chromatogram view (zoom in to see base calls)</translation>
</message>
<message>
- <location filename="../src/ChromatogramView.cpp" line="735"/>
+ <location filename="../src/ChromatogramView.cpp" line="736"/>
<source>original sequence</source>
<translation>original sequence</translation>
</message>
diff --git a/src/plugins/chroma_view/transl/russian.ts b/src/plugins/chroma_view/transl/russian.ts
index 97a5fdc..9ed5c7a 100644
--- a/src/plugins/chroma_view/transl/russian.ts
+++ b/src/plugins/chroma_view/transl/russian.ts
@@ -56,7 +56,7 @@
</message>
<message>
<location filename="../src/ChromatogramView.cpp" line="219"/>
- <location filename="../src/ChromatogramView.cpp" line="354"/>
+ <location filename="../src/ChromatogramView.cpp" line="355"/>
<source>The sequence is locked</source>
<translation>Последовательность заблокирована</translation>
</message>
@@ -77,12 +77,12 @@
<context>
<name>U2::ChromatogramViewRenderArea</name>
<message>
- <location filename="../src/ChromatogramView.cpp" line="510"/>
+ <location filename="../src/ChromatogramView.cpp" line="511"/>
<source>Chromatogram view (zoom in to see base calls)</source>
<translation>Хроматограмма (приближайте масштаб)</translation>
</message>
<message>
- <location filename="../src/ChromatogramView.cpp" line="735"/>
+ <location filename="../src/ChromatogramView.cpp" line="736"/>
<source>original sequence</source>
<translation>Исходная последовательность</translation>
</message>
diff --git a/src/plugins/circular_view/src/CircularItems.cpp b/src/plugins/circular_view/src/CircularItems.cpp
index 54c1213..476a6a2 100644
--- a/src/plugins/circular_view/src/CircularItems.cpp
+++ b/src/plugins/circular_view/src/CircularItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularItems.h b/src/plugins/circular_view/src/CircularItems.h
index 2955da7..3e97bce 100644
--- a/src/plugins/circular_view/src/CircularItems.h
+++ b/src/plugins/circular_view/src/CircularItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularView.cpp b/src/plugins/circular_view/src/CircularView.cpp
index a7b9082..713f790 100644
--- a/src/plugins/circular_view/src/CircularView.cpp
+++ b/src/plugins/circular_view/src/CircularView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -653,7 +653,10 @@ void CircularViewRenderArea::drawAnnotationsSelection(QPainter& p) {
}
}
-#define RULER_PAD 40
+namespace {
+ const int RULER_PAD = 40;
+ const int DEFAULT_SYMBOLS_ALLOWED = 20;
+}
void CircularViewRenderArea::drawSequenceName(QPainter& p) {
QPen boldPen(Qt::black);
boldPen.setWidth(3);
@@ -670,7 +673,7 @@ void CircularViewRenderArea::drawSequenceName(QPainter& p) {
p.setFont(font);
QFontMetrics fm(font, this);
int cw = fm.width('O');
- int symbolsAlowed = (rulerEllipseSize - RULER_PAD)/cw;
+ int symbolsAlowed = (0 == cw) ? DEFAULT_SYMBOLS_ALLOWED : (rulerEllipseSize - RULER_PAD) / cw;
if(symbolsAlowed<docNameFullLength) {
docName=docName.mid(0,symbolsAlowed - 2);
docName+="..";
diff --git a/src/plugins/circular_view/src/CircularView.h b/src/plugins/circular_view/src/CircularView.h
index f680d10..cd771e9 100644
--- a/src/plugins/circular_view/src/CircularView.h
+++ b/src/plugins/circular_view/src/CircularView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewImageExportTask.cpp b/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
index a29e423..ed830c9 100644
--- a/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
+++ b/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewImageExportTask.h b/src/plugins/circular_view/src/CircularViewImageExportTask.h
index 7ee1998..c59d75c 100644
--- a/src/plugins/circular_view/src/CircularViewImageExportTask.h
+++ b/src/plugins/circular_view/src/CircularViewImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewPlugin.cpp b/src/plugins/circular_view/src/CircularViewPlugin.cpp
index f17d2ed..72a86e8 100644
--- a/src/plugins/circular_view/src/CircularViewPlugin.cpp
+++ b/src/plugins/circular_view/src/CircularViewPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewPlugin.h b/src/plugins/circular_view/src/CircularViewPlugin.h
index b0590ad..f8e7b85 100644
--- a/src/plugins/circular_view/src/CircularViewPlugin.h
+++ b/src/plugins/circular_view/src/CircularViewPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp b/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
index fa10ebe..3c94556 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewSettingsWidget.h b/src/plugins/circular_view/src/CircularViewSettingsWidget.h
index 1f354d0..d951c7f 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidget.h
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
index cf91556..bbecf5c 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ namespace U2 {
const QString CircularViewSettingsWidgetFactory::GROUP_ID = "OP_CV_SETTINGS";
const QString CircularViewSettingsWidgetFactory::GROUP_ICON_STR = ":circular_view/images/circular.png";
const QString CircularViewSettingsWidgetFactory::GROUP_TITLE = QObject::tr("Circular View Settings");
-const QString CircularViewSettingsWidgetFactory::GROUP_DOC_PAGE = "17466036";
+const QString CircularViewSettingsWidgetFactory::GROUP_DOC_PAGE = "17467583";
CircularViewSettingsWidgetFactory::CircularViewSettingsWidgetFactory(CircularViewContext* context)
: ctx(context) {
diff --git a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h
index 5025bd4..f8b97b3 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewSplitter.cpp b/src/plugins/circular_view/src/CircularViewSplitter.cpp
index f5dd55c..c75f656 100644
--- a/src/plugins/circular_view/src/CircularViewSplitter.cpp
+++ b/src/plugins/circular_view/src/CircularViewSplitter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/CircularViewSplitter.h b/src/plugins/circular_view/src/CircularViewSplitter.h
index a9bf54f..474d28f 100644
--- a/src/plugins/circular_view/src/CircularViewSplitter.h
+++ b/src/plugins/circular_view/src/CircularViewSplitter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/RestrictionMapWidget.cpp b/src/plugins/circular_view/src/RestrictionMapWidget.cpp
index c172390..fe662e5 100644
--- a/src/plugins/circular_view/src/RestrictionMapWidget.cpp
+++ b/src/plugins/circular_view/src/RestrictionMapWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/RestrictionMapWidget.h b/src/plugins/circular_view/src/RestrictionMapWidget.h
index 0f630dd..9508c5b 100644
--- a/src/plugins/circular_view/src/RestrictionMapWidget.h
+++ b/src/plugins/circular_view/src/RestrictionMapWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp b/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
index 4540666..ddfda13 100644
--- a/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
+++ b/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/SetSequenceOriginDialog.h b/src/plugins/circular_view/src/SetSequenceOriginDialog.h
index 31d0fc6..14b391d 100644
--- a/src/plugins/circular_view/src/SetSequenceOriginDialog.h
+++ b/src/plugins/circular_view/src/SetSequenceOriginDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp b/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
index e3b8e65..f26c123 100644
--- a/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
+++ b/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/circular_view/src/ShiftSequenceStartTask.h b/src/plugins/circular_view/src/ShiftSequenceStartTask.h
index f1f49e4..ff93a87 100644
--- a/src/plugins/circular_view/src/ShiftSequenceStartTask.h
+++ b/src/plugins/circular_view/src/ShiftSequenceStartTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/cuda_support/src/CudaSupportPlugin.cpp b/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
index a0cdb3b..640cb8e 100644
--- a/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
+++ b/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/cuda_support/src/CudaSupportPlugin.h b/src/plugins/cuda_support/src/CudaSupportPlugin.h
index 0482105..aa8ad08 100644
--- a/src/plugins/cuda_support/src/CudaSupportPlugin.h
+++ b/src/plugins/cuda_support/src/CudaSupportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp b/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
index 0f5d303..41e0028 100644
--- a/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
+++ b/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/cuda_support/src/CudaSupportSettingsController.h b/src/plugins/cuda_support/src/CudaSupportSettingsController.h
index e1e97c2..293f0fe 100644
--- a/src/plugins/cuda_support/src/CudaSupportSettingsController.h
+++ b/src/plugins/cuda_support/src/CudaSupportSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Alignment.cpp b/src/plugins/dbi_bam/src/Alignment.cpp
index cb3459a..d04cff4 100644
--- a/src/plugins/dbi_bam/src/Alignment.cpp
+++ b/src/plugins/dbi_bam/src/Alignment.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Alignment.h b/src/plugins/dbi_bam/src/Alignment.h
index daaaee7..03942fc 100644
--- a/src/plugins/dbi_bam/src/Alignment.h
+++ b/src/plugins/dbi_bam/src/Alignment.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp b/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
index 91fffad..0e8a918 100644
--- a/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
+++ b/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BAMDbiPlugin.h b/src/plugins/dbi_bam/src/BAMDbiPlugin.h
index 3fd3a93..d7787e5 100644
--- a/src/plugins/dbi_bam/src/BAMDbiPlugin.h
+++ b/src/plugins/dbi_bam/src/BAMDbiPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BAMFormat.cpp b/src/plugins/dbi_bam/src/BAMFormat.cpp
index fb632e5..c25c986 100644
--- a/src/plugins/dbi_bam/src/BAMFormat.cpp
+++ b/src/plugins/dbi_bam/src/BAMFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BAMFormat.h b/src/plugins/dbi_bam/src/BAMFormat.h
index 2e1905f..41419d4 100644
--- a/src/plugins/dbi_bam/src/BAMFormat.h
+++ b/src/plugins/dbi_bam/src/BAMFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BaiReader.cpp b/src/plugins/dbi_bam/src/BaiReader.cpp
index f349b01..ed6693f 100644
--- a/src/plugins/dbi_bam/src/BaiReader.cpp
+++ b/src/plugins/dbi_bam/src/BaiReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BaiReader.h b/src/plugins/dbi_bam/src/BaiReader.h
index f9d80f7..672bf2d 100644
--- a/src/plugins/dbi_bam/src/BaiReader.h
+++ b/src/plugins/dbi_bam/src/BaiReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BaiWriter.cpp b/src/plugins/dbi_bam/src/BaiWriter.cpp
index 47d5c94..d4666bc 100644
--- a/src/plugins/dbi_bam/src/BaiWriter.cpp
+++ b/src/plugins/dbi_bam/src/BaiWriter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BaiWriter.h b/src/plugins/dbi_bam/src/BaiWriter.h
index 567e6cd..0966507 100644
--- a/src/plugins/dbi_bam/src/BaiWriter.h
+++ b/src/plugins/dbi_bam/src/BaiWriter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BgzfReader.cpp b/src/plugins/dbi_bam/src/BgzfReader.cpp
index ee56ee3..5fec7e1 100644
--- a/src/plugins/dbi_bam/src/BgzfReader.cpp
+++ b/src/plugins/dbi_bam/src/BgzfReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BgzfReader.h b/src/plugins/dbi_bam/src/BgzfReader.h
index 0a240ee..6608ced 100644
--- a/src/plugins/dbi_bam/src/BgzfReader.h
+++ b/src/plugins/dbi_bam/src/BgzfReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BgzfWriter.cpp b/src/plugins/dbi_bam/src/BgzfWriter.cpp
index a5ef2bf..d9b2012 100644
--- a/src/plugins/dbi_bam/src/BgzfWriter.cpp
+++ b/src/plugins/dbi_bam/src/BgzfWriter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/BgzfWriter.h b/src/plugins/dbi_bam/src/BgzfWriter.h
index 470d8d6..e56f329 100644
--- a/src/plugins/dbi_bam/src/BgzfWriter.h
+++ b/src/plugins/dbi_bam/src/BgzfWriter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/CancelledException.cpp b/src/plugins/dbi_bam/src/CancelledException.cpp
index 9200b44..0b766c0 100644
--- a/src/plugins/dbi_bam/src/CancelledException.cpp
+++ b/src/plugins/dbi_bam/src/CancelledException.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/CancelledException.h b/src/plugins/dbi_bam/src/CancelledException.h
index 6028cf8..bde165b 100644
--- a/src/plugins/dbi_bam/src/CancelledException.h
+++ b/src/plugins/dbi_bam/src/CancelledException.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
index 1ccfd53..9b689f9 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ namespace BAM {
ConvertToSQLiteDialog::ConvertToSQLiteDialog(const GUrl& _sourceUrl, BAMInfo& _bamInfo, bool sam) : QDialog(QApplication::activeWindow()), sourceUrl(_sourceUrl), bamInfo(_bamInfo) {
ui.setupUi(this);
- new HelpButton(this, ui.buttonBox, "17466121");
+ new HelpButton(this, ui.buttonBox, "17467668");
ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Import"));
ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -58,7 +58,7 @@ ConvertToSQLiteDialog::ConvertToSQLiteDialog(const GUrl& _sourceUrl, BAMInfo& _b
} else {
setWindowTitle(tr("Import BAM File"));
}
- this->setObjectName(tr("Import BAM File"));
+ this->setObjectName("Import BAM File");
const QString warningMessageStyleSheet( "color: " + L10N::successColorLabelStr( )
+ "; font: bold;" );
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
index b8ee20a..5ae67ca 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
index 692b031..45717ce 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
index 6fb920a..c32f74f 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Dbi.cpp b/src/plugins/dbi_bam/src/Dbi.cpp
index 1793a5d..0f4bab7 100644
--- a/src/plugins/dbi_bam/src/Dbi.cpp
+++ b/src/plugins/dbi_bam/src/Dbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Dbi.h b/src/plugins/dbi_bam/src/Dbi.h
index f258fad..a545bf1 100644
--- a/src/plugins/dbi_bam/src/Dbi.h
+++ b/src/plugins/dbi_bam/src/Dbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Exception.cpp b/src/plugins/dbi_bam/src/Exception.cpp
index 7d7cf42..09d927d 100644
--- a/src/plugins/dbi_bam/src/Exception.cpp
+++ b/src/plugins/dbi_bam/src/Exception.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Exception.h b/src/plugins/dbi_bam/src/Exception.h
index ac48752..0a01b37 100644
--- a/src/plugins/dbi_bam/src/Exception.h
+++ b/src/plugins/dbi_bam/src/Exception.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Header.cpp b/src/plugins/dbi_bam/src/Header.cpp
index fb6d88a..4b3f681 100644
--- a/src/plugins/dbi_bam/src/Header.cpp
+++ b/src/plugins/dbi_bam/src/Header.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Header.h b/src/plugins/dbi_bam/src/Header.h
index f4403b8..b610495 100644
--- a/src/plugins/dbi_bam/src/Header.h
+++ b/src/plugins/dbi_bam/src/Header.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/IOException.cpp b/src/plugins/dbi_bam/src/IOException.cpp
index 5746a0c..a856273 100644
--- a/src/plugins/dbi_bam/src/IOException.cpp
+++ b/src/plugins/dbi_bam/src/IOException.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/IOException.h b/src/plugins/dbi_bam/src/IOException.h
index b37c188..79944f9 100644
--- a/src/plugins/dbi_bam/src/IOException.h
+++ b/src/plugins/dbi_bam/src/IOException.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Index.cpp b/src/plugins/dbi_bam/src/Index.cpp
index 8171598..8468f5f 100644
--- a/src/plugins/dbi_bam/src/Index.cpp
+++ b/src/plugins/dbi_bam/src/Index.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Index.h b/src/plugins/dbi_bam/src/Index.h
index 2da7ee3..1acc06f 100644
--- a/src/plugins/dbi_bam/src/Index.h
+++ b/src/plugins/dbi_bam/src/Index.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/InvalidFormatException.cpp b/src/plugins/dbi_bam/src/InvalidFormatException.cpp
index 02b3ed4..8cce84a 100644
--- a/src/plugins/dbi_bam/src/InvalidFormatException.cpp
+++ b/src/plugins/dbi_bam/src/InvalidFormatException.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/InvalidFormatException.h b/src/plugins/dbi_bam/src/InvalidFormatException.h
index f63b3e3..622c06c 100644
--- a/src/plugins/dbi_bam/src/InvalidFormatException.h
+++ b/src/plugins/dbi_bam/src/InvalidFormatException.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp b/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
index 0fcf541..044da6e 100644
--- a/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
+++ b/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/LoadBamInfoTask.h b/src/plugins/dbi_bam/src/LoadBamInfoTask.h
index b85a4f5..f8f2f8b 100644
--- a/src/plugins/dbi_bam/src/LoadBamInfoTask.h
+++ b/src/plugins/dbi_bam/src/LoadBamInfoTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/PrepareToImportTask.cpp b/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
index 2cb84a6..a89d99e 100644
--- a/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
+++ b/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/PrepareToImportTask.h b/src/plugins/dbi_bam/src/PrepareToImportTask.h
index eb26cc2..d531096 100644
--- a/src/plugins/dbi_bam/src/PrepareToImportTask.h
+++ b/src/plugins/dbi_bam/src/PrepareToImportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Reader.cpp b/src/plugins/dbi_bam/src/Reader.cpp
index 38cc1e2..625abd1 100644
--- a/src/plugins/dbi_bam/src/Reader.cpp
+++ b/src/plugins/dbi_bam/src/Reader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/Reader.h b/src/plugins/dbi_bam/src/Reader.h
index d2baab0..b4c0578 100644
--- a/src/plugins/dbi_bam/src/Reader.h
+++ b/src/plugins/dbi_bam/src/Reader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/SamReader.cpp b/src/plugins/dbi_bam/src/SamReader.cpp
index a6c1ba3..e019c03 100644
--- a/src/plugins/dbi_bam/src/SamReader.cpp
+++ b/src/plugins/dbi_bam/src/SamReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/SamReader.h b/src/plugins/dbi_bam/src/SamReader.h
index e6a9dee..431127b 100644
--- a/src/plugins/dbi_bam/src/SamReader.h
+++ b/src/plugins/dbi_bam/src/SamReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
index a84403e..5301cf4 100644
--- a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
+++ b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
index 2e809c5..e7e85aa 100644
--- a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
+++ b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/VirtualOffset.cpp b/src/plugins/dbi_bam/src/VirtualOffset.cpp
index b3bd108..cf0c09d 100644
--- a/src/plugins/dbi_bam/src/VirtualOffset.cpp
+++ b/src/plugins/dbi_bam/src/VirtualOffset.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dbi_bam/src/VirtualOffset.h b/src/plugins/dbi_bam/src/VirtualOffset.h
index 324f732..f5662c0 100644
--- a/src/plugins/dbi_bam/src/VirtualOffset.h
+++ b/src/plugins/dbi_bam/src/VirtualOffset.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/CSVColumnConfiguration.h b/src/plugins/dna_export/src/CSVColumnConfiguration.h
index a01f80c..9b463c5 100644
--- a/src/plugins/dna_export/src/CSVColumnConfiguration.h
+++ b/src/plugins/dna_export/src/CSVColumnConfiguration.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
index 425bd4a..b473091 100644
--- a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
+++ b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ CSVColumnConfigurationDialog::CSVColumnConfigurationDialog(QWidget* w, const Col
: QDialog(w), config(_config)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466030");
+ new HelpButton(this, buttonBox, "17467577");
connect(complMarkRB, SIGNAL(toggled(bool)), SLOT(sl_complMarkToggle(bool)));
connect(startRB, SIGNAL(toggled(bool)), SLOT(sl_startToggle(bool)));
diff --git a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h
index 9847120..7296fb5 100644
--- a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h
+++ b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNAExportPlugin.cpp b/src/plugins/dna_export/src/DNAExportPlugin.cpp
index 7fd730a..3861b15 100644
--- a/src/plugins/dna_export/src/DNAExportPlugin.cpp
+++ b/src/plugins/dna_export/src/DNAExportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNAExportPlugin.h b/src/plugins/dna_export/src/DNAExportPlugin.h
index f07dab8..fa3aee7 100644
--- a/src/plugins/dna_export/src/DNAExportPlugin.h
+++ b/src/plugins/dna_export/src/DNAExportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNAExportPluginTests.cpp b/src/plugins/dna_export/src/DNAExportPluginTests.cpp
index f8aaf35..91eb2df 100644
--- a/src/plugins/dna_export/src/DNAExportPluginTests.cpp
+++ b/src/plugins/dna_export/src/DNAExportPluginTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNAExportPluginTests.h b/src/plugins/dna_export/src/DNAExportPluginTests.h
index 6ed71c6..20a54c3 100644
--- a/src/plugins/dna_export/src/DNAExportPluginTests.h
+++ b/src/plugins/dna_export/src/DNAExportPluginTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNASequenceGenerator.cpp b/src/plugins/dna_export/src/DNASequenceGenerator.cpp
index 30ab102..cf53f9b 100644
--- a/src/plugins/dna_export/src/DNASequenceGenerator.cpp
+++ b/src/plugins/dna_export/src/DNASequenceGenerator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNASequenceGenerator.h b/src/plugins/dna_export/src/DNASequenceGenerator.h
index a3dae78..e2dc26a 100644
--- a/src/plugins/dna_export/src/DNASequenceGenerator.h
+++ b/src/plugins/dna_export/src/DNASequenceGenerator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
index 97fc1f4..8dc47fc 100644
--- a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
+++ b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -55,7 +55,7 @@ QMap<char, qreal> DNASequenceGeneratorDialog::content = initContent();
DNASequenceGeneratorDialog::DNASequenceGeneratorDialog(QWidget* p) : QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466253");
+ new HelpButton(this, buttonBox, "17467800");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Generate"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -159,7 +159,7 @@ void DNASequenceGeneratorDialog::sl_refButtonToggled(bool checked) {
BaseContentDialog::BaseContentDialog(QMap<char, qreal>& percentMap_, QWidget* p)
: QDialog(p), percentMap(percentMap_) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466253");
+ new HelpButton(this, buttonBox, "17467800");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Save"));
percentASpin->setValue(percentMap.value('A')*100.0);
diff --git a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h
index a62cb51..5495218 100644
--- a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h
+++ b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp b/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
index 6278bd9..912c8bc 100644
--- a/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportAlignmentViewItems.h b/src/plugins/dna_export/src/ExportAlignmentViewItems.h
index 666dd42..bc56d21 100644
--- a/src/plugins/dna_export/src/ExportAlignmentViewItems.h
+++ b/src/plugins/dna_export/src/ExportAlignmentViewItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportBlastResultDialog.cpp b/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
index b414fca..b027f06 100644
--- a/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
+++ b/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ namespace U2 {
ExportBlastResultDialog::ExportBlastResultDialog(QWidget* p, const QString& defaultUrl): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466181");
+ new HelpButton(this, buttonBox, "17467728");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ExportBlastResultDialog.h b/src/plugins/dna_export/src/ExportBlastResultDialog.h
index 915b59e..859d79f 100644
--- a/src/plugins/dna_export/src/ExportBlastResultDialog.h
+++ b/src/plugins/dna_export/src/ExportBlastResultDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportChromatogramDialog.cpp b/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
index 0eec751..2355262 100644
--- a/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
+++ b/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ namespace U2 {
ExportChromatogramDialog::ExportChromatogramDialog(QWidget* p, const GUrl& fileUrl): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466053");
+ new HelpButton(this, buttonBox, "17467600");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ExportChromatogramDialog.h b/src/plugins/dna_export/src/ExportChromatogramDialog.h
index c0c426a..8545cfa 100644
--- a/src/plugins/dna_export/src/ExportChromatogramDialog.h
+++ b/src/plugins/dna_export/src/ExportChromatogramDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp b/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
index 6e7c6e1..a98bbbe 100644
--- a/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
+++ b/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ namespace U2 {
ExportMSA2MSADialog::ExportMSA2MSADialog(const QString& defaultFileName, const DocumentFormatId& f, bool wholeAlignmentOnly, QWidget* p): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465963");
+ new HelpButton(this, buttonBox, "17467510");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ExportMSA2MSADialog.h b/src/plugins/dna_export/src/ExportMSA2MSADialog.h
index 243700a..72ec947 100644
--- a/src/plugins/dna_export/src/ExportMSA2MSADialog.h
+++ b/src/plugins/dna_export/src/ExportMSA2MSADialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
index b800848..8814169 100644
--- a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
+++ b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ namespace U2 {
ExportMSA2SequencesDialog::ExportMSA2SequencesDialog(QWidget* p): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465962");
+ new HelpButton(this, buttonBox, "17467509");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h
index a7426f0..0943535 100644
--- a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h
+++ b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportProjectViewItems.cpp b/src/plugins/dna_export/src/ExportProjectViewItems.cpp
index 9072d96..6710530 100644
--- a/src/plugins/dna_export/src/ExportProjectViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportProjectViewItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportProjectViewItems.h b/src/plugins/dna_export/src/ExportProjectViewItems.h
index 8f53d5a..3ca2db3 100644
--- a/src/plugins/dna_export/src/ExportProjectViewItems.h
+++ b/src/plugins/dna_export/src/ExportProjectViewItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportQualityScoresTask.cpp b/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
index bf56b1a..fce9042 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
+++ b/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportQualityScoresTask.h b/src/plugins/dna_export/src/ExportQualityScoresTask.h
index af52e6e..0bfbb97 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresTask.h
+++ b/src/plugins/dna_export/src/ExportQualityScoresTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp b/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
index 86cf586..84190ce 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
+++ b/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportQualityScoresWorker.h b/src/plugins/dna_export/src/ExportQualityScoresWorker.h
index c3d97a9..23e9802 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresWorker.h
+++ b/src/plugins/dna_export/src/ExportQualityScoresWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
index ecbd27f..acf73a1 100644
--- a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
+++ b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
index 6b0f2f6..7f7f3b6 100644
--- a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
+++ b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSequenceTask.cpp b/src/plugins/dna_export/src/ExportSequenceTask.cpp
index 967419c..416e7e3 100644
--- a/src/plugins/dna_export/src/ExportSequenceTask.cpp
+++ b/src/plugins/dna_export/src/ExportSequenceTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -499,11 +499,15 @@ ExportAnnotationSequenceTask::ExportAnnotationSequenceTask(const ExportAnnotatio
QList<Task*> ExportAnnotationSequenceTask::onSubTaskFinished(Task* subTask) {
QList<Task*> res;
- if (subTask == extractSubTask && !extractSubTask->hasError() && !isCanceled()) {
+ CHECK(!isCanceled(), res);
+
+ if (subTask == extractSubTask && !extractSubTask->hasError()) {
exportSubTask = new ExportSequenceTask(config.exportSequenceSettings);
res.append(exportSubTask);
}
- resultDocument = exportSubTask->takeDocument();
+ if (subTask == exportSubTask && !exportSubTask->hasError()) {
+ resultDocument = exportSubTask->takeDocument();
+ }
return res;
}
@@ -523,7 +527,9 @@ int totalAnnotationCount(const ExportAnnotationSequenceTaskSettings &config) {
return result;
}
-U2Sequence importAnnotatedSeq2Dbi(const SharedAnnotationData &ad, const ExportSequenceAItem &ei, const U2DbiRef &resultDbiRef,
+}
+
+U2Sequence ExportAnnotationSequenceSubTask::importAnnotatedSeq2Dbi(const SharedAnnotationData &ad, const ExportSequenceAItem &ei, const U2DbiRef &resultDbiRef,
QVector<U2Region> &resultRegions, U2OpStatus &os)
{
U2SequenceImporter importer(QVariantMap(), true);
@@ -537,6 +543,9 @@ U2Sequence importAnnotatedSeq2Dbi(const SharedAnnotationData &ad, const ExportSe
const U2Region chunkRegion(pos, currentChunkSize);
QByteArray chunkContent = ei.sequence->getSequenceData(chunkRegion, os);
CHECK_OP(os, U2Sequence());
+ if (chunkContent.isEmpty()) {
+ continue;
+ }
if (ad->getStrand().isCompementary() && NULL != ei.complTT) {
TextUtils::reverse(chunkContent.data(), currentChunkSize);
@@ -554,13 +563,14 @@ U2Sequence importAnnotatedSeq2Dbi(const SharedAnnotationData &ad, const ExportSe
CHECK_OP(os, U2Sequence());
currentRegionLength += chunkContent.length();
}
+ CHECK_EXT(currentRegionLength == annotatedRegion.length,
+ os.setError(tr("Sequences of the selected annotations can't be exported. At least one of the annotations is out of boundaries")),
+ U2Sequence());
resultRegions.append(U2Region(resultRegions.isEmpty() ? 0 : resultRegions.last().endPos(), currentRegionLength));
}
return importer.finalizeSequence(os);
}
-}
-
void ExportAnnotationSequenceSubTask::run() {
const U2DbiRef dbiRef = AppContext::getDbiRegistry()->getSessionTmpDbiRef(stateInfo);
diff --git a/src/plugins/dna_export/src/ExportSequenceTask.h b/src/plugins/dna_export/src/ExportSequenceTask.h
index b4e2e75..377ef48 100644
--- a/src/plugins/dna_export/src/ExportSequenceTask.h
+++ b/src/plugins/dna_export/src/ExportSequenceTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -133,6 +133,7 @@ public:
void run();
private:
+ U2Sequence importAnnotatedSeq2Dbi(const SharedAnnotationData &ad, const ExportSequenceAItem &ei, const U2DbiRef &resultDbiRef, QVector<U2Region> &resultRegions, U2OpStatus &os);
ExportAnnotationSequenceTaskSettings &config;
};
diff --git a/src/plugins/dna_export/src/ExportSequenceViewItems.cpp b/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
index 1f77799..c0eab17 100644
--- a/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSequenceViewItems.h b/src/plugins/dna_export/src/ExportSequenceViewItems.h
index 667724f..d09a801 100644
--- a/src/plugins/dna_export/src/ExportSequenceViewItems.h
+++ b/src/plugins/dna_export/src/ExportSequenceViewItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp b/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
index 1ae265e..ff2d775 100644
--- a/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
+++ b/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ namespace U2 {
ExportSequences2MSADialog::ExportSequences2MSADialog(QWidget* p, const QString& defaultUrl): QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465961");
+ new HelpButton(this, buttonBox, "17467508");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
okButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/plugins/dna_export/src/ExportSequences2MSADialog.h b/src/plugins/dna_export/src/ExportSequences2MSADialog.h
index d9c3874..25d73b2 100644
--- a/src/plugins/dna_export/src/ExportSequences2MSADialog.h
+++ b/src/plugins/dna_export/src/ExportSequences2MSADialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportSequencesDialog.cpp b/src/plugins/dna_export/src/ExportSequencesDialog.cpp
index c18f4f3..7561b55 100644
--- a/src/plugins/dna_export/src/ExportSequencesDialog.cpp
+++ b/src/plugins/dna_export/src/ExportSequencesDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ ExportSequencesDialog::ExportSequencesDialog( bool m, bool allowComplement, bool
: QDialog( p ), sequenceName( sourceFileBaseName )
{
setupUi(this);
- new HelpButton(this, buttonBox, "17465960");
+ new HelpButton(this, buttonBox, "17467507");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ExportSequencesDialog.h b/src/plugins/dna_export/src/ExportSequencesDialog.h
index 9f9c925..e001528 100644
--- a/src/plugins/dna_export/src/ExportSequencesDialog.h
+++ b/src/plugins/dna_export/src/ExportSequencesDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportTasks.cpp b/src/plugins/dna_export/src/ExportTasks.cpp
index d4bad7f..0753d3b 100644
--- a/src/plugins/dna_export/src/ExportTasks.cpp
+++ b/src/plugins/dna_export/src/ExportTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportTasks.h b/src/plugins/dna_export/src/ExportTasks.h
index 02839b0..f49e8b6 100644
--- a/src/plugins/dna_export/src/ExportTasks.h
+++ b/src/plugins/dna_export/src/ExportTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportUtils.cpp b/src/plugins/dna_export/src/ExportUtils.cpp
index dab1a8f..c513976 100644
--- a/src/plugins/dna_export/src/ExportUtils.cpp
+++ b/src/plugins/dna_export/src/ExportUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ExportUtils.h b/src/plugins/dna_export/src/ExportUtils.h
index dfa16ef..f28dc9f 100644
--- a/src/plugins/dna_export/src/ExportUtils.h
+++ b/src/plugins/dna_export/src/ExportUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/GenerateDNAWorker.cpp b/src/plugins/dna_export/src/GenerateDNAWorker.cpp
index e5f1d73..7a1b88c 100644
--- a/src/plugins/dna_export/src/GenerateDNAWorker.cpp
+++ b/src/plugins/dna_export/src/GenerateDNAWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/GenerateDNAWorker.h b/src/plugins/dna_export/src/GenerateDNAWorker.h
index 727faab..c9f797e 100644
--- a/src/plugins/dna_export/src/GenerateDNAWorker.h
+++ b/src/plugins/dna_export/src/GenerateDNAWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp b/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
index e1dc114..c2d0e60 100644
--- a/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
+++ b/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ namespace U2 {
GetSequenceByIdDialog::GetSequenceByIdDialog(QWidget *w): QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466180");
+ new HelpButton(this, buttonBox, "17467727");
connect(toolButton, SIGNAL(clicked()), SLOT(sl_saveFilenameButtonClicked()));
QString defaultPath = AppContext::getAppSettings()->getUserAppsSettings()->getDownloadDirPath();
diff --git a/src/plugins/dna_export/src/GetSequenceByIdDialog.h b/src/plugins/dna_export/src/GetSequenceByIdDialog.h
index c551f63..d68eb97 100644
--- a/src/plugins/dna_export/src/GetSequenceByIdDialog.h
+++ b/src/plugins/dna_export/src/GetSequenceByIdDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
index d50b1f8..3f5dba8 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ ImportAnnotationsFromCSVDialog::ImportAnnotationsFromCSVDialog(QWidget* w)
: QDialog (w)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466030");
+ new HelpButton(this, buttonBox, "17467577");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h
index 8e8753f..3037327 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
index 78927e1..cd18f2e 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
index 5d54931..ebe5b66 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportQualityScoresTask.cpp b/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
index 4226098..aa569cf 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
+++ b/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportQualityScoresTask.h b/src/plugins/dna_export/src/ImportQualityScoresTask.h
index 0da1cbc..363e68e 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresTask.h
+++ b/src/plugins/dna_export/src/ImportQualityScoresTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp b/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
index 63c0733..50f5b65 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
+++ b/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/src/ImportQualityScoresWorker.h b/src/plugins/dna_export/src/ImportQualityScoresWorker.h
index 9594e6e..d2b0aa2 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresWorker.h
+++ b/src/plugins/dna_export/src/ImportQualityScoresWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_export/transl/english.ts b/src/plugins/dna_export/transl/english.ts
index cf07b9a..32ecbcc 100644
--- a/src/plugins/dna_export/transl/english.ts
+++ b/src/plugins/dna_export/transl/english.ts
@@ -812,12 +812,17 @@
<context>
<name>U2::ExportAnnotationSequenceSubTask</name>
<message>
- <location filename="../src/ExportSequenceTask.cpp" line="511"/>
+ <location filename="../src/ExportSequenceTask.cpp" line="515"/>
<source>Extract annotation regions</source>
<translation>Extract annotation regions</translation>
</message>
<message>
- <location filename="../src/ExportSequenceTask.cpp" line="575"/>
+ <location filename="../src/ExportSequenceTask.cpp" line="567"/>
+ <source>Sequences of the selected annotations can't be exported. At least one of the annotations is out of boundaries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ExportSequenceTask.cpp" line="585"/>
<source>Exported sequence has been deleted unexpectedly</source>
<translation>Exported sequence has been deleted unexpectedly</translation>
</message>
diff --git a/src/plugins/dna_export/transl/russian.ts b/src/plugins/dna_export/transl/russian.ts
index 75b3744..1d5f175 100644
--- a/src/plugins/dna_export/transl/russian.ts
+++ b/src/plugins/dna_export/transl/russian.ts
@@ -812,12 +812,17 @@
<context>
<name>U2::ExportAnnotationSequenceSubTask</name>
<message>
- <location filename="../src/ExportSequenceTask.cpp" line="511"/>
+ <location filename="../src/ExportSequenceTask.cpp" line="515"/>
<source>Extract annotation regions</source>
<translation>Извлечь регионы аннотаций</translation>
</message>
<message>
- <location filename="../src/ExportSequenceTask.cpp" line="575"/>
+ <location filename="../src/ExportSequenceTask.cpp" line="567"/>
+ <source>Sequences of the selected annotations can't be exported. At least one of the annotations is out of boundaries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ExportSequenceTask.cpp" line="585"/>
<source>Exported sequence has been deleted unexpectedly</source>
<translation>Exported sequence has been deleted unexpectedly</translation>
</message>
@@ -995,7 +1000,7 @@
<message>
<location filename="../src/ui/ExportMSA2SequencesDialog.ui" line="64"/>
<source>Gap characters ('-')</source>
- <translation>Символы пропуска ("-")</translation>
+ <translation>Символы пробела ("-")</translation>
</message>
<message>
<location filename="../src/ui/ExportMSA2SequencesDialog.ui" line="70"/>
diff --git a/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp b/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
index 5adb813..da8ff9d 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ DNAFlexDialog::DNAFlexDialog(ADVSequenceObjectContext* _ctx)
: QDialog(_ctx->getAnnotatedDNAView()->getWidget())
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466174");
+ new HelpButton(this, buttonBox, "17467721");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_flexibility/src/DNAFlexDialog.h b/src/plugins/dna_flexibility/src/DNAFlexDialog.h
index ace7b02..cae006c 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexDialog.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp b/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
index 18bdbda..fe0a03c 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexGraph.h b/src/plugins/dna_flexibility/src/DNAFlexGraph.h
index dea693e..92e3caf 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraph.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraph.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
index 01ed422..a77b856 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
index 199fbc6..aab1fe7 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp b/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
index 43bfa2a..82288f8 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexPlugin.h b/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
index dce48a2..ee64c48 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexTask.cpp b/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
index 9ddb075..bd561c3 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/DNAFlexTask.h b/src/plugins/dna_flexibility/src/DNAFlexTask.h
index d724297..ffdab0d 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexTask.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp b/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
index 4b33a86..46dd5d7 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/FindHighFlexRegions.h b/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
index 07c7d46..6ebcbde 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
index ad56729..ff836c3 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
index 36316e7..7419340 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/HighFlexResult.h b/src/plugins/dna_flexibility/src/HighFlexResult.h
index 58a86f5..3586d34 100644
--- a/src/plugins/dna_flexibility/src/HighFlexResult.h
+++ b/src/plugins/dna_flexibility/src/HighFlexResult.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/HighFlexSettings.cpp b/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
index a20c664..a896020 100644
--- a/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
+++ b/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/src/HighFlexSettings.h b/src/plugins/dna_flexibility/src/HighFlexSettings.h
index bc35f6d..15f5c54 100644
--- a/src/plugins/dna_flexibility/src/HighFlexSettings.h
+++ b/src/plugins/dna_flexibility/src/HighFlexSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_flexibility/transl/russian.ts b/src/plugins/dna_flexibility/transl/russian.ts
index 170a9db..b48b424 100644
--- a/src/plugins/dna_flexibility/transl/russian.ts
+++ b/src/plugins/dna_flexibility/transl/russian.ts
@@ -6,12 +6,12 @@
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="26"/>
<source>DNA Flexibility</source>
- <translation>ДНК флексибильность</translation>
+ <translation>ДНК гибкость</translation>
</message>
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="32"/>
<source>The DNA Flexibility plugin allows searching for high DNA flexibility regions.</source>
- <translation>Модуль "ДНК флексибильность" позволяет искать в ДНК районы высокой флексибильности.</translation>
+ <translation>Модуль "ДНК гибкость" позволяет искать в ДНК районы повышенной гибкости.</translation>
</message>
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="42"/>
@@ -21,7 +21,7 @@
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="48"/>
<source>High DNA Flexibility Regions Settings</source>
- <translation>Параметры районов высокой флексибильности</translation>
+ <translation>Параметры районов повышенной гибкости</translation>
</message>
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="56"/>
@@ -41,12 +41,12 @@
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="150"/>
<source>Remember Settings</source>
- <translation>Запомнить</translation>
+ <translation>Запомнить настройки</translation>
</message>
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="157"/>
<source>Restore Defaults</source>
- <translation>По умолчанию</translation>
+ <translation>Настройки по умолчанию</translation>
</message>
<message>
<location filename="../src/ui/DNAFlexDialog.ui" line="185"/>
@@ -101,7 +101,7 @@
<message>
<location filename="../src/DNAFlexGraph.cpp" line="40"/>
<source>DNA Flexibility</source>
- <translation>ДНК флексибильность</translation>
+ <translation>ДНК гибкость</translation>
</message>
</context>
<context>
@@ -109,7 +109,7 @@
<message>
<location filename="../src/DNAFlexPlugin.cpp" line="49"/>
<source>DNA Flexibility</source>
- <translation>ДНК флексибильность</translation>
+ <translation>ДНК гибкость</translation>
</message>
<message>
<location filename="../src/DNAFlexPlugin.cpp" line="50"/>
diff --git a/src/plugins/dna_graphpack/src/BaseContentGraph.cpp b/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
index 2ed0e5d..294a9bb 100644
--- a/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
+++ b/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/BaseContentGraph.h b/src/plugins/dna_graphpack/src/BaseContentGraph.h
index 2825e19..802f204 100644
--- a/src/plugins/dna_graphpack/src/BaseContentGraph.h
+++ b/src/plugins/dna_graphpack/src/BaseContentGraph.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/CumulativeSkew.cpp b/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
index 16fc2dc..b60b113 100644
--- a/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
+++ b/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/CumulativeSkew.h b/src/plugins/dna_graphpack/src/CumulativeSkew.h
index e4361e1..d25446a 100644
--- a/src/plugins/dna_graphpack/src/CumulativeSkew.h
+++ b/src/plugins/dna_graphpack/src/CumulativeSkew.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
index 290ac14..1c1f3dd 100644
--- a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
+++ b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
index 284525a..e4f85a8 100644
--- a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
+++ b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/DeviationGraph.cpp b/src/plugins/dna_graphpack/src/DeviationGraph.cpp
index a0adb14..8b289dd 100644
--- a/src/plugins/dna_graphpack/src/DeviationGraph.cpp
+++ b/src/plugins/dna_graphpack/src/DeviationGraph.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/DeviationGraph.h b/src/plugins/dna_graphpack/src/DeviationGraph.h
index 3281554..3c8255b 100644
--- a/src/plugins/dna_graphpack/src/DeviationGraph.h
+++ b/src/plugins/dna_graphpack/src/DeviationGraph.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp b/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
index 1e6ac78..41b407a 100644
--- a/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
+++ b/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/EntropyAlgorithm.h b/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
index 761d777..5be2ccb 100644
--- a/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
+++ b/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/GCFramePlot.cpp b/src/plugins/dna_graphpack/src/GCFramePlot.cpp
index 439b2e2..0c12af0 100644
--- a/src/plugins/dna_graphpack/src/GCFramePlot.cpp
+++ b/src/plugins/dna_graphpack/src/GCFramePlot.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/GCFramePlot.h b/src/plugins/dna_graphpack/src/GCFramePlot.h
index f310933..8ff9d7f 100644
--- a/src/plugins/dna_graphpack/src/GCFramePlot.h
+++ b/src/plugins/dna_graphpack/src/GCFramePlot.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
index 85b41ea..aee6a3a 100644
--- a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
+++ b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
index bc47460..23b0688 100644
--- a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
+++ b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
index 10d0ec6..b126241 100644
--- a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
+++ b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ namespace U2 {
DNAStatMSAProfileDialog::DNAStatMSAProfileDialog(QWidget* p, MSAEditor* _c) : QDialog(p), ctx(_c) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466118");
+ new HelpButton(this, buttonBox, "17467665");
connect(fileButton, SIGNAL(clicked()), SLOT(sl_selectFile()));
connect(htmlRB, SIGNAL(toggled(bool)), SLOT(sl_formatChanged(bool)));
diff --git a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
index 93622ce..c060b0b 100644
--- a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
+++ b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatPlugin.cpp b/src/plugins/dna_stat/src/DNAStatPlugin.cpp
index b98539f..8a686cb 100644
--- a/src/plugins/dna_stat/src/DNAStatPlugin.cpp
+++ b/src/plugins/dna_stat/src/DNAStatPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatPlugin.h b/src/plugins/dna_stat/src/DNAStatPlugin.h
index 1f7d6e2..a6b598c 100644
--- a/src/plugins/dna_stat/src/DNAStatPlugin.h
+++ b/src/plugins/dna_stat/src/DNAStatPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatProfileTask.cpp b/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
index e4d02bf..7be4491 100644
--- a/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
+++ b/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatProfileTask.h b/src/plugins/dna_stat/src/DNAStatProfileTask.h
index 13bf535..3174ee1 100644
--- a/src/plugins/dna_stat/src/DNAStatProfileTask.h
+++ b/src/plugins/dna_stat/src/DNAStatProfileTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatsWindow.cpp b/src/plugins/dna_stat/src/DNAStatsWindow.cpp
index 39f8c0c..e80d77c 100644
--- a/src/plugins/dna_stat/src/DNAStatsWindow.cpp
+++ b/src/plugins/dna_stat/src/DNAStatsWindow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DNAStatsWindow.h b/src/plugins/dna_stat/src/DNAStatsWindow.h
index b4e7069..b286c02 100644
--- a/src/plugins/dna_stat/src/DNAStatsWindow.h
+++ b/src/plugins/dna_stat/src/DNAStatsWindow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
index 214c2cc..e179b9d 100644
--- a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
+++ b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ namespace U2 {
DistanceMatrixMSAProfileDialog::DistanceMatrixMSAProfileDialog(QWidget* p, MSAEditor* _c) : QDialog(p), ctx(_c) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466119");
+ new HelpButton(this, buttonBox, "17467666");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Generate"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h
index 0557aab..934f32e 100644
--- a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h
+++ b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dna_stat/transl/english.ts b/src/plugins/dna_stat/transl/english.ts
index 2999f05..2285596 100644
--- a/src/plugins/dna_stat/transl/english.ts
+++ b/src/plugins/dna_stat/transl/english.ts
@@ -135,7 +135,7 @@
<context>
<name>U2::DNAStatMSAEditorContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="75"/>
+ <location filename="../src/DNAStatPlugin.cpp" line="71"/>
<source>Generate grid profile</source>
<translation>Generate grid profile</translation>
</message>
@@ -328,15 +328,14 @@
<context>
<name>U2::DNAViewStatsContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="162"/>
<source>Statistics</source>
- <translation>Statistics</translation>
+ <translation type="vanished">Statistics</translation>
</message>
</context>
<context>
<name>U2::DistanceMatrixMSAEditorContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="112"/>
+ <location filename="../src/DNAStatPlugin.cpp" line="108"/>
<source>Generate distance matrix</source>
<translation>Generate distance matrix</translation>
</message>
diff --git a/src/plugins/dna_stat/transl/russian.ts b/src/plugins/dna_stat/transl/russian.ts
index 73b2777..dc5e785 100644
--- a/src/plugins/dna_stat/transl/russian.ts
+++ b/src/plugins/dna_stat/transl/russian.ts
@@ -31,7 +31,7 @@
<message>
<location filename="../src/ui/DNAStatMSAProfileDialog.ui" line="52"/>
<source>Show scores for gaps</source>
- <translation>Включить в отчет статистику для пропусков</translation>
+ <translation>Включить в отчет статистику для пробелов</translation>
</message>
<message>
<location filename="../src/ui/DNAStatMSAProfileDialog.ui" line="59"/>
@@ -41,7 +41,7 @@
<message>
<location filename="../src/ui/DNAStatMSAProfileDialog.ui" line="66"/>
<source>Skip gaps in consensus position increments</source>
- <translation>Не учитывать пропуске в шкале позиций</translation>
+ <translation>Не учитывать пробелы в шкале позиций</translation>
</message>
<message>
<location filename="../src/ui/DNAStatMSAProfileDialog.ui" line="76"/>
@@ -135,7 +135,7 @@
<context>
<name>U2::DNAStatMSAEditorContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="75"/>
+ <location filename="../src/DNAStatPlugin.cpp" line="71"/>
<source>Generate grid profile</source>
<translation>Представить выравнивание в виде таблицы частот</translation>
</message>
@@ -328,15 +328,14 @@
<context>
<name>U2::DNAViewStatsContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="162"/>
<source>Statistics</source>
- <translation>Статистика</translation>
+ <translation type="vanished">Статистика</translation>
</message>
</context>
<context>
<name>U2::DistanceMatrixMSAEditorContext</name>
<message>
- <location filename="../src/DNAStatPlugin.cpp" line="112"/>
+ <location filename="../src/DNAStatPlugin.cpp" line="108"/>
<source>Generate distance matrix</source>
<translation>Рассчитать матрицу расстояний</translation>
</message>
diff --git a/src/plugins/dotplot/src/DotPlotClasses.cpp b/src/plugins/dotplot/src/DotPlotClasses.cpp
index 3ac42cb..44278e4 100644
--- a/src/plugins/dotplot/src/DotPlotClasses.cpp
+++ b/src/plugins/dotplot/src/DotPlotClasses.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotClasses.h b/src/plugins/dotplot/src/DotPlotClasses.h
index 1449439..5974581 100644
--- a/src/plugins/dotplot/src/DotPlotClasses.h
+++ b/src/plugins/dotplot/src/DotPlotClasses.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotDialog.cpp b/src/plugins/dotplot/src/DotPlotDialog.cpp
index 02546b9..d2f7c8d 100644
--- a/src/plugins/dotplot/src/DotPlotDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ DotPlotDialog::DotPlotDialog(QWidget *parent, AnnotatedDNAView* currentADV, int
,openSequenceTask(NULL), curURL("")
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466060");
+ new HelpButton(this, buttonBox, "17467607");
startButton = buttonBox->button(QDialogButtonBox::Ok);
SAFE_POINT(adv != NULL, "DotPlotDialog called without view context!", );
diff --git a/src/plugins/dotplot/src/DotPlotDialog.h b/src/plugins/dotplot/src/DotPlotDialog.h
index dd436d4..ffbab9c 100644
--- a/src/plugins/dotplot/src/DotPlotDialog.h
+++ b/src/plugins/dotplot/src/DotPlotDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotFilesDialog.cpp b/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
index 9abd76e..69ad368 100644
--- a/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ DotPlotFilesDialog::DotPlotFilesDialog(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466060");
+ new HelpButton(this, buttonBox, "17467607");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Next"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dotplot/src/DotPlotFilesDialog.h b/src/plugins/dotplot/src/DotPlotFilesDialog.h
index 2f754ef..1407977 100644
--- a/src/plugins/dotplot/src/DotPlotFilesDialog.h
+++ b/src/plugins/dotplot/src/DotPlotFilesDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotFilterDialog.cpp b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
index e6b0885..3a5e6c2 100644
--- a/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ DotPlotFilterDialog::DotPlotFilterDialog(QWidget *parent, ADVSequenceObjectConte
,seqYItem(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466070");
+ new HelpButton(this, buttonBox, "17467617");
{
diff --git a/src/plugins/dotplot/src/DotPlotFilterDialog.h b/src/plugins/dotplot/src/DotPlotFilterDialog.h
index 52cb97a..d85dbe6 100644
--- a/src/plugins/dotplot/src/DotPlotFilterDialog.h
+++ b/src/plugins/dotplot/src/DotPlotFilterDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotImageExportTask.cpp b/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
index 784a3f3..7ff1e1c 100644
--- a/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
+++ b/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotImageExportTask.h b/src/plugins/dotplot/src/DotPlotImageExportTask.h
index ff4ca9f..c289e4f 100644
--- a/src/plugins/dotplot/src/DotPlotImageExportTask.h
+++ b/src/plugins/dotplot/src/DotPlotImageExportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotPlugin.cpp b/src/plugins/dotplot/src/DotPlotPlugin.cpp
index 9b6438d..3d87cc2 100644
--- a/src/plugins/dotplot/src/DotPlotPlugin.cpp
+++ b/src/plugins/dotplot/src/DotPlotPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotPlugin.h b/src/plugins/dotplot/src/DotPlotPlugin.h
index d2aec98..d322814 100644
--- a/src/plugins/dotplot/src/DotPlotPlugin.h
+++ b/src/plugins/dotplot/src/DotPlotPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotSplitter.cpp b/src/plugins/dotplot/src/DotPlotSplitter.cpp
index 7896025..e67bcd2 100644
--- a/src/plugins/dotplot/src/DotPlotSplitter.cpp
+++ b/src/plugins/dotplot/src/DotPlotSplitter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotSplitter.h b/src/plugins/dotplot/src/DotPlotSplitter.h
index 45093da..2bbb1d6 100644
--- a/src/plugins/dotplot/src/DotPlotSplitter.h
+++ b/src/plugins/dotplot/src/DotPlotSplitter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotTasks.cpp b/src/plugins/dotplot/src/DotPlotTasks.cpp
index 07505cc..68d4453 100644
--- a/src/plugins/dotplot/src/DotPlotTasks.cpp
+++ b/src/plugins/dotplot/src/DotPlotTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotTasks.h b/src/plugins/dotplot/src/DotPlotTasks.h
index 348dbd0..c55fa34 100644
--- a/src/plugins/dotplot/src/DotPlotTasks.h
+++ b/src/plugins/dotplot/src/DotPlotTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotWidget.cpp b/src/plugins/dotplot/src/DotPlotWidget.cpp
index 5af1612..75c6b61 100644
--- a/src/plugins/dotplot/src/DotPlotWidget.cpp
+++ b/src/plugins/dotplot/src/DotPlotWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/src/DotPlotWidget.h b/src/plugins/dotplot/src/DotPlotWidget.h
index 0c6f75a..e6f4c54 100644
--- a/src/plugins/dotplot/src/DotPlotWidget.h
+++ b/src/plugins/dotplot/src/DotPlotWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/dotplot/transl/russian.ts b/src/plugins/dotplot/transl/russian.ts
index 38abee5..1725e5b 100644
--- a/src/plugins/dotplot/transl/russian.ts
+++ b/src/plugins/dotplot/transl/russian.ts
@@ -123,7 +123,7 @@
<location filename="../src/ui/DotPlotFilesDialog.ui" line="62"/>
<location filename="../src/ui/DotPlotFilesDialog.ui" line="130"/>
<source>Gap size:</source>
- <translation>Длина пропуска:</translation>
+ <translation>Длина пробела:</translation>
</message>
<message>
<location filename="../src/ui/DotPlotFilesDialog.ui" line="79"/>
diff --git a/src/plugins/enzymes/src/CloningUtilTasks.cpp b/src/plugins/enzymes/src/CloningUtilTasks.cpp
index 271bbb3..ba5b775 100644
--- a/src/plugins/enzymes/src/CloningUtilTasks.cpp
+++ b/src/plugins/enzymes/src/CloningUtilTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/CloningUtilTasks.h b/src/plugins/enzymes/src/CloningUtilTasks.h
index b1f7e49..8715a2f 100644
--- a/src/plugins/enzymes/src/CloningUtilTasks.h
+++ b/src/plugins/enzymes/src/CloningUtilTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp b/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
index 5e08372..8fdfbaf 100644
--- a/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
+++ b/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ ConstructMoleculeDialog::ConstructMoleculeDialog(const QList<DNAFragment>& fragm
: QDialog(p), fragments(fragmentList)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466196");
+ new HelpButton(this, buttonBox, "17467743");
tabWidget->setCurrentIndex(0);
diff --git a/src/plugins/enzymes/src/ConstructMoleculeDialog.h b/src/plugins/enzymes/src/ConstructMoleculeDialog.h
index cd08179..55015c0 100644
--- a/src/plugins/enzymes/src/ConstructMoleculeDialog.h
+++ b/src/plugins/enzymes/src/ConstructMoleculeDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/CreateFragmentDialog.cpp b/src/plugins/enzymes/src/CreateFragmentDialog.cpp
index a3e6ae0..a59283b 100644
--- a/src/plugins/enzymes/src/CreateFragmentDialog.cpp
+++ b/src/plugins/enzymes/src/CreateFragmentDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ CreateFragmentDialog::CreateFragmentDialog(ADVSequenceObjectContext* ctx, QWidg
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466195");
+ new HelpButton(this, buttonBox, "17467742");
tabWidget->setCurrentIndex(0);
@@ -69,7 +69,7 @@ CreateFragmentDialog::CreateFragmentDialog(U2SequenceObject* obj, const U2Region
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466195");
+ new HelpButton(this, buttonBox, "17467742");
seqObj = obj;
QList<GObject*> aObjects = GObjectUtils::findAllObjects(UOF_LoadedOnly,GObjectTypes::ANNOTATION_TABLE);
diff --git a/src/plugins/enzymes/src/CreateFragmentDialog.h b/src/plugins/enzymes/src/CreateFragmentDialog.h
index c90fccd..cd596b7 100644
--- a/src/plugins/enzymes/src/CreateFragmentDialog.h
+++ b/src/plugins/enzymes/src/CreateFragmentDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/DNAFragment.cpp b/src/plugins/enzymes/src/DNAFragment.cpp
index 1eef1b9..24dd46d 100644
--- a/src/plugins/enzymes/src/DNAFragment.cpp
+++ b/src/plugins/enzymes/src/DNAFragment.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/DNAFragment.h b/src/plugins/enzymes/src/DNAFragment.h
index 66d9a45..5fd4711 100644
--- a/src/plugins/enzymes/src/DNAFragment.h
+++ b/src/plugins/enzymes/src/DNAFragment.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/DigestSequenceDialog.cpp b/src/plugins/enzymes/src/DigestSequenceDialog.cpp
index dee1609..5816afb 100644
--- a/src/plugins/enzymes/src/DigestSequenceDialog.cpp
+++ b/src/plugins/enzymes/src/DigestSequenceDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -58,7 +58,7 @@ DigestSequenceDialog::DigestSequenceDialog(ADVSequenceObjectContext* ctx, QWidge
: QDialog(p),seqCtx(ctx), timer(NULL), animationCounter(0)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466194");
+ new HelpButton(this, buttonBox, "17467741");
okButton = buttonBox->button(QDialogButtonBox::Ok);
tabWidget->setCurrentIndex(0);
diff --git a/src/plugins/enzymes/src/DigestSequenceDialog.h b/src/plugins/enzymes/src/DigestSequenceDialog.h
index 934c557..958965a 100644
--- a/src/plugins/enzymes/src/DigestSequenceDialog.h
+++ b/src/plugins/enzymes/src/DigestSequenceDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EditFragmentDialog.cpp b/src/plugins/enzymes/src/EditFragmentDialog.cpp
index c2d30bb..3e882f8 100644
--- a/src/plugins/enzymes/src/EditFragmentDialog.cpp
+++ b/src/plugins/enzymes/src/EditFragmentDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ EditFragmentDialog::EditFragmentDialog( DNAFragment& fragment, QWidget* p )
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466201");
+ new HelpButton(this, buttonBox, "17467748");
connect(lBluntButton, SIGNAL(toggled(bool)), SLOT(sl_onLeftBluntButtonToogled(bool)));
connect(rBluntButton, SIGNAL(toggled(bool)), SLOT(sl_onRightBluntButtonToggled(bool)));
diff --git a/src/plugins/enzymes/src/EditFragmentDialog.h b/src/plugins/enzymes/src/EditFragmentDialog.h
index 7149003..b634e6f 100644
--- a/src/plugins/enzymes/src/EditFragmentDialog.h
+++ b/src/plugins/enzymes/src/EditFragmentDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesIO.cpp b/src/plugins/enzymes/src/EnzymesIO.cpp
index 62851c5..78eb718 100644
--- a/src/plugins/enzymes/src/EnzymesIO.cpp
+++ b/src/plugins/enzymes/src/EnzymesIO.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesIO.h b/src/plugins/enzymes/src/EnzymesIO.h
index 5a10ad9..4a3cbb1 100644
--- a/src/plugins/enzymes/src/EnzymesIO.h
+++ b/src/plugins/enzymes/src/EnzymesIO.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesPlugin.cpp b/src/plugins/enzymes/src/EnzymesPlugin.cpp
index cfabdfe..a8f6fba 100644
--- a/src/plugins/enzymes/src/EnzymesPlugin.cpp
+++ b/src/plugins/enzymes/src/EnzymesPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesPlugin.h b/src/plugins/enzymes/src/EnzymesPlugin.h
index 0afa0c8..9140255 100644
--- a/src/plugins/enzymes/src/EnzymesPlugin.h
+++ b/src/plugins/enzymes/src/EnzymesPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesQuery.cpp b/src/plugins/enzymes/src/EnzymesQuery.cpp
index f60e78b..6779488 100644
--- a/src/plugins/enzymes/src/EnzymesQuery.cpp
+++ b/src/plugins/enzymes/src/EnzymesQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -145,7 +145,7 @@ QString EnzymesSelectorDialogHandler::getSelectedString(QDialog* dlg) {
EnzymesSelectorDialog::EnzymesSelectorDialog(EnzymesSelectorDialogHandler* parent)
: factory(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466186");
+ new HelpButton(this, buttonBox, "17467733");
QVBoxLayout* vl = new QVBoxLayout();
enzSel = new EnzymesSelectorWidget();
diff --git a/src/plugins/enzymes/src/EnzymesQuery.h b/src/plugins/enzymes/src/EnzymesQuery.h
index 1f063c2..7070259 100644
--- a/src/plugins/enzymes/src/EnzymesQuery.h
+++ b/src/plugins/enzymes/src/EnzymesQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesTests.cpp b/src/plugins/enzymes/src/EnzymesTests.cpp
index 71c5c20..6dae4b8 100644
--- a/src/plugins/enzymes/src/EnzymesTests.cpp
+++ b/src/plugins/enzymes/src/EnzymesTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/EnzymesTests.h b/src/plugins/enzymes/src/EnzymesTests.h
index 29ef7bc..0ba3565 100644
--- a/src/plugins/enzymes/src/EnzymesTests.h
+++ b/src/plugins/enzymes/src/EnzymesTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/FindEnzymesAlgorithm.h b/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
index f2add9e..dd22c9c 100644
--- a/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
+++ b/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/FindEnzymesDialog.cpp b/src/plugins/enzymes/src/FindEnzymesDialog.cpp
index 9c4599f..ba7725f 100644
--- a/src/plugins/enzymes/src/FindEnzymesDialog.cpp
+++ b/src/plugins/enzymes/src/FindEnzymesDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -520,7 +520,7 @@ void EnzymesSelectorWidget::sl_saveEnzymesFile()
FindEnzymesDialog::FindEnzymesDialog(ADVSequenceObjectContext* sctx)
: QDialog(sctx->getAnnotatedDNAView()->getWidget()), seqCtx(sctx) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466186");
+ new HelpButton(this, buttonBox, "17467733");
maxHitSB->setMaximum(INT_MAX);
minHitSB->setMaximum(INT_MAX);
diff --git a/src/plugins/enzymes/src/FindEnzymesDialog.h b/src/plugins/enzymes/src/FindEnzymesDialog.h
index 2797b97..711eeca 100644
--- a/src/plugins/enzymes/src/FindEnzymesDialog.h
+++ b/src/plugins/enzymes/src/FindEnzymesDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/FindEnzymesTask.cpp b/src/plugins/enzymes/src/FindEnzymesTask.cpp
index 664268d..737e28a 100644
--- a/src/plugins/enzymes/src/FindEnzymesTask.cpp
+++ b/src/plugins/enzymes/src/FindEnzymesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/src/FindEnzymesTask.h b/src/plugins/enzymes/src/FindEnzymesTask.h
index 5b4b527..86b386c 100644
--- a/src/plugins/enzymes/src/FindEnzymesTask.h
+++ b/src/plugins/enzymes/src/FindEnzymesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/enzymes/transl/english.ts b/src/plugins/enzymes/transl/english.ts
index 3603016..afbdb0d 100644
--- a/src/plugins/enzymes/transl/english.ts
+++ b/src/plugins/enzymes/transl/english.ts
@@ -825,36 +825,36 @@ Choose another region.</translation>
<context>
<name>U2::EnzymesIO</name>
<message>
- <location filename="../src/EnzymesIO.cpp" line="41"/>
+ <location filename="../src/EnzymesIO.cpp" line="42"/>
<source>Bairoch format</source>
<translation>Bairoch format
</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="50"/>
- <location filename="../src/EnzymesIO.cpp" line="100"/>
- <location filename="../src/EnzymesIO.cpp" line="107"/>
+ <location filename="../src/EnzymesIO.cpp" line="51"/>
+ <location filename="../src/EnzymesIO.cpp" line="101"/>
+ <location filename="../src/EnzymesIO.cpp" line="108"/>
<source>Unsupported URI type</source>
<translation>Unsupported URI type</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="63"/>
- <location filename="../src/EnzymesIO.cpp" line="120"/>
+ <location filename="../src/EnzymesIO.cpp" line="64"/>
+ <location filename="../src/EnzymesIO.cpp" line="121"/>
<source>Unsupported enzymes file format</source>
<translation>Unsupported enzymes file format</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="72"/>
+ <location filename="../src/EnzymesIO.cpp" line="73"/>
<source>The enzyme '%1' has unknown sequence</source>
<translation>The enzyme '%1' has unknown sequence</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="78"/>
+ <location filename="../src/EnzymesIO.cpp" line="79"/>
<source>No enzyme alphabet: '%1', sequence '%2'</source>
<translation>No enzyme alphabet: '%1', sequence '%2'</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="82"/>
+ <location filename="../src/EnzymesIO.cpp" line="83"/>
<source>Non-nucleic enzyme alphabet: '%1', alphabet: %2, sequence '%3'</source>
<translation>Non-nucleic enzyme alphabet: '%1', alphabet: %2, sequence '%3'</translation>
</message>
diff --git a/src/plugins/enzymes/transl/russian.ts b/src/plugins/enzymes/transl/russian.ts
index 696a62d..f9eb922 100644
--- a/src/plugins/enzymes/transl/russian.ts
+++ b/src/plugins/enzymes/transl/russian.ts
@@ -823,35 +823,35 @@ Choose another region.</translation>
<context>
<name>U2::EnzymesIO</name>
<message>
- <location filename="../src/EnzymesIO.cpp" line="41"/>
+ <location filename="../src/EnzymesIO.cpp" line="42"/>
<source>Bairoch format</source>
<translation>Формат Bairoch</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="50"/>
- <location filename="../src/EnzymesIO.cpp" line="100"/>
- <location filename="../src/EnzymesIO.cpp" line="107"/>
+ <location filename="../src/EnzymesIO.cpp" line="51"/>
+ <location filename="../src/EnzymesIO.cpp" line="101"/>
+ <location filename="../src/EnzymesIO.cpp" line="108"/>
<source>Unsupported URI type</source>
<translation>Неподдерживаемый протокол</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="63"/>
- <location filename="../src/EnzymesIO.cpp" line="120"/>
+ <location filename="../src/EnzymesIO.cpp" line="64"/>
+ <location filename="../src/EnzymesIO.cpp" line="121"/>
<source>Unsupported enzymes file format</source>
<translation>Неподдерживаемый формат базы</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="72"/>
+ <location filename="../src/EnzymesIO.cpp" line="73"/>
<source>The enzyme '%1' has unknown sequence</source>
<translation>Фермент '%1' имеет неизвестную последовательность</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="78"/>
+ <location filename="../src/EnzymesIO.cpp" line="79"/>
<source>No enzyme alphabet: '%1', sequence '%2'</source>
<translation>Нет алфавита: '%1', последовательность '%2'</translation>
</message>
<message>
- <location filename="../src/EnzymesIO.cpp" line="82"/>
+ <location filename="../src/EnzymesIO.cpp" line="83"/>
<source>Non-nucleic enzyme alphabet: '%1', alphabet: %2, sequence '%3'</source>
<translation>Ненуклеотидный алфавит ферменты: %1 %2, последовательность "%3"</translation>
</message>
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.cpp
index 0a016e4..0680196 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -82,7 +82,7 @@ ExpertDiscoveryAdvSetDialog::ExpertDiscoveryAdvSetDialog(QWidget *parent,
connect( checkCorrel, SIGNAL(clicked()), SLOT(sl_checkCorrel()) );
hideParameters();
- new HelpButton(this, buttonBox, "17466264");
+ new HelpButton(this, buttonBox, "17467810");
}
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.h
index 7f08977..ad7faba 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryAdvSetDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.cpp
index 9b471a6..ef344cc 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ ExpertDiscoveryControlDialog::ExpertDiscoveryControlDialog(QWidget *parent)
: QDialog(parent){
setupUi(this);
- new HelpButton(this, buttonBox, "17466264");
+ new HelpButton(this, buttonBox, "17467810");
connect(openFirstButton, SIGNAL(clicked()), SLOT(sl_openFirstFile()));
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.h
index fa2705f..13d6dbe 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryControlDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.cpp
index 3db39e7..f7063e8 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ ExpertDiscoveryControlMrkDialog::ExpertDiscoveryControlMrkDialog(QWidget *parent
: QDialog(parent){
setupUi(this);
- new HelpButton(this, buttonBox, "17466264");
+ new HelpButton(this, buttonBox, "17467810");
connect(openFirstButton, SIGNAL(clicked()), SLOT(sl_openFirstFile()));
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.h
index 3f80d18..b9a0b2b 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryControlMrkDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryData.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryData.cpp
index 327eb36..8f6d620 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryData.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryData.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryData.h b/src/plugins/expert_discovery/src/ExpertDiscoveryData.h
index 60a2d69..c48ebc0 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryData.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.cpp
index 8f00f7f..9b22bdf 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.h b/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.h
index 64bdff1..d025139 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryExtSigWiz.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.cpp
index 92854d6..ab4f599 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.h b/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.h
index b611ec3..fe7fbf7 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryGraphs.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.cpp
index dc8785b..249be76 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ ExpertDiscoveryPosNegDialog::ExpertDiscoveryPosNegDialog(QWidget *parent)
: QDialog(parent), generateNeg(false), negativePerPositive(100){
setupUi(this);
- new HelpButton(this, buttonBox, "17466264");
+ new HelpButton(this, buttonBox, "17467810");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Next"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.h
index 3f28050..01cf6df 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.cpp
index 2a25670..d6e7919 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ ExpertDiscoveryPosNegMrkDialog::ExpertDiscoveryPosNegMrkDialog(QWidget *parent)
: QDialog(parent), generateDescr(true){
setupUi(this);
- new HelpButton(this, buttonBox, "17466265");
+ new HelpButton(this, buttonBox, "17467811");
connect(openFirstButton, SIGNAL(clicked()), SLOT(sl_openFirstFile()));
connect(openSecondButton, SIGNAL(clicked()), SLOT(sl_openSecondFile()));
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.h
index f57aa8e..c1a500a 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryPosNegMrkDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.cpp b/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.cpp
index dc19136..653faa3 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -73,7 +73,7 @@ public:
ExpertDiscoverySearchDialogController::ExpertDiscoverySearchDialogController(ADVSequenceObjectContext* _ctx, ExpertDiscoveryData& data, QWidget *p):QDialog(p), edData(data) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466264");
+ new HelpButton(this, buttonBox, "17467810");
ctx = _ctx;
task = NULL;
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.h b/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.h
index daeeffd..45531f5 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoverySearchDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.cpp b/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.cpp
index 348d4d6..99ffccb 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ ExpertDiscoverySetupRecBoundDialog::ExpertDiscoverySetupRecBoundDialog(double dR
,graphWidget(NULL){
setupUi(this);
- new HelpButton(this, buttonBox, "17466270");
+ new HelpButton(this, buttonBox, "17467816");
boundLabel->setStyleSheet(QString("color : %1;").arg(ExpertDiscoveryRecognitionErrorGraphWidget::BOUNDCOLOR.name()));
er1Lable->setStyleSheet(QString("color : %1;").arg(ExpertDiscoveryRecognitionErrorGraphWidget::ER1COLOR.name()));
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.h b/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.h
index 139cc64..020e20e 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoverySetupRecBoundDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryTask.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryTask.cpp
index de94098..980d4b9 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryTask.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryTask.h b/src/plugins/expert_discovery/src/ExpertDiscoveryTask.h
index 4dce0d0..f40df83 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryTask.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.cpp
index 1bd97a6..41e6836 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.h b/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.h
index ff3c70f..adf4291 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryTreeWidgetsCtrl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryView.cpp b/src/plugins/expert_discovery/src/ExpertDiscoveryView.cpp
index 494e6ca..5948969 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryView.cpp
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/expert_discovery/src/ExpertDiscoveryView.h b/src/plugins/expert_discovery/src/ExpertDiscoveryView.h
index 0fda45d..3f637d5 100644
--- a/src/plugins/expert_discovery/src/ExpertDiscoveryView.h
+++ b/src/plugins/expert_discovery/src/ExpertDiscoveryView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
index 3b174e3..16d4012 100644
--- a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
+++ b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
index 1a7804e..ec4a9cd 100644
--- a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
+++ b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolManager.cpp b/src/plugins/external_tool_support/src/ExternalToolManager.cpp
index fcb9357..d93a943 100644
--- a/src/plugins/external_tool_support/src/ExternalToolManager.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolManager.h b/src/plugins/external_tool_support/src/ExternalToolManager.h
index 4bcc600..7665f23 100644
--- a/src/plugins/external_tool_support/src/ExternalToolManager.h
+++ b/src/plugins/external_tool_support/src/ExternalToolManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h b/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
index 3bc128b..bef96dc 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
index 2d6f804..941ca51 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
index f5f030f..47616f8 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
index 618b84d..8e3ece4 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
index 6fd29e7..e08ef49 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
index 225e928..c7b95f2 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -69,7 +69,7 @@ AppSettingsGUIPageWidget* ExternalToolSupportSettingsPageController::createWidge
return r;
}
-const QString ExternalToolSupportSettingsPageController::helpPageId = QString("17465979");
+const QString ExternalToolSupportSettingsPageController::helpPageId = QString("17467526");
/////////////////////////////////////////////
////ExternalToolSupportSettingsPageWidget
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
index f62c3be..058b222 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/R/RSupport.cpp b/src/plugins/external_tool_support/src/R/RSupport.cpp
index 9c81c75..c5f2bd2 100644
--- a/src/plugins/external_tool_support/src/R/RSupport.cpp
+++ b/src/plugins/external_tool_support/src/R/RSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/R/RSupport.h b/src/plugins/external_tool_support/src/R/RSupport.h
index 4b48f9c..2f2b873 100644
--- a/src/plugins/external_tool_support/src/R/RSupport.h
+++ b/src/plugins/external_tool_support/src/R/RSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/RnaSeqCommon.cpp b/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
index 49ba247..78d306e 100644
--- a/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
+++ b/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/RnaSeqCommon.h b/src/plugins/external_tool_support/src/RnaSeqCommon.h
index dc8f6a2..2922c1b 100644
--- a/src/plugins/external_tool_support/src/RnaSeqCommon.h
+++ b/src/plugins/external_tool_support/src/RnaSeqCommon.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/TaskLocalStorage.cpp b/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
index b3db82e..11cef2d 100644
--- a/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
+++ b/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/TaskLocalStorage.h b/src/plugins/external_tool_support/src/TaskLocalStorage.h
index a2b0b8e..4ea1722 100644
--- a/src/plugins/external_tool_support/src/TaskLocalStorage.h
+++ b/src/plugins/external_tool_support/src/TaskLocalStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
index 1efaf3e..cc7889d 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
index c53ee00..ce47389 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
index bd3d58d..cc06288 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
index 996cbde..63fff93 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
index 61164e6..dd4ae5c 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
index 1430273..3b370ce 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
index 8ef5518..005aa36 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
index 0271c3e..40bea7c 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
index eb3cea6..c4c95d0 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
index 453a68c..583c05d 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
index 27fc498..f6eef67 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
index 5c9bcf2..f610743 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
index 71d9d88..367b901 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
index 1b5142d..875a7de 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
index ca37667..cac75bb 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupport.h b/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
index 8ff7974..19450c4 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
index b23762d..de77f92 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
index d31d335..441071f 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
index 26f7b1c..635b5b4 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
index 398b897..629cc73 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp b/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
index 4f6cd68..e9b29e1 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllWorker.h b/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
index 8c92a4d..c64d35e 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
index 032ea86..bb6390f 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupport.h b/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
index 2c730e3..36fd0b4 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
index e33b677..2391ca0 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ FormatDBSupportRunDialog::FormatDBSupportRunDialog(const QString &_name, FormatD
QDialog(_parent), name(_name), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466246");
+ new HelpButton(this, buttonBox, "17467793");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Format"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
formatButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h
index 88bda47..0fdd7df 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
index 608adf4..7c8b2fd 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
index 932b925..a834f72 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
index 6d91243..beebece 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ BlastDBCmdDialog::BlastDBCmdDialog(BlastDBCmdSupportTaskSettings &_settings, QWi
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466248");
+ new HelpButton(this, buttonBox, "17467795");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Fetch"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h
index 671e26d..afe03ec 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp
index d8bf646..75c5c04 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
index de0f7c8..7004182 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
index d71bea3..263a6bb 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
index 16a3baa..748c516 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
index 245379a..f76340c 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
index 9cbb738..eb22297 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
index 084e5d1..2c9a21c 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
index 4eb1c10..c858fc9 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
index 0871af0..e249065 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h
index ee45f82..5ede788 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
index d95b7eb..567890e 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h
index a8366d1..5cc248b 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
index bf5afc1..03a0afa 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h
index 663da9f..d61ca40 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
index e45c496..9b72c2e 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
index 9814c41..f87d64e 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
index 16290e5..a8f93e8 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
index bbb26c6..fc67988 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
index 426b4c8..8964746 100644
--- a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
index 4a34978..c09155d 100644
--- a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
index 6f0c426..94e54cb 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
index 8c65ac9..6dee64c 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
index 139e498..8606b9b 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
index 168bbd6..0a7983a 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
index eae0216..f431509 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
index 6a494cc..b7774ab 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
index 9753511..e10452d 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
index 533985d..11f9733 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
index e79697e..e1ec344 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieTask.h b/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
index 24487e1..f4c34ab 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
index 632fc13..ba0c728 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
index 563b2f2..79fe66d 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.cpp b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.cpp
index 7c4865b..284c849 100644
--- a/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.h b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.h
index 09abc72..f811658 100644
--- a/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.h
+++ b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
index 64c5c78..9ef3404 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
index ee5304e..c195bfe 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
index ee236a2..b466814 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
index 255d6b6..2e20489 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
index 77b8720..b5c5808 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
index 4195102..8aded47 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
index c031dab..5134151 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
index 7d1d306..fb31bba 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
index 4cb4a6c..b8a3d83 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
index 5b01463..40740ca 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
index 0753074..0dc5591 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
index cda1fed..c823b26 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp b/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
index 4448dce..afcf19a 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaSupport.h b/src/plugins/external_tool_support/src/bwa/BwaSupport.h
index 30c6537..2f487bf 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSupport.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaTask.cpp b/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
index 87e23aa..0f5c527 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaTask.h b/src/plugins/external_tool_support/src/bwa/BwaTask.h
index fb02555..e1560a1 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaTask.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp b/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
index 9d83469..538d551 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/BwaWorker.h b/src/plugins/external_tool_support/src/bwa/BwaWorker.h
index b69c5b3..e5475c9 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaWorker.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.cpp b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.cpp
index d4f9da3..e318ead 100644
--- a/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.cpp
+++ b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.h b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.h
index 59b87f1..40c56ff 100644
--- a/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.h
+++ b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp b/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
index 9101072..772af36 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3Support.h b/src/plugins/external_tool_support/src/cap3/CAP3Support.h
index 1277f36..87c549b 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Support.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Support.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
index 7645b98..16c6e19 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ CAP3SupportDialog::CAP3SupportDialog(CAP3SupportTaskSettings& s, QWidget* parent
: QDialog(parent), settings(s)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466236");
+ new HelpButton(this, buttonBox, "17467783");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h
index c7d5034..b68a458 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
index 09e635d..2ddada7 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
index 643665e..97ec0ab 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp b/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
index 126e0fd..8cd4671 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3Worker.h b/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
index 5807187..afb1cc7 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
index 4bc1125..58c4e1f 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
index 3e2e1d7..ba4c726 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp b/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
index 749a047..39237bf 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSettings.h b/src/plugins/external_tool_support/src/ceas/CEASSettings.h
index 22b67b9..cabf9d3 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSettings.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp b/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
index 3db0f14..9fd9f65 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSupport.h b/src/plugins/external_tool_support/src/ceas/CEASSupport.h
index 5c105f1..3e2524e 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupport.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
index c3b434b..bc63323 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
index 2d0c4f5..5d28906 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
index c27cb70..d3a3c0c 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
index 3d1e78f..64a53f1 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
index f3c9abf..4cf8c14 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ ClustalOSupportRunDialog::ClustalOSupportRunDialog(const MAlignment& _ma, Clusta
QDialog(_parent), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466260");
+ new HelpButton(this, buttonBox, "17467807");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -87,7 +87,7 @@ ClustalOWithExtFileSpecifySupportRunDialog::ClustalOWithExtFileSpecifySupportRun
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466242");
+ new HelpButton(this, buttonBox, "17467789");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h
index c65e308..19501b0 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
index 59e1fd7..db7e987 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
index 6cda686..ba30062 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
index 4cb19d2..6942d5a 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
index 8a77f96..62cfc3f 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
index 81fafa5..60a95f1 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
index 2d1530f..9ec7819 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
index ef4a4b6..560c466 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ ClustalWSupportRunDialog::ClustalWSupportRunDialog(const MAlignment& _ma, Clusta
QDialog(_parent), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466249");
+ new HelpButton(this, buttonBox, "17467796");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -127,7 +127,7 @@ ClustalWWithExtFileSpecifySupportRunDialog::ClustalWWithExtFileSpecifySupportRun
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466249");
+ new HelpButton(this, buttonBox, "17467796");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h
index 95c8e4a..be4156e 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
index cd991f9..b885e93 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
index e3b8ef3..e07846f 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
index 4eec362..d069ae5 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
index 1e7ad7c..7f87a04 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
index cf9ecc1..eeb9763 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
index 04e3852..9240aa4 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
index ea7c9fa..666f2d4 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -66,7 +66,7 @@ void ConductGOSupport::initialize() {
validMessage = "Conduct GO";
validationArguments << "--version";
- versionRegExp = QRegExp("Conduct GO (\\d+\\.\\d+)");
+ versionRegExp = QRegExp("Conduct GO (\\d+\\.\\d+(\\.\\d+)?)");
muted = true;
}
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
index f2d3e4e..80bc941 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
index 2f98b1e..38961ff 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
index 1bfcbb0..e74c5dc 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
index a879651..704c301 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
index 170e885..9ccdd59 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
index b121e8e..c68c02f 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
index 193571a..039cfc6 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
index 8f5e51d..97831f2 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
index 5dad267..e5d6f1d 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
index 8149583..de894d6 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
index 03d61ed..6f52873 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
index e8b69a1..ceefcf8 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
index d8c9115..69492bd 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
index 03da1c4..a82cda6 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
index 682a876..bc532ad 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
index f6206e2..cd62d73 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
index 659c7ad..bdfcd3d 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
index 116a243..5d18a20 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
index 5a06027..2825ed2 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
index b16250e..d3b61bb 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
index f8cd9bf..a7bd8b5 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
index 3a164b4..25e7b37 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
index 268f7e1..c3bbb68 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
index b1490fb..1b575e6 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
index 95c9fe1..91064c5 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
index e364fb8..7925aea 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
index 03f8f09..9c78b87 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
index 35e7c01..e16d1f7 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
index cb52b7c..cfc6f2a 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
index 42a9598..55457a5 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
index 72c7bc3..758aa36 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
index feed891..671bf7d 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
index 3a05434..a6d66a5 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
index 70974c5..8a967ff 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
index f31f65b..3efd796 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
index ec07962..518dbcf 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
index 2c746ef..22033f2 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
index 7ba040d..92907e5 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
index 7542d4d..958b372 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
index 89358e5..9ca2b27 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcTask.h b/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
index 5a8424d..4c92c39 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
index 91521e2..504b4a3 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
index 01e70f8..5b44e34 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/java/JavaSupport.cpp b/src/plugins/external_tool_support/src/java/JavaSupport.cpp
index 48197f4..8d89b79 100644
--- a/src/plugins/external_tool_support/src/java/JavaSupport.cpp
+++ b/src/plugins/external_tool_support/src/java/JavaSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/java/JavaSupport.h b/src/plugins/external_tool_support/src/java/JavaSupport.h
index b2175ac..bf9a7cb 100644
--- a/src/plugins/external_tool_support/src/java/JavaSupport.h
+++ b/src/plugins/external_tool_support/src/java/JavaSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSSettings.cpp b/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
index 99497e6..5b5918f 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSSettings.h b/src/plugins/external_tool_support/src/macs/MACSSettings.h
index 3a6c154..2a7d004 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSettings.h
+++ b/src/plugins/external_tool_support/src/macs/MACSSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSSupport.cpp b/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
index e683c56..cc12bc8 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSSupport.h b/src/plugins/external_tool_support/src/macs/MACSSupport.h
index 7096257..4f08d13 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSupport.h
+++ b/src/plugins/external_tool_support/src/macs/MACSSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSTask.cpp b/src/plugins/external_tool_support/src/macs/MACSTask.cpp
index 08144b9..52d96e3 100644
--- a/src/plugins/external_tool_support/src/macs/MACSTask.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSTask.h b/src/plugins/external_tool_support/src/macs/MACSTask.h
index 087bf45..042e79f 100644
--- a/src/plugins/external_tool_support/src/macs/MACSTask.h
+++ b/src/plugins/external_tool_support/src/macs/MACSTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSWorker.cpp b/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
index f4ad3f6..7ff6efd 100644
--- a/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/macs/MACSWorker.h b/src/plugins/external_tool_support/src/macs/MACSWorker.h
index e07841f..bdc9570 100644
--- a/src/plugins/external_tool_support/src/macs/MACSWorker.h
+++ b/src/plugins/external_tool_support/src/macs/MACSWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
index cbd8203..0df88f2 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
index 47ae13c..969b40e 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
index ae9d5b7..670d9c7 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ MAFFTSupportRunDialog::MAFFTSupportRunDialog(MAFFTSupportTaskSettings& _settings
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466250");
+ new HelpButton(this, buttonBox, "17467797");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -80,7 +80,7 @@ MAFFTWithExtFileSpecifySupportRunDialog::MAFFTWithExtFileSpecifySupportRunDialog
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466250");
+ new HelpButton(this, buttonBox, "17467797");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h
index 0e1e6e3..a9410ec 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
index c1308f0..3b9c30f 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
index e74cab7..a216d14 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
index 26392f1..17890b1 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
index 5aca404..a399535 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
index 2056e3b..f924a06 100644
--- a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
index f7e359d..90c5966 100644
--- a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
+++ b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
index c59e277..d8bfdfa 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -75,18 +75,18 @@ MrBayesWidget::MrBayesWidget(const MAlignment &ma, QWidget *parent) :
seedSpin->setValue(getRandomSeed());
- gammaCategoriesSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_GAMMA, 4).toInt());
- ngenSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_CHAIN_LENGTH, 10000).toInt());
- sfreqSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_SUBSEMPL_FREQ, 1000).toInt());
- burninSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_BURNIN, 10).toInt());
- nheatedSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_HEATED, 4).toInt());
- tempSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_TEMPR, 0.4).toDouble());
- seedSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_SEED, getRandomSeed()).toInt());
+ gammaCategoriesSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_GAMMA, 4).toInt());
+ ngenSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_CHAIN_LENGTH, 10000).toInt());
+ sfreqSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SUBSEMPL_FREQ, 1000).toInt());
+ burninSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_BURNIN, 10).toInt());
+ nheatedSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_HEATED, 4).toInt());
+ tempSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_TEMPR, 0.4).toDouble());
+ seedSpin->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SEED, getRandomSeed()).toInt());
- QString comboText = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_MODEL_TYPE, isAminoAcidAlphabet ? modelTypeCombo->itemText(0) : MrBayesModelTypes::HKY85).toString();
+ QString comboText = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_MODEL_TYPE, isAminoAcidAlphabet ? modelTypeCombo->itemText(0) : MrBayesModelTypes::HKY85).toString();
setComboText(modelTypeCombo, comboText);
- comboText = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_RATE_VATIATION, MrBayesVariationTypes::gamma).toString();
+ comboText = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_RATE_VATIATION, MrBayesVariationTypes::gamma).toString();
setComboText(rateVariationCombo, comboText);
}
@@ -105,27 +105,27 @@ void MrBayesWidget::fillSettings(CreatePhyTreeSettings& settings) {
}
void MrBayesWidget::storeSettings(){
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_MODEL_TYPE, modelTypeCombo->currentText());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_RATE_VATIATION, rateVariationCombo->currentText());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_GAMMA, gammaCategoriesSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_CHAIN_LENGTH, ngenSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_SUBSEMPL_FREQ, sfreqSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_BURNIN, burninSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_HEATED, nheatedSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_TEMPR, tempSpin->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + MR_BAYES_SEED, seedSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_MODEL_TYPE, modelTypeCombo->currentText());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_RATE_VATIATION, rateVariationCombo->currentText());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_GAMMA, gammaCategoriesSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_CHAIN_LENGTH, ngenSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SUBSEMPL_FREQ, sfreqSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_BURNIN, burninSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_HEATED, nheatedSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_TEMPR, tempSpin->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SEED, seedSpin->value());
displayOptions->storeSettings();
}
void MrBayesWidget::restoreDefault(){
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_MODEL_TYPE);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_RATE_VATIATION);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_GAMMA);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_CHAIN_LENGTH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_SUBSEMPL_FREQ);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_BURNIN);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_HEATED);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_TEMPR);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + MR_BAYES_SEED);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_MODEL_TYPE);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_RATE_VATIATION);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_GAMMA);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_CHAIN_LENGTH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SUBSEMPL_FREQ);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_BURNIN);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_HEATED);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_TEMPR);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + MR_BAYES_SEED);
setComboText(modelTypeCombo, MrBayesModelTypes::HKY85);
setComboText(rateVariationCombo, MrBayesVariationTypes::gamma);
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
index 8b1e29e..bae92c8 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
index c4f62d9..20b2c15 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
index 262d84e..6cba6c9 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
index 01e05af..d3b9863 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
index 9498614..3df3052 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
index 558d776..7ac54db 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
index a2b40e9..a54c2a7 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
index 329bc2d..9d71705 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
index f1db67b..6dc82ec 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
index 4967df6..77e72b3 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
index c9829ff..6fef806 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
index 3bec8e8..20bf2a8 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
index 533866e..0e673d5 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
index 53a881a..000b0a8 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
index 4e7b24b..6b5aa6b 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
index 10d08aa..2df603a 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
index 58f9ffa..2580f16 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
index 531da4f..fd1e41d 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
index 656d73f..886e3f1 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
index 79d471d..07aa842 100644
--- a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
index dcc9ae2..507e4de 100644
--- a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/perl/PerlSupport.cpp b/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
index 96a27df..483800f 100644
--- a/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
+++ b/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/perl/PerlSupport.h b/src/plugins/external_tool_support/src/perl/PerlSupport.h
index f4ba5a2..e25d233 100644
--- a/src/plugins/external_tool_support/src/perl/PerlSupport.h
+++ b/src/plugins/external_tool_support/src/perl/PerlSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
index 1c5b8a7..153269f 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,31 +38,31 @@
namespace U2 {
-const QString PhyMlSettingsPreffixes::ModelType(CreatePhyTreeWidget::settingsPath + "/phyml_model_t");
-const QString PhyMlSettingsPreffixes::OptimiseEquilibriumFreq(CreatePhyTreeWidget::settingsPath + "/phyml_eq_freq_flag");
+const QString PhyMlSettingsPreffixes::ModelType(CreatePhyTreeWidget::settingsPath() + "/phyml_model_t");
+const QString PhyMlSettingsPreffixes::OptimiseEquilibriumFreq(CreatePhyTreeWidget::settingsPath() + "/phyml_eq_freq_flag");
-const QString PhyMlSettingsPreffixes::EstimateTtRatio(CreatePhyTreeWidget::settingsPath + "/phyml_est_trans_ratio");
-const QString PhyMlSettingsPreffixes::TtRatio(CreatePhyTreeWidget::settingsPath + "/phyml_trans_ratio");
+const QString PhyMlSettingsPreffixes::EstimateTtRatio(CreatePhyTreeWidget::settingsPath() + "/phyml_est_trans_ratio");
+const QString PhyMlSettingsPreffixes::TtRatio(CreatePhyTreeWidget::settingsPath() + "/phyml_trans_ratio");
-const QString PhyMlSettingsPreffixes::EstimateSitesProportion(CreatePhyTreeWidget::settingsPath + "/phyml_est_sites_prop");
-const QString PhyMlSettingsPreffixes::InvariableSitesProportion(CreatePhyTreeWidget::settingsPath + "/phyml_sites_proportion");
+const QString PhyMlSettingsPreffixes::EstimateSitesProportion(CreatePhyTreeWidget::settingsPath() + "/phyml_est_sites_prop");
+const QString PhyMlSettingsPreffixes::InvariableSitesProportion(CreatePhyTreeWidget::settingsPath() + "/phyml_sites_proportion");
-const QString PhyMlSettingsPreffixes::EstimateGammaFactor(CreatePhyTreeWidget::settingsPath + "/phyml_est_gamma");
-const QString PhyMlSettingsPreffixes::GammaFactor(CreatePhyTreeWidget::settingsPath + "/phyml_gamma");
+const QString PhyMlSettingsPreffixes::EstimateGammaFactor(CreatePhyTreeWidget::settingsPath() + "/phyml_est_gamma");
+const QString PhyMlSettingsPreffixes::GammaFactor(CreatePhyTreeWidget::settingsPath() + "/phyml_gamma");
-const QString PhyMlSettingsPreffixes::UseBootstrap(CreatePhyTreeWidget::settingsPath + "/phyml_use_boot");
-const QString PhyMlSettingsPreffixes::BootstrapReplicatesNumber(CreatePhyTreeWidget::settingsPath + "/phyml_boot_repl");
+const QString PhyMlSettingsPreffixes::UseBootstrap(CreatePhyTreeWidget::settingsPath() + "/phyml_use_boot");
+const QString PhyMlSettingsPreffixes::BootstrapReplicatesNumber(CreatePhyTreeWidget::settingsPath() + "/phyml_boot_repl");
-const QString PhyMlSettingsPreffixes::UseFastMethod(CreatePhyTreeWidget::settingsPath + "/phyml_use_fast");
-const QString PhyMlSettingsPreffixes::FastMethodIndex(CreatePhyTreeWidget::settingsPath + "/phyml_fast_method");
+const QString PhyMlSettingsPreffixes::UseFastMethod(CreatePhyTreeWidget::settingsPath() + "/phyml_use_fast");
+const QString PhyMlSettingsPreffixes::FastMethodIndex(CreatePhyTreeWidget::settingsPath() + "/phyml_fast_method");
-const QString PhyMlSettingsPreffixes::SubRatesNumber(CreatePhyTreeWidget::settingsPath + "/phyml_sub_rates");
-const QString PhyMlSettingsPreffixes::OptimiseTopology(CreatePhyTreeWidget::settingsPath + "/phyml_opt_topol");
-const QString PhyMlSettingsPreffixes::OptimiseBranchLenghs(CreatePhyTreeWidget::settingsPath + "/phyml_opt_lengths");
+const QString PhyMlSettingsPreffixes::SubRatesNumber(CreatePhyTreeWidget::settingsPath() + "/phyml_sub_rates");
+const QString PhyMlSettingsPreffixes::OptimiseTopology(CreatePhyTreeWidget::settingsPath() + "/phyml_opt_topol");
+const QString PhyMlSettingsPreffixes::OptimiseBranchLenghs(CreatePhyTreeWidget::settingsPath() + "/phyml_opt_lengths");
-const QString PhyMlSettingsPreffixes::TreeImprovementType(CreatePhyTreeWidget::settingsPath + "/phyml_tree_impr");
-const QString PhyMlSettingsPreffixes::TreeSearchingType(CreatePhyTreeWidget::settingsPath + "/phyml_search");
-const QString PhyMlSettingsPreffixes::UserTreePath(CreatePhyTreeWidget::settingsPath + "/user_tree");
+const QString PhyMlSettingsPreffixes::TreeImprovementType(CreatePhyTreeWidget::settingsPath() + "/phyml_tree_impr");
+const QString PhyMlSettingsPreffixes::TreeSearchingType(CreatePhyTreeWidget::settingsPath() + "/phyml_search");
+const QString PhyMlSettingsPreffixes::UserTreePath(CreatePhyTreeWidget::settingsPath() + "/user_tree");
PhyMlWidget::PhyMlWidget(const MAlignment &ma, QWidget *parent) :
CreatePhyTreeWidget(parent)
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
index a5fa28c..e853fa6 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
index f7dfc30..a0712f0 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
index adcdcb7..7067f7a 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
index 4f0c81e..e198258 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLTask.h b/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
index d3d2da7..48b20f4 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
index c0c6f52..e1139ab 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLTests.h b/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
index b593e97..a26c254 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/python/PythonSupport.cpp b/src/plugins/external_tool_support/src/python/PythonSupport.cpp
index 7e884c1..30778e7 100644
--- a/src/plugins/external_tool_support/src/python/PythonSupport.cpp
+++ b/src/plugins/external_tool_support/src/python/PythonSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/python/PythonSupport.h b/src/plugins/external_tool_support/src/python/PythonSupport.h
index 83dc7d6..28784af 100644
--- a/src/plugins/external_tool_support/src/python/PythonSupport.h
+++ b/src/plugins/external_tool_support/src/python/PythonSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
index 1292c1c..6b19aa8 100644
--- a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
index 5033b85..90d03bf 100644
--- a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
index 5ee3d71..22e98a5 100644
--- a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
index 62ac331..d76cfd1 100644
--- a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp b/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
index df767af..ee0d8ae 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/TabixSupport.h b/src/plugins/external_tool_support/src/samtools/TabixSupport.h
index a7ab457..cf1819d 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
index 785fe43..0114b0e 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
index bf8212f..21175f1 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
index de4db1a..a244159 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
index 342381e..7d40828 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
index f00a462..6e1180c 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
index c0f1b6d..07ff660 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
index e863a61..7313423 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
index 1c9c799..f902a41 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
index 9453488..a05b1f4 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
index 7d6c9f4..1620cb1 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
index afcedc1..1a64ec8 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
@@ -1,23 +1,23 @@
/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+* UGENE - Integrated Bioinformatics Tools.
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+* http://ugene.unipro.ru
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+*/
#include "SnpEffSupport.h"
#include "java/JavaSupport.h"
@@ -35,15 +35,14 @@
namespace U2 {
-SnpEffSupport::SnpEffSupport(const QString& name, const QString& path) : ExternalTool(name, path)
-{
+SnpEffSupport::SnpEffSupport(const QString& name, const QString& path) : ExternalTool(name, path) {
if (AppContext::getMainWindow()) {
icon = QIcon(":external_tool_support/images/cmdline.png");
grayIcon = QIcon(":external_tool_support/images/cmdline_gray.png");
warnIcon = QIcon(":external_tool_support/images/cmdline_warn.png");
}
- executableFileName="snpEff.jar";
+ executableFileName = "snpEff.jar";
validMessage = "Usage: snpEff \\[command\\] \\[options\\] \\[files\\]";
description = tr("<i>SnpEff</i>: Genetic variant annotation and effect prediction toolbox.");
@@ -60,7 +59,9 @@ const QStringList SnpEffSupport::getToolRunnerAdditionalOptions() {
QStringList result;
AppResourcePool* s = AppContext::getAppSettings()->getAppResourcePool();
CHECK(s != NULL, result);
- result << "-Xmx" + QString::number(s->getMaxMemorySizeInMB()) + "M";
+ //java VM can't allocate whole free memory, Xmx size should be lesser than free memory
+ int memSize = s->getMaxMemorySizeInMB();
+ result << "-Xmx" + QString::number(memSize > 150 ? memSize - 150 : memSize) + "M";
return result;
}
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
index c4079d4..9af464f 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
index 334fbac..0daeb18 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
@@ -1,23 +1,23 @@
/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+* UGENE - Integrated Bioinformatics Tools.
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+* http://ugene.unipro.ru
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+*/
#include <QtCore/QDir>
@@ -48,20 +48,45 @@ SnpEffParser::SnpEffParser()
}
-void SnpEffParser::parseOutput( const QString& partOfLog ){
- ExternalToolLogParser::parseOutput(partOfLog);
+void SnpEffParser::parseOutput(const QString& partOfLog) {
+ lastPartOfLog = partOfLog.split(QRegExp("(\n|\r)"));
+
+ foreach(const QString &buf, lastPartOfLog) {
+ if (buf.contains("Could not reserve enough space for object heap", Qt::CaseInsensitive) ||
+ buf.contains("Invalid maximum heap size", Qt::CaseInsensitive) ||
+ buf.contains("Unable to allocate", Qt::CaseInsensitive) ||
+ buf.contains("Failed to allocate", Qt::CaseInsensitive)) {
+ setLastError(tr("A problem occurred during allocating memory for running SnpEff. Check the \"Tasks memory limit\" parameter in the UGENE Application Settings.It is recommended to set this value to the available RAM on the computer."));
+ }
+ }
}
-void SnpEffParser::parseErrOutput( const QString& partOfLog ) {
+void SnpEffParser::parseErrOutput(const QString& partOfLog) {
lastPartOfLog = partOfLog.split(QRegExp("(\n|\r)"));
- lastPartOfLog.first() = lastErrLine+lastPartOfLog.first();
+ lastPartOfLog.first() = lastErrLine + lastPartOfLog.first();
lastErrLine = lastPartOfLog.takeLast();
- foreach (const QString &buf, lastPartOfLog) {
+ foreach(const QString &buf, lastPartOfLog) {
if (stringsToIgnore.contains(buf)) {
continue;
}
+ if (buf.contains("java.lang.OutOfMemoryError")) {
+ setLastError(tr("There is not enough memory to complete the SnpEff execution.It is recommended to run SnpEff on a computer with RAM 4Gb or more."));
+ continue;
+ }
+ if (buf.contains("Could not reserve enough space for object heap", Qt::CaseInsensitive) ||
+ buf.contains("Invalid maximum heap size", Qt::CaseInsensitive) ||
+ buf.contains("Unable to allocate", Qt::CaseInsensitive)) {
+ setLastError(tr("A problem occurred during allocating memory for running SnpEff. Check the \"Tasks memory limit\" parameter in the UGENE Application Settings.It is recommended to set this value to the available RAM on the computer."));
+ continue;
+ }
+
+ if (buf.contains("ERROR while connecting to http://downloads.sourceforge.net/project/snpeff/", Qt::CaseInsensitive)) {
+ setLastError(tr("Failed to download SnpEff database. Check your internet connection."));
+ continue;
+ }
+
if (buf.contains("ERROR", Qt::CaseInsensitive)) {
if (buf.startsWith("#")) {
coreLog.details("SnpEff notificates about genome database error: " + buf);
@@ -81,6 +106,8 @@ QStringList SnpEffParser::initStringsToIgnore() {
result << "Warning type\tNumber of warnings";
result << "ERRORS: Some errors were detected";
result << "Error type\tNumber of errors";
+ result << "Error: A fatal exception has occurred. Program will exit.";
+ result << "Error: Could not create the Java Virtual Machine.";
return result;
}
@@ -89,51 +116,50 @@ QStringList SnpEffParser::initStringsToIgnore() {
//////////////////////////////////////////////////////////////////////////
//SnpEffTask
SnpEffTask::SnpEffTask(const SnpEffSetting &settings)
-:ExternalToolSupportTask(QString("snpEff for %1").arg(settings.inputUrl), TaskFlags_FOSE_COSC)
-,settings(settings)
-{
+ :ExternalToolSupportTask(QString("snpEff for %1").arg(settings.inputUrl), TaskFlags_FOSE_COSC)
+ , settings(settings) {
}
-void SnpEffTask::prepare(){
+void SnpEffTask::prepare() {
- if (settings.inputUrl.isEmpty()){
+ if (settings.inputUrl.isEmpty()) {
setError("No input URL");
- return ;
+ return;
}
const QDir outDir = QFileInfo(settings.outDir).absoluteDir();
if (!outDir.exists()) {
setError("Directory does not exist: " + outDir.absolutePath());
- return ;
+ return;
}
- if(settings.genome.isEmpty()){
+ if (settings.genome.isEmpty()) {
setError("No path to genome lengths");
- return ;
+ return;
}
const QStringList args = getParameters(stateInfo);
CHECK_OP(stateInfo, );
- ExternalToolRunTask* etTask = new ExternalToolRunTask(ET_SNPEFF, args, new SnpEffParser(), settings.outDir);
+ ExternalToolRunTask* etTask = new ExternalToolRunTask(ET_SNPEFF, args, new SnpEffParser(), settings.outDir, QStringList(), QString(), true);
setListenerForTask(etTask);
- etTask->setStandartOutputFile( getResFileUrl() );
+ etTask->setStandartOutputFile(getResFileUrl());
addSubTask(etTask);
}
-void SnpEffTask::run(){
+void SnpEffTask::run() {
CHECK_OP(stateInfo, );
const QFileInfo resFile(getResFileUrl());
if (!resFile.exists()) {
setError("Result file does not exist: " + resFile.absoluteFilePath());
- return ;
+ return;
}
resultUrl = getResFileUrl();
}
-QString SnpEffTask::getSummaryUrl(){
+QString SnpEffTask::getSummaryUrl() {
QString res = "";
const QFileInfo resFile = QFileInfo(settings.outDir + "/" + SUMMARY_FILE);
if (!resFile.exists()) {
@@ -143,13 +169,13 @@ QString SnpEffTask::getSummaryUrl(){
return res;
}
-QString SnpEffTask::getResFileUrl(){
+QString SnpEffTask::getResFileUrl() {
QString res = "";
res = settings.outDir + "/" + RES_FILE_BASE + "." + settings.outFormat;
return res;
}
-QString SnpEffTask::getDataPath() const{
+QString SnpEffTask::getDataPath() const {
CHECK(NULL != AppContext::getAppSettings(), QString());
CHECK(NULL != AppContext::getAppSettings()->getUserAppsSettings(), QString());
CHECK(NULL != AppContext::getExternalToolRegistry(), QString());
@@ -157,7 +183,7 @@ QString SnpEffTask::getDataPath() const{
return AppContext::getAppSettings()->getUserAppsSettings()->getDownloadDirPath() + "/" + "snpeff_data_" + AppContext::getExternalToolRegistry()->getByName(ET_SNPEFF)->getVersion();
}
-QStringList SnpEffTask::getParameters(U2OpStatus & os) const{
+QStringList SnpEffTask::getParameters(U2OpStatus & os) const {
QStringList res;
res << QString("-dataDir");
@@ -166,10 +192,10 @@ QStringList SnpEffTask::getParameters(U2OpStatus & os) const{
#ifdef Q_OS_WIN
additionalSlash = "/";
#endif
- QString dataPath=getDataPath();
- if (dataPath.isEmpty()){
+ QString dataPath = getDataPath();
+ if (dataPath.isEmpty()) {
os.setError(tr("SNPEff dataDir is not initialized."));
- }else{
+ } else {
res << additionalSlash + dataPath;
}
@@ -182,19 +208,19 @@ QStringList SnpEffTask::getParameters(U2OpStatus & os) const{
res << QString("-upDownStreamLen");
res << settings.updownLength;
- if(settings.canon){
+ if (settings.canon) {
res << QString("-canon");
}
- if(settings.hgvs){
+ if (settings.hgvs) {
res << QString("-hgvs");
}
- if(settings.lof){
+ if (settings.lof) {
res << QString("-lof");
}
- if(settings.motif){
+ if (settings.motif) {
res << QString("-motif");
}
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
index ebfd67d..0f00b12 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
index 6164323..0bded76 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -132,14 +132,14 @@ void SnpEffFactory::init() {
Descriptor updownLength(SnpEffWorker::UPDOWN_LENGTH, SnpEffWorker::tr("Upstream/downstream length"),
SnpEffWorker::tr("Upstream and downstream interval size. Eliminate any upstream and downstream effect by using 0 length"));
- Descriptor canon(SnpEffWorker::CANON, SnpEffWorker::tr("Cannonical transcripts"),
- SnpEffWorker::tr("Use only cannonical transcripts"));
+ Descriptor canon(SnpEffWorker::CANON, SnpEffWorker::tr("Canonical transcripts"),
+ SnpEffWorker::tr("Use only canonical transcripts"));
Descriptor hgvs(SnpEffWorker::HGVS, SnpEffWorker::tr("HGVS nomenclature"),
SnpEffWorker::tr("Annotate using HGVS nomenclature"));
- Descriptor lof(SnpEffWorker::LOF, SnpEffWorker::tr("Annotate Loss of function"),
- SnpEffWorker::tr("Annotate Loss of function (LOF) and Nonsense mediated decay (NMD)"));
+ Descriptor lof(SnpEffWorker::LOF, SnpEffWorker::tr("Annotate Loss of function variations"),
+ SnpEffWorker::tr("Annotate Loss of function variations (LOF) and Nonsense mediated decay (NMD)"));
Descriptor motif(SnpEffWorker::MOTIF, SnpEffWorker::tr("Annotate TFBSs motifs"),
SnpEffWorker::tr("Annotate transcription factor binding site motifs (only available for latest GRCh37)"));
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
index 25c6104..14c59b4 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
index 8e1b454..f59a063 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
index cd65892..f599ebc 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp b/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
index 38d4f92..18c56cb 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSupport.h b/src/plugins/external_tool_support/src/spades/SpadesSupport.h
index 365f4e3..ece5bde 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSupport.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesTask.cpp b/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
index 0d14408..d5e7006 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesTask.h b/src/plugins/external_tool_support/src/spades/SpadesTask.h
index e8d3da4..018475c 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesTask.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp b/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
index 73f00c1..308b183 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spades/SpadesWorker.h b/src/plugins/external_tool_support/src/spades/SpadesWorker.h
index 0b310ac..c7f3b66 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesWorker.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp b/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
index e1d3b00..cabc33e 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spidey/SpideySupport.h b/src/plugins/external_tool_support/src/spidey/SpideySupport.h
index cb9d896..dc5b4a0 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupport.h
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
index 1168f59..0faabf4 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
index dc6c1a9..386ba21 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
index c91a578..7577c09 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
index 19e3c62..46df9fc 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
index 3d3330e..077bbec 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ TCoffeeSupportRunDialog::TCoffeeSupportRunDialog(TCoffeeSupportTaskSettings& _se
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466251");
+ new HelpButton(this, buttonBox, "17467798");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -79,7 +79,7 @@ TCoffeeWithExtFileSpecifySupportRunDialog::TCoffeeWithExtFileSpecifySupportRunDi
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466251");
+ new HelpButton(this, buttonBox, "17467798");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h
index d8ef2e3..8b951b4 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
index 66578cb..822efed 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
index 3efc207..f630552 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
index 495bd50..9b155da 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
index d774acd..c5d8f27 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
index e13c954..5833818 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSettings.h b/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
index 5d583c0..543ada3 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
index 6d73966..15f91a0 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSupport.h b/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
index 9cf0734..87aa71d 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
index a4b5744..711cc6d 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
index 5c2a735..01b1357 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp b/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
index 7d0d015..e5f3dea 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/tophat/TopHatWorker.h b/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
index 6585621..bf1b1b2 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp b/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
index adba571..4ba1e12 100644
--- a/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
+++ b/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/AlignMsaAction.h b/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
index ecdfcd1..da20f98 100644
--- a/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
+++ b/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
index c0529c4..7c2de85 100644
--- a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
+++ b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
index b000dc5..9cd2f5f 100644
--- a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
+++ b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
index 70fc511..a4aeb12 100644
--- a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
index 49e097f..302c231 100644
--- a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
+++ b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
index 688ce1f..ab6c495 100644
--- a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -60,7 +60,7 @@ BlastRunCommonDialog::BlastRunCommonDialog(QWidget *parent, BlastType blastType,
: QDialog(parent), ca_c(NULL), useCompValues(useCompValues), compValues(compValues)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466247");
+ new HelpButton(this, buttonBox, "17467794");
buttonBox->button(QDialogButtonBox::Yes)->setText(tr("Restore to default"));
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h
index fa046b9..58b3238 100644
--- a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h
+++ b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
index acd5407..0f43586 100644
--- a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
index 2d55550..c3b2acc 100644
--- a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
+++ b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp b/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
index dcc857e..f457d63 100644
--- a/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
+++ b/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/CistromeDelegate.h b/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
index d1f1602..a7f76e5 100644
--- a/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
+++ b/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExportTasks.cpp b/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
index 1de504b..9f336a1 100644
--- a/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExportTasks.h b/src/plugins/external_tool_support/src/utils/ExportTasks.h
index 30c1ccf..11c6912 100644
--- a/src/plugins/external_tool_support/src/utils/ExportTasks.h
+++ b/src/plugins/external_tool_support/src/utils/ExportTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
index d69ba3f..c1ddb92 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
index d97f22c..51eef6a 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
index 77b60d2..7a6ae44 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
index a51dc64..de6b229 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
index 4338184..7809af8 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
index 69913ca..748f2c9 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
index acfb5ff..bf819de 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
index dbf8336..cbeb51f 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
index a5e776b..3a4c6de 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
index 226d18d..10fc91e 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
index 0cbb549..80503fa 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
index b3a68aa..6024123 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
index 8d4c098..3aa8a8e 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -142,7 +142,7 @@ void VcfConsensusWorkerFactory::init() {
QList<Attribute*> attrs;
{
Descriptor outAttDesc(OUT_FASTA_URL_ID, VcfConsensusWorker::tr("Output FASTA consensus"),
- VcfConsensusWorker::tr("The url to the output file with the result consensus."));
+ VcfConsensusWorker::tr("The path to the output file with the result consensus."));
attrs << new Attribute(outAttDesc, BaseTypes::STRING_TYPE(), true);
}
diff --git a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
index f01e0db..3ff8861 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
index 8da56f0..e56f218 100644
--- a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
+++ b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
index ea6c224..d4987e2 100644
--- a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
+++ b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/external_tool_support/transl/english.ts b/src/plugins/external_tool_support/transl/english.ts
index a1ebe17..bc884f4 100644
--- a/src/plugins/external_tool_support/transl/english.ts
+++ b/src/plugins/external_tool_support/transl/english.ts
@@ -3621,12 +3621,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ConductGOTask</name>
<message>
- <location filename="../src/conduct_go/ConductGOTask.cpp" line="154"/>
+ <location filename="../src/conduct_go/ConductGOTask.cpp" line="107"/>
<source>Conduct GO warning: Can not find a required output file %1.</source>
<translation>Conduct GO warning: Can not find a required output file %1.</translation>
</message>
<message>
- <location filename="../src/conduct_go/ConductGOTask.cpp" line="165"/>
+ <location filename="../src/conduct_go/ConductGOTask.cpp" line="118"/>
<source>Can not copy the result file to: %1</source>
<translation>Can not copy the result file to: %1</translation>
</message>
@@ -4277,6 +4277,24 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::Gene2PeakFormatLoader</name>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="98"/>
+ <source>Incorrect start position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="102"/>
+ <source>Incorrect end position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="117"/>
+ <source>Incorrect NA value at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::GffreadSupportTask</name>
<message>
<location filename="../src/cufflinks/GffreadSupportTask.cpp" line="34"/>
@@ -6427,10 +6445,14 @@ Default: 64.</translation>
<translation>Target genes</translation>
</message>
<message>
+ <source>Gene list to identify over represented GO terms.</source>
+ <translation type="vanished">Gene list to identify over represented GO terms.</translation>
+ </message>
+ <message>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="142"/>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="147"/>
- <source>Gene list to identify over represented GO terms.</source>
- <translation>Gene list to identify over represented GO terms.</translation>
+ <source>URL to file with genes to identify over represented GO terms.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="146"/>
@@ -8016,17 +8038,17 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::Peak2GenePrompter</name>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="316"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="327"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="321"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="332"/>
<source>Uses annotations from <u>%1</u> as peak regions </source>
<translation>Uses annotations from <u>%1</u> as peak regions </translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="322"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="333"/>
<source> to annotate with genes nearby from <u>%1</u>.</source>
<translation> to annotate with genes nearby from <u>%1</u>.</translation>
</message>
@@ -8034,102 +8056,122 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::Peak2GeneWorker</name>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="194"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="198"/>
<source>Treatment features</source>
<translation>Treatment features</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="195"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="199"/>
<source>Result peaks of MACS.</source>
<translation>Result peaks of MACS.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="199"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="203"/>
<source>Peak2gene data</source>
<translation>Peak2gene data</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="200"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="204"/>
<source>MACS peaks to get the refgenes near the peak summit/center.</source>
<translation>MACS peaks to get the refgenes near the peak summit/center.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="208"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="212"/>
<source>Gene regions</source>
<translation>Gene regions</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="209"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="213"/>
<source>Annotation for each gene, containing all the peaks nearby.</source>
<translation>Annotation for each gene, containing all the peaks nearby.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="211"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="215"/>
<source>Peak regions</source>
<translation>Peak regions</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="212"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="216"/>
<source>Annotation for each peak, containing all the genes nearby.</source>
<translation>Annotation for each peak, containing all the genes nearby.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="215"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="218"/>
+ <source>Gene regions URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="219"/>
+ <source>URL to file with annotation for each gene, containing all the peaks nearby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="221"/>
+ <source>Peak regions URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="222"/>
+ <source>URL to file with annotation for each peak, containing all the genes nearby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="225"/>
<source>Peak2gene output data</source>
<translation>Peak2gene output data</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="216"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="226"/>
<source>Genes containing all the peaks nearby and peaks containing all the genes nearby.</source>
<translation>Genes containing all the peaks nearby and peaks containing all the genes nearby.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="228"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="239"/>
<source>Output type</source>
<translation>Output type</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="229"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="240"/>
<source>Select which type of genes need to output. <b>up</b> for genes upstream to peak summit, <b>down</b> for genes downstream to peak summit, <b>all</b> for both <b>up</b> and <b>down</b> (--op).</source>
<translation>Select which type of genes need to output. <b>up</b> for genes upstream to peak summit, <b>down</b> for genes downstream to peak summit, <b>all</b> for both <b>up</b> and <b>down</b> (--op).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="234"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="245"/>
<source>Official gene symbols</source>
<translation>Official gene symbols</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="235"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="246"/>
<source>Output <b>official gene symbol</b> instead of <b>refseq name</b> (--symbol).</source>
<translation>Output <b>official gene symbol</b> instead of <b>refseq name</b> (--symbol).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="237"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="248"/>
<source>Distance</source>
<translation>Distance</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="238"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="249"/>
<source>Set a number which unit is base. It will get the refGenes in n bases from peak center (--distance).</source>
<translation>Set a number which unit is base. It will get the refGenes in n bases from peak center (--distance).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="240"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="251"/>
<source>Genome file</source>
<translation>Genome file</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="241"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="252"/>
<source>Select a genome file (sqlite3 file) to search refGenes (--genome).</source>
<translation>Select a genome file (sqlite3 file) to search refGenes (--genome).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="296"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="307"/>
<source>Annotate Peaks with peak2gene</source>
<translation>Annotate Peaks with peak2gene</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="297"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="308"/>
<source>Gets refGenes near the ChIP regions identified by a peak-caller.</source>
<translation>Gets refGenes near the ChIP regions identified by a peak-caller.</translation>
</message>
@@ -8593,13 +8635,13 @@ Default: 64.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
- <source>Cannonical transcripts</source>
- <translation>Cannonical transcripts</translation>
+ <source>Canonical transcripts</source>
+ <translation>Canonical transcripts</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="136"/>
- <source>Use only cannonical transcripts</source>
- <translation>Use only cannonical transcripts</translation>
+ <source>Use only canonical transcripts</source>
+ <translation>Use only canonical transcripts</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
@@ -8613,13 +8655,13 @@ Default: 64.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
- <source>Annotate Loss of function</source>
- <translation>Annotate Loss of function</translation>
+ <source>Annotate Loss of function variations</source>
+ <translation>Annotate Loss of function variations</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="142"/>
- <source>Annotate Loss of function (LOF) and Nonsense mediated decay (NMD)</source>
- <translation>Annotate Loss of function (LOF) and Nonsense mediated decay (NMD)</translation>
+ <source>Annotate Loss of function variations (LOF) and Nonsense mediated decay (NMD)</source>
+ <translation>Annotate Loss of function variations (LOF) and Nonsense mediated decay (NMD)</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="144"/>
@@ -9347,8 +9389,8 @@ Set it empty if you want to run Tophat once for all input reads</translation>
</message>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="145"/>
- <source>The url to the output file with the result consensus.</source>
- <translation>The url to the output file with the result consensus.</translation>
+ <source>The path to the output file with the result consensus.</source>
+ <translation>The path to the output file with the result consensus.</translation>
</message>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="155"/>
@@ -9653,6 +9695,29 @@ Set it empty if you want to run Tophat once for all input reads</translation>
</message>
</context>
<context>
+ <name>U2::Peak2GeneFormatLoader</name>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="101"/>
+ <source>Incorrect start position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="105"/>
+ <source>Incorrect end position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="120"/>
+ <source>Incorrect peak score at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="128"/>
+ <source>Incorrect NA value at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::Peak2GeneSupport</name>
<message>
<location filename="../src/peak2gene/Peak2GeneSupport.cpp" line="45"/>
@@ -10285,6 +10350,14 @@ Set it empty if you want to run Tophat once for all input reads</translation>
</message>
</context>
<context>
+ <name>U2::TabulatedFormatReader</name>
+ <message>
+ <location filename="../src/peak2gene/TabulatedFormatReader.cpp" line="36"/>
+ <source>IO adapter is not opened</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::TopHatSupportTask</name>
<message>
<location filename="../src/tophat/TopHatSupportTask.cpp" line="53"/>
diff --git a/src/plugins/external_tool_support/transl/russian.ts b/src/plugins/external_tool_support/transl/russian.ts
index 134fac7..00ab88e 100644
--- a/src/plugins/external_tool_support/transl/russian.ts
+++ b/src/plugins/external_tool_support/transl/russian.ts
@@ -86,7 +86,7 @@
<message>
<location filename="../src/ui/BlastAllSupportDialog.ui" line="528"/>
<source>Gap costs</source>
- <translation>Вес пропуска</translation>
+ <translation>Вес пробела</translation>
</message>
<message>
<location filename="../src/ui/BlastAllSupportDialog.ui" line="307"/>
@@ -906,7 +906,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="454"/>
<source>Gap open penalty (-O)</source>
- <translation>Штраф за открывающий пропуск (-O)</translation>
+ <translation>Штраф за открытие пробела (-O)</translation>
</message>
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="557"/>
@@ -936,7 +936,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="499"/>
<source>Gap extension penalty; a gap of size k cost {-O} + {-E}*k</source>
- <translation>Штраф за расширение пропуска; пропуск размера k стоит {-O} + {-E}*k</translation>
+ <translation>Штраф за расширение пробела; пробел размера k стоит {-O} + {-E}*k</translation>
</message>
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="512"/>
@@ -946,7 +946,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="483"/>
<source>Gap extention penalty (-E)</source>
- <translation>Штраф за расширение пропуска (-E)</translation>
+ <translation>Штраф за расширение пробела (-E)</translation>
</message>
<message>
<location filename="../src/ui/BwaMemSettings.ui" line="570"/>
@@ -1107,7 +1107,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="336"/>
<source>Max gap extensions (-e)</source>
- <translation>Максимальное расширение пропуска (-e)</translation>
+ <translation>Максимальное расширение пробела (-e)</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="346"/>
@@ -1137,7 +1137,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="356"/>
<source>Enable long gaps</source>
- <translation>Допустимы длинные пропуски</translation>
+ <translation>Допустимы длинные пробелы</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="171"/>
@@ -1152,7 +1152,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="42"/>
<source>Long-scaled gap penalty for long deletions (-L)</source>
- <translation>Долгосрочный штраф за длительный промежуток (-L)</translation>
+ <translation>Долгосрочный штраф за длительный пробел (-L)</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="241"/>
@@ -1162,7 +1162,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="395"/>
<source>Gap open penalty (-O)</source>
- <translation>Штраф за открывающий пропуск (-O)</translation>
+ <translation>Штраф за открытие пробела (-O)</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="303"/>
@@ -1182,7 +1182,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="415"/>
<source>Gap extension penalty (-E)</source>
- <translation>Штраф за расширение пропуска (-E)</translation>
+ <translation>Штраф за расширение пробела (-E)</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="462"/>
@@ -1197,7 +1197,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSettings.ui" line="72"/>
<source>Max gap opens (-o)</source>
- <translation>Максимальное число пропусков (-o)</translation>
+ <translation>Максимальное число пробелов (-o)</translation>
</message>
<message>
<location filename="../src/ui/BwaSettings.ui" line="30"/>
@@ -1280,7 +1280,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSwSettings.ui" line="159"/>
<source>Gap extention penalty (-r)</source>
- <translation>Штраф за расширение пропуска (-r)</translation>
+ <translation>Штраф за расширение пробела (-r)</translation>
</message>
<message>
<location filename="../src/ui/BwaSwSettings.ui" line="113"/>
@@ -1310,7 +1310,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/BwaSwSettings.ui" line="136"/>
<source>Gap open penalty (-q)</source>
- <translation>Штраф за открывающий пропуск (-q)</translation>
+ <translation>Штраф за открытие пробела (-q)</translation>
</message>
<message>
<location filename="../src/ui/BwaSwSettings.ui" line="182"/>
@@ -1466,12 +1466,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/CAP3SupportDialog.ui" line="318"/>
<source>Max gap length in any overlap (-f)</source>
- <translation>Максимальная длина пропуска в перекрытии (-f)</translation>
+ <translation>Максимальная длина пробела в перекрытии (-f)</translation>
</message>
<message>
<location filename="../src/ui/CAP3SupportDialog.ui" line="338"/>
<source>Assembly reverse reads (-r)</source>
- <translation>Сборка обратных ридов (-r)</translation>
+ <translation>Сборка обратных прочтений (-r)</translation>
</message>
<message>
<location filename="../src/ui/CAP3SupportDialog.ui" line="364"/>
@@ -1491,7 +1491,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/CAP3SupportDialog.ui" line="410"/>
<source>Gap penalty factor (-g)</source>
- <translation>Фактор штрафа за пропуск (-g)</translation>
+ <translation>Фактор штрафа за пробел (-g)</translation>
</message>
<message>
<location filename="../src/ui/CAP3SupportDialog.ui" line="417"/>
@@ -1599,12 +1599,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="98"/>
<source>Gap opening penalty</source>
- <translation>Штраф за открывающий пропуск</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="141"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="184"/>
@@ -1669,22 +1669,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="398"/>
<source>Gap separation distance</source>
- <translation>Расстояние между пропусками</translation>
+ <translation>Расстояние между пробелами</translation>
</message>
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="456"/>
<source>Residue-specific gaps off</source>
- <translation>Откл. специфические для остатков пропуски</translation>
+ <translation>Откл. специфические для остатков пробелы</translation>
</message>
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="442"/>
<source>Hydrophilic gaps off</source>
- <translation>Отключить гидрофильные пропуски</translation>
+ <translation>Отключить гидрофильные пробелы</translation>
</message>
<message>
<location filename="../src/ui/ClustalWSupportRunDialog.ui" line="449"/>
<source>No end gap separation penalty</source>
- <translation>Не вводить штраф за разделение пропусков</translation>
+ <translation>Не вводить штраф за разделение пробелов</translation>
</message>
</context>
<context>
@@ -1911,7 +1911,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/MAFFTSupportRunDialog.ui" line="131"/>
<source>Offset (works like gap extension penalty)</source>
- <translation>Смещение (работает как штраф за промежуточный пропуск)</translation>
+ <translation>Смещение (работает как штраф за промежуточный пробел)</translation>
</message>
<message>
<location filename="../src/ui/MAFFTSupportRunDialog.ui" line="174"/>
@@ -2344,7 +2344,7 @@ Uncheck to get the maximum likelihood estimate.</source>
<message>
<location filename="../src/ui/TCoffeeSupportRunDialog.ui" line="122"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/ui/TCoffeeSupportRunDialog.ui" line="158"/>
@@ -3618,12 +3618,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ConductGOTask</name>
<message>
- <location filename="../src/conduct_go/ConductGOTask.cpp" line="154"/>
+ <location filename="../src/conduct_go/ConductGOTask.cpp" line="107"/>
<source>Conduct GO warning: Can not find a required output file %1.</source>
<translation>Conduct GO warning: Can not find a required output file %1.</translation>
</message>
<message>
- <location filename="../src/conduct_go/ConductGOTask.cpp" line="165"/>
+ <location filename="../src/conduct_go/ConductGOTask.cpp" line="118"/>
<source>Can not copy the result file to: %1</source>
<translation>Can not copy the result file to: %1</translation>
</message>
@@ -4274,6 +4274,24 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::Gene2PeakFormatLoader</name>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="98"/>
+ <source>Incorrect start position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="102"/>
+ <source>Incorrect end position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Gene2PeakFormatLoader.cpp" line="117"/>
+ <source>Incorrect NA value at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::GffreadSupportTask</name>
<message>
<location filename="../src/cufflinks/GffreadSupportTask.cpp" line="34"/>
@@ -4452,7 +4470,7 @@ To save under other name press 'Cancel' and change name in 'Resul
<message>
<location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="118"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="122"/>
@@ -4750,22 +4768,22 @@ To save under other name press 'Cancel' and change name in 'Resul
<message>
<location filename="../src/blast/BlastAllWorker.cpp" line="119"/>
<source>Gapped alignment</source>
- <translation>Выравнивание с пропусками</translation>
+ <translation>Выравнивание с пробелами</translation>
</message>
<message>
<location filename="../src/blast/BlastAllWorker.cpp" line="120"/>
<source>Perform gapped alignment.</source>
- <translation>Выполняет выравнивание с пропусками.</translation>
+ <translation>Выполняет выравнивание с пробелами.</translation>
</message>
<message>
<location filename="../src/blast/BlastAllWorker.cpp" line="122"/>
<source>Gap costs</source>
- <translation>Вес пропуска</translation>
+ <translation>Вес пробела</translation>
</message>
<message>
<location filename="../src/blast/BlastAllWorker.cpp" line="123"/>
<source>Cost to create and extend a gap in an alignment.</source>
- <translation>Стоимость создания и расширения пропуска в выравнивании.</translation>
+ <translation>Стоимость создания и расширения пробела в выравнивании.</translation>
</message>
<message>
<location filename="../src/blast/BlastAllWorker.cpp" line="124"/>
@@ -4911,7 +4929,7 @@ To save under other name press 'Cancel' and change name in 'Resul
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="116"/>
<source>Gapped alignment</source>
- <translation>Выравнивание с пропусками</translation>
+ <translation>Выравнивание с пробелами</translation>
</message>
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="97"/>
@@ -4966,17 +4984,17 @@ To save under other name press 'Cancel' and change name in 'Resul
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="117"/>
<source>Perform gapped alignment.</source>
- <translation>Выполняет выравнивание с пропусками.</translation>
+ <translation>Выполняет выравнивание с пробелами.</translation>
</message>
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="119"/>
<source>Gap costs</source>
- <translation>Вес пропуска</translation>
+ <translation>Вес пробела</translation>
</message>
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="120"/>
<source>Cost to create and extend a gap in an alignment.</source>
- <translation>Стоимость создания и расширения пропуска в выравнивании.</translation>
+ <translation>Стоимость создания и расширения пробела в выравнивании.</translation>
</message>
<message>
<location filename="../src/blast_plus/BlastPlusWorker.cpp" line="121"/>
@@ -5482,22 +5500,22 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bwa/BwaMemWorker.cpp" line="189"/>
<source>Gap open penalty</source>
- <translation>Штраф за открывающий пропуск</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/bwa/BwaMemWorker.cpp" line="190"/>
<source>Gap open penalty (-O).</source>
- <translation>Штраф за открывающий пропуск (-O).</translation>
+ <translation>Штраф за открытие пробела (-O).</translation>
</message>
<message>
<location filename="../src/bwa/BwaMemWorker.cpp" line="193"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/bwa/BwaMemWorker.cpp" line="194"/>
<source>Gap extension penalty; a gap of size k cost {-O} (-E).</source>
- <translation>Штраф за расширение пропуска; пропуск размера k стоит {-O} (-E).</translation>
+ <translation>Штраф за расширение пробела; пробел размера k стоит {-O} (-E).</translation>
</message>
<message>
<location filename="../src/bwa/BwaMemWorker.cpp" line="197"/>
@@ -5585,12 +5603,12 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="155"/>
<source>Max gap opens</source>
- <translation>Максимальное число пропусков</translation>
+ <translation>Максимальное число пробелов</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="156"/>
<source>Max gap opens (-o).</source>
- <translation>Максимальное число пропусков (-o).</translation>
+ <translation>Максимальное число пробелов (-o).</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="159"/>
@@ -5615,12 +5633,12 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="167"/>
<source>Long-scaled gap penalty for long deletions</source>
- <translation>Долгосрочный штраф за длительный промежуток</translation>
+ <translation>Долгосрочный штраф за длительный пробел</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="168"/>
<source>Long-scaled gap penalty for long deletions (-L)</source>
- <translation>Долгосрочный штраф за длительный промежуток (-L)</translation>
+ <translation>Долгосрочный штраф за длительный пробел (-L)</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="171"/>
@@ -5636,17 +5654,17 @@ bowtie медленнее, когда указан режим --best.</translati
<location filename="../src/bwa/BwaWorker.cpp" line="175"/>
<location filename="../src/bwa/BwaWorker.cpp" line="176"/>
<source>Enable long gaps</source>
- <translation>Допустимы длинные пропуски</translation>
+ <translation>Допустимы длинные пробелы</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="179"/>
<source>Max gap extensions</source>
- <translation>Максимальное расширение пропуска</translation>
+ <translation>Максимальное расширение пробела</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="180"/>
<source>Max gap extensions (-e)</source>
- <translation>Максимальное расширение пропуска (-e)</translation>
+ <translation>Максимальное расширение пробела (-e)</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="183"/>
@@ -5721,22 +5739,22 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="211"/>
<source>Gap open penalty</source>
- <translation>Штраф за открывающий пропуск</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="212"/>
<source>Gap open penalty (-O).</source>
- <translation>Штраф за открывающий пропуск (-O).</translation>
+ <translation>Штраф за открытие пробела (-O).</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="215"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="216"/>
<source>Gap extension penalty; a gap of size k cost (-E).</source>
- <translation>Штраф за расширение пропуска; пропуск размера k стоит (-E).</translation>
+ <translation>Штраф за расширение пробела; пробел размера k стоит (-E).</translation>
</message>
<message>
<location filename="../src/bwa/BwaWorker.cpp" line="219"/>
@@ -5872,7 +5890,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cap3/CAP3Worker.cpp" line="162"/>
<source>Gap penalty factor (-g) is one of the parameters that affects similarity score of an overlap. See <i>Overlap similarity score cutoff</i> description for details.</source>
- <translation>Фактор штрафа за пропуск (-g) - один из параметров, который влияет на оценку схожести перекрытия.</translation>
+ <translation>Фактор штрафа за пробел (-g) - один из параметров, который влияет на оценку схожести перекрытия.</translation>
</message>
<message>
<location filename="../src/cap3/CAP3Worker.cpp" line="167"/>
@@ -5932,7 +5950,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cap3/CAP3Worker.cpp" line="219"/>
<source>The maximum length of gaps allowed in any overlap (-f)<p>I.e. overlaps with longer gaps are rejected.</p><p>Note that a small value for this parameter may cause the program to remove true overlaps and to produce incorrect results.</p><p>The parameter may be used to split reads from alternative splicing forms into separate contigs.</p></source>
- <translation>Максимальная длина пропуска допустимая в перекрытии (-f)</translation>
+ <translation>Максимальная длина пробела допустимая в перекрытии (-f)</translation>
</message>
<message>
<location filename="../src/cap3/CAP3Worker.cpp" line="227"/>
@@ -6290,57 +6308,57 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="76"/>
<source>The penalty for opening a gap.</source>
- <translation>Штраф за открывающий пропуск.</translation>
+ <translation>Штраф за открытие пробела.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="77"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="78"/>
<source>The penalty for extending a gap.</source>
- <translation>Штраф за расширение пропуска.</translation>
+ <translation>Штраф за расширение пробел.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="79"/>
<source>Gap distance</source>
- <translation>Расстояние пропуска</translation>
+ <translation>Расстояние пробела</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="80"/>
<source>The gap separation penalty. Tries to decrease the chances of gaps being too close to each other.</source>
- <translation>Штраф за разделение пропуска. Пытается уменьшить изменение пропусков располагая их близко друг к другу.</translation>
+ <translation>Штраф за разделение пробела. Пытается уменьшить изменение пробелов располагая их близко друг к другу.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="81"/>
<source>End gaps</source>
- <translation>Убрать пропуск</translation>
+ <translation>Убрать пробел</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="82"/>
<source>The penalty for closing a gap.</source>
- <translation>Штраф за закрытие пропуска.</translation>
+ <translation>Штраф за закрытие пробела.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="83"/>
<source>Residue-specific gaps off</source>
- <translation>Откл. спецефические для остатков пропуски</translation>
+ <translation>Откл. спецефические для остатков пробелы</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="84"/>
<source>Residue-specific penalties are amino specific gap penalties that reduce or increase the gap opening penalties at each position in the alignment.</source>
- <translation>Отключение спецефические для остатков пропусков - штрафы за специфические белковые остатки которые увеличивают или уменьшают штрафы за открытие пропуска в каждой позиции.</translation>
+ <translation>Отключение спецефические для остатков пробелы - штрафы за специфические белковые остатки которые увеличивают или уменьшают штрафы за открытие пробела в каждой позиции.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="85"/>
<source>Hydrophilic gaps off</source>
- <translation>Отключить гидрофильные пропуски</translation>
+ <translation>Отключить гидрофильные пробелы</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="86"/>
<source>Hydrophilic gap penalties are used to increase the chances of a gap within a run (5 or more residues) of hydrophilic amino acids.</source>
- <translation>Штрафы за гидрофильные пропуски используются для увеличения изменения пропуска гидрофильных амино кислот.</translation>
+ <translation>Штрафы за гидрофильные пробелы используются для увеличения изменения пробела гидрофильных амино кислот.</translation>
</message>
<message>
<location filename="../src/clustalw/ClustalWWorker.cpp" line="87"/>
@@ -6439,10 +6457,14 @@ bowtie медленнее, когда указан режим --best.</translati
<translation>Контрольные гены</translation>
</message>
<message>
+ <source>Gene list to identify over represented GO terms.</source>
+ <translation type="vanished">Список генов для выявления терминов GO.</translation>
+ </message>
+ <message>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="142"/>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="147"/>
- <source>Gene list to identify over represented GO terms.</source>
- <translation>Список генов для выявления терминов GO.</translation>
+ <source>URL to file with genes to identify over represented GO terms.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/conduct_go/ConductGOWorker.cpp" line="146"/>
@@ -7147,7 +7169,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="114"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="118"/>
@@ -7263,7 +7285,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/fastqc/FastqcWorker.cpp" line="104"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/fastqc/FastqcWorker.cpp" line="108"/>
@@ -7377,7 +7399,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bedtools/BedToolsWorkersLibrary.cpp" line="499"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/bedtools/BedToolsWorkersLibrary.cpp" line="503"/>
@@ -7950,12 +7972,12 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/mafft/MAFFTWorker.cpp" line="71"/>
<source>Gap Open Penalty</source>
- <translation>Штраф за открывающий пропуск</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/mafft/MAFFTWorker.cpp" line="72"/>
<source>Gap Open Penalty.</source>
- <translation>Штраф за открывающий пропуск.</translation>
+ <translation>Штраф за открытие пробела.</translation>
</message>
<message>
<location filename="../src/mafft/MAFFTWorker.cpp" line="73"/>
@@ -7965,7 +7987,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/mafft/MAFFTWorker.cpp" line="74"/>
<source>Works like gap extension penalty.</source>
- <translation>Работает как штраф за расширение пропуска.</translation>
+ <translation>Работает как штраф за расширение пробела.</translation>
</message>
<message>
<location filename="../src/mafft/MAFFTWorker.cpp" line="76"/>
@@ -8021,17 +8043,17 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::Peak2GenePrompter</name>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="316"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="327"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="321"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="332"/>
<source>Uses annotations from <u>%1</u> as peak regions </source>
<translation>Использует аннотации из <u>%1</u> в качестве пиковых регионов </translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="322"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="333"/>
<source> to annotate with genes nearby from <u>%1</u>.</source>
<translation> для аннотации генов рядом с to <u>%1</u>.</translation>
</message>
@@ -8039,102 +8061,122 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::Peak2GeneWorker</name>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="194"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="198"/>
<source>Treatment features</source>
<translation>Treatment особенности</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="195"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="199"/>
<source>Result peaks of MACS.</source>
<translation>MACS пики.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="199"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="203"/>
<source>Peak2gene data</source>
<translation>Данные Peak2gene</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="200"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="204"/>
<source>MACS peaks to get the refgenes near the peak summit/center.</source>
<translation>Пики MACS, чтобы получить refgenes вблизи пика в центре.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="208"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="212"/>
<source>Gene regions</source>
<translation>Регионы гена</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="209"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="213"/>
<source>Annotation for each gene, containing all the peaks nearby.</source>
<translation>Аннотация для каждого гена, содержащая все близлежащие пики.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="211"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="215"/>
<source>Peak regions</source>
<translation>Пиковые регионы</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="212"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="216"/>
<source>Annotation for each peak, containing all the genes nearby.</source>
<translation>Аннотрация для каждого пика, содержащая все близлежащие гены.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="215"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="218"/>
+ <source>Gene regions URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="219"/>
+ <source>URL to file with annotation for each gene, containing all the peaks nearby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="221"/>
+ <source>Peak regions URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="222"/>
+ <source>URL to file with annotation for each peak, containing all the genes nearby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="225"/>
<source>Peak2gene output data</source>
<translation>Выходные данные Peak2gene</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="216"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="226"/>
<source>Genes containing all the peaks nearby and peaks containing all the genes nearby.</source>
<translation>Гены, содержащие все близлежащие пики и пики, содержащие все близлежащие гены.</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="228"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="239"/>
<source>Output type</source>
<translation>Тип выходного файла</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="229"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="240"/>
<source>Select which type of genes need to output. <b>up</b> for genes upstream to peak summit, <b>down</b> for genes downstream to peak summit, <b>all</b> for both <b>up</b> and <b>down</b> (--op).</source>
<translation>Выберите тип генов для выходных файлов <b>up</b> для вышележащих генов, <b>down</b> для нижележащих генов, <b>all</b> для обоих <b>up</b> и <b>down</b> (--op).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="234"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="245"/>
<source>Official gene symbols</source>
<translation>Официальные символы генов</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="235"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="246"/>
<source>Output <b>official gene symbol</b> instead of <b>refseq name</b> (--symbol).</source>
<translation>Выходной <b>официальный символ гена</b> вместо <b>имени refseq</b> (--symbol).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="237"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="248"/>
<source>Distance</source>
<translation>Расстояние</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="238"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="249"/>
<source>Set a number which unit is base. It will get the refGenes in n bases from peak center (--distance).</source>
<translation>Установите число, которое является базовым. Он будет получать refGenes в n базах из центра пика (--distance).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="240"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="251"/>
<source>Genome file</source>
<translation>Файл генома</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="241"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="252"/>
<source>Select a genome file (sqlite3 file) to search refGenes (--genome).</source>
<translation>Выберите файл генома для (sqlite3 файл) для поиска refGenes (--genome).</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="296"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="307"/>
<source>Annotate Peaks with peak2gene</source>
<translation>Аннотация пиков с помощью peak2gene</translation>
</message>
<message>
- <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="297"/>
+ <location filename="../src/peak2gene/Peak2GeneWorker.cpp" line="308"/>
<source>Gets refGenes near the ChIP regions identified by a peak-caller.</source>
<translation>Получает refGenes рядом с регионами ChIP найденными поиском пиков.</translation>
</message>
@@ -8365,7 +8407,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/bedtools/BedToolsWorkersLibrary.cpp" line="111"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/bedtools/BedToolsWorkersLibrary.cpp" line="115"/>
@@ -8515,7 +8557,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="94"/>
<source>Annotates and filters variations with SnpEff.</source>
- <translation>Аннотирует и фильтрует вариации при помощи SnpEff.</translation>
+ <translation>этот элемент аннотирует и фильтрует вариации при помощи SnpEff.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="98"/>
@@ -8541,7 +8583,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="116"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="120"/>
@@ -8561,7 +8603,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="124"/>
<source>Select the input format of variations.</source>
- <translation>Выберите входной формат вариаций.</translation>
+ <translation>выберите входной формат вариаций.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="126"/>
@@ -8571,7 +8613,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="127"/>
<source>Select the format of annotated output files.</source>
- <translation>Выберите формат выходных аннотированных файлов.</translation>
+ <translation>выберите формат выходных аннотированных файлов.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="129"/>
@@ -8581,7 +8623,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="130"/>
<source>Select the target genome. Genome data will be downloaded if it is not found.</source>
- <translation>Выберите нужный геном. Данные генома будет скачаны, если он не будет найден.</translation>
+ <translation>выберите референсный геном. Если он не найден, данные генома будут загружены из сети Интернет.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="132"/>
@@ -8591,17 +8633,17 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="133"/>
<source>Upstream and downstream interval size. Eliminate any upstream and downstream effect by using 0 length</source>
- <translation>Верхний и нижний размеры интервала</translation>
+ <translation>верхний и нижний размеры интервала.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
- <source>Cannonical transcripts</source>
- <translation>Канонические транскрипции</translation>
+ <source>Canonical transcripts</source>
+ <translation>Канонические транскрипты</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="136"/>
- <source>Use only cannonical transcripts</source>
- <translation>Использовать только канонические транскрипции</translation>
+ <source>Use only canonical transcripts</source>
+ <translation>использовать только канонические транскрипты.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
@@ -8611,27 +8653,27 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="139"/>
<source>Annotate using HGVS nomenclature</source>
- <translation>Аннотировать при помощи номенклатуры HGVS</translation>
+ <translation>аннотировать при помощи номенклатуры HGVS.</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
- <source>Annotate Loss of function</source>
- <translation>Аннотировать Loss of function</translation>
+ <source>Annotate Loss of function variations</source>
+ <translation>Аннотировать варианты loss of function</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="142"/>
- <source>Annotate Loss of function (LOF) and Nonsense mediated decay (NMD)</source>
- <translation>Аннотирует Loss of function (LOF) и Nonsense mediated decay (NMD)</translation>
+ <source>Annotate Loss of function variations (LOF) and Nonsense mediated decay (NMD)</source>
+ <translation>аннотирует варианты, связанные с потерей функции (loss of function) и изменением деградации, связанной с преждевременным стоп-кодоном (NMD).</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="144"/>
<source>Annotate TFBSs motifs</source>
- <translation>Аннотировать TFBS мотивы</translation>
+ <translation>Аннотировать мотивы TFBS</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="145"/>
<source>Annotate transcription factor binding site motifs (only available for latest GRCh37)</source>
- <translation>Аннотирует сайты связывания транскрипционных факторов</translation>
+ <translation>аннотирует сайты связывания транскрипционных факторов (опция доступна только для последней версии сборки GRCh37).</translation>
</message>
<message>
<location filename="../src/snpeff/SnpEffWorker.cpp" line="167"/>
@@ -8828,22 +8870,22 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/tcoffee/TCoffeeWorker.cpp" line="69"/>
<source>Gap Open Penalty</source>
- <translation>Штраф за открывающий пропуск</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/tcoffee/TCoffeeWorker.cpp" line="70"/>
<source>Gap Open Penalty. Must be negative, best matches get a score of 1000.</source>
- <translation>Штраф за открытие пропуска. Должно быть отрицательным, лучшие совпадения оцениваются в 1000.</translation>
+ <translation>Штраф за открытие пробела. Должно быть отрицательным, лучшие совпадения оцениваются в 1000.</translation>
</message>
<message>
<location filename="../src/tcoffee/TCoffeeWorker.cpp" line="71"/>
<source>Gap Extension Penalty</source>
- <translation>Штраф за расширение пропуска</translation>
+ <translation>Штраф за расширение пробела</translation>
</message>
<message>
<location filename="../src/tcoffee/TCoffeeWorker.cpp" line="72"/>
<source>Gap Extension Penalty. Positive values give rewards to gaps and prevent the alignment of unrelated segments.</source>
- <translation>Штраф за расширение пропуска. Положительные значения дают дополнительные очки для пробелов и предотвращают выравнивание не связанных между собой сегментов.</translation>
+ <translation>Штраф за расширение пробела. Положительные значения дают дополнительные очки для пробелов и предотвращают выравнивание не связанных между собой сегментов.</translation>
</message>
<message>
<location filename="../src/tcoffee/TCoffeeWorker.cpp" line="73"/>
@@ -9344,12 +9386,12 @@ Set it empty if you want to run Tophat once for all input reads</source>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="144"/>
<source>Output FASTA consensus</source>
- <translation>Выходной FASTA консенсус</translation>
+ <translation>Записать консенсус в формате FASTA</translation>
</message>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="145"/>
- <source>The url to the output file with the result consensus.</source>
- <translation>Путь до выходного файла с консенсусом.</translation>
+ <source>The path to the output file with the result consensus.</source>
+ <translation>путь до выходного файла с консенсусом.</translation>
</message>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="155"/>
@@ -9359,7 +9401,7 @@ Set it empty if you want to run Tophat once for all input reads</source>
<message>
<location filename="../src/vcftools/VcfConsensusWorker.cpp" line="156"/>
<source>Apply VCF variants to a fasta file to create consensus sequence.</source>
- <translation>Применяет VCF вариации для файла fasta для создания консенсуса.</translation>
+ <translation>этот элемент применяет список вариаций в формате VCF к файлу в формате FASTA для создания консенсуса.</translation>
</message>
</context>
<context>
@@ -9654,6 +9696,29 @@ Set it empty if you want to run Tophat once for all input reads</source>
</message>
</context>
<context>
+ <name>U2::Peak2GeneFormatLoader</name>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="101"/>
+ <source>Incorrect start position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="105"/>
+ <source>Incorrect end position at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="120"/>
+ <source>Incorrect peak score at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/peak2gene/Peak2GeneFormatLoader.cpp" line="128"/>
+ <source>Incorrect NA value at line %1: '%2'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::Peak2GeneSupport</name>
<message>
<location filename="../src/peak2gene/Peak2GeneSupport.cpp" line="45"/>
@@ -10286,6 +10351,14 @@ Set it empty if you want to run Tophat once for all input reads</source>
</message>
</context>
<context>
+ <name>U2::TabulatedFormatReader</name>
+ <message>
+ <location filename="../src/peak2gene/TabulatedFormatReader.cpp" line="36"/>
+ <source>IO adapter is not opened</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::TopHatSupportTask</name>
<message>
<location filename="../src/tophat/TopHatSupportTask.cpp" line="53"/>
diff --git a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
index 0f5b101..c759213 100644
--- a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
+++ b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
index 346c154..d0b2fe5 100644
--- a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
+++ b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/DataBunch.cpp b/src/plugins/genome_aligner/src/DataBunch.cpp
index bda0ede..4eb9101 100644
--- a/src/plugins/genome_aligner/src/DataBunch.cpp
+++ b/src/plugins/genome_aligner/src/DataBunch.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/DataBunch.h b/src/plugins/genome_aligner/src/DataBunch.h
index b35cbb0..51b8f97 100644
--- a/src/plugins/genome_aligner/src/DataBunch.h
+++ b/src/plugins/genome_aligner/src/DataBunch.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
index 0027755..47da596 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
index 73b9e6f..252baae 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
index 917c830..4f0e7e6 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
index 93dd007..16c26b0 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
index 8a4a6e3..a8161ba 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIO.h b/src/plugins/genome_aligner/src/GenomeAlignerIO.h
index 6975a0f..e592278 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIO.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIO.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
index 584a9ce..db726e8 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndex.h b/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
index 557e17f..799f5de 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
index 4953898..d04584f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
index b96341d..2586516 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
index ee0bcc4..de98157 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
index f3ed28d..5df7793 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
index ceeeb3a..b104056 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
index f7a4774..5a9bc7c 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
index 5e719eb..ee61321 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
index 8ebb371..e457505 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
index 00bd96a..3c18ab2 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
index 35727a3..3f10d40 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
index 4986603..8bfd33e 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -73,7 +73,7 @@ AppSettingsGUIPageWidget* GenomeAlignerSettingsPageController::createWidget(AppS
return r;
}
-const QString GenomeAlignerSettingsPageController::helpPageId = QString("17465978");
+const QString GenomeAlignerSettingsPageController::helpPageId = QString("17467525");
GenomeAlignerSettingsPageWidget::GenomeAlignerSettingsPageWidget(GenomeAlignerSettingsPageController* ) {
setupUi(this);
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
index c78e8b6..12d0e4f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
index fd3976d..2703666 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
index 2d535bb..b16ae9c 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
index 8eb5901..a915995 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerTask.h b/src/plugins/genome_aligner/src/GenomeAlignerTask.h
index 37cfea1..af41344 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp b/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
index 34df43c..54cac6c 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerWorker.h b/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
index a640da3..c79c850 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
index c0ad798..ebd0038 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
index 9fe7cd8..4691efc 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
diff --git a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
index bc2ffcf..be2381a 100644
--- a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
+++ b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
index 90e4cf5..581e8a7 100644
--- a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
+++ b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
index 7ef459d..ecd5c2e 100644
--- a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
+++ b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
index 955f102..ffd7f07 100644
--- a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
+++ b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
index 5f8952d..aeff4fe 100644
--- a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
+++ b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
index b8b89a2..5e78624 100644
--- a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
+++ b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
index e87a96d..00df38f 100644
--- a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
+++ b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
index 4cbdcdb..9f6ea5a 100644
--- a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
+++ b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp b/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
index a7d0c47..b0be4de 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
+++ b/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/opencl_support/src/OpenCLSupportPlugin.h b/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
index 9b77242..6e0dca6 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
+++ b/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
index 2c7b86b..a9d67d1 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
+++ b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -74,7 +74,7 @@ AppSettingsGUIPageWidget * OpenCLSupportSettingsPageController::createWidget( Ap
return w;
}
-const QString OpenCLSupportSettingsPageController::helpPageId = QString("17465976");
+const QString OpenCLSupportSettingsPageController::helpPageId = QString("17467523");
OpenCLSupportSettingsPageState::OpenCLSupportSettingsPageState( int num_gpus ) {
assert( num_gpus >= 0 );
diff --git a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h
index ff84b9f..2a2e9db 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h
+++ b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/opencl_support/transl/english.ts b/src/plugins/opencl_support/transl/english.ts
index ab6fc68..26e8481 100644
--- a/src/plugins/opencl_support/transl/english.ts
+++ b/src/plugins/opencl_support/transl/english.ts
@@ -14,37 +14,37 @@
<translation>Plugin provides support for OpenCL-enabled GPUs.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="78"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="88"/>
<source>Cannot load OpenCL driver dynamic library.<p> Install the latest video GPU driver.</source>
<translation>Cannot load OpenCL driver dynamic library.<p> Install the latest video GPU driver.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="82"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="92"/>
<source>An error has occurred while obtaining information about installed OpenCL GPUs.<br> See OpenCL Support plugin log for details.</source>
<translation>An error has occurred while obtaining information about installed OpenCL GPUs.<br> See OpenCL Support plugin log for details.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="101"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="110"/>
<source>Initializing OpenCL</source>
<translation>Initializing OpenCL</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="112"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="121"/>
<source>Number of OpenCL platforms: %1</source>
<translation>Number of OpenCL platforms: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="127"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="136"/>
<source>Number of OpenCL devices: %1</source>
<translation>Number of OpenCL devices: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="228"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="237"/>
<source>Registering OpenCL-enabled GPU: %1, global mem: %2 Mb, local mem: %3 Kb, max compute units: %4, max work group size: %5, max frequency: %6 Hz</source>
<translation>Registering OpenCL-enabled GPU: %1, global mem: %2 Mb, local mem: %3 Kb, max compute units: %4, max work group size: %5, max frequency: %6 Hz</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="246"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="255"/>
<source>OpenCL error code (%1)</source>
<translation>OpenCL error code (%1)</translation>
</message>
diff --git a/src/plugins/opencl_support/transl/russian.ts b/src/plugins/opencl_support/transl/russian.ts
index c698265..406c12b 100644
--- a/src/plugins/opencl_support/transl/russian.ts
+++ b/src/plugins/opencl_support/transl/russian.ts
@@ -14,37 +14,37 @@
<translation>Плагин поддерживает OpenCL GPUs.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="78"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="88"/>
<source>Cannot load OpenCL driver dynamic library.<p> Install the latest video GPU driver.</source>
<translation>Невозможно загрузить драйвер для OpenCL.<p> Установите последний GPU драйвер.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="82"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="92"/>
<source>An error has occurred while obtaining information about installed OpenCL GPUs.<br> See OpenCL Support plugin log for details.</source>
<translation>Произошла ошибка в процессе получения информации об установленных OpenCL GPU.<br> Посмотрите лог поддержки OpenCL чтобы получить детали.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="101"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="110"/>
<source>Initializing OpenCL</source>
<translation>Инициализация OpenCL</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="112"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="121"/>
<source>Number of OpenCL platforms: %1</source>
<translation>Число OpenCL платформ: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="127"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="136"/>
<source>Number of OpenCL devices: %1</source>
<translation>Число OpenCL устройств: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="228"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="237"/>
<source>Registering OpenCL-enabled GPU: %1, global mem: %2 Mb, local mem: %3 Kb, max compute units: %4, max work group size: %5, max frequency: %6 Hz</source>
<translation>Зарегистрирован OpenCL GPU: %1, глобальная память: %2 Mb, локальная память: %3 Kb, максимальное количество юнитов: %4, максимальный размер рабочей группы: %5, максимальная частота: %6 Hz</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="246"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="255"/>
<source>OpenCL error code (%1)</source>
<translation>Код ошибки OpenCL (%1)</translation>
</message>
diff --git a/src/plugins/orf_marker/src/ORFDialog.cpp b/src/plugins/orf_marker/src/ORFDialog.cpp
index c68b67c..dd3143b 100644
--- a/src/plugins/orf_marker/src/ORFDialog.cpp
+++ b/src/plugins/orf_marker/src/ORFDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -79,7 +79,7 @@ ORFDialog::ORFDialog(ADVSequenceObjectContext* _ctx)
: QDialog(_ctx->getAnnotatedDNAView()->getWidget()), aaUpdateTask(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466178");
+ new HelpButton(this, buttonBox, "17467725");
tabWidget->setCurrentIndex(0);
diff --git a/src/plugins/orf_marker/src/ORFDialog.h b/src/plugins/orf_marker/src/ORFDialog.h
index 897d024..7301c42 100644
--- a/src/plugins/orf_marker/src/ORFDialog.h
+++ b/src/plugins/orf_marker/src/ORFDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp b/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
index 278c513..5f7c77e 100644
--- a/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerPlugin.h b/src/plugins/orf_marker/src/ORFMarkerPlugin.h
index 1d67cca..4eb833e 100644
--- a/src/plugins/orf_marker/src/ORFMarkerPlugin.h
+++ b/src/plugins/orf_marker/src/ORFMarkerPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerTask.cpp b/src/plugins/orf_marker/src/ORFMarkerTask.cpp
index 93b2cd1..0358a17 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTask.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerTask.h b/src/plugins/orf_marker/src/ORFMarkerTask.h
index 4926d3e..62c3be9 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTask.h
+++ b/src/plugins/orf_marker/src/ORFMarkerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerTests.cpp b/src/plugins/orf_marker/src/ORFMarkerTests.cpp
index 312f7d1..fced54f 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTests.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFMarkerTests.h b/src/plugins/orf_marker/src/ORFMarkerTests.h
index 1b58364..c3def98 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTests.h
+++ b/src/plugins/orf_marker/src/ORFMarkerTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFQuery.cpp b/src/plugins/orf_marker/src/ORFQuery.cpp
index 9c07b1a..507dbf6 100644
--- a/src/plugins/orf_marker/src/ORFQuery.cpp
+++ b/src/plugins/orf_marker/src/ORFQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFQuery.h b/src/plugins/orf_marker/src/ORFQuery.h
index e949b5e..8c92bb1 100644
--- a/src/plugins/orf_marker/src/ORFQuery.h
+++ b/src/plugins/orf_marker/src/ORFQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFWorker.cpp b/src/plugins/orf_marker/src/ORFWorker.cpp
index b2a3781..52da8e3 100644
--- a/src/plugins/orf_marker/src/ORFWorker.cpp
+++ b/src/plugins/orf_marker/src/ORFWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/orf_marker/src/ORFWorker.h b/src/plugins/orf_marker/src/ORFWorker.h
index 664cd13..9d74db3 100644
--- a/src/plugins/orf_marker/src/ORFWorker.h
+++ b/src/plugins/orf_marker/src/ORFWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/EditPrimerDialog.cpp b/src/plugins/pcr/src/EditPrimerDialog.cpp
index 58739b3..2f6f9c8 100644
--- a/src/plugins/pcr/src/EditPrimerDialog.cpp
+++ b/src/plugins/pcr/src/EditPrimerDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ EditPrimerDialog::EditPrimerDialog(QWidget *parent, const Primer &editToPrimer)
void EditPrimerDialog::init() {
GCOUNTER(cvar, tvar, "Add primer in library");
setupUi(this);
- new HelpButton(this, buttonBox, "17466277");
+ new HelpButton(this, buttonBox, "17467823");
primerEdit->setValidator(new QRegExpValidator(QRegExp("[acgtACGT]+")));
connect(primerEdit, SIGNAL(textEdited(const QString &)), SLOT(sl_onPrimerChanged(const QString &)));
diff --git a/src/plugins/pcr/src/EditPrimerDialog.h b/src/plugins/pcr/src/EditPrimerDialog.h
index e668e61..17884df 100644
--- a/src/plugins/pcr/src/EditPrimerDialog.h
+++ b/src/plugins/pcr/src/EditPrimerDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/ExtractProductTask.cpp b/src/plugins/pcr/src/ExtractProductTask.cpp
index 8042cf1..9d154b9 100644
--- a/src/plugins/pcr/src/ExtractProductTask.cpp
+++ b/src/plugins/pcr/src/ExtractProductTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/ExtractProductTask.h b/src/plugins/pcr/src/ExtractProductTask.h
index c844704..d1c31e0 100644
--- a/src/plugins/pcr/src/ExtractProductTask.h
+++ b/src/plugins/pcr/src/ExtractProductTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/FindPrimerPairsWorker.cpp b/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
index f91eb67..e090155 100644
--- a/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
+++ b/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/FindPrimerPairsWorker.h b/src/plugins/pcr/src/FindPrimerPairsWorker.h
index 7d86821..05a654a 100644
--- a/src/plugins/pcr/src/FindPrimerPairsWorker.h
+++ b/src/plugins/pcr/src/FindPrimerPairsWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
index 8e5ab70..02df8d4 100644
--- a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
namespace U2 {
-const QString InSilicoPcrOPWidgetFactory::GROUP_DOC_PAGE = "17466275";
+const QString InSilicoPcrOPWidgetFactory::GROUP_DOC_PAGE = "17467821";
InSilicoPcrOPWidgetFactory::InSilicoPcrOPWidgetFactory()
: OPWidgetFactory()
diff --git a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
index e8b0e42..1479561 100644
--- a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
+++ b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
index 4808356..3d84120 100644
--- a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
index 4dced4a..11b5eb7 100644
--- a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
+++ b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp b/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
index dabd8e1..472867a 100644
--- a/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrProductsTable.h b/src/plugins/pcr/src/InSilicoPcrProductsTable.h
index 364b7a5..7ade87c 100644
--- a/src/plugins/pcr/src/InSilicoPcrProductsTable.h
+++ b/src/plugins/pcr/src/InSilicoPcrProductsTable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrTask.cpp b/src/plugins/pcr/src/InSilicoPcrTask.cpp
index de6777e..7979e1b 100644
--- a/src/plugins/pcr/src/InSilicoPcrTask.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrTask.h b/src/plugins/pcr/src/InSilicoPcrTask.h
index b27bb1e..be98e05 100644
--- a/src/plugins/pcr/src/InSilicoPcrTask.h
+++ b/src/plugins/pcr/src/InSilicoPcrTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrWorker.cpp b/src/plugins/pcr/src/InSilicoPcrWorker.cpp
index ff0b0f6..40103ee 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorker.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrWorker.h b/src/plugins/pcr/src/InSilicoPcrWorker.h
index b33dd60..d166057 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorker.h
+++ b/src/plugins/pcr/src/InSilicoPcrWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
index 3281269..136eb17 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
index 2265d07..a0dd7f3 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
+++ b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
index 7fe309a..f5fc6c4 100644
--- a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
+++ b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
index 943a292..6317698 100644
--- a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
+++ b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PcrPlugin.cpp b/src/plugins/pcr/src/PcrPlugin.cpp
index cd32a86..df54734 100644
--- a/src/plugins/pcr/src/PcrPlugin.cpp
+++ b/src/plugins/pcr/src/PcrPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PcrPlugin.h b/src/plugins/pcr/src/PcrPlugin.h
index 9871731..aec5ade 100644
--- a/src/plugins/pcr/src/PcrPlugin.h
+++ b/src/plugins/pcr/src/PcrPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/Primer.cpp b/src/plugins/pcr/src/Primer.cpp
index 66628d1..0f5744b 100644
--- a/src/plugins/pcr/src/Primer.cpp
+++ b/src/plugins/pcr/src/Primer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/Primer.h b/src/plugins/pcr/src/Primer.h
index 9a72b23..2c1ae0c 100644
--- a/src/plugins/pcr/src/Primer.h
+++ b/src/plugins/pcr/src/Primer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerDimersFinder.cpp b/src/plugins/pcr/src/PrimerDimersFinder.cpp
index 913be47..a629a70 100644
--- a/src/plugins/pcr/src/PrimerDimersFinder.cpp
+++ b/src/plugins/pcr/src/PrimerDimersFinder.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerDimersFinder.h b/src/plugins/pcr/src/PrimerDimersFinder.h
index beff16d..cf98f33 100644
--- a/src/plugins/pcr/src/PrimerDimersFinder.h
+++ b/src/plugins/pcr/src/PrimerDimersFinder.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerGroupBox.cpp b/src/plugins/pcr/src/PrimerGroupBox.cpp
index 8b6b0b1..1ce649e 100644
--- a/src/plugins/pcr/src/PrimerGroupBox.cpp
+++ b/src/plugins/pcr/src/PrimerGroupBox.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerGroupBox.h b/src/plugins/pcr/src/PrimerGroupBox.h
index 0431ed2..b3977e1 100644
--- a/src/plugins/pcr/src/PrimerGroupBox.h
+++ b/src/plugins/pcr/src/PrimerGroupBox.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibrary.cpp b/src/plugins/pcr/src/PrimerLibrary.cpp
index 7864a27..e8deadf 100644
--- a/src/plugins/pcr/src/PrimerLibrary.cpp
+++ b/src/plugins/pcr/src/PrimerLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibrary.h b/src/plugins/pcr/src/PrimerLibrary.h
index c5a5a42..5375db7 100644
--- a/src/plugins/pcr/src/PrimerLibrary.h
+++ b/src/plugins/pcr/src/PrimerLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp b/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
index a5769be..36e57c8 100644
--- a/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryMdiWindow.h b/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
index 604b83b..6ed4b9b 100644
--- a/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
+++ b/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibrarySelector.cpp b/src/plugins/pcr/src/PrimerLibrarySelector.cpp
index c1386d8..3c205a4 100644
--- a/src/plugins/pcr/src/PrimerLibrarySelector.cpp
+++ b/src/plugins/pcr/src/PrimerLibrarySelector.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ PrimerLibrarySelector::PrimerLibrarySelector(QWidget *parent)
{
GCOUNTER(cvar, tvar, "PrimerLibrarySelector");
setupUi(this);
- new HelpButton(this, buttonBox, "17466275");
+ new HelpButton(this, buttonBox, "17467821");
connect(primerTable, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(accept()));
connect(primerTable->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), SLOT(sl_selectionChanged()));
diff --git a/src/plugins/pcr/src/PrimerLibrarySelector.h b/src/plugins/pcr/src/PrimerLibrarySelector.h
index 2fea04d..a8386c7 100644
--- a/src/plugins/pcr/src/PrimerLibrarySelector.h
+++ b/src/plugins/pcr/src/PrimerLibrarySelector.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryTable.cpp b/src/plugins/pcr/src/PrimerLibraryTable.cpp
index 970927a..b3a4d1c 100644
--- a/src/plugins/pcr/src/PrimerLibraryTable.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryTable.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryTable.h b/src/plugins/pcr/src/PrimerLibraryTable.h
index d863213..9302f8a 100644
--- a/src/plugins/pcr/src/PrimerLibraryTable.h
+++ b/src/plugins/pcr/src/PrimerLibraryTable.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryTableController.cpp b/src/plugins/pcr/src/PrimerLibraryTableController.cpp
index ff4924c..3e273cd 100644
--- a/src/plugins/pcr/src/PrimerLibraryTableController.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryTableController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryTableController.h b/src/plugins/pcr/src/PrimerLibraryTableController.h
index bf31e01..f1a6d22 100644
--- a/src/plugins/pcr/src/PrimerLibraryTableController.h
+++ b/src/plugins/pcr/src/PrimerLibraryTableController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLibraryWidget.cpp b/src/plugins/pcr/src/PrimerLibraryWidget.cpp
index 0bc50d5..b0961f4 100644
--- a/src/plugins/pcr/src/PrimerLibraryWidget.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -52,7 +52,7 @@ PrimerLibraryWidget::PrimerLibraryWidget(QWidget *parent)
: QWidget(parent), editPrimerButton(NULL), removePrimersButton(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466277");
+ new HelpButton(this, buttonBox, "17467823");
QPushButton *newPrimerButton = buttonBox->addButton(tr("New primer"), QDialogButtonBox::ActionRole);
connect(newPrimerButton, SIGNAL(clicked()), SLOT(sl_newPrimer()));
diff --git a/src/plugins/pcr/src/PrimerLibraryWidget.h b/src/plugins/pcr/src/PrimerLibraryWidget.h
index f1b47dc..d632d98 100644
--- a/src/plugins/pcr/src/PrimerLibraryWidget.h
+++ b/src/plugins/pcr/src/PrimerLibraryWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLineEdit.cpp b/src/plugins/pcr/src/PrimerLineEdit.cpp
index a0c8c5c..1008eff 100644
--- a/src/plugins/pcr/src/PrimerLineEdit.cpp
+++ b/src/plugins/pcr/src/PrimerLineEdit.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerLineEdit.h b/src/plugins/pcr/src/PrimerLineEdit.h
index d49021b..6f91a5b 100644
--- a/src/plugins/pcr/src/PrimerLineEdit.h
+++ b/src/plugins/pcr/src/PrimerLineEdit.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerStatistics.cpp b/src/plugins/pcr/src/PrimerStatistics.cpp
index af3e300..cbd0d4b 100644
--- a/src/plugins/pcr/src/PrimerStatistics.cpp
+++ b/src/plugins/pcr/src/PrimerStatistics.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimerStatistics.h b/src/plugins/pcr/src/PrimerStatistics.h
index ad51e43..ba83600 100644
--- a/src/plugins/pcr/src/PrimerStatistics.h
+++ b/src/plugins/pcr/src/PrimerStatistics.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimersDetailsDialog.cpp b/src/plugins/pcr/src/PrimersDetailsDialog.cpp
index ff448b4..eccc32e 100644
--- a/src/plugins/pcr/src/PrimersDetailsDialog.cpp
+++ b/src/plugins/pcr/src/PrimersDetailsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ PrimersDetailsDialog::PrimersDetailsDialog(QWidget *parent, const QString &detai
{
GCOUNTER(cvar, tvar, "PrimersDetailsDialog");
setupUi(this);
- new HelpButton(this, buttonBox, "17466276");
+ new HelpButton(this, buttonBox, "17467822");
textEdit->setText(details);
}
diff --git a/src/plugins/pcr/src/PrimersDetailsDialog.h b/src/plugins/pcr/src/PrimersDetailsDialog.h
index a0d7bfc..bf3049f 100644
--- a/src/plugins/pcr/src/PrimersDetailsDialog.h
+++ b/src/plugins/pcr/src/PrimersDetailsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimersGrouperWorker.cpp b/src/plugins/pcr/src/PrimersGrouperWorker.cpp
index a85de0f..d81487c 100644
--- a/src/plugins/pcr/src/PrimersGrouperWorker.cpp
+++ b/src/plugins/pcr/src/PrimersGrouperWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/PrimersGrouperWorker.h b/src/plugins/pcr/src/PrimersGrouperWorker.h
index c25bcf1..fb70d96 100644
--- a/src/plugins/pcr/src/PrimersGrouperWorker.h
+++ b/src/plugins/pcr/src/PrimersGrouperWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/export/ExportPrimersDialog.cpp b/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
index 39b1119..d2d2157 100644
--- a/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -60,7 +60,7 @@ ExportPrimersDialog::ExportPrimersDialog(const QList<Primer> &primers) :
primers(primers)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466277");
+ new HelpButton(this, buttonBox, "17467823");
init();
connectSignals();
diff --git a/src/plugins/pcr/src/export/ExportPrimersDialog.h b/src/plugins/pcr/src/export/ExportPrimersDialog.h
index cd27437..1fe3db6 100644
--- a/src/plugins/pcr/src/export/ExportPrimersDialog.h
+++ b/src/plugins/pcr/src/export/ExportPrimersDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
index 8b6ed6d..efdbdc1 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
index 5c882fc..8d671a7 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
+++ b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
index 93d6b4d..8da167b 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
index 4423b0d..2031ef2 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
+++ b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
index e2e59bc..6437be7 100644
--- a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
index c4c3201..25ad7aa 100644
--- a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersDialog.cpp b/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
index 3aa584a..3097313 100644
--- a/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ ImportPrimersDialog::ImportPrimersDialog(QWidget *parent) :
waitForConnection(false)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466277");
+ new HelpButton(this, buttonBox, "17467823");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Import"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
init();
diff --git a/src/plugins/pcr/src/import/ImportPrimersDialog.h b/src/plugins/pcr/src/import/ImportPrimersDialog.h
index 2188c34..fda0866 100644
--- a/src/plugins/pcr/src/import/ImportPrimersDialog.h
+++ b/src/plugins/pcr/src/import/ImportPrimersDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
index 5d4a1f1..8d1075e 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
index 1d2fd05..a8f46b5 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
index a7f55b6..041c936 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
index 1539df3..10596f2 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp b/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
index 43c7e15..a08a997 100644
--- a/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/pcr/src/import/ImportPrimersMultiTask.h b/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
index f26867e..c810b1b 100644
--- a/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp b/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
index f4b17f3..1f83443 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
+++ b/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/perf_monitor/src/PerfMonitorPlugin.h b/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
index 69f3f51..f7284e7 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
+++ b/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/perf_monitor/src/PerfMonitorView.cpp b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
index 6d2b484..5fe82e8 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorView.cpp
+++ b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/perf_monitor/src/PerfMonitorView.h b/src/plugins/perf_monitor/src/PerfMonitorView.h
index 31cc34e..b72dcd0 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorView.h
+++ b/src/plugins/perf_monitor/src/PerfMonitorView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDDocument.cpp b/src/plugins/query_designer/src/QDDocument.cpp
index 84d4ea8..676aacf 100644
--- a/src/plugins/query_designer/src/QDDocument.cpp
+++ b/src/plugins/query_designer/src/QDDocument.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDDocument.h b/src/plugins/query_designer/src/QDDocument.h
index 6316e83..785a8b3 100644
--- a/src/plugins/query_designer/src/QDDocument.h
+++ b/src/plugins/query_designer/src/QDDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDDocumentFormat.cpp b/src/plugins/query_designer/src/QDDocumentFormat.cpp
index 7fd7f14..9b99b3f 100644
--- a/src/plugins/query_designer/src/QDDocumentFormat.cpp
+++ b/src/plugins/query_designer/src/QDDocumentFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDDocumentFormat.h b/src/plugins/query_designer/src/QDDocumentFormat.h
index c739794..3e8652c 100644
--- a/src/plugins/query_designer/src/QDDocumentFormat.h
+++ b/src/plugins/query_designer/src/QDDocumentFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDGroupsEditor.cpp b/src/plugins/query_designer/src/QDGroupsEditor.cpp
index e141b68..d34b6e6 100644
--- a/src/plugins/query_designer/src/QDGroupsEditor.cpp
+++ b/src/plugins/query_designer/src/QDGroupsEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDGroupsEditor.h b/src/plugins/query_designer/src/QDGroupsEditor.h
index a45eb94..4f2f83f 100644
--- a/src/plugins/query_designer/src/QDGroupsEditor.h
+++ b/src/plugins/query_designer/src/QDGroupsEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDRunDialog.cpp b/src/plugins/query_designer/src/QDRunDialog.cpp
index ce42c89..cf44675 100644
--- a/src/plugins/query_designer/src/QDRunDialog.cpp
+++ b/src/plugins/query_designer/src/QDRunDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -73,7 +73,7 @@ namespace U2 {
QDRunDialog::QDRunDialog(QDScheme* _scheme, QWidget* parent, const QString& defaultIn, const QString& defaultOut)
: QDialog(parent), scheme(_scheme) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465892");
+ new HelpButton(this, buttonBox, "17467440");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -292,7 +292,7 @@ QList<Task*> QDRunDialogTask::onSubTaskFinished(Task* subTask) {
QDDialog::QDDialog(ADVSequenceObjectContext* _ctx)
: QDialog(_ctx->getAnnotatedDNAView()->getWidget()), ctx(_ctx), scheme(NULL), txtDoc(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465893");
+ new HelpButton(this, buttonBox, "17467441");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/query_designer/src/QDRunDialog.h b/src/plugins/query_designer/src/QDRunDialog.h
index 0605f7b..4e43739 100644
--- a/src/plugins/query_designer/src/QDRunDialog.h
+++ b/src/plugins/query_designer/src/QDRunDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDSamples.cpp b/src/plugins/query_designer/src/QDSamples.cpp
index 289ed37..0503014 100644
--- a/src/plugins/query_designer/src/QDSamples.cpp
+++ b/src/plugins/query_designer/src/QDSamples.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDSamples.h b/src/plugins/query_designer/src/QDSamples.h
index e93edc3..d689afb 100644
--- a/src/plugins/query_designer/src/QDSamples.h
+++ b/src/plugins/query_designer/src/QDSamples.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDSceneIOTasks.cpp b/src/plugins/query_designer/src/QDSceneIOTasks.cpp
index 3eebb36..7df3f84 100644
--- a/src/plugins/query_designer/src/QDSceneIOTasks.cpp
+++ b/src/plugins/query_designer/src/QDSceneIOTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDSceneIOTasks.h b/src/plugins/query_designer/src/QDSceneIOTasks.h
index c2f06ae..77a6d79 100644
--- a/src/plugins/query_designer/src/QDSceneIOTasks.h
+++ b/src/plugins/query_designer/src/QDSceneIOTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDTests.cpp b/src/plugins/query_designer/src/QDTests.cpp
index acecd9a..fa353ec 100644
--- a/src/plugins/query_designer/src/QDTests.cpp
+++ b/src/plugins/query_designer/src/QDTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDTests.h b/src/plugins/query_designer/src/QDTests.h
index b3f8f63..36d3d5d 100644
--- a/src/plugins/query_designer/src/QDTests.h
+++ b/src/plugins/query_designer/src/QDTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDWorker.cpp b/src/plugins/query_designer/src/QDWorker.cpp
index 8dc871e..82878b5 100644
--- a/src/plugins/query_designer/src/QDWorker.cpp
+++ b/src/plugins/query_designer/src/QDWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QDWorker.h b/src/plugins/query_designer/src/QDWorker.h
index 90950d8..4932634 100644
--- a/src/plugins/query_designer/src/QDWorker.h
+++ b/src/plugins/query_designer/src/QDWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryDesignerPlugin.cpp b/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
index a06d2dc..ed9a371 100644
--- a/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
+++ b/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryDesignerPlugin.h b/src/plugins/query_designer/src/QueryDesignerPlugin.h
index 5f933d3..2b20346 100644
--- a/src/plugins/query_designer/src/QueryDesignerPlugin.h
+++ b/src/plugins/query_designer/src/QueryDesignerPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryEditor.cpp b/src/plugins/query_designer/src/QueryEditor.cpp
index 5b26779..20cf438 100644
--- a/src/plugins/query_designer/src/QueryEditor.cpp
+++ b/src/plugins/query_designer/src/QueryEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryEditor.h b/src/plugins/query_designer/src/QueryEditor.h
index ada984c..05e17a4 100644
--- a/src/plugins/query_designer/src/QueryEditor.h
+++ b/src/plugins/query_designer/src/QueryEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryPalette.cpp b/src/plugins/query_designer/src/QueryPalette.cpp
index 9bbc921..ff3a266 100644
--- a/src/plugins/query_designer/src/QueryPalette.cpp
+++ b/src/plugins/query_designer/src/QueryPalette.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryPalette.h b/src/plugins/query_designer/src/QueryPalette.h
index 2a30d22..55b707e 100644
--- a/src/plugins/query_designer/src/QueryPalette.h
+++ b/src/plugins/query_designer/src/QueryPalette.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryProcCfgDelegate.h b/src/plugins/query_designer/src/QueryProcCfgDelegate.h
index 666e1f9..cf73125 100644
--- a/src/plugins/query_designer/src/QueryProcCfgDelegate.h
+++ b/src/plugins/query_designer/src/QueryProcCfgDelegate.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryProcCfgModel.h b/src/plugins/query_designer/src/QueryProcCfgModel.h
index 15a233a..11c8cad 100644
--- a/src/plugins/query_designer/src/QueryProcCfgModel.h
+++ b/src/plugins/query_designer/src/QueryProcCfgModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryViewAdapter.cpp b/src/plugins/query_designer/src/QueryViewAdapter.cpp
index 9106c31..7ee6c94 100644
--- a/src/plugins/query_designer/src/QueryViewAdapter.cpp
+++ b/src/plugins/query_designer/src/QueryViewAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryViewAdapter.h b/src/plugins/query_designer/src/QueryViewAdapter.h
index 58fe323..ed1e4b9 100644
--- a/src/plugins/query_designer/src/QueryViewAdapter.h
+++ b/src/plugins/query_designer/src/QueryViewAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryViewController.cpp b/src/plugins/query_designer/src/QueryViewController.cpp
index 81cf67b..b22bd7a 100644
--- a/src/plugins/query_designer/src/QueryViewController.cpp
+++ b/src/plugins/query_designer/src/QueryViewController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -1147,7 +1147,7 @@ AddConstraintDialog::AddConstraintDialog(QueryScene* _scene, QDDistanceType _kin
QDElement* defSrc, QDElement* defDst)
: scene(_scene), kind(_kind) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465877");
+ new HelpButton(this, buttonBox, "17467425");
QString title = "Add %1 Constraint";
switch (kind)
diff --git a/src/plugins/query_designer/src/QueryViewController.h b/src/plugins/query_designer/src/QueryViewController.h
index a3ffc90..539e0bf 100644
--- a/src/plugins/query_designer/src/QueryViewController.h
+++ b/src/plugins/query_designer/src/QueryViewController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryViewItems.cpp b/src/plugins/query_designer/src/QueryViewItems.cpp
index 34312c4..1b38c41 100644
--- a/src/plugins/query_designer/src/QueryViewItems.cpp
+++ b/src/plugins/query_designer/src/QueryViewItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/QueryViewItems.h b/src/plugins/query_designer/src/QueryViewItems.h
index c57cc5f..0fca7ff 100644
--- a/src/plugins/query_designer/src/QueryViewItems.h
+++ b/src/plugins/query_designer/src/QueryViewItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDFindActor.cpp b/src/plugins/query_designer/src/library/QDFindActor.cpp
index f5e0720..9af4b3c 100644
--- a/src/plugins/query_designer/src/library/QDFindActor.cpp
+++ b/src/plugins/query_designer/src/library/QDFindActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDFindActor.h b/src/plugins/query_designer/src/library/QDFindActor.h
index 3d5d740..362ac06 100644
--- a/src/plugins/query_designer/src/library/QDFindActor.h
+++ b/src/plugins/query_designer/src/library/QDFindActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
index c60c224..e52ad1e 100644
--- a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
+++ b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
index 0fed8f7..82732ce 100644
--- a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
+++ b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDGcContentActor.cpp b/src/plugins/query_designer/src/library/QDGcContentActor.cpp
index dea865a..8506445 100644
--- a/src/plugins/query_designer/src/library/QDGcContentActor.cpp
+++ b/src/plugins/query_designer/src/library/QDGcContentActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/query_designer/src/library/QDGcContentActor.h b/src/plugins/query_designer/src/library/QDGcContentActor.h
index 7366614..8166ec8 100644
--- a/src/plugins/query_designer/src/library/QDGcContentActor.h
+++ b/src/plugins/query_designer/src/library/QDGcContentActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/BlastQuery.cpp b/src/plugins/remote_blast/src/BlastQuery.cpp
index ebb51b6..80aace6 100644
--- a/src/plugins/remote_blast/src/BlastQuery.cpp
+++ b/src/plugins/remote_blast/src/BlastQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/BlastQuery.h b/src/plugins/remote_blast/src/BlastQuery.h
index d02e1ab..154c110 100644
--- a/src/plugins/remote_blast/src/BlastQuery.h
+++ b/src/plugins/remote_blast/src/BlastQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/DBRequestFactory.h b/src/plugins/remote_blast/src/DBRequestFactory.h
index f2d0813..e4c80e3 100644
--- a/src/plugins/remote_blast/src/DBRequestFactory.h
+++ b/src/plugins/remote_blast/src/DBRequestFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/HttpRequest.h b/src/plugins/remote_blast/src/HttpRequest.h
index 3f4a19f..334629c 100644
--- a/src/plugins/remote_blast/src/HttpRequest.h
+++ b/src/plugins/remote_blast/src/HttpRequest.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/HttpRequestBLAST.cpp b/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
index 9eb465c..7a9f1ea 100644
--- a/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
+++ b/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp b/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
index 3160382..47d028a 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTConsts.h b/src/plugins/remote_blast/src/RemoteBLASTConsts.h
index 3c3066f..e864284 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTConsts.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTConsts.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp b/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
index 41d35cd..81c395d 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTPlugin.h b/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
index a8654c3..a37b74a 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
index 98c3265..2423fc5 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
index fc6fb18..c2e4666 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTTask.cpp b/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
index 1819094..dde17b3 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTTask.h b/src/plugins/remote_blast/src/RemoteBLASTTask.h
index f52582d..09818d9 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTTask.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp b/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
index 3ec40bb..2045f28 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/RemoteBLASTWorker.h b/src/plugins/remote_blast/src/RemoteBLASTWorker.h
index fe56ef8..7dd175a 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTWorker.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/src/SendSelectionDialog.cpp b/src/plugins/remote_blast/src/SendSelectionDialog.cpp
index 32f0c87..97b2b23 100644
--- a/src/plugins/remote_blast/src/SendSelectionDialog.cpp
+++ b/src/plugins/remote_blast/src/SendSelectionDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -137,7 +137,7 @@ SendSelectionDialog::SendSelectionDialog(const U2SequenceObject* dnaso, bool _is
ca_m.sequenceLen = dnaso->getSequenceLength();
ca_c = new CreateAnnotationWidgetController(ca_m, this);
setupUi(this);
- new HelpButton(this, buttonBox, "17466179");
+ new HelpButton(this, buttonBox, "17467726");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/remote_blast/src/SendSelectionDialog.h b/src/plugins/remote_blast/src/SendSelectionDialog.h
index f055bd2..535c078 100644
--- a/src/plugins/remote_blast/src/SendSelectionDialog.h
+++ b/src/plugins/remote_blast/src/SendSelectionDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_blast/transl/english.ts b/src/plugins/remote_blast/transl/english.ts
index 89e236d..15fe948 100644
--- a/src/plugins/remote_blast/transl/english.ts
+++ b/src/plugins/remote_blast/transl/english.ts
@@ -14,7 +14,7 @@
<translation>Cannot load a page. %1</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="96"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="95"/>
<source>Cannot get the request ID</source>
<translation>Cannot get the request ID</translation>
</message>
@@ -24,49 +24,49 @@
<translation>Cannot get the waiting time</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="127"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="129"/>
<source>The response is empty</source>
<translation>The response is empty</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="144"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="146"/>
<source>Database couldn't prepare the response. You can increase timeout and perform search again.</source>
<translation>Database couldn't prepare the response. You can increase timeout and perform search again.</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="149"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="151"/>
<source>CPU usage limit in BLAST was exceeded, probably query sequence is too large</source>
<translation>CPU usage limit in BLAST was exceeded, probably query sequence is too large</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="167"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="169"/>
<source>Cannot read the response</source>
<translation>Cannot read the response</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="235"/>
- <location filename="../src/HttpRequestBLAST.cpp" line="243"/>
- <location filename="../src/HttpRequestBLAST.cpp" line="261"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="237"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="245"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="263"/>
<source>Cannot get the location</source>
<translation>Cannot get the location</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="272"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="274"/>
<source>Cannot get the identity</source>
<translation>Cannot get the identity</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="280"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="282"/>
<source>Cannot evaluate the gaps</source>
<translation>Cannot evaluate the gaps</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="288"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="290"/>
<source>Cannot get the alignment length</source>
<translation>Cannot get the alignment length</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="302"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="304"/>
<source>Cannot evaluate the location</source>
<translation>Cannot evaluate the location</translation>
</message>
@@ -894,7 +894,7 @@ p, li { white-space: pre-wrap; }
<translation>Cannot create an annotation object. Please check settings</translation>
</message>
<message>
- <location filename="../src/SendSelectionDialog.cpp" line="400"/>
+ <location filename="../src/SendSelectionDialog.cpp" line="402"/>
<source>You chose to search nucleotide sequence in protein database. This sequence will be converted into 6 sequences(3 translations for both strands).Therefore this search may take some time. Continue?</source>
<translation>You chose to search nucleotide sequence in protein database. This sequence will be converted into 6 sequences(3 translations for both strands).Therefore this search may take some time. Continue?</translation>
</message>
diff --git a/src/plugins/remote_blast/transl/russian.ts b/src/plugins/remote_blast/transl/russian.ts
index 9380c7c..c47e1a2 100644
--- a/src/plugins/remote_blast/transl/russian.ts
+++ b/src/plugins/remote_blast/transl/russian.ts
@@ -9,7 +9,7 @@
<translation>Неудалось открыть адаптер</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="96"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="95"/>
<source>Cannot get the request ID</source>
<translation>Не удалось получить ID для поиска</translation>
</message>
@@ -19,7 +19,7 @@
<translation>Не удалось получить время ожидания</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="127"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="129"/>
<source>The response is empty</source>
<translation>Пустой ответ</translation>
</message>
@@ -29,44 +29,44 @@
<translation>Не удалось загрузить страницу. %1</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="144"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="146"/>
<source>Database couldn't prepare the response. You can increase timeout and perform search again.</source>
<translation>База данных не готова для запроса. Вы можете увеличить таймаут и запустить снова.</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="149"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="151"/>
<source>CPU usage limit in BLAST was exceeded, probably query sequence is too large</source>
<translation>Был превышен предел использования CPU в BLAST, вероятно, последовательность слишком большая</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="167"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="169"/>
<source>Cannot read the response</source>
<translation>Не удалось прочитать ответ</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="235"/>
- <location filename="../src/HttpRequestBLAST.cpp" line="243"/>
- <location filename="../src/HttpRequestBLAST.cpp" line="261"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="237"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="245"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="263"/>
<source>Cannot get the location</source>
<translation>Не удалось получитьь локацию</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="272"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="274"/>
<source>Cannot get the identity</source>
<translation>Не удалось получить идентификатор последовательности</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="280"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="282"/>
<source>Cannot evaluate the gaps</source>
- <translation>Не удалось вычислить пропуски</translation>
+ <translation>Не удалось вычислить пробелы</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="288"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="290"/>
<source>Cannot get the alignment length</source>
<translation>Не удалось получить длину выравнивания</translation>
</message>
<message>
- <location filename="../src/HttpRequestBLAST.cpp" line="302"/>
+ <location filename="../src/HttpRequestBLAST.cpp" line="304"/>
<source>Cannot evaluate the location</source>
<translation>Не удалось вычислить локацию</translation>
</message>
@@ -269,7 +269,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/RemoteBLASTDialog.ui" line="459"/>
<source>Gap costs</source>
- <translation>Вес пропуска</translation>
+ <translation>Вес пробела</translation>
</message>
<message>
<location filename="../src/ui/RemoteBLASTDialog.ui" line="476"/>
@@ -649,12 +649,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/RemoteBLASTWorker.cpp" line="85"/>
<source>Gap costs</source>
- <translation>Вес пропуска</translation>
+ <translation>Вес пробела</translation>
</message>
<message>
<location filename="../src/RemoteBLASTWorker.cpp" line="86"/>
<source>Cost to create and extend a gap in an alignment.</source>
- <translation>Стоимость создания и расширения пропуска.</translation>
+ <translation>Стоимость создания и расширения пробела.</translation>
</message>
<message>
<location filename="../src/RemoteBLASTWorker.cpp" line="87"/>
@@ -894,7 +894,7 @@ p, li { white-space: pre-wrap; }
<translation>Невозможно создать аннотацию. Проверьте настройки</translation>
</message>
<message>
- <location filename="../src/SendSelectionDialog.cpp" line="400"/>
+ <location filename="../src/SendSelectionDialog.cpp" line="402"/>
<source>You chose to search nucleotide sequence in protein database. This sequence will be converted into 6 sequences(3 translations for both strands).Therefore this search may take some time. Continue?</source>
<translation>Вы выбрали поиск нуклеотидной последовательности в протеиновой базе данных. Эта последовательность будет сконвертирована в 6 последовательностей(3 трансляции для обоих направлений).Этот поиск может занять некоторое время. Продолжить?</translation>
</message>
diff --git a/src/plugins/remote_service/src/Base64File.cpp b/src/plugins/remote_service/src/Base64File.cpp
index a9142cc..be87906 100644
--- a/src/plugins/remote_service/src/Base64File.cpp
+++ b/src/plugins/remote_service/src/Base64File.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/Base64File.h b/src/plugins/remote_service/src/Base64File.h
index cbbb08d..85b3abe 100644
--- a/src/plugins/remote_service/src/Base64File.h
+++ b/src/plugins/remote_service/src/Base64File.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/BufferedDataReader.cpp b/src/plugins/remote_service/src/BufferedDataReader.cpp
index 2c425e5..721b50c 100644
--- a/src/plugins/remote_service/src/BufferedDataReader.cpp
+++ b/src/plugins/remote_service/src/BufferedDataReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/BufferedDataReader.h b/src/plugins/remote_service/src/BufferedDataReader.h
index 4a790dd..31736c6 100644
--- a/src/plugins/remote_service/src/BufferedDataReader.h
+++ b/src/plugins/remote_service/src/BufferedDataReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceMachine.cpp b/src/plugins/remote_service/src/RemoteServiceMachine.cpp
index b5ba935..ecf37ec 100644
--- a/src/plugins/remote_service/src/RemoteServiceMachine.cpp
+++ b/src/plugins/remote_service/src/RemoteServiceMachine.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceMachine.h b/src/plugins/remote_service/src/RemoteServiceMachine.h
index 7017f2d..5ad0b6e 100644
--- a/src/plugins/remote_service/src/RemoteServiceMachine.h
+++ b/src/plugins/remote_service/src/RemoteServiceMachine.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServicePingTask.cpp b/src/plugins/remote_service/src/RemoteServicePingTask.cpp
index 6c2419e..f57fadf 100644
--- a/src/plugins/remote_service/src/RemoteServicePingTask.cpp
+++ b/src/plugins/remote_service/src/RemoteServicePingTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServicePingTask.h b/src/plugins/remote_service/src/RemoteServicePingTask.h
index 9033a1e..205861e 100644
--- a/src/plugins/remote_service/src/RemoteServicePingTask.h
+++ b/src/plugins/remote_service/src/RemoteServicePingTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServicePlugin.cpp b/src/plugins/remote_service/src/RemoteServicePlugin.cpp
index 163f872..436b0a4 100644
--- a/src/plugins/remote_service/src/RemoteServicePlugin.cpp
+++ b/src/plugins/remote_service/src/RemoteServicePlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServicePlugin.h b/src/plugins/remote_service/src/RemoteServicePlugin.h
index b1abab6..3901749 100644
--- a/src/plugins/remote_service/src/RemoteServicePlugin.h
+++ b/src/plugins/remote_service/src/RemoteServicePlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceSettingsUI.cpp b/src/plugins/remote_service/src/RemoteServiceSettingsUI.cpp
index 9eb6e89..fedea36 100644
--- a/src/plugins/remote_service/src/RemoteServiceSettingsUI.cpp
+++ b/src/plugins/remote_service/src/RemoteServiceSettingsUI.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceSettingsUI.h b/src/plugins/remote_service/src/RemoteServiceSettingsUI.h
index 7a35953..9c1e52a 100644
--- a/src/plugins/remote_service/src/RemoteServiceSettingsUI.h
+++ b/src/plugins/remote_service/src/RemoteServiceSettingsUI.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceUtilTasks.cpp b/src/plugins/remote_service/src/RemoteServiceUtilTasks.cpp
index e02df6f..8fa2649 100644
--- a/src/plugins/remote_service/src/RemoteServiceUtilTasks.cpp
+++ b/src/plugins/remote_service/src/RemoteServiceUtilTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteServiceUtilTasks.h b/src/plugins/remote_service/src/RemoteServiceUtilTasks.h
index 14a516a..f411679 100644
--- a/src/plugins/remote_service/src/RemoteServiceUtilTasks.h
+++ b/src/plugins/remote_service/src/RemoteServiceUtilTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/RemoteTasksDialog.cpp b/src/plugins/remote_service/src/RemoteTasksDialog.cpp
index 42a9370..5010d08 100644
--- a/src/plugins/remote_service/src/RemoteTasksDialog.cpp
+++ b/src/plugins/remote_service/src/RemoteTasksDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ RemoteTasksDialog::RemoteTasksDialog(const RemoteServiceSettingsPtr& settings,QW
refresh();
updateState();
- new HelpButton(this, buttonBox, "17465925");
+ new HelpButton(this, buttonBox, "17467472");
}
diff --git a/src/plugins/remote_service/src/RemoteTasksDialog.h b/src/plugins/remote_service/src/RemoteTasksDialog.h
index 0ee4f18..a294eed 100644
--- a/src/plugins/remote_service/src/RemoteTasksDialog.h
+++ b/src/plugins/remote_service/src/RemoteTasksDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/UctpRequestBuilders.cpp b/src/plugins/remote_service/src/UctpRequestBuilders.cpp
index 02b8e05..3fbcff6 100644
--- a/src/plugins/remote_service/src/UctpRequestBuilders.cpp
+++ b/src/plugins/remote_service/src/UctpRequestBuilders.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/UctpRequestBuilders.h b/src/plugins/remote_service/src/UctpRequestBuilders.h
index c11a89a..c2da85b 100644
--- a/src/plugins/remote_service/src/UctpRequestBuilders.h
+++ b/src/plugins/remote_service/src/UctpRequestBuilders.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/WebTransportProtocol.cpp b/src/plugins/remote_service/src/WebTransportProtocol.cpp
index 9934b7e..24ecbb8 100644
--- a/src/plugins/remote_service/src/WebTransportProtocol.cpp
+++ b/src/plugins/remote_service/src/WebTransportProtocol.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/WebTransportProtocol.h b/src/plugins/remote_service/src/WebTransportProtocol.h
index ae0d8da..4127557 100644
--- a/src/plugins/remote_service/src/WebTransportProtocol.h
+++ b/src/plugins/remote_service/src/WebTransportProtocol.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/base64/cdecode.c b/src/plugins/remote_service/src/base64/cdecode.c
index e9bf369..73cf7fc 100644
--- a/src/plugins/remote_service/src/base64/cdecode.c
+++ b/src/plugins/remote_service/src/base64/cdecode.c
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/remote_service/src/base64/cencode.c b/src/plugins/remote_service/src/base64/cencode.c
index 0dd3a9b..0b3a58d 100644
--- a/src/plugins/remote_service/src/base64/cencode.c
+++ b/src/plugins/remote_service/src/base64/cencode.c
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp b/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
index 406379a..7b7b684 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
+++ b/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -32,6 +32,7 @@
#include <U2Core/GenbankFeatures.h>
#include <U2Core/L10n.h>
#include <U2Core/Settings.h>
+#include <U2Core/TaskWatchdog.h>
#include <U2Core/U2OpStatusUtils.h>
#include <U2Core/U2SafePoints.h>
@@ -77,7 +78,7 @@ FindRepeatsDialog::FindRepeatsDialog(ADVSequenceObjectContext* _sc)
{
sc = _sc;
setupUi(this);
- new HelpButton(this, buttonBox, "17466183");
+ new HelpButton(this, buttonBox, "17467730");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -300,6 +301,7 @@ void FindRepeatsDialog::accept() {
FindRepeatsToAnnotationsTask* t = new FindRepeatsToAnnotationsTask(settings, seqPart,
cam.data->name, cam.groupName, cam.description, cam.annotationObjectRef);
+ TaskWatchdog::trackResourceExistence(sc->getSequenceObject(), t, tr("A problem occurred during finding repeats. The sequence is no more available."));
AppContext::getTaskScheduler()->registerTopLevelTask(t);
diff --git a/src/plugins/repeat_finder/src/FindRepeatsDialog.h b/src/plugins/repeat_finder/src/FindRepeatsDialog.h
index d7d8d1d..b73fbd8 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsDialog.h
+++ b/src/plugins/repeat_finder/src/FindRepeatsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/FindRepeatsTask.cpp b/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
index d175f12..82ffa79 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
+++ b/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/FindRepeatsTask.h b/src/plugins/repeat_finder/src/FindRepeatsTask.h
index 8c6217f..ff3e54e 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsTask.h
+++ b/src/plugins/repeat_finder/src/FindRepeatsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/FindTandemsDialog.cpp b/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
index f5e1047..8a80463 100644
--- a/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
+++ b/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -64,7 +64,7 @@ FindTandemsDialog::FindTandemsDialog(ADVSequenceObjectContext* _sc)
{
sc = _sc;
setupUi(this);
- new HelpButton(this, buttonBox, "17466184");
+ new HelpButton(this, buttonBox, "17467731");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/repeat_finder/src/FindTandemsDialog.h b/src/plugins/repeat_finder/src/FindTandemsDialog.h
index 34c0482..e14472e 100644
--- a/src/plugins/repeat_finder/src/FindTandemsDialog.h
+++ b/src/plugins/repeat_finder/src/FindTandemsDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFBase.cpp b/src/plugins/repeat_finder/src/RFBase.cpp
index 457a9c5..1873469 100644
--- a/src/plugins/repeat_finder/src/RFBase.cpp
+++ b/src/plugins/repeat_finder/src/RFBase.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFBase.h b/src/plugins/repeat_finder/src/RFBase.h
index d7ce7d6..8497af4 100644
--- a/src/plugins/repeat_finder/src/RFBase.h
+++ b/src/plugins/repeat_finder/src/RFBase.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFConstants.h b/src/plugins/repeat_finder/src/RFConstants.h
index f674687..a5cf117 100644
--- a/src/plugins/repeat_finder/src/RFConstants.h
+++ b/src/plugins/repeat_finder/src/RFConstants.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFDiagonal.cpp b/src/plugins/repeat_finder/src/RFDiagonal.cpp
index 8b8beb8..1a7c169 100644
--- a/src/plugins/repeat_finder/src/RFDiagonal.cpp
+++ b/src/plugins/repeat_finder/src/RFDiagonal.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFDiagonal.h b/src/plugins/repeat_finder/src/RFDiagonal.h
index fc49770..79e3405 100644
--- a/src/plugins/repeat_finder/src/RFDiagonal.h
+++ b/src/plugins/repeat_finder/src/RFDiagonal.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFSArray.cpp b/src/plugins/repeat_finder/src/RFSArray.cpp
index 7bea38f..db83e48 100644
--- a/src/plugins/repeat_finder/src/RFSArray.cpp
+++ b/src/plugins/repeat_finder/src/RFSArray.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFSArray.h b/src/plugins/repeat_finder/src/RFSArray.h
index 8ca743d..29041b3 100644
--- a/src/plugins/repeat_finder/src/RFSArray.h
+++ b/src/plugins/repeat_finder/src/RFSArray.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFSArrayWK.cpp b/src/plugins/repeat_finder/src/RFSArrayWK.cpp
index e07d1b4..b9a34ed 100644
--- a/src/plugins/repeat_finder/src/RFSArrayWK.cpp
+++ b/src/plugins/repeat_finder/src/RFSArrayWK.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFSArrayWK.h b/src/plugins/repeat_finder/src/RFSArrayWK.h
index 0e29367..188654a 100644
--- a/src/plugins/repeat_finder/src/RFSArrayWK.h
+++ b/src/plugins/repeat_finder/src/RFSArrayWK.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFTaskFactory.cpp b/src/plugins/repeat_finder/src/RFTaskFactory.cpp
index dd6511e..7902ba7 100644
--- a/src/plugins/repeat_finder/src/RFTaskFactory.cpp
+++ b/src/plugins/repeat_finder/src/RFTaskFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RFTaskFactory.h b/src/plugins/repeat_finder/src/RFTaskFactory.h
index fd20581..ccdaa57 100644
--- a/src/plugins/repeat_finder/src/RFTaskFactory.h
+++ b/src/plugins/repeat_finder/src/RFTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RF_BitMask.h b/src/plugins/repeat_finder/src/RF_BitMask.h
index 565a03b..4b06fb2 100644
--- a/src/plugins/repeat_finder/src/RF_BitMask.h
+++ b/src/plugins/repeat_finder/src/RF_BitMask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
index ea4d6f5..cc83754 100644
--- a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
+++ b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
index 599354c..ad18925 100644
--- a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
+++ b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RF_SuffixArray.cpp b/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
index f0dcbe0..4b9d888 100644
--- a/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
+++ b/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RF_SuffixArray.h b/src/plugins/repeat_finder/src/RF_SuffixArray.h
index be8f2b0..d62247f 100644
--- a/src/plugins/repeat_finder/src/RF_SuffixArray.h
+++ b/src/plugins/repeat_finder/src/RF_SuffixArray.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp b/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
index b35e747..13c1c86 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
+++ b/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatFinderPlugin.h b/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
index 94f2234..af8ab6b 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
+++ b/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatFinderTests.cpp b/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
index 8f1a4dd..de48d39 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
+++ b/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatFinderTests.h b/src/plugins/repeat_finder/src/RepeatFinderTests.h
index e1b4970..eba0672 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderTests.h
+++ b/src/plugins/repeat_finder/src/RepeatFinderTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatQuery.cpp b/src/plugins/repeat_finder/src/RepeatQuery.cpp
index a24ff76..c02ea1a 100644
--- a/src/plugins/repeat_finder/src/RepeatQuery.cpp
+++ b/src/plugins/repeat_finder/src/RepeatQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatQuery.h b/src/plugins/repeat_finder/src/RepeatQuery.h
index dbdc6d4..92f32da 100644
--- a/src/plugins/repeat_finder/src/RepeatQuery.h
+++ b/src/plugins/repeat_finder/src/RepeatQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatWorker.cpp b/src/plugins/repeat_finder/src/RepeatWorker.cpp
index e5b50c8..d6963dc 100644
--- a/src/plugins/repeat_finder/src/RepeatWorker.cpp
+++ b/src/plugins/repeat_finder/src/RepeatWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/RepeatWorker.h b/src/plugins/repeat_finder/src/RepeatWorker.h
index 7fd0695..a011ad9 100644
--- a/src/plugins/repeat_finder/src/RepeatWorker.h
+++ b/src/plugins/repeat_finder/src/RepeatWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/TandemQuery.cpp b/src/plugins/repeat_finder/src/TandemQuery.cpp
index ddf3e8e..a66ac75 100644
--- a/src/plugins/repeat_finder/src/TandemQuery.cpp
+++ b/src/plugins/repeat_finder/src/TandemQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/src/TandemQuery.h b/src/plugins/repeat_finder/src/TandemQuery.h
index 6cb12ab..97ef1ea 100644
--- a/src/plugins/repeat_finder/src/TandemQuery.h
+++ b/src/plugins/repeat_finder/src/TandemQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/repeat_finder/transl/english.ts b/src/plugins/repeat_finder/transl/english.ts
index 0341055..350bf46 100644
--- a/src/plugins/repeat_finder/transl/english.ts
+++ b/src/plugins/repeat_finder/transl/english.ts
@@ -228,83 +228,88 @@
<context>
<name>U2::FindRepeatsDialog</name>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="82"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="83"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="83"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="84"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="102"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="103"/>
<source>Auto</source>
<translation>Auto</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="103"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="104"/>
<source>Suffix index</source>
<translation>Suffix index</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="104"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="105"/>
<source>Diagonals</source>
<translation>Diagonals</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="106"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="107"/>
<source>Disjoint repeats</source>
<translation>Disjoint repeats</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="107"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="108"/>
<source>No filtering</source>
<translation>No filtering</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="108"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="109"/>
<source>Unique repeats</source>
<translation>Unique repeats</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="279"/>
- <location filename="../src/FindRepeatsDialog.cpp" line="286"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="280"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="287"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="223"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="224"/>
<source>No annotations found: %1</source>
<translation>No annotations found: %1</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="279"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="280"/>
<source>Not enough memory error ocurred while preparing data. Try to set smaller region.</source>
<translation>Not enough memory error ocurred while preparing data. Try to set smaller region.</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="286"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="287"/>
<source>Cannot create an annotation object. Please check settings</source>
<translation>Cannot create an annotation object. Please check settings</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="294"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="295"/>
<source>Warning</source>
<translation>Warning</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="295"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="296"/>
<source>Search with given identity %1% and length more then 80m bps can take very long time. Approximate repeat searching time for 80m bp with 95% identity is 40 minutes on Intel Core 2 Quad Q9500. Do you want to continue?</source>
<translation>Search with given identity %1% and length more then 80m bps can take very long time. Approximate repeat searching time for 80m bp with 95% identity is 40 minutes on Intel Core 2 Quad Q9500. Do you want to continue?</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="381"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="304"/>
+ <source>A problem occurred during finding repeats. The sequence is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindRepeatsDialog.cpp" line="383"/>
<source>Estimated repeats count: %1</source>
<translation>Estimated repeats count: %1</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="382"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="384"/>
<source>Estimated repeats count hint is based on the active settings and random sequence model</source>
<translation>Estimated repeats count hint is based on the active settings and random sequence model</translation>
</message>
diff --git a/src/plugins/repeat_finder/transl/russian.ts b/src/plugins/repeat_finder/transl/russian.ts
index 41bdc9c..029ec37 100644
--- a/src/plugins/repeat_finder/transl/russian.ts
+++ b/src/plugins/repeat_finder/transl/russian.ts
@@ -228,83 +228,88 @@
<context>
<name>U2::FindRepeatsDialog</name>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="82"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="83"/>
<source>Start</source>
<translation>Искать</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="83"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="84"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="102"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="103"/>
<source>Auto</source>
<translation>Автовыбор</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="103"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="104"/>
<source>Suffix index</source>
<translation>Суффиксный индекс</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="104"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="105"/>
<source>Diagonals</source>
<translation>Диагональный</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="106"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="107"/>
<source>Disjoint repeats</source>
<translation>Непересекающиеся повторы</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="107"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="108"/>
<source>No filtering</source>
<translation>Без фильтрации</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="108"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="109"/>
<source>Unique repeats</source>
<translation>Уникальные повторы</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="279"/>
- <location filename="../src/FindRepeatsDialog.cpp" line="286"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="280"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="287"/>
<source>Error</source>
<translation>Проблема</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="223"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="224"/>
<source>No annotations found: %1</source>
<translation>Аннотации не найдены: %1</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="279"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="280"/>
<source>Not enough memory error ocurred while preparing data. Try to set smaller region.</source>
<translation>Недостаточно памяти, возникла ошибка в процессе подготовки данных. Попробуйте указать меньший регион.</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="286"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="287"/>
<source>Cannot create an annotation object. Please check settings</source>
<translation>Невозможно создать аннотацию. Проверьте настройки</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="294"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="295"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="295"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="296"/>
<source>Search with given identity %1% and length more then 80m bps can take very long time. Approximate repeat searching time for 80m bp with 95% identity is 40 minutes on Intel Core 2 Quad Q9500. Do you want to continue?</source>
<translation>Поиск с указанной схожестью %1% и длиной более 80m bps может занять длительное время. Примерное время поиска для 80m bp с 95% схожестью занимает 40 минут на Intel Core 2 Quad Q9500. Хотите продолжить?</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="381"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="304"/>
+ <source>A problem occurred during finding repeats. The sequence is no more available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindRepeatsDialog.cpp" line="383"/>
<source>Estimated repeats count: %1</source>
<translation>Оценка возможного кол-ва результатов: %1</translation>
</message>
<message>
- <location filename="../src/FindRepeatsDialog.cpp" line="382"/>
+ <location filename="../src/FindRepeatsDialog.cpp" line="384"/>
<source>Estimated repeats count hint is based on the active settings and random sequence model</source>
<translation>Оценка основана на текущих параметрах поиска и модели случайной последовательности</translation>
</message>
diff --git a/src/plugins/smith_waterman/src/PairAlignSequences.cpp b/src/plugins/smith_waterman/src/PairAlignSequences.cpp
index 22bb1c7..93a3183 100644
--- a/src/plugins/smith_waterman/src/PairAlignSequences.cpp
+++ b/src/plugins/smith_waterman/src/PairAlignSequences.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/PairAlignSequences.h b/src/plugins/smith_waterman/src/PairAlignSequences.h
index 9b93ac5..f7f98f3 100644
--- a/src/plugins/smith_waterman/src/PairAlignSequences.h
+++ b/src/plugins/smith_waterman/src/PairAlignSequences.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
index 0c9d7b2..22bbe51 100644
--- a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
+++ b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
index d139333..e2db2a2 100644
--- a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
+++ b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
index bed947c..eef09b2 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
+++ b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
index 32295de..546243b 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
+++ b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp b/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
index 28845b3..8a4b0fc 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
+++ b/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWAlgorithmTask.h b/src/plugins/smith_waterman/src/SWAlgorithmTask.h
index c0f200d..2846b5f 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmTask.h
+++ b/src/plugins/smith_waterman/src/SWAlgorithmTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWQuery.cpp b/src/plugins/smith_waterman/src/SWQuery.cpp
index 48efbf9..d53e9f8 100644
--- a/src/plugins/smith_waterman/src/SWQuery.cpp
+++ b/src/plugins/smith_waterman/src/SWQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWQuery.h b/src/plugins/smith_waterman/src/SWQuery.h
index d28f298..16ad6e3 100644
--- a/src/plugins/smith_waterman/src/SWQuery.h
+++ b/src/plugins/smith_waterman/src/SWQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWTaskFactory.cpp b/src/plugins/smith_waterman/src/SWTaskFactory.cpp
index 148875c..e7e4a93 100644
--- a/src/plugins/smith_waterman/src/SWTaskFactory.cpp
+++ b/src/plugins/smith_waterman/src/SWTaskFactory.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWTaskFactory.h b/src/plugins/smith_waterman/src/SWTaskFactory.h
index c127ca8..6e241de 100644
--- a/src/plugins/smith_waterman/src/SWTaskFactory.h
+++ b/src/plugins/smith_waterman/src/SWTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWWorker.cpp b/src/plugins/smith_waterman/src/SWWorker.cpp
index 445820e..3e2ec70 100644
--- a/src/plugins/smith_waterman/src/SWWorker.cpp
+++ b/src/plugins/smith_waterman/src/SWWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SWWorker.h b/src/plugins/smith_waterman/src/SWWorker.h
index 50a2787..1b9192c 100644
--- a/src/plugins/smith_waterman/src/SWWorker.h
+++ b/src/plugins/smith_waterman/src/SWWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
index 98465cf..9fe64b1 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
index 7e4181d..83b7669 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
index d1f47bf..d65a341 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
index e3364eb..4b040df 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
index a1929bd..8cc8289 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
index 59f851b..dad22f0 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
index a505f90..0b51dd8 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
index aa3dd4c..7a585e2 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanTests.cpp b/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
index a4d1228..87fc917 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/SmithWatermanTests.h b/src/plugins/smith_waterman/src/SmithWatermanTests.h
index 4507946..ef3430c 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanTests.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/sw_cuda.cu b/src/plugins/smith_waterman/src/sw_cuda.cu
index 4a1b49f..c24fbe3 100644
--- a/src/plugins/smith_waterman/src/sw_cuda.cu
+++ b/src/plugins/smith_waterman/src/sw_cuda.cu
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp b/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
index c55b66a..d1bd367 100644
--- a/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
+++ b/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/src/sw_cuda_cpp.h b/src/plugins/smith_waterman/src/sw_cuda_cpp.h
index 1979160..b56a0d4 100644
--- a/src/plugins/smith_waterman/src/sw_cuda_cpp.h
+++ b/src/plugins/smith_waterman/src/sw_cuda_cpp.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/smith_waterman/transl/english.ts b/src/plugins/smith_waterman/transl/english.ts
index 8a11418..07e189e 100644
--- a/src/plugins/smith_waterman/transl/english.ts
+++ b/src/plugins/smith_waterman/transl/english.ts
@@ -37,58 +37,58 @@
<context>
<name>QObject</name>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="150"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="151"/>
<source>START SmithWatermanAlgorithmOPENCL::launch</source>
<translation>START SmithWatermanAlgorithmOPENCL::launch</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="306"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="310"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="314"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="318"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="322"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="326"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="331"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="335"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="339"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="343"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="347"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="352"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="356"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="360"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="364"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="368"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="372"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="377"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="382"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="386"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="390"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="394"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="398"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="402"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="406"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="410"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="414"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="308"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="312"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="316"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="320"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="324"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="328"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="333"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="337"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="341"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="345"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="349"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="354"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="358"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="362"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="366"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="370"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="374"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="379"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="384"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="388"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="392"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="396"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="400"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="404"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="408"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="412"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="416"/>
<source>Kernel::setArg(%1) failed</source>
<translation>Kernel::setArg(%1) failed</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="421"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="423"/>
<source>OPENCL: Running CL program</source>
<translation>OPENCL: Running CL program</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="603"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="605"/>
<source>FINISH SmithWatermanAlgorithmOPENCL::launch</source>
<translation>FINISH SmithWatermanAlgorithmOPENCL::launch</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="607"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="609"/>
<source>Starting cleanup OpenCL resources</source>
<translation>Starting cleanup OpenCL resources</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="675"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="678"/>
<source>Finish cleanup OpenCL resources</source>
<translation>Finish cleanup OpenCL resources</translation>
</message>
diff --git a/src/plugins/smith_waterman/transl/russian.ts b/src/plugins/smith_waterman/transl/russian.ts
index 7881a4b..339488d 100644
--- a/src/plugins/smith_waterman/transl/russian.ts
+++ b/src/plugins/smith_waterman/transl/russian.ts
@@ -21,7 +21,7 @@
<message>
<location filename="../src/ui/PairwiseAlignmentSmithWatermanOptionsPanelMainWidget.ui" line="62"/>
<source>Gap penalty</source>
- <translation>Штраф за пропуск</translation>
+ <translation>Штраф за пробел</translation>
</message>
<message>
<location filename="../src/ui/PairwiseAlignmentSmithWatermanOptionsPanelMainWidget.ui" line="77"/>
@@ -37,58 +37,58 @@
<context>
<name>QObject</name>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="150"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="151"/>
<source>START SmithWatermanAlgorithmOPENCL::launch</source>
<translation>START SmithWatermanAlgorithmOPENCL::launch</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="306"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="310"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="314"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="318"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="322"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="326"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="331"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="335"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="339"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="343"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="347"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="352"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="356"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="360"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="364"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="368"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="372"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="377"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="382"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="386"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="390"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="394"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="398"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="402"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="406"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="410"/>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="414"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="308"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="312"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="316"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="320"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="324"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="328"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="333"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="337"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="341"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="345"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="349"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="354"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="358"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="362"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="366"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="370"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="374"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="379"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="384"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="388"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="392"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="396"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="400"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="404"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="408"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="412"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="416"/>
<source>Kernel::setArg(%1) failed</source>
<translation>Kernel::setArg(%1) failed</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="421"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="423"/>
<source>OPENCL: Running CL program</source>
<translation>OPENCL: Running CL program</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="603"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="605"/>
<source>FINISH SmithWatermanAlgorithmOPENCL::launch</source>
<translation>FINISH SmithWatermanAlgorithmOPENCL::launch</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="607"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="609"/>
<source>Starting cleanup OpenCL resources</source>
<translation>Starting cleanup OpenCL resources</translation>
</message>
<message>
- <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="675"/>
+ <location filename="../src/SmithWatermanAlgorithmOPENCL.cpp" line="678"/>
<source>Finish cleanup OpenCL resources</source>
<translation>Finish cleanup OpenCL resources</translation>
</message>
@@ -209,22 +209,22 @@
<message>
<location filename="../src/SWWorker.cpp" line="165"/>
<source>Gap Open Score</source>
- <translation>Вес открытия пропуска</translation>
+ <translation>Вес открытия пробела</translation>
</message>
<message>
<location filename="../src/SWWorker.cpp" line="166"/>
<source>Penalty for opening a gap.</source>
- <translation>Штраф, накладываемый за открытие пропуска.</translation>
+ <translation>Штраф, накладываемый за открытие пробела.</translation>
</message>
<message>
<location filename="../src/SWWorker.cpp" line="169"/>
<source>Gap Extension Score</source>
- <translation>Вес продления пропуска</translation>
+ <translation>Вес продления пробела</translation>
</message>
<message>
<location filename="../src/SWWorker.cpp" line="170"/>
<source>Penalty for extending a gap.</source>
- <translation>Штраф, накладываемый за продление пропуска.</translation>
+ <translation>Штраф, накладываемый за продление пробела.</translation>
</message>
<message>
<location filename="../src/SWWorker.cpp" line="173"/>
@@ -543,22 +543,22 @@
<message>
<location filename="../src/SWQuery.cpp" line="251"/>
<source>Gap open score</source>
- <translation>Вес открытия пропуска</translation>
+ <translation>Вес открытия пробела</translation>
</message>
<message>
<location filename="../src/SWQuery.cpp" line="251"/>
<source>Gap open score.</source>
- <translation>Вес открытия пропуска.</translation>
+ <translation>Вес открытия пробела.</translation>
</message>
<message>
<location filename="../src/SWQuery.cpp" line="252"/>
<source>Gap ext score</source>
- <translation>Вес продления пропуска</translation>
+ <translation>Вес продления пробела</translation>
</message>
<message>
<location filename="../src/SWQuery.cpp" line="252"/>
<source>Gap extension score.</source>
- <translation>Вес продления пропуска.</translation>
+ <translation>Вес продления пробела.</translation>
</message>
<message>
<location filename="../src/SWQuery.cpp" line="283"/>
diff --git a/src/plugins/test_runner/src/GTestScriptWrapper.cpp b/src/plugins/test_runner/src/GTestScriptWrapper.cpp
index a21df5f..1bede78 100644
--- a/src/plugins/test_runner/src/GTestScriptWrapper.cpp
+++ b/src/plugins/test_runner/src/GTestScriptWrapper.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/GTestScriptWrapper.h b/src/plugins/test_runner/src/GTestScriptWrapper.h
index eea2790..1d86781 100644
--- a/src/plugins/test_runner/src/GTestScriptWrapper.h
+++ b/src/plugins/test_runner/src/GTestScriptWrapper.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestRunnerPlugin.cpp b/src/plugins/test_runner/src/TestRunnerPlugin.cpp
index c7fdc30..106c6e7 100644
--- a/src/plugins/test_runner/src/TestRunnerPlugin.cpp
+++ b/src/plugins/test_runner/src/TestRunnerPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestRunnerPlugin.h b/src/plugins/test_runner/src/TestRunnerPlugin.h
index 00876ce..eb6107e 100644
--- a/src/plugins/test_runner/src/TestRunnerPlugin.h
+++ b/src/plugins/test_runner/src/TestRunnerPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestViewController.cpp b/src/plugins/test_runner/src/TestViewController.cpp
index bfd3084..1fd8692 100644
--- a/src/plugins/test_runner/src/TestViewController.cpp
+++ b/src/plugins/test_runner/src/TestViewController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestViewController.h b/src/plugins/test_runner/src/TestViewController.h
index 4e109b7..f6fe1fe 100644
--- a/src/plugins/test_runner/src/TestViewController.h
+++ b/src/plugins/test_runner/src/TestViewController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestViewReporter.cpp b/src/plugins/test_runner/src/TestViewReporter.cpp
index 551cf9f..a9aa5e3 100644
--- a/src/plugins/test_runner/src/TestViewReporter.cpp
+++ b/src/plugins/test_runner/src/TestViewReporter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/test_runner/src/TestViewReporter.h b/src/plugins/test_runner/src/TestViewReporter.h
index b98afb7..b07fe54 100644
--- a/src/plugins/test_runner/src/TestViewReporter.h
+++ b/src/plugins/test_runner/src/TestViewReporter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/PMatrixFormat.cpp b/src/plugins/weight_matrix/src/PMatrixFormat.cpp
index 8f5b592..3ed4985 100644
--- a/src/plugins/weight_matrix/src/PMatrixFormat.cpp
+++ b/src/plugins/weight_matrix/src/PMatrixFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/PMatrixFormat.h b/src/plugins/weight_matrix/src/PMatrixFormat.h
index c17c50a..640ba7d 100644
--- a/src/plugins/weight_matrix/src/PMatrixFormat.h
+++ b/src/plugins/weight_matrix/src/PMatrixFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp b/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
index a4fa7d7..af88bef 100644
--- a/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -68,7 +68,7 @@ PWMBuildDialogController::PWMBuildDialogController(QWidget* w)
{
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "17466239");
+ new HelpButton(this, buttonBox, "17467786");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/weight_matrix/src/PWMBuildDialogController.h b/src/plugins/weight_matrix/src/PWMBuildDialogController.h
index 6df3202..251dcea 100644
--- a/src/plugins/weight_matrix/src/PWMBuildDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMBuildDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp b/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
index d050b2e..1a6b7e8 100644
--- a/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ namespace U2 {
PWMJASPARDialogController::PWMJASPARDialogController(QWidget *w)
: QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466238");
+ new HelpButton(this, buttonBox, "17467785");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Select"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/weight_matrix/src/PWMJASPARDialogController.h b/src/plugins/weight_matrix/src/PWMJASPARDialogController.h
index 1cb3f18..b162cee 100644
--- a/src/plugins/weight_matrix/src/PWMJASPARDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMJASPARDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp b/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
index 2edb252..f2dc919 100644
--- a/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -108,7 +108,7 @@ public:
PWMSearchDialogController::PWMSearchDialogController(ADVSequenceObjectContext* _ctx, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466237");
+ new HelpButton(this, buttonBox, "17467784");
buttonBox->button(QDialogButtonBox::Yes)->setText(tr("Add to queue"));
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/weight_matrix/src/PWMSearchDialogController.h b/src/plugins/weight_matrix/src/PWMSearchDialogController.h
index 112f2d3..325e3ba 100644
--- a/src/plugins/weight_matrix/src/PWMSearchDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMSearchDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/SetParametersDialogController.cpp b/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
index e14c40f..3e87cdf 100644
--- a/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
+++ b/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ SetParametersDialogController::SetParametersDialogController(QWidget *w)
: QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466237");
+ new HelpButton(this, buttonBox, "17467784");
QStringList algo = AppContext::getPWMConversionAlgorithmRegistry()->getAlgorithmIds();
algorithmComboBox->addItems(algo);
diff --git a/src/plugins/weight_matrix/src/SetParametersDialogController.h b/src/plugins/weight_matrix/src/SetParametersDialogController.h
index 9fb7dde..bbca5f9 100644
--- a/src/plugins/weight_matrix/src/SetParametersDialogController.h
+++ b/src/plugins/weight_matrix/src/SetParametersDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp b/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
index 0ee3146..0b4f5a3 100644
--- a/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
+++ b/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -183,7 +183,7 @@ ViewMatrixDialogController::ViewMatrixDialogController(PFMatrix matrix, QWidget
ViewMatrixDialogController::ViewMatrixDialogController(PWMatrix matrix, QWidget *w): QDialog(w){
setupUi(this);
- new HelpButton(this, buttonBox, "17466239");
+ new HelpButton(this, buttonBox, "17467786");
buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
ml = new MatrixAndLogoController(matrix, this);
diff --git a/src/plugins/weight_matrix/src/ViewMatrixDialogController.h b/src/plugins/weight_matrix/src/ViewMatrixDialogController.h
index d8968a3..16e1d82 100644
--- a/src/plugins/weight_matrix/src/ViewMatrixDialogController.h
+++ b/src/plugins/weight_matrix/src/ViewMatrixDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WMQuery.cpp b/src/plugins/weight_matrix/src/WMQuery.cpp
index b0a417b..28f4032 100644
--- a/src/plugins/weight_matrix/src/WMQuery.cpp
+++ b/src/plugins/weight_matrix/src/WMQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WMQuery.h b/src/plugins/weight_matrix/src/WMQuery.h
index 6e851a0..6f81a62 100644
--- a/src/plugins/weight_matrix/src/WMQuery.h
+++ b/src/plugins/weight_matrix/src/WMQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
index ed06c51..d459935 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
index 56da322..658a11d 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp b/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
index ab05327..1b94b29 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixIO.cpp b/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
index 801b3fd..01158eb 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixIO.h b/src/plugins/weight_matrix/src/WeightMatrixIO.h
index b155096..14d6508 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIO.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixIO.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
index f814ad4..99fee21 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
index a1d5634..b860829 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp b/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
index 69ef4d1..233fdce 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixPlugin.h b/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
index 2e1bfa2..a3f7bc8 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
index aab61c7..65a4510 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
index 1f4c59f..46215c0 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp b/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
index 3a278ce..183ce46 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/weight_matrix/src/WeightMatrixWorkers.h b/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
index 982ebbb..ad5ac12 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
index f6b7d61..c3b28ab 100644
--- a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
+++ b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
index 6c4106b..6b0a077 100644
--- a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
+++ b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ActorCfgModel.cpp b/src/plugins/workflow_designer/src/ActorCfgModel.cpp
index fc5c0be..f2c67c8 100644
--- a/src/plugins/workflow_designer/src/ActorCfgModel.cpp
+++ b/src/plugins/workflow_designer/src/ActorCfgModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ActorCfgModel.h b/src/plugins/workflow_designer/src/ActorCfgModel.h
index c57c57f..21055f3 100644
--- a/src/plugins/workflow_designer/src/ActorCfgModel.h
+++ b/src/plugins/workflow_designer/src/ActorCfgModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/BreakpointManagerView.cpp b/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
index 4eb6c93..69f8e35 100644
--- a/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
+++ b/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/BreakpointManagerView.h b/src/plugins/workflow_designer/src/BreakpointManagerView.h
index d08ec01..807cba9 100644
--- a/src/plugins/workflow_designer/src/BreakpointManagerView.h
+++ b/src/plugins/workflow_designer/src/BreakpointManagerView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ChooseItemDialog.cpp b/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
index 09d4c1d..47070fa 100644
--- a/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
+++ b/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ChooseItemDialog.h b/src/plugins/workflow_designer/src/ChooseItemDialog.h
index d0edefa..7ac419e 100644
--- a/src/plugins/workflow_designer/src/ChooseItemDialog.h
+++ b/src/plugins/workflow_designer/src/ChooseItemDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/CreateScriptWorker.cpp b/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
index 1719d65..fde143d 100644
--- a/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
+++ b/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -358,7 +358,7 @@ private:
CreateScriptElementDialog::CreateScriptElementDialog(QWidget *p, ActorPrototype* proto): QDialog(p), editing(false) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466370");
+ new HelpButton(this, buttonBox, "17467915");
inputList->setModel(new CfgListModel());
inputList->setItemDelegate(new ProxyDelegate());
diff --git a/src/plugins/workflow_designer/src/CreateScriptWorker.h b/src/plugins/workflow_designer/src/CreateScriptWorker.h
index fddc170..29d0a7b 100644
--- a/src/plugins/workflow_designer/src/CreateScriptWorker.h
+++ b/src/plugins/workflow_designer/src/CreateScriptWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp b/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
index 5e1886d..9b18ed2 100644
--- a/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
+++ b/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ DashboardsManagerDialog::DashboardsManagerDialog(ScanDashboardsDirTask *_task, Q
: QDialog(parent), task(_task)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466368");
+ new HelpButton(this, buttonBox, "17467913");
setupList();
diff --git a/src/plugins/workflow_designer/src/DashboardsManagerDialog.h b/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
index 9e48adc..d8fe56b 100644
--- a/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
+++ b/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/EstimationDialog.cpp b/src/plugins/workflow_designer/src/EstimationDialog.cpp
index fa93889..77af2df 100644
--- a/src/plugins/workflow_designer/src/EstimationDialog.cpp
+++ b/src/plugins/workflow_designer/src/EstimationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/EstimationDialog.h b/src/plugins/workflow_designer/src/EstimationDialog.h
index 85d29e8..1d35992 100644
--- a/src/plugins/workflow_designer/src/EstimationDialog.h
+++ b/src/plugins/workflow_designer/src/EstimationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
index 31cc0cc..901ce19 100644
--- a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
+++ b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
index 8b825b4..e945e95 100644
--- a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
+++ b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp b/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
index 58fede5..fdf96c2 100644
--- a/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
+++ b/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ namespace U2 {
ImportSchemaDialog::ImportSchemaDialog(QWidget* p) : QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466382");
+ new HelpButton(this, buttonBox, "17467927");
}
void ImportSchemaDialog::accept() {
diff --git a/src/plugins/workflow_designer/src/ImportSchemaDialog.h b/src/plugins/workflow_designer/src/ImportSchemaDialog.h
index fb94b05..63567dc 100644
--- a/src/plugins/workflow_designer/src/ImportSchemaDialog.h
+++ b/src/plugins/workflow_designer/src/ImportSchemaDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/InvestigationDataModel.cpp b/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
index 377b563..68c0014 100644
--- a/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
+++ b/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/InvestigationDataModel.h b/src/plugins/workflow_designer/src/InvestigationDataModel.h
index c9b3208..7727432 100644
--- a/src/plugins/workflow_designer/src/InvestigationDataModel.h
+++ b/src/plugins/workflow_designer/src/InvestigationDataModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ItemViewStyle.cpp b/src/plugins/workflow_designer/src/ItemViewStyle.cpp
index f09eef5..2c89dbc 100644
--- a/src/plugins/workflow_designer/src/ItemViewStyle.cpp
+++ b/src/plugins/workflow_designer/src/ItemViewStyle.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ItemViewStyle.h b/src/plugins/workflow_designer/src/ItemViewStyle.h
index 4664b15..516d1e0 100644
--- a/src/plugins/workflow_designer/src/ItemViewStyle.h
+++ b/src/plugins/workflow_designer/src/ItemViewStyle.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
index 7df1d79..b839823 100644
--- a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
+++ b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ namespace Workflow {
PortAliasesConfigurationDialog::PortAliasesConfigurationDialog( const Schema & schema, QWidget * p )
: QDialog(p), portNameMaxSz(0), currentRow(-1) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466382");
+ new HelpButton(this, buttonBox, "17467927");
QPushButton* cancelPushButton = buttonBox->button(QDialogButtonBox::Cancel);
QPushButton* okPushButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h
index e9a21cb..d2cf70f 100644
--- a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h
+++ b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/SampleActionsManager.cpp b/src/plugins/workflow_designer/src/SampleActionsManager.cpp
index f23a8e8..31aad09 100644
--- a/src/plugins/workflow_designer/src/SampleActionsManager.cpp
+++ b/src/plugins/workflow_designer/src/SampleActionsManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/SampleActionsManager.h b/src/plugins/workflow_designer/src/SampleActionsManager.h
index e679c73..aab8636 100644
--- a/src/plugins/workflow_designer/src/SampleActionsManager.h
+++ b/src/plugins/workflow_designer/src/SampleActionsManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/SceneSerializer.cpp b/src/plugins/workflow_designer/src/SceneSerializer.cpp
index bdc52f1..7823824 100644
--- a/src/plugins/workflow_designer/src/SceneSerializer.cpp
+++ b/src/plugins/workflow_designer/src/SceneSerializer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/SceneSerializer.h b/src/plugins/workflow_designer/src/SceneSerializer.h
index 8a34b05..1c0f433 100644
--- a/src/plugins/workflow_designer/src/SceneSerializer.h
+++ b/src/plugins/workflow_designer/src/SceneSerializer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
index f6f6004..5e202d8 100644
--- a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
+++ b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ namespace Workflow {
SchemaAliasesConfigurationDialogImpl::SchemaAliasesConfigurationDialogImpl( const Schema & schema, QWidget * p )
: QDialog(p), procNameMaxSz(0) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466382");
+ new HelpButton(this, buttonBox, "17467927");
QPushButton* cancelPushButton = buttonBox->button(QDialogButtonBox::Cancel);
QPushButton* okPushButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h
index 81b220d..3985db4 100644
--- a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h
+++ b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/StartupDialog.cpp b/src/plugins/workflow_designer/src/StartupDialog.cpp
index 965063f..12c86bc 100644
--- a/src/plugins/workflow_designer/src/StartupDialog.cpp
+++ b/src/plugins/workflow_designer/src/StartupDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ StartupDialog::StartupDialog(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466339");
+ new HelpButton(this, buttonBox, "17467884");
label->setStyleSheet(L10N::infoHintStyleSheet());
diff --git a/src/plugins/workflow_designer/src/StartupDialog.h b/src/plugins/workflow_designer/src/StartupDialog.h
index b9ca6cb..3686fdc 100644
--- a/src/plugins/workflow_designer/src/StartupDialog.h
+++ b/src/plugins/workflow_designer/src/StartupDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/TableViewTabKey.cpp b/src/plugins/workflow_designer/src/TableViewTabKey.cpp
index 16cb67a..e221a2c 100644
--- a/src/plugins/workflow_designer/src/TableViewTabKey.cpp
+++ b/src/plugins/workflow_designer/src/TableViewTabKey.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/TableViewTabKey.h b/src/plugins/workflow_designer/src/TableViewTabKey.h
index f9370ba..7366aa2 100644
--- a/src/plugins/workflow_designer/src/TableViewTabKey.h
+++ b/src/plugins/workflow_designer/src/TableViewTabKey.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
index 6892115..e4e358e 100644
--- a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
index c991918..52f023f 100644
--- a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
+++ b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowDocument.cpp b/src/plugins/workflow_designer/src/WorkflowDocument.cpp
index 08ee68b..ce3026d 100644
--- a/src/plugins/workflow_designer/src/WorkflowDocument.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowDocument.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowDocument.h b/src/plugins/workflow_designer/src/WorkflowDocument.h
index 8a4d6c0..ad1d28e 100644
--- a/src/plugins/workflow_designer/src/WorkflowDocument.h
+++ b/src/plugins/workflow_designer/src/WorkflowDocument.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowEditor.cpp b/src/plugins/workflow_designer/src/WorkflowEditor.cpp
index ac7a4ae..a663274 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditor.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowEditor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowEditor.h b/src/plugins/workflow_designer/src/WorkflowEditor.h
index 12c32a1..71a8367 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditor.h
+++ b/src/plugins/workflow_designer/src/WorkflowEditor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
index 273e93b..ed321ed 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
index 9822ef0..356e673 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
+++ b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
index d90d164..0c252c8 100644
--- a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
index 5f910e1..1914281 100644
--- a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
+++ b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp b/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
index 631734a..4ca8924 100644
--- a/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ namespace U2 {
WorkflowMetaDialog::WorkflowMetaDialog(QWidget * p, const Metadata& meta): QDialog(p), meta(meta) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466361");
+ new HelpButton(this, buttonBox, "17467906");
cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
okButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/plugins/workflow_designer/src/WorkflowMetaDialog.h b/src/plugins/workflow_designer/src/WorkflowMetaDialog.h
index 57e26f4..db6660e 100644
--- a/src/plugins/workflow_designer/src/WorkflowMetaDialog.h
+++ b/src/plugins/workflow_designer/src/WorkflowMetaDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowPalette.cpp b/src/plugins/workflow_designer/src/WorkflowPalette.cpp
index 9e5b013..8a1ca58 100644
--- a/src/plugins/workflow_designer/src/WorkflowPalette.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowPalette.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowPalette.h b/src/plugins/workflow_designer/src/WorkflowPalette.h
index 6d3f966..914fb12 100644
--- a/src/plugins/workflow_designer/src/WorkflowPalette.h
+++ b/src/plugins/workflow_designer/src/WorkflowPalette.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowSamples.cpp b/src/plugins/workflow_designer/src/WorkflowSamples.cpp
index ffc7dbf..7c332dd 100644
--- a/src/plugins/workflow_designer/src/WorkflowSamples.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSamples.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowSamples.h b/src/plugins/workflow_designer/src/WorkflowSamples.h
index 39ad248..83eec7c 100644
--- a/src/plugins/workflow_designer/src/WorkflowSamples.h
+++ b/src/plugins/workflow_designer/src/WorkflowSamples.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
index 9bfdc3d..a8030eb 100644
--- a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
index c843887..5af62f0 100644
--- a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
+++ b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp b/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
index 523a61e..0cf4712 100644
--- a/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -75,7 +75,7 @@ AppSettingsGUIPageWidget* WorkflowSettingsPageController::createWidget(AppSettin
return r;
}
-const QString WorkflowSettingsPageController::helpPageId = QString("17465977");
+const QString WorkflowSettingsPageController::helpPageId = QString("17467524");
WorkflowSettingsPageWidget::WorkflowSettingsPageWidget(WorkflowSettingsPageController* ) {
setupUi(this);
diff --git a/src/plugins/workflow_designer/src/WorkflowSettingsController.h b/src/plugins/workflow_designer/src/WorkflowSettingsController.h
index a1d55d0..fce410f 100644
--- a/src/plugins/workflow_designer/src/WorkflowSettingsController.h
+++ b/src/plugins/workflow_designer/src/WorkflowSettingsController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowTabView.cpp b/src/plugins/workflow_designer/src/WorkflowTabView.cpp
index 4b2490f..00f00a1 100644
--- a/src/plugins/workflow_designer/src/WorkflowTabView.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowTabView.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowTabView.h b/src/plugins/workflow_designer/src/WorkflowTabView.h
index 9503411..c8fde95 100644
--- a/src/plugins/workflow_designer/src/WorkflowTabView.h
+++ b/src/plugins/workflow_designer/src/WorkflowTabView.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowViewController.cpp b/src/plugins/workflow_designer/src/WorkflowViewController.cpp
index ea04631..209a9e4 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowViewController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowViewController.h b/src/plugins/workflow_designer/src/WorkflowViewController.h
index a762070..8d17c9b 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewController.h
+++ b/src/plugins/workflow_designer/src/WorkflowViewController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowViewItems.cpp b/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
index 02ea0e5..086eba9 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/WorkflowViewItems.h b/src/plugins/workflow_designer/src/WorkflowViewItems.h
index 3ae6a0d..8523581 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewItems.h
+++ b/src/plugins/workflow_designer/src/WorkflowViewItems.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
index 234c177..421536d 100644
--- a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
+++ b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
index 3894e01..a361fc1 100644
--- a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
+++ b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
index 62d28b4..927e261 100644
--- a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
+++ b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
index 9407d40..0e2346e 100644
--- a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
+++ b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
index 9279def..50e8d71 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
index 2df3a30..4f381ef 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
index 543d30b..021a807 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
index bf085ed..4e8706c 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
index c9ad26b..a03df22 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
index d751fb9..a040445 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
index e0a2ea8..7554250 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
index 8e8a62f..42b780d 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
index 0dafc67..5f0b595 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
index e00395e..b0cd067 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
index 1ccc1ed..1d54967 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
index 51a6262..4992ee4 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
index 4049bdd..5bf7b9b 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
index 07697a8..c751104 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
index 6ebab27..a6e257e 100644
--- a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
index 45a0dfc..c8ec9b6 100644
--- a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h b/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
index ebfa993..72c26fd 100644
--- a/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
+++ b/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
index b807269..9120661 100644
--- a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
index ca0809f..0dc2e17 100644
--- a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp b/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
index 3415e40..ab57b13 100644
--- a/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
+++ b/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/BaseDocWriter.h b/src/plugins/workflow_designer/src/library/BaseDocWriter.h
index 81c52fd..0995786 100644
--- a/src/plugins/workflow_designer/src/library/BaseDocWriter.h
+++ b/src/plugins/workflow_designer/src/library/BaseDocWriter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp b/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
index 6e8378d..71cbb4c 100644
--- a/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CDSearchWorker.h b/src/plugins/workflow_designer/src/library/CDSearchWorker.h
index 2f02c57..2b29e8e 100644
--- a/src/plugins/workflow_designer/src/library/CDSearchWorker.h
+++ b/src/plugins/workflow_designer/src/library/CDSearchWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
index 2f576c3..39119a0 100644
--- a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
+++ b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
index 82a2993..147cbfb 100644
--- a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
+++ b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
index be03fa4..c5c7af5 100644
--- a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
index 4db80be..9196a01 100644
--- a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
+++ b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CoreLib.cpp b/src/plugins/workflow_designer/src/library/CoreLib.cpp
index d28ff63..23663b5 100644
--- a/src/plugins/workflow_designer/src/library/CoreLib.cpp
+++ b/src/plugins/workflow_designer/src/library/CoreLib.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CoreLib.h b/src/plugins/workflow_designer/src/library/CoreLib.h
index d104ddd..ed0d4b5 100644
--- a/src/plugins/workflow_designer/src/library/CoreLib.h
+++ b/src/plugins/workflow_designer/src/library/CoreLib.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
index f99c5ca..9dbfea7 100644
--- a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
+++ b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
@@ -1,23 +1,23 @@
/**
- * UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+* UGENE - Integrated Bioinformatics Tools.
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+* http://ugene.unipro.ru
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+*/
#include <QMessageBox>
#include <QWizardPage>
@@ -60,7 +60,7 @@ public:
};
CreateExternalProcessDialog::CreateExternalProcessDialog(QWidget *p, ExternalProcessConfig *cfg, bool lastPage)
-: QWizard(p), initialCfg(NULL), lastPage(lastPage) {
+ : QWizard(p), initialCfg(NULL), lastPage(lastPage) {
ui.setupUi(this);
new U2::HelpButton(this, button(QWizard::HelpButton), "2097199");
@@ -104,9 +104,9 @@ CreateExternalProcessDialog::CreateExternalProcessDialog(QWidget *p, ExternalPro
editing = true;
connect(ui.nameLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(sl_validateName(const QString &)));
connect(ui.templateLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(sl_validateCmdLine(const QString &)));
- connect(ui.inputTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
- connect(ui.outputTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
- connect(ui.attributesTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateAttributeModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.inputTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.outputTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.attributesTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateAttributeModel(const QModelIndex &, const QModelIndex &)));
descr1 = ui.descr1TextEdit->toHtml();
//validateNextPage();
@@ -126,13 +126,13 @@ void CreateExternalProcessDialog::init(ExternalProcessConfig *cfg) {
clearModel(ui.inputTableView->model());
foreach(const DataConfig &dataCfg, cfg->inputs) {
ui.inputTableView->model()->insertRow(0, QModelIndex());
- QModelIndex index = ui.inputTableView->model()->index(ind,0);
+ QModelIndex index = ui.inputTableView->model()->index(ind, 0);
ui.inputTableView->model()->setData(index, dataCfg.attrName);
- index = ui.inputTableView->model()->index(ind,1);
+ index = ui.inputTableView->model()->index(ind, 1);
ui.inputTableView->model()->setData(index, dataCfg.type);
- index = ui.inputTableView->model()->index(ind,2);
+ index = ui.inputTableView->model()->index(ind, 2);
ui.inputTableView->model()->setData(index, dataCfg.format);
- index = ui.inputTableView->model()->index(ind,3);
+ index = ui.inputTableView->model()->index(ind, 3);
ui.inputTableView->model()->setData(index, dataCfg.description);
ind++;
}
@@ -141,13 +141,13 @@ void CreateExternalProcessDialog::init(ExternalProcessConfig *cfg) {
clearModel(ui.outputTableView->model());
foreach(const DataConfig &dataCfg, cfg->outputs) {
ui.outputTableView->model()->insertRow(0, QModelIndex());
- QModelIndex index = ui.outputTableView->model()->index(ind,0);
+ QModelIndex index = ui.outputTableView->model()->index(ind, 0);
ui.outputTableView->model()->setData(index, dataCfg.attrName);
- index = ui.outputTableView->model()->index(ind,1);
+ index = ui.outputTableView->model()->index(ind, 1);
ui.outputTableView->model()->setData(index, dataCfg.type);
- index = ui.outputTableView->model()->index(ind,2);
+ index = ui.outputTableView->model()->index(ind, 2);
ui.outputTableView->model()->setData(index, dataCfg.format);
- index = ui.outputTableView->model()->index(ind,3);
+ index = ui.outputTableView->model()->index(ind, 3);
ui.outputTableView->model()->setData(index, dataCfg.description);
ind++;
}
@@ -156,11 +156,11 @@ void CreateExternalProcessDialog::init(ExternalProcessConfig *cfg) {
clearModel(ui.attributesTableView->model());
foreach(const AttributeConfig &attrCfg, cfg->attrs) {
ui.attributesTableView->model()->insertRow(0, QModelIndex());
- QModelIndex index = ui.attributesTableView->model()->index(ind,0);
+ QModelIndex index = ui.attributesTableView->model()->index(ind, 0);
ui.attributesTableView->model()->setData(index, attrCfg.attrName);
- index = ui.attributesTableView->model()->index(ind,1);
+ index = ui.attributesTableView->model()->index(ind, 1);
ui.attributesTableView->model()->setData(index, attrCfg.type);
- index = ui.attributesTableView->model()->index(ind,2);
+ index = ui.attributesTableView->model()->index(ind, 2);
ui.attributesTableView->model()->setData(index, attrCfg.description);
ind++;
}
@@ -204,8 +204,8 @@ void CreateExternalProcessDialog::sl_deleteAttribute() {
validateAttributeModel();
}
-CreateExternalProcessDialog::CreateExternalProcessDialog( QWidget *p /* = NULL*/ )
-: QWizard(p), initialCfg(NULL), lastPage(false) {
+CreateExternalProcessDialog::CreateExternalProcessDialog(QWidget *p /* = NULL*/)
+ : QWizard(p), initialCfg(NULL), lastPage(false) {
ui.setupUi(this);
new U2::HelpButton(this, button(QWizard::HelpButton), "2097199");
@@ -228,9 +228,9 @@ CreateExternalProcessDialog::CreateExternalProcessDialog( QWidget *p /* = NULL*/
ui.outputTableView->setModel(new CfgExternalToolModel(false));
ui.attributesTableView->setModel(new CfgExternalToolModelAttributes());
- connect(ui.inputTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
- connect(ui.outputTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
- connect(ui.attributesTableView->model(), SIGNAL(dataChanged ( const QModelIndex &, const QModelIndex &)), SLOT(validateAttributeModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.inputTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.outputTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateDataModel(const QModelIndex &, const QModelIndex &)));
+ connect(ui.attributesTableView->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(validateAttributeModel(const QModelIndex &, const QModelIndex &)));
ui.inputTableView->setItemDelegate(new ProxyDelegate());
ui.outputTableView->setItemDelegate(new ProxyDelegate());
@@ -270,18 +270,28 @@ CreateExternalProcessDialog::~CreateExternalProcessDialog() {
void CreateExternalProcessDialog::showEvent(QShowEvent *event) {
QDialog::showEvent(event);
if (lastPage) {
- for (int i=0; i<(pageIds().size()-1); i++) {
+ for (int i = 0; i<(pageIds().size() - 1); i++) {
next();
}
}
}
+QString removeEmptyLines(const QString &str) {
+ QStringList res;
+ foreach(const QString &s, str.split(QRegExp("(\n|\r)"))) {
+ if (!s.trimmed().isEmpty()) {
+ res.append(s);
+ }
+ }
+ return res.join("\r\n");
+}
+
void CreateExternalProcessDialog::accept() {
CfgExternalToolModel *model;
cfg = new ExternalProcessConfig();
cfg->name = ui.nameLineEdit->text();
- cfg->description = ui.descriptionTextEdit->toPlainText();
- cfg->templateDescription = ui.prompterTextEdit->toPlainText();
+ cfg->description = removeEmptyLines(ui.descriptionTextEdit->toPlainText());
+ cfg->templateDescription = removeEmptyLines(ui.prompterTextEdit->toPlainText());
model = static_cast<CfgExternalToolModel*>(ui.inputTableView->model());
foreach(CfgExternalToolItem *item, model->getItems()) {
@@ -304,7 +314,7 @@ void CreateExternalProcessDialog::accept() {
cfg->cmdLine = ui.templateLineEdit->text();
- if(!validate()) {
+ if (!validate()) {
return;
}
@@ -327,7 +337,7 @@ void CreateExternalProcessDialog::accept() {
QString str = HRSchemaSerializer::actor2String(cfg);
QString dir = WorkflowSettings::getExternalToolDirectory();
QDir d(dir);
- if(!d.exists()) {
+ if (!d.exists()) {
d.mkdir(dir);
}
cfg->filePath = dir + cfg->name + ".etc";
@@ -341,28 +351,28 @@ void CreateExternalProcessDialog::accept() {
bool CreateExternalProcessDialog::validate() {
QString title = tr("Create Element");
- if(cfg->inputs.isEmpty() && cfg->outputs.isEmpty()) {
+ if (cfg->inputs.isEmpty() && cfg->outputs.isEmpty()) {
QMessageBox::critical(this, title, tr("Please set the input/output data."));
return false;
}
- if(cfg->cmdLine.isEmpty()) {
+ if (cfg->cmdLine.isEmpty()) {
QMessageBox::critical(this, title, tr("Please set the command line to run external tool."));
return false;
}
- if(cfg->name.isEmpty()) {
+ if (cfg->name.isEmpty()) {
QMessageBox::critical(this, title, tr("Please set the name for the new element."));
return false;
}
QRegExp invalidSymbols("[\\.,:;\\?]");
- if(cfg->name.contains(invalidSymbols)) {
+ if (cfg->name.contains(invalidSymbols)) {
QMessageBox::critical(this, title, tr("Invalid symbols in the element name."));
return false;
}
- if(WorkflowEnv::getProtoRegistry()->getProto(cfg->name) && !editing) {
+ if (WorkflowEnv::getProtoRegistry()->getProto(cfg->name) && !editing) {
QMessageBox::critical(this, title, tr("Element with this name already exists."));
return false;
}
@@ -370,46 +380,46 @@ bool CreateExternalProcessDialog::validate() {
invalidSymbols = QRegExp("\\W");
QStringList nameList;
foreach(const DataConfig & dc, cfg->inputs) {
- if(dc.attrName.isEmpty()) {
+ if (dc.attrName.isEmpty()) {
QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
return false;
}
- if(dc.attrName.contains(invalidSymbols)) {
+ if (dc.attrName.contains(invalidSymbols)) {
QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
return false;
}
nameList << dc.attrName;
}
foreach(const DataConfig & dc, cfg->outputs) {
- if(dc.attrName.isEmpty()) {
+ if (dc.attrName.isEmpty()) {
QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
return false;
}
- if(dc.attrName.contains(invalidSymbols)) {
+ if (dc.attrName.contains(invalidSymbols)) {
QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
return false;
}
nameList << dc.attrName;
}
foreach(const AttributeConfig & ac, cfg->attrs) {
- if(ac.attrName.isEmpty()) {
+ if (ac.attrName.isEmpty()) {
QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
return false;
}
- if(ac.attrName.contains(invalidSymbols)) {
+ if (ac.attrName.contains(invalidSymbols)) {
QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(ac.attrName));
return false;
}
nameList << ac.attrName;
}
- if(nameList.removeDuplicates() > 0) {
+ if (nameList.removeDuplicates() > 0) {
QMessageBox::critical(this, title, tr("The same name of element parameters was found"));
return false;
}
foreach(const QString &str, nameList) {
- if(!cfg->cmdLine.contains("$" + str)) {
+ if (!cfg->cmdLine.contains("$" + str)) {
QObjectScopedPointer<QMessageBox> msgBox = new QMessageBox(this);
msgBox->setWindowTitle(title);
msgBox->setText(tr("You don't use parameter %1 in template string. Continue?").arg(str));
@@ -417,7 +427,7 @@ bool CreateExternalProcessDialog::validate() {
QPushButton *cancel = msgBox->addButton(tr("Abort"), QMessageBox::ActionRole);
msgBox->exec();
CHECK(!msgBox.isNull(), false);
- if(msgBox->clickedButton() == cancel) {
+ if (msgBox->clickedButton() == cancel) {
return false;
}
}
@@ -443,31 +453,31 @@ void CreateExternalProcessDialog::sl_generateTemplateString() {
int i = 0;
foreach(AttributeItem *item, aModel->getItems()) {
i++;
- cmd += " -p" + QString::number(i) + " $" + item->getName();
+ cmd += " -p" + QString::number(i) + " $" + item->getName();
}
ui.templateLineEdit->setText(cmd);
}
bool CreateExternalProcessDialog::validateProcessName(const QString &name, QString &error) {
- if(name.isEmpty()) {
+ if (name.isEmpty()) {
error = tr("Please set the name for the new element.");
return false;
}
QRegExp spaces("\\s");
- if(name.contains(spaces)) {
+ if (name.contains(spaces)) {
error = tr("Spaces in the element name.");
return false;
}
QRegExp invalidSymbols("\\W");
- if(name.contains(invalidSymbols)) {
+ if (name.contains(invalidSymbols)) {
error = tr("Invalid symbols in the element name.");
return false;
}
- if(WorkflowEnv::getProtoRegistry()->getProto(name) && !editing) {
+ if (WorkflowEnv::getProtoRegistry()->getProto(name) && !editing) {
error = tr("Element with this name already exists.");
return false;
}
@@ -476,7 +486,7 @@ bool CreateExternalProcessDialog::validateProcessName(const QString &name, QStri
}
static QString statusTemplate = QString("<font color=\"%1\">%2</font>");
-void CreateExternalProcessDialog::sl_validateName( const QString &text) {
+void CreateExternalProcessDialog::sl_validateName(const QString &text) {
QString error;
bool res = validateProcessName(text, error);
@@ -490,15 +500,15 @@ void CreateExternalProcessDialog::sl_validateName( const QString &text) {
ui.descr1TextEdit->setText(descr1.arg(statusStr));
}
-void CreateExternalProcessDialog::sl_validateCmdLine( const QString & text) {
- if(text.isEmpty()) {
+void CreateExternalProcessDialog::sl_validateCmdLine(const QString & text) {
+ if (text.isEmpty()) {
button(QWizard::FinishButton)->setEnabled(false);
} else {
button(QWizard::FinishButton)->setEnabled(true);
}
}
-void CreateExternalProcessDialog::validateDataModel(const QModelIndex &, const QModelIndex & ) {
+void CreateExternalProcessDialog::validateDataModel(const QModelIndex &, const QModelIndex &) {
bool res = true;
CfgExternalToolModel *model;
@@ -506,11 +516,11 @@ void CreateExternalProcessDialog::validateDataModel(const QModelIndex &, const Q
QStringList nameList;
model = static_cast<CfgExternalToolModel*>(ui.inputTableView->model());
foreach(CfgExternalToolItem *item, model->getItems()) {
- if(item->itemData.attrName.isEmpty()) {
+ if (item->itemData.attrName.isEmpty()) {
//QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
res = false;
}
- if(item->itemData.attrName.contains(invalidSymbols)) {
+ if (item->itemData.attrName.contains(invalidSymbols)) {
//QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
res = false;
}
@@ -519,11 +529,11 @@ void CreateExternalProcessDialog::validateDataModel(const QModelIndex &, const Q
model = static_cast<CfgExternalToolModel*>(ui.outputTableView->model());
foreach(CfgExternalToolItem *item, model->getItems()) {
- if(item->itemData.attrName.isEmpty()) {
+ if (item->itemData.attrName.isEmpty()) {
//QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
res = false;
}
- if(item->itemData.attrName.contains(invalidSymbols)) {
+ if (item->itemData.attrName.contains(invalidSymbols)) {
//QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
res = false;
}
@@ -532,18 +542,18 @@ void CreateExternalProcessDialog::validateDataModel(const QModelIndex &, const Q
- if(nameList.removeDuplicates() > 0) {
+ if (nameList.removeDuplicates() > 0) {
//QMessageBox::critical(this, title, tr("The same name of element parameters was found"));
res = false;
}
- if(nameList.isEmpty()) {
+ if (nameList.isEmpty()) {
res = false;
}
button(QWizard::NextButton)->setEnabled(res);
}
-void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, const QModelIndex & ) {
+void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, const QModelIndex &) {
bool res = true;
CfgExternalToolModel *model;
@@ -551,11 +561,11 @@ void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, co
QStringList nameList;
model = static_cast<CfgExternalToolModel*>(ui.inputTableView->model());
foreach(CfgExternalToolItem *item, model->getItems()) {
- if(item->itemData.attrName.isEmpty()) {
+ if (item->itemData.attrName.isEmpty()) {
//QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
res = false;
}
- if(item->itemData.attrName.contains(invalidSymbols)) {
+ if (item->itemData.attrName.contains(invalidSymbols)) {
//QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
res = false;
}
@@ -564,11 +574,11 @@ void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, co
model = static_cast<CfgExternalToolModel*>(ui.outputTableView->model());
foreach(CfgExternalToolItem *item, model->getItems()) {
- if(item->itemData.attrName.isEmpty()) {
+ if (item->itemData.attrName.isEmpty()) {
//QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
res = false;
}
- if(item->itemData.attrName.contains(invalidSymbols)) {
+ if (item->itemData.attrName.contains(invalidSymbols)) {
//QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(dc.attrName));
res = false;
}
@@ -577,11 +587,11 @@ void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, co
CfgExternalToolModelAttributes *aModel = static_cast<CfgExternalToolModelAttributes*>(ui.attributesTableView->model());
foreach(AttributeItem *item, aModel->getItems()) {
- if(item->getName().isEmpty()) {
+ if (item->getName().isEmpty()) {
//QMessageBox::critical(this, title, tr("For one or more parameter name was not set."));
res = false;
}
- if(item->getName().contains(invalidSymbols)) {
+ if (item->getName().contains(invalidSymbols)) {
//QMessageBox::critical(this, title, tr("Invalid symbols in a name.").arg(ac.attrName));
res = false;
}
@@ -589,7 +599,7 @@ void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, co
}
- if(nameList.removeDuplicates() > 0) {
+ if (nameList.removeDuplicates() > 0) {
//QMessageBox::critical(this, title, tr("The same name of element parameters was found"));
res = false;
}
@@ -598,32 +608,32 @@ void CreateExternalProcessDialog::validateAttributeModel(const QModelIndex &, co
void CreateExternalProcessDialog::validateNextPage() {
int id = currentId();
- switch(id) {
- case 0:
- sl_validateName(ui.nameLineEdit->text());
- break;
- case 1:
- validateDataModel();
- break;
- case 2:
- validateAttributeModel();
- case 3:
- sl_validateCmdLine(ui.templateLineEdit->text());
+ switch (id) {
+ case 0:
+ sl_validateName(ui.nameLineEdit->text());
+ break;
+ case 1:
+ validateDataModel();
+ break;
+ case 2:
+ validateAttributeModel();
+ case 3:
+ sl_validateCmdLine(ui.templateLineEdit->text());
}
}
void CreateExternalProcessDialog::sl_validatePage(int id) {
- switch(id) {
- case 0:
- sl_validateName(ui.nameLineEdit->text());
- break;
- case 1:
- validateDataModel();
- break;
- case 2:
- validateAttributeModel();
- case 3:
- sl_validateCmdLine(ui.templateLineEdit->text());
+ switch (id) {
+ case 0:
+ sl_validateName(ui.nameLineEdit->text());
+ break;
+ case 1:
+ validateDataModel();
+ break;
+ case 2:
+ validateAttributeModel();
+ case 3:
+ sl_validateCmdLine(ui.templateLineEdit->text());
}
}
diff --git a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
index 56aa837..c54162c 100644
--- a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
+++ b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/DocActors.cpp b/src/plugins/workflow_designer/src/library/DocActors.cpp
index 3c8edde..cf0c302 100644
--- a/src/plugins/workflow_designer/src/library/DocActors.cpp
+++ b/src/plugins/workflow_designer/src/library/DocActors.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/DocActors.h b/src/plugins/workflow_designer/src/library/DocActors.h
index d752db6..cd10fe1 100644
--- a/src/plugins/workflow_designer/src/library/DocActors.h
+++ b/src/plugins/workflow_designer/src/library/DocActors.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/DocWorkers.cpp b/src/plugins/workflow_designer/src/library/DocWorkers.cpp
index 4f65a77..26251af 100644
--- a/src/plugins/workflow_designer/src/library/DocWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/DocWorkers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/DocWorkers.h b/src/plugins/workflow_designer/src/library/DocWorkers.h
index be179e9..b1d74a8 100644
--- a/src/plugins/workflow_designer/src/library/DocWorkers.h
+++ b/src/plugins/workflow_designer/src/library/DocWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
index d479a82..6cec366 100644
--- a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
index c81db50..721b34c 100644
--- a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
index 48ef617..53ddece 100644
--- a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
index 68073d2..a39a89d 100644
--- a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
index b6308d0..7423568 100644
--- a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
index 1ab90b7..4d2eeb3 100644
--- a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
index 0140ca8..1f3647d 100644
--- a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
index 3439ed9..e9c6db5 100644
--- a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
index 047fd6b..69ef73d 100644
--- a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
+++ b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
index c4f272b..e10ddcb 100644
--- a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
+++ b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
index aa447d9..1353b49 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
index e6bb915..b492a59 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
index 3fa2073..e67efdc 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
index f5b6f59..4986e00 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp b/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
index 1082272..0cf4a8b 100644
--- a/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FilterBamWorker.h b/src/plugins/workflow_designer/src/library/FilterBamWorker.h
index 4924023..c3c77ec 100644
--- a/src/plugins/workflow_designer/src/library/FilterBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterBamWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FindWorker.cpp b/src/plugins/workflow_designer/src/library/FindWorker.cpp
index ace1a18..a566c4b 100644
--- a/src/plugins/workflow_designer/src/library/FindWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FindWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/FindWorker.h b/src/plugins/workflow_designer/src/library/FindWorker.h
index 189f7e9..3630179 100644
--- a/src/plugins/workflow_designer/src/library/FindWorker.h
+++ b/src/plugins/workflow_designer/src/library/FindWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GenericReadActor.cpp b/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
index 7cd3a73..9975867 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
+++ b/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -109,7 +109,7 @@ GenericSeqActorProto::GenericSeqActorProto() : GenericReadDocProto(CoreLibConsta
"This is helpful, for example, to avoid finding false positives at the merge boundaries."));
Descriptor acd(GenericSeqActorProto::ACC_ATTR, SeqReadPrompter::tr("Accession filter"),
SeqReadPrompter::tr("Reports only sequences containing the specified regular expression."
- "<p><i>Leave it empty to switch off this filter. Use <b>*</b> and <b>?</b> to mask some symbols.</i></p>"));
+ "<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbol and use <b>?</b> to mask one symbol.</i></p>"));
Descriptor ld(LIMIT_ATTR, SeqReadPrompter::tr("Sequence count limit"),
SeqReadPrompter::tr("<i>Split mode</i> only."
"<p>Read only first N sequences from each file."
@@ -147,7 +147,7 @@ GenericMAActorProto::GenericMAActorProto() : GenericReadDocProto(CoreLibConstant
setDisplayName(U2::Workflow::CoreLib::tr("Read Alignment"));
desc = U2::Workflow::CoreLib::tr("Reads multiple sequence alignments (MSAs) from local or remote files."
- "<p>Besides the known alignment formats, it supports composing an alignment from a set of sequences in a corresponding file (e.g. FASTA or Genbank).");
+ "<p>Besides recognized alignment formats, it supports aligning from a set of sequences in a corresponding file (e.g. FASTA or Genbank).");
QMap<Descriptor, DataTypePtr> m;
m[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
diff --git a/src/plugins/workflow_designer/src/library/GenericReadActor.h b/src/plugins/workflow_designer/src/library/GenericReadActor.h
index 3f2c989..63d99c8 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadActor.h
+++ b/src/plugins/workflow_designer/src/library/GenericReadActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp b/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
index 5105250..62c8688 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GenericReadWorker.h b/src/plugins/workflow_designer/src/library/GenericReadWorker.h
index 5f7ca60..2b51fa3 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadWorker.h
+++ b/src/plugins/workflow_designer/src/library/GenericReadWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp b/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
index 36d49f0..a0efa7f 100644
--- a/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GetFileListWorker.h b/src/plugins/workflow_designer/src/library/GetFileListWorker.h
index e16ee32..0398155 100644
--- a/src/plugins/workflow_designer/src/library/GetFileListWorker.h
+++ b/src/plugins/workflow_designer/src/library/GetFileListWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GroupWorker.cpp b/src/plugins/workflow_designer/src/library/GroupWorker.cpp
index a013584..73cf962 100644
--- a/src/plugins/workflow_designer/src/library/GroupWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GroupWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/GroupWorker.h b/src/plugins/workflow_designer/src/library/GroupWorker.h
index 617cf13..a559c78 100644
--- a/src/plugins/workflow_designer/src/library/GroupWorker.h
+++ b/src/plugins/workflow_designer/src/library/GroupWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
index 69963cf..ac3429b 100644
--- a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
index 3b19ce2..d7a8717 100644
--- a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
index 30f6a99..af51acd 100644
--- a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
+++ b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
index 25fed0b..f2c96b5 100644
--- a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
+++ b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
index b5726fe..65e9ea2 100644
--- a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
index 8eb545e..a0a918a 100644
--- a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
index 6c88031..e861639 100644
--- a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
index 2f50d26..125ad21 100644
--- a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp b/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
index 244bdc8..ec33aac 100644
--- a/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MergeBamWorker.h b/src/plugins/workflow_designer/src/library/MergeBamWorker.h
index 090685b..005f99e 100644
--- a/src/plugins/workflow_designer/src/library/MergeBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/MergeBamWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp b/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
index e733f37..34cca77 100644
--- a/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/MultiplexerWorker.h b/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
index bf7a62a..8eaeaa3 100644
--- a/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
+++ b/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp b/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
index a8bd584..c475aa3 100644
--- a/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/PassFilterWorker.h b/src/plugins/workflow_designer/src/library/PassFilterWorker.h
index 29bdd62..1f22a28 100644
--- a/src/plugins/workflow_designer/src/library/PassFilterWorker.h
+++ b/src/plugins/workflow_designer/src/library/PassFilterWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
index 06953d9..3a510e1 100644
--- a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
index 4cfd9f9..f19e6b9 100644
--- a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
index 9197ddb..a697ebb 100644
--- a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
index 879f521..12502e0 100644
--- a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp b/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
index 92ab429..4bc1290 100644
--- a/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ReadVariationWorker.h b/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
index 3555328..9eec4ba 100644
--- a/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
index 02f812b..8eed64a 100644
--- a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
index 5c74e0c..0b1c38b 100644
--- a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
+++ b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
index 4d2c8bc..dd6d1e9 100644
--- a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -120,7 +120,7 @@ RenameChomosomeInVariationWorkerFactory::RenameChomosomeInVariationWorkerFactory
void RenameChomosomeInVariationWorkerFactory::init() {
Descriptor desc(ACTOR_ID, RenameChomosomeInVariationWorker::tr("Change Chromosome Notation for VCF"),
- RenameChomosomeInVariationWorker::tr("Changes chromosome notation for each variant from the input, VCF or other variation files."));
+ RenameChomosomeInVariationWorker::tr("Changes chromosome notation for each variant from the input VCF or other variation files."));
QList<PortDescriptor*> p;
{
@@ -142,7 +142,7 @@ void RenameChomosomeInVariationWorkerFactory::init() {
QList<Attribute*> a;
{
Descriptor prefixesToReplace(TO_REPLACE_ATTR, RenameChomosomeInVariationWorker::tr("Replace prefixes"),
- RenameChomosomeInVariationWorker::tr("Input the list of chromosome prefixes that you would like to replace. For example \"NC_000\". Separate different prefixes by semicolons."));
+ RenameChomosomeInVariationWorker::tr("Input the list of chromosome prefixes that you would like to replace, for example \"NC_000\". Separate different prefixes by semicolons."));
Descriptor prefixReplaceWith(REPLACE_WITH_ATTR, RenameChomosomeInVariationWorker::tr("Replace by"),
RenameChomosomeInVariationWorker::tr("Input the prefix that should be set instead, for example \"chr\"."));
diff --git a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
index 197d44e..4455ae5 100644
--- a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp b/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
index 4468c2f..5277276 100644
--- a/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/RmdupBamWorker.h b/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
index 88bbfdb..508c61b 100644
--- a/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SchemaWorker.cpp b/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
index 673d2dd..d00d548 100644
--- a/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SchemaWorker.h b/src/plugins/workflow_designer/src/library/SchemaWorker.h
index 215be62..9b63a14 100644
--- a/src/plugins/workflow_designer/src/library/SchemaWorker.h
+++ b/src/plugins/workflow_designer/src/library/SchemaWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ScriptWorker.cpp b/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
index b2e381b..c18a1b2 100644
--- a/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/ScriptWorker.h b/src/plugins/workflow_designer/src/library/ScriptWorker.h
index 8df8a3b..8ac17cd 100644
--- a/src/plugins/workflow_designer/src/library/ScriptWorker.h
+++ b/src/plugins/workflow_designer/src/library/ScriptWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
index c9985a9..d0e8d19 100644
--- a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
index ce80fd1..f795ab8 100644
--- a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
+++ b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
index 55fc6dd..f2654b1 100644
--- a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
index 929a320..16071b5 100644
--- a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
+++ b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SortBamWorker.cpp b/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
index 280b8d9..8a5f098 100644
--- a/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/SortBamWorker.h b/src/plugins/workflow_designer/src/library/SortBamWorker.h
index 18da2fe..9f9a0dd 100644
--- a/src/plugins/workflow_designer/src/library/SortBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/SortBamWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp b/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
index 0b77a7b..b0d7a66 100644
--- a/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/StatisticWorkers.h b/src/plugins/workflow_designer/src/library/StatisticWorkers.h
index b8a06c3..ef79cec 100644
--- a/src/plugins/workflow_designer/src/library/StatisticWorkers.h
+++ b/src/plugins/workflow_designer/src/library/StatisticWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
index 5d792b1..c9429d7 100644
--- a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
index 01bb8ce..bd75ef7 100644
--- a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
index 79c994a..380fe4d 100644
--- a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
index d06d668..917186d 100644
--- a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
index 93c4bf8..6353a5b 100644
--- a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
index b20acdc..cbe3d7b 100644
--- a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
+++ b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp b/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
index a34a302..b09c155 100644
--- a/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/library/WriteVariationWorker.h b/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
index 4ebfc87..d96c553 100644
--- a/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
index 072e6bd..4e6d808 100644
--- a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
+++ b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
index 4157816..5a7096c 100644
--- a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
+++ b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
index 01593be..dc65c9c 100644
--- a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
+++ b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
index b29929f..601fe1c 100644
--- a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
+++ b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/ui/ExternalProcessWorkerDialog.ui b/src/plugins/workflow_designer/src/ui/ExternalProcessWorkerDialog.ui
index 7f62918..b520ceb 100644
--- a/src/plugins/workflow_designer/src/ui/ExternalProcessWorkerDialog.ui
+++ b/src/plugins/workflow_designer/src/ui/ExternalProcessWorkerDialog.ui
@@ -85,7 +85,7 @@ p, li { white-space: pre-wrap; }
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
+<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
</property>
</widget>
</item>
@@ -301,7 +301,7 @@ p, li { white-space: pre-wrap; }
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Execution string and element's description. To substitute input, output data or parameter, use it's name with prefix $ in execution string. You can set parameterized description for new element(description that appears not in property editor but on element itself). In parameterized description you also can u [...]
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Execution string and element's description. To substitute input, output data or parameter, use it's name with prefix $ in execution string. You can set parameterized description for new element(description that appears not in property editor but on element itself). In parameterized description you also can u [...]
</property>
</widget>
</item>
@@ -350,7 +350,7 @@ p, li { white-space: pre-wrap; }
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
+<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
</property>
</widget>
</item>
diff --git a/src/plugins/workflow_designer/src/util/DatasetValidator.cpp b/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
index 4e4a120..9b2f11c 100644
--- a/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/DatasetValidator.h b/src/plugins/workflow_designer/src/util/DatasetValidator.h
index 698bc9f..6330cf6 100644
--- a/src/plugins/workflow_designer/src/util/DatasetValidator.h
+++ b/src/plugins/workflow_designer/src/util/DatasetValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
index c58813c..9dca67c 100644
--- a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
index 4145682..2407e93 100644
--- a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
+++ b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp b/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
index 4fe3d5b..4c413ea 100644
--- a/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
+++ b/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/GrouperActionUtils.h b/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
index 32cb39e..a68128b 100644
--- a/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
+++ b/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
index 16a40e1..68320ce 100644
--- a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
index 3977cd1..2d5d980 100644
--- a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
+++ b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
index 676fc2b..22ecb2f 100644
--- a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
+++ b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
index 74cb550..44ef5c3 100644
--- a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
+++ b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp b/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
index 421d021..52b67e6 100644
--- a/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/WorkerNameValidator.h b/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
index 638e399..bfacc40 100644
--- a/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
+++ b/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
index 1de8120..7e251bb 100644
--- a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
index 7a3a28e..9149a77 100644
--- a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
+++ b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_designer/transl/english.ts b/src/plugins/workflow_designer/transl/english.ts
index 4d7a582..4520efc 100644
--- a/src/plugins/workflow_designer/transl/english.ts
+++ b/src/plugins/workflow_designer/transl/english.ts
@@ -686,7 +686,7 @@ p, li { white-space: pre-wrap; }
<translation>Output Directory</translation>
</message>
<message>
- <location filename="../src/ui/StartupDialog.ui" line="41"/>
+ <location filename="../src/ui/StartupDialog.ui" line="33"/>
<source>Note: you can change this option in the UGENE Application Settings
(Settings > Preferences > Workflow Designer)</source>
<translation>Note: you can change this option in the UGENE Application Settings
@@ -1823,288 +1823,233 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::DASAnnotationPrompter</name>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="241"/>
<source>unset</source>
- <translation>unset</translation>
+ <translation type="vanished">unset</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="242"/>
<source> from <u>%1</u></source>
- <translation> from <u>%1</u></translation>
+ <translation type="vanished"> from <u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="245"/>
<source>For each protein sequence %1, finds IDs of similar sequences using remote BLAST.<br>Loads annotations for DAS sources using the first %2 ID(s).</source>
- <translation>For each protein sequence %1, finds IDs of similar sequences using remote BLAST.<br>Loads annotations for DAS sources using the first %2 ID(s).</translation>
+ <translation type="vanished">For each protein sequence %1, finds IDs of similar sequences using remote BLAST.<br>Loads annotations for DAS sources using the first %2 ID(s).</translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASAnnotationWorker</name>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="72"/>
<source>Input sequences</source>
- <translation>Input sequences</translation>
+ <translation type="vanished">Input sequences</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="73"/>
<source>Protein sequences for annotation. Nucleotide sequences are skipped.</source>
- <translation>Protein sequences for annotation. Nucleotide sequences are skipped.</translation>
+ <translation type="vanished">Protein sequences for annotation. Nucleotide sequences are skipped.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="74"/>
<source>DAS annotations</source>
- <translation>DAS annotations</translation>
+ <translation type="vanished">DAS annotations</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="75"/>
<source>A set of annotations loaded from DAS sources using IDs of similar sequences.</source>
- <translation>A set of annotations loaded from DAS sources using IDs of similar sequences.</translation>
+ <translation type="vanished">A set of annotations loaded from DAS sources using IDs of similar sequences.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="84"/>
<source>Max result IDs</source>
- <translation>Max result IDs</translation>
+ <translation type="vanished">Max result IDs</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="84"/>
<source>Use first IDs of similar sequences to load annotations.</source>
- <translation>Use first IDs of similar sequences to load annotations.</translation>
+ <translation type="vanished">Use first IDs of similar sequences to load annotations.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="85"/>
<source>Database</source>
- <translation>Database</translation>
+ <translation type="vanished">Database</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="85"/>
<source>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity.</source>
- <translation>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity.</translation>
+ <translation type="vanished">Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="86"/>
<source>Min identity</source>
- <translation>Min identity</translation>
+ <translation type="vanished">Min identity</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="86"/>
<source>Minimum identity of a BLAST result and an input sequence.</source>
- <translation>Minimum identity of a BLAST result and an input sequence.</translation>
+ <translation type="vanished">Minimum identity of a BLAST result and an input sequence.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="87"/>
<source>Feature sources</source>
- <translation>Feature sources</translation>
+ <translation type="vanished">Feature sources</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="87"/>
<source>The DAS sources to read features from.</source>
- <translation>The DAS sources to read features from.</translation>
+ <translation type="vanished">The DAS sources to read features from.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="88"/>
<source>Threshold</source>
- <translation>Threshold</translation>
+ <translation type="vanished">Threshold</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="88"/>
<source>The expectation value (E) threshold is a statistical measure of the number of expected matches in a random database. The lower the e-value, the more likely the match is to be significant.</source>
- <translation>The expectation value (E) threshold is a statistical measure of the number of expected matches in a random database. The lower the e-value, the more likely the match is to be significant.</translation>
+ <translation type="vanished">The expectation value (E) threshold is a statistical measure of the number of expected matches in a random database. The lower the e-value, the more likely the match is to be significant.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="89"/>
<source>Matrix</source>
- <translation>Matrix</translation>
+ <translation type="vanished">Matrix</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="89"/>
<source>The matrix assigns a probability score for each position in an alignment.</source>
- <translation>The matrix assigns a probability score for each position in an alignment.</translation>
+ <translation type="vanished">The matrix assigns a probability score for each position in an alignment.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="90"/>
<source>Filtering</source>
- <translation>Filtering</translation>
+ <translation type="vanished">Filtering</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="90"/>
<source>Low-complexity regions (e.g. stretches of cysteine in Q03751, or hydrophobic regions in membrane proteins) tend to producespurious, insignificant matches with sequences in the database which have the same kind of low-complexity regions, but are unrelated biologically. If 'Filter low complexity regions' is selected, the query sequence will be run through the program SEG, and all amino acids in low-complexity regions will be replaced by X's.</source>
- <translation>Low-complexity regions (e.g. stretches of cysteine in Q03751, or hydrophobic regions in membrane proteins) tend to producespurious, insignificant matches with sequences in the database which have the same kind of low-complexity regions, but are unrelated biologically. If 'Filter low complexity regions' is selected, the query sequence will be run through the program SEG, and all amino acids in low-complexity regions will be replaced by X's.</translation>
+ <translation type="vanished">Low-complexity regions (e.g. stretches of cysteine in Q03751, or hydrophobic regions in membrane proteins) tend to producespurious, insignificant matches with sequences in the database which have the same kind of low-complexity regions, but are unrelated biologically. If 'Filter low complexity regions' is selected, the query sequence will be run through the program SEG, and all amino acids in low-complexity regions will be replaced by X&apos [...]
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="93"/>
<source>Gapped</source>
- <translation>Gapped</translation>
+ <translation type="vanished">Gapped</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="93"/>
<source>This will allow gaps to be introduced in the sequences when the comparison is done.</source>
- <translation>This will allow gaps to be introduced in the sequences when the comparison is done.</translation>
+ <translation type="vanished">This will allow gaps to be introduced in the sequences when the comparison is done.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="94"/>
<source>Hits</source>
- <translation>Hits</translation>
+ <translation type="vanished">Hits</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="94"/>
<source>Limits the number of returned alignments.</source>
- <translation>Limits the number of returned alignments.</translation>
+ <translation type="vanished">Limits the number of returned alignments.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="106"/>
<source>Annotate with DAS</source>
- <translation>Annotate with DAS</translation>
+ <translation type="vanished">Annotate with DAS</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="107"/>
<source>Finds similar protein sequence using remote BLAST.<p>Using IDs of sequences found loads annotation for DAS sources.<p>Nucleotide sequences are skipped if any supplied to input.</p></source>
- <translation>Finds similar protein sequence using remote BLAST.<p>Using IDs of sequences found loads annotation for DAS sources.<p>Nucleotide sequences are skipped if any supplied to input.</p></translation>
+ <translation type="vanished">Finds similar protein sequence using remote BLAST.<p>Using IDs of sequences found loads annotation for DAS sources.<p>Nucleotide sequences are skipped if any supplied to input.</p></translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="150"/>
<source>No DAS registry</source>
- <translation>No DAS registry</translation>
+ <translation type="vanished">No DAS registry</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="153"/>
<source>No DAS feature sources</source>
- <translation>No DAS feature sources</translation>
+ <translation type="vanished">No DAS feature sources</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="286"/>
<source>Internal error: no DAS Registry.</source>
- <translation>Internal error: no DAS Registry.</translation>
+ <translation type="vanished">Internal error: no DAS Registry.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="313"/>
<source>Sequence %1 is %2 amino acids long. Only sequences from %3 to %4 amino acids are processed.</source>
- <translation>Sequence %1 is %2 amino acids long. Only sequences from %3 to %4 amino acids are processed.</translation>
+ <translation type="vanished">Sequence %1 is %2 amino acids long. Only sequences from %3 to %4 amino acids are processed.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="333"/>
<source>Bad sequence supplied to DASAnnotationWorker: %1</source>
- <translation>Bad sequence supplied to DASAnnotationWorker: %1</translation>
+ <translation type="vanished">Bad sequence supplied to DASAnnotationWorker: %1</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="363"/>
<source>Number of similar sequences: %1.</source>
- <translation>Number of similar sequences: %1.</translation>
+ <translation type="vanished">Number of similar sequences: %1.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="362"/>
<source> IDs: </source>
- <translation> IDs: </translation>
+ <translation type="vanished"> IDs: </translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASFetcherPrompter</name>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="69"/>
<source>unset</source>
- <translation>unset</translation>
+ <translation type="vanished">unset</translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASFetcherWorker</name>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="72"/>
<source>sequences identified with</source>
- <translation>sequences identified with</translation>
+ <translation type="vanished">sequences identified with</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="73"/>
<source>sequence identified with</source>
- <translation>sequence identified with</translation>
+ <translation type="vanished">sequence identified with</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="87"/>
<source>Save result to <u>%1</u> directory.</source>
- <translation>Save result to <u>%1</u> directory.</translation>
+ <translation type="vanished">Save result to <u>%1</u> directory.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="89"/>
<source>Reads %1 %2 from <u>%3</u> DAS source. %4</source>
- <translation>Reads %1 %2 from <u>%3</u> DAS source. %4</translation>
+ <translation type="vanished">Reads %1 %2 from <u>%3</u> DAS source. %4</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="128"/>
<source>Cannot create directory '%1'</source>
- <translation>Cannot create directory '%1'</translation>
+ <translation type="vanished">Cannot create directory '%1'</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="188"/>
<source>failed to load item from DAS source : %3</source>
- <translation>failed to load item from DAS source : %3</translation>
+ <translation type="vanished">failed to load item from DAS source : %3</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="280"/>
<source>Read from DAS</source>
- <translation>Read from DAS</translation>
+ <translation type="vanished">Read from DAS</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="281"/>
<source>Reads sequences and annotations if any from the Distributed Annotation System.</source>
- <translation>Reads sequences and annotations if any from the Distributed Annotation System.</translation>
+ <translation type="vanished">Reads sequences and annotations if any from the Distributed Annotation System.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="285"/>
<source>Sequence</source>
- <translation>Sequence</translation>
+ <translation type="vanished">Sequence</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="290"/>
<source>No DAS registry</source>
- <translation>No DAS registry</translation>
+ <translation type="vanished">No DAS registry</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="293"/>
<source>No DAS sources</source>
- <translation>No DAS sources</translation>
+ <translation type="vanished">No DAS sources</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="295"/>
<source>No DAS feature sources</source>
- <translation>No DAS feature sources</translation>
+ <translation type="vanished">No DAS feature sources</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="312"/>
<source>Feature Sources</source>
- <translation>Feature Sources</translation>
+ <translation type="vanished">Feature Sources</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="313"/>
<source>The DAS sources to read features from.</source>
- <translation>The DAS sources to read features from.</translation>
+ <translation type="vanished">The DAS sources to read features from.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="317"/>
<source>Reference Source</source>
- <translation>Reference Source</translation>
+ <translation type="vanished">Reference Source</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="318"/>
<source>The DAS source to read reference from.</source>
- <translation>The DAS source to read reference from.</translation>
+ <translation type="vanished">The DAS source to read reference from.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="328"/>
<source>Resource ID(s)</source>
- <translation>Resource ID(s)</translation>
+ <translation type="vanished">Resource ID(s)</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="329"/>
<source>Semicolon-separated list of resource ID`s in the source.</source>
- <translation>Semicolon-separated list of resource ID`s in the source.</translation>
+ <translation type="vanished">Semicolon-separated list of resource ID`s in the source.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="335"/>
<source>Save file to directory</source>
- <translation>Save file to directory</translation>
+ <translation type="vanished">Save file to directory</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="336"/>
<source>The directory to store sequence files loaded from the source.</source>
- <translation>The directory to store sequence files loaded from the source.</translation>
+ <translation type="vanished">The directory to store sequence files loaded from the source.</translation>
</message>
</context>
<context>
@@ -4287,8 +4232,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="123"/>
- <source>Changes chromosome notation for each variant from the input, VCF or other variation files.</source>
- <translation>Changes chromosome notation for each variant from the input, VCF or other variation files.</translation>
+ <source>Changes chromosome notation for each variant from the input VCF or other variation files.</source>
+ <translation>Changes chromosome notation for each variant from the input VCF or other variation files.</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="127"/>
@@ -4327,8 +4272,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="145"/>
- <source>Input the list of chromosome prefixes that you would like to replace. For example "NC_000". Separate different prefixes by semicolons.</source>
- <translation>Input the list of chromosome prefixes that you would like to replace. For example "NC_000". Separate different prefixes by semicolons.</translation>
+ <source>Input the list of chromosome prefixes that you would like to replace, for example "NC_000". Separate different prefixes by semicolons.</source>
+ <translation>Input the list of chromosome prefixes that you would like to replace, for example "NC_000". Separate different prefixes by semicolons.</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="147"/>
@@ -5333,7 +5278,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::StartupDialog</name>
<message>
- <location filename="../src/StartupDialog.cpp" line="68"/>
+ <location filename="../src/StartupDialog.cpp" line="65"/>
<source>You have no write access to the directory. Please choose another one.</source>
<translation>You have no write access to the directory. Please choose another one.</translation>
</message>
@@ -5341,116 +5286,116 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::Workflow::CoreLib</name>
<message>
- <location filename="../src/library/CoreLib.cpp" line="127"/>
+ <location filename="../src/library/CoreLib.cpp" line="125"/>
<source>Location</source>
<translation>Location</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="127"/>
+ <location filename="../src/library/CoreLib.cpp" line="125"/>
<source>Location for writing data</source>
<translation>Location for writing data</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="152"/>
<source>Write FASTA</source>
<translation>Write FASTA</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="152"/>
<source>Writes all supplied sequences to file(s) in FASTA format.</source>
<translation>Writes all supplied sequences to file(s) in FASTA format.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="155"/>
- <location filename="../src/library/CoreLib.cpp" line="253"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<location filename="../src/library/GenericReadActor.cpp" line="100"/>
<source>Sequence</source>
<translation>Sequence</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="155"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<source>A sequence along with FASTA header line.</source>
<translation>A sequence along with FASTA header line.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="173"/>
<source>Read Plain Text</source>
<translation>Read Plain Text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="173"/>
<source>Reads text from local or remote files.</source>
<translation>Reads text from local or remote files.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="176"/>
- <location filename="../src/library/CoreLib.cpp" line="196"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Plain text</source>
<translation>Plain text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="179"/>
+ <location filename="../src/library/CoreLib.cpp" line="177"/>
<source>Reads text from <u>%1</u>.</source>
<translation>Reads text from <u>%1</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="195"/>
+ <location filename="../src/library/CoreLib.cpp" line="193"/>
<source>Write Plain Text</source>
<translation>Write Plain Text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="195"/>
+ <location filename="../src/library/CoreLib.cpp" line="193"/>
<source>Write strings to a file.</source>
<translation>Write strings to a file.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="202"/>
+ <location filename="../src/library/CoreLib.cpp" line="200"/>
<source>Save text from <u>%1</u> to <u>%2</u>.</source>
<translation>Save text from <u>%1</u> to <u>%2</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="430"/>
+ <location filename="../src/library/CoreLib.cpp" line="426"/>
<source>Another worker with this name is already registered: %1</source>
<translation>Another worker with this name is already registered: %1</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="432"/>
+ <location filename="../src/library/CoreLib.cpp" line="428"/>
<source>The actor '%1' has been already registered</source>
<translation>The actor '%1' has been already registered</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="217"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<location filename="../src/library/GenericReadActor.cpp" line="160"/>
<source>Multiple sequence alignment</source>
<translation>Multiple sequence alignment</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="230"/>
+ <location filename="../src/library/CoreLib.cpp" line="228"/>
<source>Save all MSAs from <u>%1</u> to <u>%2</u>.</source>
<translation>Save all MSAs from <u>%1</u> to <u>%2</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="216"/>
+ <location filename="../src/library/CoreLib.cpp" line="214"/>
<source>Write Alignment</source>
<translation>Write Alignment</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="216"/>
+ <location filename="../src/library/CoreLib.cpp" line="214"/>
<source>Writes all supplied alignments to file(s) in selected format.</source>
<translation>Writes all supplied alignments to file(s) in selected format.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="252"/>
+ <location filename="../src/library/CoreLib.cpp" line="250"/>
<source>Write Sequence</source>
<translation>Write Sequence</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="252"/>
+ <location filename="../src/library/CoreLib.cpp" line="250"/>
<source>Writes all supplied sequences to file(s) in selected format.</source>
<translation>Writes all supplied sequences to file(s) in selected format.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="283"/>
+ <location filename="../src/library/CoreLib.cpp" line="281"/>
<source>Save all sequences from <u>%1</u> to <u>%2</u>.</source>
<translation>Save all sequences from <u>%1</u> to <u>%2</u>.</translation>
</message>
@@ -5481,8 +5426,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="149"/>
- <source>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides the known alignment formats, it supports composing an alignment from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</source>
- <translation>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides the known alignment formats, it supports composing an alignment from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</translation>
+ <source>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides recognized alignment formats, it supports aligning from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</source>
+ <translation>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides recognized alignment formats, it supports aligning from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="163"/>
@@ -5614,8 +5559,12 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="111"/>
- <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> and <b>?</b> to mask some symbols.</i></p></source>
- <translation>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> and <b>?</b> to mask some symbols.</i></p></translation>
+ <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbol and use <b>?</b> to mask one symbol.</i></p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbols and <b>?</b> to mask one symbol.</i></p></source>
+ <translation type="vanished">Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbols and <b>?</b> to mask one symbol.</i></p></translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="113"/>
diff --git a/src/plugins/workflow_designer/transl/russian.ts b/src/plugins/workflow_designer/transl/russian.ts
index 1441e76..154c1d8 100644
--- a/src/plugins/workflow_designer/transl/russian.ts
+++ b/src/plugins/workflow_designer/transl/russian.ts
@@ -693,7 +693,7 @@ p, li { white-space: pre-wrap; }
<translation>Выходная директория</translation>
</message>
<message>
- <location filename="../src/ui/StartupDialog.ui" line="41"/>
+ <location filename="../src/ui/StartupDialog.ui" line="33"/>
<source>Note: you can change this option in the UGENE Application Settings
(Settings > Preferences > Workflow Designer)</source>
<translation>Замечание: вы можете изменить эти настройки в общих настройках UGENE
@@ -1474,12 +1474,12 @@ You could also reset the dialog to the initial state.</source>
<message>
<location filename="../src/library/WriteAssemblyWorkers.cpp" line="186"/>
<source>Build index (BAM only)</source>
- <translation>Построение индекса (только BAM)</translation>
+ <translation>Построение индекса (применимо только к файлам BAM)</translation>
</message>
<message>
<location filename="../src/library/WriteAssemblyWorkers.cpp" line="187"/>
<source>Build BAM index for the target BAM file. The file .bai will be created in the same directory.</source>
- <translation>Построение индекса для BAM файла. Файл с расширением .bai будет создан в той же директории.</translation>
+ <translation>построение индекса для BAM-файла. Файл с расширением .bai будет создан в той же директории.</translation>
</message>
</context>
<context>
@@ -1559,7 +1559,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="98"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="102"/>
@@ -1750,7 +1750,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ConvertFilesFormatWorker.cpp" line="119"/>
<source>File of selected format</source>
- <translation>Файл выбранного формата</translation>
+ <translation>Файл заданного формата</translation>
</message>
<message>
<location filename="../src/library/ConvertFilesFormatWorker.cpp" line="132"/>
@@ -1770,7 +1770,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ConvertFilesFormatWorker.cpp" line="136"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/ConvertFilesFormatWorker.cpp" line="140"/>
@@ -1826,288 +1826,233 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::DASAnnotationPrompter</name>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="241"/>
<source>unset</source>
- <translation>не указан</translation>
+ <translation type="vanished">не указан</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="242"/>
<source> from <u>%1</u></source>
- <translation>из <u>%1</u></translation>
+ <translation type="vanished">из <u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="245"/>
<source>For each protein sequence %1, finds IDs of similar sequences using remote BLAST.<br>Loads annotations for DAS sources using the first %2 ID(s).</source>
- <translation>Для каждой протеиновой последовательности %1, ищутся идентификаторы похожих последовательносетй используя удаленный BLAST.<br>Загружает аннотации для DAS используя первые %2 идентификаторы.</translation>
+ <translation type="vanished">Для каждой протеиновой последовательности %1, ищутся идентификаторы похожих последовательносетй используя удаленный BLAST.<br>Загружает аннотации для DAS используя первые %2 идентификаторы.</translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASAnnotationWorker</name>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="72"/>
<source>Input sequences</source>
- <translation>Входные последовательности</translation>
+ <translation type="vanished">Входные последовательности</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="73"/>
<source>Protein sequences for annotation. Nucleotide sequences are skipped.</source>
- <translation>Протеиновые последовательности для аннотации. Нуклеотидные последовательности будут проигнорированы.</translation>
+ <translation type="vanished">Протеиновые последовательности для аннотации. Нуклеотидные последовательности будут проигнорированы.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="74"/>
<source>DAS annotations</source>
- <translation>DAS аннотации</translation>
+ <translation type="vanished">DAS аннотации</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="75"/>
<source>A set of annotations loaded from DAS sources using IDs of similar sequences.</source>
- <translation>Набор аннотаций загружаемый из DAS источников используя идентификаторы похожих последовательностей.</translation>
+ <translation type="vanished">Набор аннотаций загружаемый из DAS источников используя идентификаторы похожих последовательностей.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="84"/>
<source>Max result IDs</source>
- <translation>Максимальное количество идентификаторов</translation>
+ <translation type="vanished">Максимальное количество идентификаторов</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="84"/>
<source>Use first IDs of similar sequences to load annotations.</source>
- <translation>Использовать первый идентификатор похожей последовательности для загрузки аннотаций.</translation>
+ <translation type="vanished">Использовать первый идентификатор похожей последовательности для загрузки аннотаций.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="85"/>
<source>Database</source>
- <translation>База данных</translation>
+ <translation type="vanished">База данных</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="85"/>
<source>Database against which the search is performed: UniProtKB or clusters of sequences with 100%, 90% or 50% identity.</source>
- <translation>База данных, по которым выполняется поиск: UniProtKB или кластеры последовательностей с 100%, 90% или 50% идентичностью.</translation>
+ <translation type="vanished">База данных, по которым выполняется поиск: UniProtKB или кластеры последовательностей с 100%, 90% или 50% идентичностью.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="86"/>
<source>Min identity</source>
- <translation>Минимальная идентификация</translation>
+ <translation type="vanished">Минимальная идентификация</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="86"/>
<source>Minimum identity of a BLAST result and an input sequence.</source>
- <translation>Минимальная идентификация результатов BLAST и входная последовательность.</translation>
+ <translation type="vanished">Минимальная идентификация результатов BLAST и входная последовательность.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="87"/>
<source>Feature sources</source>
- <translation>Тематические источники</translation>
+ <translation type="vanished">Тематические источники</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="87"/>
<source>The DAS sources to read features from.</source>
- <translation>DAS источники для чтения тем.</translation>
+ <translation type="vanished">DAS источники для чтения тем.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="88"/>
<source>Threshold</source>
- <translation>Порог</translation>
+ <translation type="vanished">Порог</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="88"/>
<source>The expectation value (E) threshold is a statistical measure of the number of expected matches in a random database. The lower the e-value, the more likely the match is to be significant.</source>
- <translation>Среднее значение (E) порога является статистической мерой из числа ожидаемых соответствий в случайной базе данных. Чем ниже это значение, тем больше вероятность того, что соответствие должно быть значимым.</translation>
+ <translation type="vanished">Среднее значение (E) порога является статистической мерой из числа ожидаемых соответствий в случайной базе данных. Чем ниже это значение, тем больше вероятность того, что соответствие должно быть значимым.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="89"/>
<source>Matrix</source>
- <translation>Матрица</translation>
+ <translation type="vanished">Матрица</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="89"/>
<source>The matrix assigns a probability score for each position in an alignment.</source>
- <translation>Матрица определяет счет вероятности для каждой позиции в выравнивании. </translation>
+ <translation type="vanished">Матрица определяет счет вероятности для каждой позиции в выравнивании. </translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="90"/>
<source>Filtering</source>
- <translation>Фильтрация</translation>
+ <translation type="vanished">Фильтрация</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="90"/>
<source>Low-complexity regions (e.g. stretches of cysteine in Q03751, or hydrophobic regions in membrane proteins) tend to producespurious, insignificant matches with sequences in the database which have the same kind of low-complexity regions, but are unrelated biologically. If 'Filter low complexity regions' is selected, the query sequence will be run through the program SEG, and all amino acids in low-complexity regions will be replaced by X's.</source>
- <translation>Регионы простой сложности (т.е. участки цистеина в Q03751, или гидрофобные регионы в мембранах белков) как правило производят ложные, незначительные по поиску с последовательностями в базе данных, которые имеют тот же самый вид с простыми регионами, но не имеют биологического смысла. Если 'Фильтр простых регионов' выбран, поиск последовательности будет работать в рамках программы SEG, и все аминокислоты в простых регионах будут заменены на X.</translation>
+ <translation type="vanished">Регионы простой сложности (т.е. участки цистеина в Q03751, или гидрофобные регионы в мембранах белков) как правило производят ложные, незначительные по поиску с последовательностями в базе данных, которые имеют тот же самый вид с простыми регионами, но не имеют биологического смысла. Если 'Фильтр простых регионов' выбран, поиск последовательности будет работать в рамках программы SEG, и все аминокислоты в простых регионах будут заменены на X [...]
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="93"/>
<source>Gapped</source>
- <translation>Пробелы</translation>
+ <translation type="vanished">Пробелы</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="93"/>
<source>This will allow gaps to be introduced in the sequences when the comparison is done.</source>
- <translation>Это позволит ввести пробелы в последовательность, когда сравнение будет завершено.</translation>
+ <translation type="vanished">Это позволит ввести пробелы в последовательность, когда сравнение будет завершено.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="94"/>
<source>Hits</source>
- <translation>Попадания</translation>
+ <translation type="vanished">Попадания</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="94"/>
<source>Limits the number of returned alignments.</source>
- <translation>Ограничивает число возвращенных выравниваний.</translation>
+ <translation type="vanished">Ограничивает число возвращенных выравниваний.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="106"/>
<source>Annotate with DAS</source>
- <translation>Аннотирование с помощью DAS</translation>
+ <translation type="vanished">Аннотирование с помощью DAS</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="107"/>
<source>Finds similar protein sequence using remote BLAST.<p>Using IDs of sequences found loads annotation for DAS sources.<p>Nucleotide sequences are skipped if any supplied to input.</p></source>
- <translation>Ищет схожие протеиновые последовательности используя удаленный remote BLAST.<p>Используя идентификаторы последовательностей находятся аннотации для источников DAS.<p>Нуклеотидные последовательности игнориурются если есть другие входные последовательности.</p></translation>
+ <translation type="vanished">Ищет схожие протеиновые последовательности используя удаленный remote BLAST.<p>Используя идентификаторы последовательностей находятся аннотации для источников DAS.<p>Нуклеотидные последовательности игнориурются если есть другие входные последовательности.</p></translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="150"/>
<source>No DAS registry</source>
- <translation>Нет DAS реестра</translation>
+ <translation type="vanished">Нет DAS реестра</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="153"/>
<source>No DAS feature sources</source>
- <translation>Нет источников DAS тем</translation>
+ <translation type="vanished">Нет источников DAS тем</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="286"/>
<source>Internal error: no DAS Registry.</source>
- <translation>Внутренняя ошибка: нет DAS реестра.</translation>
+ <translation type="vanished">Внутренняя ошибка: нет DAS реестра.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="313"/>
<source>Sequence %1 is %2 amino acids long. Only sequences from %3 to %4 amino acids are processed.</source>
- <translation>Последовательность %1 это %2 длинная аминокслотная. Только последовательности из %3 в %4 аминокислоты обрабатываются.</translation>
+ <translation type="vanished">Последовательность %1 это %2 длинная аминокслотная. Только последовательности из %3 в %4 аминокислоты обрабатываются.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="333"/>
<source>Bad sequence supplied to DASAnnotationWorker: %1</source>
- <translation>Плохая последовательность прилагаемая в DAS елементе: %1</translation>
+ <translation type="vanished">Плохая последовательность прилагаемая в DAS елементе: %1</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="363"/>
<source>Number of similar sequences: %1.</source>
- <translation>Число схожих последовательностей: %1.</translation>
+ <translation type="vanished">Число схожих последовательностей: %1.</translation>
</message>
<message>
- <location filename="../src/library/DASAnnotationWorker.cpp" line="362"/>
<source> IDs: </source>
- <translation>Идентификаторы:</translation>
+ <translation type="vanished">Идентификаторы:</translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASFetcherPrompter</name>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="69"/>
<source>unset</source>
- <translation>не указан</translation>
+ <translation type="vanished">не указан</translation>
</message>
</context>
<context>
<name>U2::LocalWorkflow::DASFetcherWorker</name>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="72"/>
<source>sequences identified with</source>
- <translation>последовательности с идентификаторами</translation>
+ <translation type="vanished">последовательности с идентификаторами</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="73"/>
<source>sequence identified with</source>
- <translation>последовательность с идентификатором</translation>
+ <translation type="vanished">последовательность с идентификатором</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="87"/>
<source>Save result to <u>%1</u> directory.</source>
- <translation>Сохранить результат в директорию <u>%1</u>.</translation>
+ <translation type="vanished">Сохранить результат в директорию <u>%1</u>.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="89"/>
<source>Reads %1 %2 from <u>%3</u> DAS source. %4</source>
- <translation>Риды %1 %2 из <u>%3</u> DAS источник. %4</translation>
+ <translation type="vanished">Риды %1 %2 из <u>%3</u> DAS источник. %4</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="128"/>
<source>Cannot create directory '%1'</source>
- <translation>Не удается создать директорию '%1'</translation>
+ <translation type="vanished">Не удается создать директорию '%1'</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="188"/>
<source>failed to load item from DAS source : %3</source>
- <translation>ошибка при загрузке элемента из DAS источника: %3</translation>
+ <translation type="vanished">ошибка при загрузке элемента из DAS источника: %3</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="280"/>
<source>Read from DAS</source>
- <translation>Чтение аннотаций из DAS</translation>
+ <translation type="vanished">Чтение аннотаций из DAS</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="281"/>
<source>Reads sequences and annotations if any from the Distributed Annotation System.</source>
- <translation>Читает последовательности и аннотации из распределенной системы аннотаций.</translation>
+ <translation type="vanished">Читает последовательности и аннотации из распределенной системы аннотаций.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="285"/>
<source>Sequence</source>
- <translation>Последовательность</translation>
+ <translation type="vanished">Последовательность</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="290"/>
<source>No DAS registry</source>
- <translation>Нет DAS реестра</translation>
+ <translation type="vanished">Нет DAS реестра</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="293"/>
<source>No DAS sources</source>
- <translation>Нет DAS источника</translation>
+ <translation type="vanished">Нет DAS источника</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="295"/>
<source>No DAS feature sources</source>
- <translation>Нет источника тем DAS</translation>
+ <translation type="vanished">Нет источника тем DAS</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="312"/>
<source>Feature Sources</source>
- <translation>Источники тем</translation>
+ <translation type="vanished">Источники тем</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="313"/>
<source>The DAS sources to read features from.</source>
- <translation>Источники DAS для чтения тем.</translation>
+ <translation type="vanished">Источники DAS для чтения тем.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="317"/>
<source>Reference Source</source>
- <translation>Референсный источник</translation>
+ <translation type="vanished">Референсный источник</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="318"/>
<source>The DAS source to read reference from.</source>
- <translation>DAS источник для чтения референса.</translation>
+ <translation type="vanished">DAS источник для чтения референса.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="328"/>
<source>Resource ID(s)</source>
- <translation>Идентификаторы</translation>
+ <translation type="vanished">Идентификаторы</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="329"/>
<source>Semicolon-separated list of resource ID`s in the source.</source>
- <translation>Разделенные запятой идентификаторы в источнике.</translation>
+ <translation type="vanished">источник - список идентификаторов через точку с запятой.</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="335"/>
<source>Save file to directory</source>
- <translation>Сохранить в директорию</translation>
+ <translation type="vanished">Сохранить в директорию</translation>
</message>
<message>
- <location filename="../src/library/DASFetchWorker.cpp" line="336"/>
<source>The directory to store sequence files loaded from the source.</source>
- <translation>Директория для сохранения файлов последовательносетй из источника.</translation>
+ <translation type="vanished">папка для сохранения файлов последовательностей из источника.</translation>
</message>
</context>
<context>
@@ -2770,7 +2715,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/FilterBamWorker.cpp" line="142"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/FilterBamWorker.cpp" line="146"/>
@@ -3089,7 +3034,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GetFileListWorker.cpp" line="133"/>
<source>Gets paths of files: <u>%1</u>.</source>
- <translation>Получает пути файлов: <u>%1</u>.</translation>
+ <translation>Получить пути файлов из <u>%1</u>.</translation>
</message>
</context>
<context>
@@ -3113,7 +3058,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GetFileListWorker.cpp" line="110"/>
<source>Produces URL(s) to files from specified directories.</source>
- <translation>Производит пути до файлов из указанных директорий.</translation>
+ <translation>этот элемент производит пути до файлов из указанных директорий.</translation>
</message>
<message>
<location filename="../src/library/GetFileListWorker.cpp" line="109"/>
@@ -3126,12 +3071,12 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GroupWorker.cpp" line="259"/>
<source>Groups all incoming messages into one message.</source>
- <translation>Группирует все входящие сообщения в одно сообщение.</translation>
+ <translation>Сгруппировать все входящие сообщения в одно сообщение.</translation>
</message>
<message>
<location filename="../src/library/GroupWorker.cpp" line="261"/>
<source>Groups all incoming messages <u>%1</u> of <u>%2</u> slot data.</source>
- <translation>Группирует все входящие сообщения <u>%1</u> от <u>%2</u> слота.</translation>
+ <translation>Сгруппировать все входящие сообщения <u>%1</u> от <u>%2</u> слота.</translation>
</message>
<message>
<location filename="../src/library/GroupWorker.cpp" line="267"/>
@@ -3194,7 +3139,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GroupWorker.cpp" line="214"/>
<source>Groups data supplied to the specified slot by the specified property (for example, by value). Additionally, it is possible to merge data from another slots associated with the specified one.</source>
- <translation>Группирует данные, передаваемые по указанному слоту по заданному свойству (например, по значению). Кроме того, можно объединить данные из других слотов, ассоциированных с указанным.</translation>
+ <translation>этот элемент группирует данные, передаваемые по указанному слоту по заданному свойству (например, по значению). Кроме того, можно объединить данные из других слотов, ассоциированных с указанным.</translation>
</message>
</context>
<context>
@@ -3348,7 +3293,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MarkSequenceWorker.cpp" line="169"/>
<source>Adds one or several marks to the input sequence.</source>
- <translation>Маркирует входную последовательность.</translation>
+ <translation>Промаркировать входную последовательность.</translation>
</message>
</context>
<context>
@@ -3381,7 +3326,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MarkSequenceWorker.cpp" line="146"/>
<source>Adds one or several marks to the input sequence depending on the sequence properties. Use this element, for example, in conjunction with the Filter element.</source>
- <translation>Маркирует входную последовательность в зависимости от ее свойств. Используйте данный элемент, например, в сочетании с элементом "Фильтрация".</translation>
+ <translation>этот элемент маркирует входную последовательность в зависимости от ее свойств. Используйте данный элемент, например, в сочетании с элементом "Фильтрация".</translation>
</message>
<message>
<location filename="../src/library/MarkSequenceWorker.cpp" line="148"/>
@@ -3452,7 +3397,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MergeBamWorker.cpp" line="103"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/MergeBamWorker.cpp" line="107"/>
@@ -3553,7 +3498,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="443"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="447"/>
@@ -3601,7 +3546,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MultiplexerWorker.cpp" line="344"/>
<source>Gets one message from <u>%1</u> and one message from <u>%2</u>, joins them into a single message, and transfers it to the output. Repeats this while there are available messages in both input ports.</source>
- <translation>Принимает по одному сообщению от каждого из элементов <u>%1</u> и <u>%2</u>, объединяет эти сообщения в одно и передает его дальше. Процедура повторяется до тех пор, пока в обоих входных портах имеются сообщения.</translation>
+ <translation>Принять по одному сообщению от каждого из элементов <u>%1</u> и <u>%2</u>, объединить эти сообщения в одно и передать его дальше. Повторять процедуру до тех пор, пока в обоих входных портах имеются сообщения.</translation>
</message>
<message>
<location filename="../src/library/MultiplexerWorker.cpp" line="348"/>
@@ -3654,7 +3599,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MultiplexerWorker.cpp" line="280"/>
<source>Specifies how to multiplex the input messages: <li><b>1 to 1</b> - the multiplexer gets one message from the first input port and one message from the second input port, joins them into a single message, and transfers it to the output. This procedure is repeated while there are available messages in both input ports.</li> <li><b>1 to many</b> - the multiplexer gets one message from the first input port, joins it with each message [...]
- <translation>Данный параметр определяет способ объединения сообщений из двух входных портов: <li><b>1 to 1</b> - одно сообщение из первого входного порта объединяется с одним сообщением из второго входного порта. Полученное мультиплексированное сообщение передается на выход. Данная процедура повторяется до тех пор, пока в обоих портах имеются сообщения.</li> <li><b>1 to many</b> - одно сообщение из первого входного порта по очереди объеди [...]
+ <translation>данный параметр определяет способ объединения сообщений из двух входных портов: значение <li><b>1 to 1</b> означает, что одно сообщение из первого входного порта объединяется с одним сообщением из второго входного порта. Полученное мультиплексированное сообщение передается на выход. Данная процедура повторяется до тех пор, пока в обоих портах имеются сообщения. Значение </li> <li><b>1 to many</b> означает, что одно сообщение [...]
</message>
<message>
<location filename="../src/library/MultiplexerWorker.cpp" line="296"/>
@@ -3674,7 +3619,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/MultiplexerWorker.cpp" line="304"/>
<source>The element allows one to join two data flows into a single data flow, i.e. to join messages from two input ports into concatenated messages and send them to the output. The concatenation approach is determined by the <i>Multiplexing rule</i> parameter.</source>
- <translation>Данный элемент позволяет объединять данные из двух различных источников, а именно объединять сообщения, пришедшие во входные порты, в комплексные мультиплексированные сообщения. Способ объединения сообщений задается с помощью параметра <i>Правило мультиплексирования</i>.</translation>
+ <translation>этот элемент позволяет объединять данные из двух различных источников, а именно объединять сообщения, пришедшие во входные порты, в комплексные мультиплексированные сообщения. Способ объединения сообщений задается с помощью параметра <i>Правило мультиплексирования</i>.</translation>
</message>
</context>
<context>
@@ -3700,7 +3645,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/PassFilterWorker.cpp" line="132"/>
<source>Filters input data from %1 by value(s) %2.</source>
- <translation>Отфильтровывает входные данные из %1 по значениям %2.</translation>
+ <translation>Отфильтровать входные данные из %1 по значениям %2.</translation>
</message>
</context>
<context>
@@ -3728,7 +3673,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/PassFilterWorker.cpp" line="101"/>
<source>Semicolon-separated list of values used to filter the input data.</source>
- <translation>Список значений, разделенных ';', используемых для фильтрации входных данных.</translation>
+ <translation>принимает на вход список значений, разделенных точкой с запятой, который будет использован для фильтрации входных данных.</translation>
</message>
<message>
<location filename="../src/library/PassFilterWorker.cpp" line="105"/>
@@ -3738,7 +3683,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/PassFilterWorker.cpp" line="106"/>
<source>Passes through only data that matches the input filter value (or values).</source>
- <translation>Отфильтровывает входные данные по заданному значению (или значениям).</translation>
+ <translation>этот элемент отфильтровывает входные данные по заданному значению (или значениям).</translation>
</message>
</context>
<context>
@@ -3799,7 +3744,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="250"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/FASTQWorkersLibrary.cpp" line="254"/>
@@ -3990,7 +3935,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadAnnotationsWorker.cpp" line="134"/>
<source>Reads annotations from files.</source>
- <translation>Читает аннотации из файлов.</translation>
+ <translation>этот элемент считывает аннотации из файлов.</translation>
</message>
<message>
<location filename="../src/library/ReadAnnotationsWorker.cpp" line="144"/>
@@ -4030,7 +3975,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadAnnotationsWorker.cpp" line="170"/>
<source>Reads annotations from <u>%1</u>.</source>
- <translation>Читает аннотации из <u>%1</u>.</translation>
+ <translation>Прочитать аннотации из <u>%1</u>.</translation>
</message>
</context>
<context>
@@ -4043,7 +3988,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadAssemblyWorker.cpp" line="123"/>
<source>Reads assembly from files.</source>
- <translation>Читает сборки из файлов.</translation>
+ <translation>этот элемент считывает сборки из файлов.</translation>
</message>
<message>
<location filename="../src/library/ReadAssemblyWorker.cpp" line="133"/>
@@ -4054,7 +3999,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadAssemblyWorker.cpp" line="139"/>
<source>Reads assembly from <u>%1</u>.</source>
- <translation>Читает сборку из <u>%1</u>.</translation>
+ <translation>Прочитать сборку из <u>%1</u>.</translation>
</message>
</context>
<context>
@@ -4095,7 +4040,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadVariationWorker.cpp" line="188"/>
<source>Reads variations from files and produces variations tracks.</source>
- <translation>Читает вариации из файлов и производит вариационные треки.</translation>
+ <translation>этот элемент читает вариации из файлов и производит наборы вариаций.</translation>
</message>
<message>
<location filename="../src/library/ReadVariationWorker.cpp" line="197"/>
@@ -4111,7 +4056,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadVariationWorker.cpp" line="204"/>
<source>If the file contains variations with multiple alleles (chr1 100 C G,A), <i>No split</i> mode sends them "as is" to the output, while <i>Split</i> splits them into two variations (chr1 100 C G and chr1 100 C A).</source>
- <translation>Если файл содержит вариации с несколькими аллелями (chr1 100 C G,A), <i>Не разбивать</i> подает как есть на выход, <i>Разбиение</i> разбивает их на две вариации (chr1 100 C G and chr1 100 C A).</translation>
+ <translation>если файл содержит вариации с несколькими аллелями (chr1 100 C G,A), режим <i>без разбиенияа</i> подает такую строку на выход без изменений, в то время как режим <i>разбиение</i> разбивает строку на две (chr1 100 C G и chr1 100 C A).</translation>
</message>
<message>
<location filename="../src/library/ReadVariationWorker.cpp" line="212"/>
@@ -4126,7 +4071,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/ReadVariationWorker.cpp" line="219"/>
<source>Reads variations from <u>%1</u>.</source>
- <translation>Читает вариации из <u>%1</u>.</translation>
+ <translation>Прочитать вариации из <u>%1</u>.</translation>
</message>
</context>
<context>
@@ -4187,7 +4132,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="302"/>
<source>Reads sequences and annotations if any from a remote database.</source>
- <translation>Загружает последовательности (вместе с аннотациями) из удаленной базы данных.</translation>
+ <translation>этот элемент загружает последовательности, а также аннотации в случае их наличия, из удаленной базы данных.</translation>
</message>
<message>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="306"/>
@@ -4203,7 +4148,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="318"/>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="559"/>
<source>The database to read from.</source>
- <translation>Выберите удаленную базу данных, из которой требуется загрузить данные.</translation>
+ <translation>выберите удаленную базу данных, из которой требуется загрузить данные.</translation>
</message>
<message>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="322"/>
@@ -4213,7 +4158,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="323"/>
<source>The source to read resource IDs from: the list or a local file.</source>
- <translation>Источник идентификаторов из: список или локальный файл.</translation>
+ <translation>источник идентификаторов (список или локальный файл).</translation>
</message>
<message>
<location filename="../src/library/RemoteDBFetcherWorker.cpp" line="327"/>
@@ -4291,8 +4236,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="123"/>
- <source>Changes chromosome notation for each variant from the input, VCF or other variation files.</source>
- <translation>Изменяет обозначения хромосомы для каждой вариации из входного файла, VCF или другие файлы.</translation>
+ <source>Changes chromosome notation for each variant from the input VCF or other variation files.</source>
+ <translation>этот элемент изменяет обозначения хромосом для каждой вариации из входного VCF-файла или других файлов.</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="127"/>
@@ -4327,22 +4272,22 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="144"/>
<source>Replace prefixes</source>
- <translation>Переписать префиксы</translation>
+ <translation>Заменить префиксы</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="145"/>
- <source>Input the list of chromosome prefixes that you would like to replace. For example "NC_000". Separate different prefixes by semicolons.</source>
- <translation>Введите список префиксов, которые необходимо переписать. Например "NC_000". Отделите разные префиксы точкой с запятой.</translation>
+ <source>Input the list of chromosome prefixes that you would like to replace, for example "NC_000". Separate different prefixes by semicolons.</source>
+ <translation>введите список префиксов, которые необходимо переписать, например "NC_000". Разделяйте префиксы точкой с запятой.</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="147"/>
<source>Replace by</source>
- <translation>Переписать при помощи</translation>
+ <translation>Заменить</translation>
</message>
<message>
<location filename="../src/library/RenameChromosomeInVariationWorker.cpp" line="148"/>
<source>Input the prefix that should be set instead, for example "chr".</source>
- <translation>Введите префикс, на который нужно заменить указанные префиксы, например "chr".</translation>
+ <translation>введите префикс, на который нужно заменить указанные префиксы, например "chr".</translation>
</message>
</context>
<context>
@@ -4403,7 +4348,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/RmdupBamWorker.cpp" line="105"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/RmdupBamWorker.cpp" line="109"/>
@@ -4845,7 +4790,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/SortBamWorker.cpp" line="103"/>
<source>Select an output directory. <b>Custom</b> - specify the output directory in the 'Custom directory' parameter. <b>Workflow</b> - internal workflow directory. <b>Input file</b> - the directory of the input file.</source>
- <translation>Выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
+ <translation>выберите выходную директорию. <b>Частная</b> - укажите директорию в параметре 'Частная директория'. <b>Заданная</b> - внутренняя директория дизайнера. <b>Входной файл</b> - директория входного файла.</translation>
</message>
<message>
<location filename="../src/library/SortBamWorker.cpp" line="107"/>
@@ -5145,7 +5090,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="396"/>
<source>Name of the saved annotations. This option is only available for document formats that support saving of annotations names.</source>
- <translation>Имя для сохранения аннотаций. Этот параметр доступен только для форматов, которые поддерживают сохранение имен аннотаций.</translation>
+ <translation>имя для сохранения аннотаций. Этот параметр доступен только для форматов, которые поддерживают сохранение имен аннотаций.</translation>
</message>
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="401"/>
@@ -5165,7 +5110,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="407"/>
<source>String which separates values in CSV files.</source>
- <translation>Строка, которая разделяет значения в CSV файлах.</translation>
+ <translation>символ, который разделяет значения в файлах CSV.</translation>
</message>
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="412"/>
@@ -5175,7 +5120,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="413"/>
<source>Add names of sequences into CSV file.</source>
- <translation>Добавить имена последовательностей в CSV файл.</translation>
+ <translation>добавить имена последовательностей в CSV-файл.</translation>
</message>
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="429"/>
@@ -5185,7 +5130,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteAnnotationsWorker.cpp" line="430"/>
<source>Writes all supplied annotations to file(s) in selected format.</source>
- <translation>Записывает все аннотации в файл в выбранном формате.</translation>
+ <translation>этот элемент записывает все аннотации в файл заданного формата.</translation>
</message>
</context>
<context>
@@ -5204,7 +5149,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteAssemblyWorkers.cpp" line="163"/>
<source>Writes all supplied assemblies to file(s) in selected format.</source>
- <translation>Записывает все сборки в файл(ы) в указанном формате.</translation>
+ <translation>этот элемент записывает все сборки в файл(ы) заданного формата.</translation>
</message>
<message>
<location filename="../src/library/WriteAssemblyWorkers.cpp" line="169"/>
@@ -5243,7 +5188,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/WriteVariationWorker.cpp" line="117"/>
<source>Writes all supplied variations to file(s) in selected format.</source>
- <translation>Записывает все прилагаемые вариации в файл или файлы в указанном формате.</translation>
+ <translation>этот элемент записывает все прилагаемые вариации в файл(ы) заданного формата.</translation>
</message>
<message>
<location filename="../src/library/WriteVariationWorker.cpp" line="123"/>
@@ -5337,7 +5282,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::StartupDialog</name>
<message>
- <location filename="../src/StartupDialog.cpp" line="68"/>
+ <location filename="../src/StartupDialog.cpp" line="65"/>
<source>You have no write access to the directory. Please choose another one.</source>
<translation>Вы не имеете прав на запись в директорию. Выберите другую директорию.</translation>
</message>
@@ -5345,101 +5290,101 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::Workflow::CoreLib</name>
<message>
- <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="152"/>
<source>Write FASTA</source>
<translation>Запись FASTA</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="173"/>
<source>Read Plain Text</source>
<translation>Чтение текста</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="173"/>
<source>Reads text from local or remote files.</source>
- <translation>Считывает текстовые данные из файлов, расположенных локально или удаленно.</translation>
+ <translation>этот элемент считывает текстовые данные из файлов, расположенных локально или удаленно.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="195"/>
+ <location filename="../src/library/CoreLib.cpp" line="193"/>
<source>Write Plain Text</source>
<translation>Запись текста</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="195"/>
+ <location filename="../src/library/CoreLib.cpp" line="193"/>
<source>Write strings to a file.</source>
- <translation>Запись текстовых данных в файл.</translation>
+ <translation>этот элемент записывает текстовые данные в файл.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="252"/>
+ <location filename="../src/library/CoreLib.cpp" line="250"/>
<source>Writes all supplied sequences to file(s) in selected format.</source>
- <translation>Записывает последовательности в файл (ы) в заданном формате.</translation>
+ <translation>этот элемент записывает последовательности в файл(ы) заданного формата.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="283"/>
+ <location filename="../src/library/CoreLib.cpp" line="281"/>
<source>Save all sequences from <u>%1</u> to <u>%2</u>.</source>
<translation>Сохранить все последовательности из <u>%1</u> в <u>%2</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="430"/>
+ <location filename="../src/library/CoreLib.cpp" line="426"/>
<source>Another worker with this name is already registered: %1</source>
<translation>Другой эелемент с таким именем уже был зарегистрирован: %1</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="432"/>
+ <location filename="../src/library/CoreLib.cpp" line="428"/>
<source>The actor '%1' has been already registered</source>
<translation>Метка '%1' уже была зарегистрирована</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="155"/>
- <location filename="../src/library/CoreLib.cpp" line="253"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<location filename="../src/library/GenericReadActor.cpp" line="100"/>
<source>Sequence</source>
<translation>Последовательность</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="176"/>
- <location filename="../src/library/CoreLib.cpp" line="196"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Plain text</source>
<translation>Текстовые данные</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="127"/>
+ <location filename="../src/library/CoreLib.cpp" line="125"/>
<source>Location</source>
<translation>Путь к файлу</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="179"/>
+ <location filename="../src/library/CoreLib.cpp" line="177"/>
<source>Reads text from <u>%1</u>.</source>
<translation>Прочитать текст из <u>%1</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="202"/>
+ <location filename="../src/library/CoreLib.cpp" line="200"/>
<source>Save text from <u>%1</u> to <u>%2</u>.</source>
<translation>Сохранить текст из <u>%1</u> в <u>%2</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="217"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<location filename="../src/library/GenericReadActor.cpp" line="160"/>
<source>Multiple sequence alignment</source>
<translation>Множественное выравнивание</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="230"/>
+ <location filename="../src/library/CoreLib.cpp" line="228"/>
<source>Save all MSAs from <u>%1</u> to <u>%2</u>.</source>
<translation>Сохранить множественные выравнивания из <u>%1</u> в <u>%2</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="216"/>
+ <location filename="../src/library/CoreLib.cpp" line="214"/>
<source>Write Alignment</source>
<translation>Запись множественного выравнивания</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="216"/>
+ <location filename="../src/library/CoreLib.cpp" line="214"/>
<source>Writes all supplied alignments to file(s) in selected format.</source>
- <translation>Запись всех входных выравниваний в файл(ы) в выбранном формате.</translation>
+ <translation>этот элемент записывает все входные выравнивания в файл(ы) заданного формата.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="252"/>
+ <location filename="../src/library/CoreLib.cpp" line="250"/>
<source>Write Sequence</source>
<translation>Запись последовательности</translation>
</message>
@@ -5461,7 +5406,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GenericReadActor.cpp" line="163"/>
<source>Reads MSA(s) from <u>%1</u>.</source>
- <translation>Прочитать множественные выравнивания из <u>%1</u>.</translation>
+ <translation>Прочитать множественное(ые) выравнивание(я) из <u>%1</u>.</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="101"/>
@@ -5469,30 +5414,30 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Биологические последовательности разных видов (ДНК, РНК, протеины).</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="127"/>
+ <location filename="../src/library/CoreLib.cpp" line="125"/>
<source>Location for writing data</source>
<translation>Путь к файлу для записи данных</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="155"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<source>A sequence along with FASTA header line.</source>
<translation>Последовательность вместе с заголовком FASTA.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="152"/>
<source>Writes all supplied sequences to file(s) in FASTA format.</source>
- <translation>Запись всех входящих данных в файл(ы) в формате FASTA.</translation>
+ <translation>этот элемент записывает все входные данные в файл(ы) в формате FASTA.</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="149"/>
- <source>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides the known alignment formats, it supports composing an alignment from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</source>
- <translation>Считывает множественные выравнивания из файлов, расположенных локально или удаленно.
+ <source>Reads multiple sequence alignments (MSAs) from local or remote files.<p>Besides recognized alignment formats, it supports aligning from a set of sequences in a corresponding file (e.g. FASTA or Genbank).</source>
+ <translation>этот элемент считывает множественные выравнивания из файлов, расположенных локально или удаленно.
<p>Помимо чтения готовых выравниваний известных форматов, поддерживается автоматическое составление выравниваний из наборов последовательностей, которые могут быть прочитаны из файла любого подходящего формата (например, FASTA или Genbank).</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="89"/>
<source>Reads sequences and annotations if any from local or remote files.</source>
- <translation>Считывает последовательности (вместе с аннотациями) из файлов, расположенных локально или удаленно.</translation>
+ <translation>этот элемент загружает последовательности, а также аннотации в случае их наличия, из файлов, расположенных локально или удаленно.</translation>
</message>
</context>
<context>
@@ -5598,17 +5543,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GenericReadActor.cpp" line="105"/>
<source>If the file contains more than one sequence, <i>Split</i> mode sends them "as is" to the output, while <i>Merge</i> appends all the sequences and outputs the sole merged sequence.</source>
- <translation>При наличии более одной последовательности в файле режим <i>Разбиение</i> отправляет их в исходном виде на выходной порт по одной, в то время как режим <i>Сшивка</i> соединяет все последовательности в одну и отправляет ее на выходной порт.</translation>
+ <translation>при наличии более одной последовательности в файле режим <i>Разбиение</i> отправляет их в исходном виде на выходной порт по одной, в то время как режим <i>Сшивка</i> соединяет все последовательности в одну и отправляет ее на выходной порт.</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="107"/>
<source>Merging gap</source>
- <translation>Сшивка пропусками</translation>
+ <translation>Сшивка с помощью пробелов</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="108"/>
<source>In <i>Merge</i> mode, the specified number of gaps are inserted between the original sequences. This is helpful, for example, to avoid finding false positives at the merge boundaries.</source>
- <translation>В режиме <i>Сшивка</i> добавляется указанное число пропусков между исходными последовательностиями. Это, в частности, помогает избежать нахождения ложных совпадений или сигналов на границах сшивки исходных последовательностей.</translation>
+ <translation>в режиме <i>Сшивка</i> между исходными последовательностями добавляется указанное число пробелов. В частности, это помогает избежать нахождения ложноположительных сигналов на границах, по которым шла сшивка исходных последовательностей.</translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="110"/>
@@ -5617,8 +5562,12 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="111"/>
- <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> and <b>?</b> to mask some symbols.</i></p></source>
- <translation>Указывает только на те последовательности, которые содержат указанное регулярное выражение.<p><i>Оставьте его пустым, чтобы отключить этот фильтр. Используйте <b>*</b> и <b>?</b> чтобы пометить некоторые символы.</i></p></translation>
+ <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbol and use <b>?</b> to mask one symbol.</i></p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Reports only sequences containing the specified regular expression.<p><i>Leave it empty to switch off this filter. Use <b>*</b> to mask many symbols and <b>?</b> to mask one symbol.</i></p></source>
+ <translation type="vanished">выбирает только те последовательности, названия которых содержат указанное регулярное выражение. <p><i>Оставьте его пустым, чтобы отключить этот фильтр. Используйте <b>*</b> чтобы заменить несколько символов и <b>?</b> чтобы заменить один символ.</i></p></translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="113"/>
@@ -5628,7 +5577,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/GenericReadActor.cpp" line="114"/>
<source><i>Split mode</i> only.<p>Read only first N sequences from each file.<br>Set 0 value for reading all sequences.</p></source>
- <translation><i>Разделительная мода</i> только.<p>Читает только первые N последовательностей из каждого файла.<br>Установите нулевое значение чтобы прочитать все последовательности.</p></translation>
+ <translation>работает только в режиме <i>Разбиение</i>. <p>В этом случае из каждого файла считываются только первые N последовательностей. <br>Чтобы прочитать все последовательности, установите нулевое значение чтобы прочитать все последовательности установите нулевое значение N.</p></translation>
</message>
<message>
<location filename="../src/library/GenericReadActor.cpp" line="127"/>
@@ -5664,7 +5613,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/library/DocActors.cpp" line="200"/>
<source>Writes sequence(s) in %1 format to <u>%2</u>.</source>
- <translation>Запись последовательностей в формате %1 в <u>%2</u>.</translation>
+ <translation>Сохранить последовательности в формате %1 в <u>%2</u>.</translation>
</message>
<message>
<location filename="../src/library/DocActors.cpp" line="204"/>
diff --git a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
index ceed55e..7c139e3 100644
--- a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
+++ b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
index 7155310..fa240e9 100644
--- a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
+++ b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/BallPlugin.cpp b/src/plugins_3rdparty/ball/src/BallPlugin.cpp
index 02005a6..a0fba65 100644
--- a/src/plugins_3rdparty/ball/src/BallPlugin.cpp
+++ b/src/plugins_3rdparty/ball/src/BallPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/BallPlugin.h b/src/plugins_3rdparty/ball/src/BallPlugin.h
index 7a3dd32..d09036f 100644
--- a/src/plugins_3rdparty/ball/src/BallPlugin.h
+++ b/src/plugins_3rdparty/ball/src/BallPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/SAS.cpp b/src/plugins_3rdparty/ball/src/SAS.cpp
index 4873672..89fdf81 100644
--- a/src/plugins_3rdparty/ball/src/SAS.cpp
+++ b/src/plugins_3rdparty/ball/src/SAS.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/SAS.h b/src/plugins_3rdparty/ball/src/SAS.h
index 277949b..3fbc4cc 100644
--- a/src/plugins_3rdparty/ball/src/SAS.h
+++ b/src/plugins_3rdparty/ball/src/SAS.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/SES.cpp b/src/plugins_3rdparty/ball/src/SES.cpp
index a53040a..0761f4f 100644
--- a/src/plugins_3rdparty/ball/src/SES.cpp
+++ b/src/plugins_3rdparty/ball/src/SES.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ball/src/SES.h b/src/plugins_3rdparty/ball/src/SES.h
index d1698a2..3e7f4c8 100644
--- a/src/plugins_3rdparty/ball/src/SES.h
+++ b/src/plugins_3rdparty/ball/src/SES.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
index 8080a67..e4db1ea 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
+++ b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
index 37e0180..e1353f9 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
+++ b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp b/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
index 405fbfa..4651f9e 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
+++ b/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/gor4/src/GorIVPlugin.h b/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
index 9be55fa..5e1777b 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
+++ b/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/HMMIO.cpp b/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
index 4adc507..74d74e5 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
+++ b/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/HMMIO.h b/src/plugins_3rdparty/hmm2/src/HMMIO.h
index 7b7dce3..a9113b5 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIO.h
+++ b/src/plugins_3rdparty/hmm2/src/HMMIO.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
index c234802..0aeb42c 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
+++ b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
index 8ad07ba..63b94a0 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
+++ b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
index 4bac63a..233a34a 100644
--- a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
index 0aac027..ec8768b 100644
--- a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
index ab63627..b6a86e2 100644
--- a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
+++ b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
index 7bb516c..9687dac 100644
--- a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
+++ b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
index 53e65a9..43cf0ce 100644
--- a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ HMMBuildDialogController::HMMBuildDialogController(const QString& _pn, const MAl
:QDialog(p), ma(_ma), profileName(_pn)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466215");
+ new HelpButton(this, buttonBox, "17467762");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
diff --git a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h
index 54e53aa..0c68cb9 100644
--- a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
index e274c7c..84e26d3 100644
--- a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ HMMCalibrateDialogController::HMMCalibrateDialogController(QWidget* w)
{
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "17466216");
+ new HelpButton(this, buttonBox, "17467763");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Calibrate"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
diff --git a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h
index 5f9bc61..fb82383 100644
--- a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
index 13bc738..c71a6c8 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C)2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C)2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ HMMSearchDialogController::HMMSearchDialogController(const DNASequence& sequence
searchTask = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "17466217");
+ new HelpButton(this, buttonBox, "17467764");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h
index ca39079..6773a0c 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
index 7c0e609..9cfdc14 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
index ca206ee..055da02 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
index dd4c320..4814be5 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
index 6a594f7..670c794 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.cpp b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.cpp
index c81c028..6a40213 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.cpp
+++ b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@ void UHMM3BuildDialogImpl::setSignalsAndSlots() {
void UHMM3BuildDialogImpl::initialize() {
setupUi( this );
- new HelpButton(this, buttonBox, "17466219");
+ new HelpButton(this, buttonBox, "17467766");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.h b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.h
index 8a085cc..daf70df 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.h
+++ b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.cpp b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.cpp
index 44169a4..9279b1d 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.cpp
+++ b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.h b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.h
index 74cc884..9ee29e3 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.h
+++ b/src/plugins_3rdparty/hmm3/src/build/uHMM3BuildTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/build/uhmm3build.cpp b/src/plugins_3rdparty/hmm3/src/build/uhmm3build.cpp
index 4200706..64f05cd 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uhmm3build.cpp
+++ b/src/plugins_3rdparty/hmm3/src/build/uhmm3build.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/build/uhmm3build.h b/src/plugins_3rdparty/hmm3/src/build/uhmm3build.h
index b0f856f..4a465c9 100644
--- a/src/plugins_3rdparty/hmm3/src/build/uhmm3build.h
+++ b/src/plugins_3rdparty/hmm3/src/build/uhmm3build.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.cpp b/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.cpp
index 4b14e41..95b05f7 100644
--- a/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.cpp
+++ b/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.h b/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.h
index db59a7d..ffc3a19 100644
--- a/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.h
+++ b/src/plugins_3rdparty/hmm3/src/format/uHMMFormat.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.cpp b/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.cpp
index 192b788..15c2e97 100644
--- a/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.cpp
+++ b/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.h b/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.h
index 725a251..383c5c9 100644
--- a/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.h
+++ b/src/plugins_3rdparty/hmm3/src/format/uHMMFormatReader.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.cpp b/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.cpp
index 5910b89..00e5080 100644
--- a/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.cpp
+++ b/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.h b/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.h
index e7a2ec0..d754c84 100644
--- a/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.h
+++ b/src/plugins_3rdparty/hmm3/src/gobject/uHMMObject.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.cpp b/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.cpp
index de66df8..e605498 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.cpp
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ const QString UHMM3PhmmerDialogImpl::ANNOTATIONS_DEFAULT_NAME = "signal";
UHMM3PhmmerDialogImpl::UHMM3PhmmerDialogImpl(const U2SequenceObject * seqObj, QWidget * p) : QDialog(p) {
assert(NULL != seqObj);
setupUi(this);
- new HelpButton(this, buttonBox, "17466221");
+ new HelpButton(this, buttonBox, "17467768");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.h b/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.h
index 6334754..40f6c70 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.h
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uHMM3PhmmerDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.cpp b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.cpp
index b7d7616..7fc893e 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.cpp
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.h b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.h
index e4fcb2e..643bf4f 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.h
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3PhmmerTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.cpp b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.cpp
index 958f2e6..cca1af4 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.cpp
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.h b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.h
index eb2198d..07ac906 100644
--- a/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.h
+++ b/src/plugins_3rdparty/hmm3/src/phmmer/uhmm3phmmer.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.cpp b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.cpp
index 986c417..c0c7af8 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.cpp
+++ b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ UHMM3SearchDialogImpl::UHMM3SearchDialogImpl(U2SequenceObject *seqObj, QWidget *
assert(NULL != seqObj);
setupUi(this);
- new HelpButton(this, buttonBox, "17466220");
+ new HelpButton(this, buttonBox, "17467767");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.h b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.h
index daa66f3..e0bfceb 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.h
+++ b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchDialogImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.cpp b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.cpp
index 18a1639..4beaf54 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.cpp
+++ b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.h b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.h
index 2b1b684..0ca3571 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.h
+++ b/src/plugins_3rdparty/hmm3/src/search/uHMM3SearchTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.cpp b/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.cpp
index 934d4b7..ad63c3e 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.cpp
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.h b/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.h
index 782914e..79a0fa3 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.h
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3QDActor.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.cpp b/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.cpp
index 1f37c2a..98eec03 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.cpp
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.h b/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.h
index a3b639c..601272a 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.h
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3SearchResult.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3search.cpp b/src/plugins_3rdparty/hmm3/src/search/uhmm3search.cpp
index 85ad863..574b616 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3search.cpp
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3search.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/search/uhmm3search.h b/src/plugins_3rdparty/hmm3/src/search/uhmm3search.h
index f75d076..4f2deb2 100644
--- a/src/plugins_3rdparty/hmm3/src/search/uhmm3search.h
+++ b/src/plugins_3rdparty/hmm3/src/search/uhmm3search.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.cpp b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.cpp
index d5dadb9..c476e84 100644
--- a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.cpp
+++ b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.h b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.h
index e22f592..312a269 100644
--- a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.h
+++ b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalData.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.cpp b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.cpp
index 99905c8..422fdd9 100644
--- a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.h b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.h
index cf2f2c2..ca8b845 100644
--- a/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.h
+++ b/src/plugins_3rdparty/hmm3/src/task_local_storage/uHMMSearchTaskLocalStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.cpp b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.cpp
index b0b9859..11514d8 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.cpp
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.h b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.h
index e573728..73bb9c0 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.h
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3BuildTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.cpp b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.cpp
index 90a3fad..346d356 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.cpp
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.h b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.h
index c6a25ca..fe3d795 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.h
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3PhmmerTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.cpp b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.cpp
index 8f985c0..1845cd1 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.cpp
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.h b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.h
index b88590b..96c08f3 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.h
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3SearchTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.cpp b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.cpp
index d8a534b..de784ab 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.cpp
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.h b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.h
index 7ddd670..528fb62 100644
--- a/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.h
+++ b/src/plugins_3rdparty/hmm3/src/tests/uhmmer3Tests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.cpp b/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.cpp
index fb19965..dd08d19 100644
--- a/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.cpp
+++ b/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.h b/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.h
index 4722a9c..08a8221 100644
--- a/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.h
+++ b/src/plugins_3rdparty/hmm3/src/uHMM3Plugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.cpp b/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.cpp
index abcbe40..229f3a8 100644
--- a/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.cpp
+++ b/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.h b/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.h
index a5d447b..3412fc9 100644
--- a/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.h
+++ b/src/plugins_3rdparty/hmm3/src/util/uhmm3Utilities.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.cpp b/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.cpp
index 5bd450c..03cc57d 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.cpp
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.h b/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.h
index 5444f0b..24563a3 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.h
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3BuildWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.cpp b/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.cpp
index 37834bf..8b881b8 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.cpp
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.h b/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.h
index 8f43cc6..a698a27 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.h
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3IOWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.cpp b/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.cpp
index f218300..6282afc 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.cpp
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.h b/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.h
index 3156548..36c64ad 100644
--- a/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.h
+++ b/src/plugins_3rdparty/hmm3/src/workers/HMM3SearchWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/hmm3/transl/russian.ts b/src/plugins_3rdparty/hmm3/transl/russian.ts
index 0505fa0..fd60b25 100644
--- a/src/plugins_3rdparty/hmm3/transl/russian.ts
+++ b/src/plugins_3rdparty/hmm3/transl/russian.ts
@@ -1857,12 +1857,12 @@
<message>
<location filename="../src/phmmer/ui/UHMM3PhmmerDialog.ui" line="217"/>
<source>Gap open probability</source>
- <translation>Вероятность открытия пропуска</translation>
+ <translation>Вероятность открытия пробела</translation>
</message>
<message>
<location filename="../src/phmmer/ui/UHMM3PhmmerDialog.ui" line="247"/>
<source>Gap extend probability</source>
- <translation>Вероятность продления пропуска</translation>
+ <translation>Вероятность продления пробела</translation>
</message>
<message>
<location filename="../src/phmmer/ui/UHMM3PhmmerDialog.ui" line="285"/>
diff --git a/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp b/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
index ec99a71..15a3bd6 100644
--- a/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignAdapter.h b/src/plugins_3rdparty/kalign/src/KalignAdapter.h
index 14a1c0e..35a1123 100644
--- a/src/plugins_3rdparty/kalign/src/KalignAdapter.h
+++ b/src/plugins_3rdparty/kalign/src/KalignAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignConstants.h b/src/plugins_3rdparty/kalign/src/KalignConstants.h
index 725d006..df5aad9 100644
--- a/src/plugins_3rdparty/kalign/src/KalignConstants.h
+++ b/src/plugins_3rdparty/kalign/src/KalignConstants.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp b/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
index 14e03fd..35d3803 100644
--- a/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -66,7 +66,7 @@ KalignDialogController::KalignDialogController(QWidget* w, const MAlignment& _ma
: QDialog(w), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466261");
+ new HelpButton(this, buttonBox, "17467808");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -128,7 +128,7 @@ KalignAlignWithExtFileSpecifyDialogController::KalignAlignWithExtFileSpecifyDial
: QDialog(w), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466295");
+ new HelpButton(this, buttonBox, "17467841");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/kalign/src/KalignDialogController.h b/src/plugins_3rdparty/kalign/src/KalignDialogController.h
index ec741ee..7b92895 100644
--- a/src/plugins_3rdparty/kalign/src/KalignDialogController.h
+++ b/src/plugins_3rdparty/kalign/src/KalignDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignException.cpp b/src/plugins_3rdparty/kalign/src/KalignException.cpp
index 27ff3e5..f92bb4d 100644
--- a/src/plugins_3rdparty/kalign/src/KalignException.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignException.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignException.h b/src/plugins_3rdparty/kalign/src/KalignException.h
index 0fca82d..29da8cb 100644
--- a/src/plugins_3rdparty/kalign/src/KalignException.h
+++ b/src/plugins_3rdparty/kalign/src/KalignException.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp b/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
index 0e22890..b0118e4 100644
--- a/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignPlugin.h b/src/plugins_3rdparty/kalign/src/KalignPlugin.h
index 1ed52a8..86e8198 100644
--- a/src/plugins_3rdparty/kalign/src/KalignPlugin.h
+++ b/src/plugins_3rdparty/kalign/src/KalignPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignTask.cpp b/src/plugins_3rdparty/kalign/src/KalignTask.cpp
index 297a5c6..8787e99 100644
--- a/src/plugins_3rdparty/kalign/src/KalignTask.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignTask.h b/src/plugins_3rdparty/kalign/src/KalignTask.h
index e2d9c6b..56f73c4 100644
--- a/src/plugins_3rdparty/kalign/src/KalignTask.h
+++ b/src/plugins_3rdparty/kalign/src/KalignTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignUtils.cpp b/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
index 9ef958b..ec243ab 100644
--- a/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignUtils.h b/src/plugins_3rdparty/kalign/src/KalignUtils.h
index a8db237..7e656fb 100644
--- a/src/plugins_3rdparty/kalign/src/KalignUtils.h
+++ b/src/plugins_3rdparty/kalign/src/KalignUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignWorker.cpp b/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
index af76c96..35b7f4f 100644
--- a/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/KalignWorker.h b/src/plugins_3rdparty/kalign/src/KalignWorker.h
index c49e3eb..306ef11 100644
--- a/src/plugins_3rdparty/kalign/src/KalignWorker.h
+++ b/src/plugins_3rdparty/kalign/src/KalignWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
index e05c02f..1bab83a 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
index 5a14ced..66a5d6e 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
index 6359037..82bf1aa 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
index 8d8bac7..5b9d2b0 100644
--- a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
index 5a9b39f..2e2c88c 100644
--- a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
index 4e7b719..30fb696 100644
--- a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
+++ b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
index 424829b..3c95e07 100644
--- a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
+++ b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/kalign/transl/russian.ts b/src/plugins_3rdparty/kalign/transl/russian.ts
index 1bc902a..b074cc2 100644
--- a/src/plugins_3rdparty/kalign/transl/russian.ts
+++ b/src/plugins_3rdparty/kalign/transl/russian.ts
@@ -33,7 +33,7 @@
<message>
<location filename="../src/ui/KalignDialog.ui" line="114"/>
<source>Gap open penalty</source>
- <translation>Штраф за открывающий пробел</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/ui/KalignDialog.ui" line="160"/>
@@ -43,7 +43,7 @@
<message>
<location filename="../src/ui/KalignDialog.ui" line="206"/>
<source>Terminal gap penalty</source>
- <translation>Штраф за закрывающий пробел</translation>
+ <translation>Штраф за закрытие пробела</translation>
</message>
<message>
<location filename="../src/ui/KalignDialog.ui" line="252"/>
@@ -66,7 +66,7 @@
<message>
<location filename="../src/ui/PairwiseAlignmentHirschbergOptionsPanelMainWidget.ui" line="37"/>
<source>Gap open penalty</source>
- <translation>Штраф за открывающий пробел</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/ui/PairwiseAlignmentHirschbergOptionsPanelMainWidget.ui" line="57"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../src/ui/PairwiseAlignmentHirschbergOptionsPanelMainWidget.ui" line="77"/>
<source>Terminate gap penalty</source>
- <translation>Штраф за закрывающий пробел</translation>
+ <translation>Штраф за закрытие пробела</translation>
</message>
<message>
<location filename="../src/ui/PairwiseAlignmentHirschbergOptionsPanelMainWidget.ui" line="97"/>
@@ -252,32 +252,32 @@
<message>
<location filename="../src/KalignWorker.cpp" line="69"/>
<source>Gap open penalty</source>
- <translation>Штраф за открывающий пробел</translation>
+ <translation>Штраф за открытие пробела</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="70"/>
<source>The penalty for opening/closing a gap. Half the value will be subtracted from the alignment score when opening, and half when closing a gap.</source>
- <translation>Штраф за открытие/закрытие пропуска. Половина значения будет вычитаться из результата выравнивания при открытии, и половина при закрытии разрыва.</translation>
+ <translation>Штраф за открытие/закрытие пробела. Половина значения будет вычитаться из результата выравнивания при открытии, и половина при закрытии пробела.</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="71"/>
<source>Gap extension penalty</source>
- <translation>Штраф за промежуточный пропуск</translation>
+ <translation>Штраф за промежуточный пробел</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="72"/>
<source>The penalty for extending a gap.</source>
- <translation>Штраф за открытие пропуска.</translation>
+ <translation>Штраф за открытие пробела.</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="73"/>
<source>Terminal gap penalty</source>
- <translation>Штраф за закрывающий пропуск</translation>
+ <translation>Штраф за закрытие пробела</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="74"/>
<source>The penalty to extend gaps from the N/C terminal of protein or 5'/3' terminal of nucleotide sequences.</source>
- <translation>Штраф за расширение пропуска терминала N/C для белков или терминала 5'/3' для нуклеотидных последовательностей.</translation>
+ <translation>Штраф за расширение пробела терминала N/C для белков или терминала 5'/3' для нуклеотидных последовательностей.</translation>
</message>
<message>
<location filename="../src/KalignWorker.cpp" line="75"/>
diff --git a/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp b/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
index 34e9682..be921b2 100644
--- a/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
+++ b/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/DistanceMatrix.h b/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
index 8b832a4..93804d6 100644
--- a/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
+++ b/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
index a1d1d29..cc9e3aa 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
index efdaf0e..14608a4 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
index 892d90b..bedd6e6 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -85,29 +85,29 @@ void NeighborJoinWidget::fillSettings(CreatePhyTreeSettings &settings) {
}
void NeighborJoinWidget::storeSettings() {
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_MODEL_PATH, cbModel->currentText());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_GAMMADISTR_PATH, chbGamma->isChecked());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_ALPHAFACTOR_PATH, sbAlpha->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_TRRATIO_PATH, transitionRatioSpinBox->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_BOTTSTR_PATH, chbEnableBootstrapping->isChecked());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_REPL_PATH, sbReplicatesNumber->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_SEED_PATH, sbSeed->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_FRACTION_PATH, sbFraction->value());
- AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_CONSENSUSID_PATH, cbConsensusType->currentText());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_MODEL_PATH, cbModel->currentText());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_GAMMADISTR_PATH, chbGamma->isChecked());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_ALPHAFACTOR_PATH, sbAlpha->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_TRRATIO_PATH, transitionRatioSpinBox->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_BOTTSTR_PATH, chbEnableBootstrapping->isChecked());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_REPL_PATH, sbReplicatesNumber->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_SEED_PATH, sbSeed->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_FRACTION_PATH, sbFraction->value());
+ AppContext::getSettings()->setValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_CONSENSUSID_PATH, cbConsensusType->currentText());
displayOptions->storeSettings();
}
void NeighborJoinWidget::restoreDefault() {
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_MODEL_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_GAMMADISTR_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_ALPHAFACTOR_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_TRRATIO_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_BOTTSTR_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_REPL_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_SEED_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_FRACTION_PATH);
- AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_CONSENSUSID_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_MODEL_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_GAMMADISTR_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_ALPHAFACTOR_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_TRRATIO_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_BOTTSTR_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_REPL_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_SEED_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_FRACTION_PATH);
+ AppContext::getSettings()->remove(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_CONSENSUSID_PATH);
cbModel->setCurrentIndex(0);
chbGamma->setChecked(false);
@@ -192,25 +192,25 @@ void NeighborJoinWidget::init(const MAlignment &ma) {
cbModel->addItems(ProtDistModelTypes::getProtDistModelTypes());
}
- const QString matrixModelName = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_MODEL_PATH, cbModel->itemText(0)).toString();
+ const QString matrixModelName = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_MODEL_PATH, cbModel->itemText(0)).toString();
cbModel->setCurrentIndex(cbModel->findText(matrixModelName));
sl_onMatrixModelChanged(matrixModelName);
- chbGamma->setChecked(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_GAMMADISTR_PATH, false).toBool());
- sbAlpha->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_ALPHAFACTOR_PATH, 0.5).toDouble());
- transitionRatioSpinBox->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + DIST_MATRIX_TRRATIO_PATH, 2.0).toDouble());
+ chbGamma->setChecked(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_GAMMADISTR_PATH, false).toBool());
+ sbAlpha->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_ALPHAFACTOR_PATH, 0.5).toDouble());
+ transitionRatioSpinBox->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + DIST_MATRIX_TRRATIO_PATH, 2.0).toDouble());
sbSeed->setValue(getRandomSeed());
cbConsensusType->addItems(ConsensusModelTypes::getConsensusModelTypes());
- chbEnableBootstrapping->setChecked(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_BOTTSTR_PATH, false).toBool());
+ chbEnableBootstrapping->setChecked(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_BOTTSTR_PATH, false).toBool());
- sbReplicatesNumber->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_REPL_PATH, 100).toInt());
- sbSeed->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_SEED_PATH, getRandomSeed()).toInt());
- sbFraction->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_FRACTION_PATH, 0.5).toDouble());
+ sbReplicatesNumber->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_REPL_PATH, 100).toInt());
+ sbSeed->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_SEED_PATH, getRandomSeed()).toInt());
+ sbFraction->setValue(AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_FRACTION_PATH, 0.5).toDouble());
- const QString consensusTypeName = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath + SEQ_BOOT_CONSENSUSID_PATH, cbConsensusType->itemText(0)).toString();
+ const QString consensusTypeName = AppContext::getSettings()->getValue(CreatePhyTreeWidget::settingsPath() + SEQ_BOOT_CONSENSUSID_PATH, cbConsensusType->itemText(0)).toString();
cbConsensusType->setCurrentIndex(cbConsensusType->findText(consensusTypeName));
sl_onConsensusTypeChanged(consensusTypeName);
}
diff --git a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
index 8e0232c..ac90b25 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp b/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
index 32f43b2..cd62147 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/PhylipPlugin.h b/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
index 37ad0f3..a8284a0 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
index 34babc2..fa552fe 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
index 8a5d343..b26a6b9 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
index c5b516a..b4aa109 100644
--- a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
+++ b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
index bd5b05b..71f3567 100644
--- a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
+++ b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
-* Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
index 10416bc..8275bdd 100644
--- a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
+++ b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
index 904bcbb..0966755 100644
--- a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
+++ b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp b/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
index 9aba548..c92b9ce 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ Primer3Dialog::Primer3Dialog(const Primer3TaskSettings &defaultSettings, ADVSequ
defaultSettings(defaultSettings)
{
ui.setupUi(this);
- new HelpButton(this, ui.helpButton, "17466240");
+ new HelpButton(this, ui.helpButton, "17467787");
QPushButton* pbPick = ui.pickPrimersButton;
QPushButton* pbReset = ui.resetButton;
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Dialog.h b/src/plugins_3rdparty/primer3/src/Primer3Dialog.h
index 48fbe6f..e56d239 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Dialog.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Dialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp b/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
index bf03f91..693e373 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Plugin.h b/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
index 72e5dfd..4c948d0 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Query.cpp b/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
index 7fb91e5..10de41f 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Query.h b/src/plugins_3rdparty/primer3/src/Primer3Query.h
index 7539734..363b096 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Query.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Query.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Task.cpp b/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
index 3341213..1269015 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Task.h b/src/plugins_3rdparty/primer3/src/Primer3Task.h
index c411949..aead302 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Task.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Task.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
index 54a0eed..128fa17 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
index 8bfc4ab..6569023 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp b/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
index a2ea817..e9b9cdb 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/primer3/src/Primer3Tests.h b/src/plugins_3rdparty/primer3/src/Primer3Tests.h
index 67d4ba1..5e23200 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Tests.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Tests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
index f5a7aab..8798c9e 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
+++ b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
index f9f5cd6..9443c92 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
+++ b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp b/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
index f9402f5..535452e 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
+++ b/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/psipred/src/PsipredPlugin.h b/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
index 08bbc82..3c138dc 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
+++ b/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp b/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
index 726b400..f0e325a 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsAligner.h b/src/plugins_3rdparty/ptools/src/PToolsAligner.h
index b8d84dd..5703900 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsAligner.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsAligner.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp b/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
index d0e9e0a..3b95fc6 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsPlugin.h b/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
index b309f5f..f9760ae 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsTests.cpp b/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
index 20aed34..d40dd11 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/ptools/src/PToolsTests.h b/src/plugins_3rdparty/ptools/src/PToolsTests.h
index ef75395..05d4cd8 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsTests.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
index 2a8f263..7e048d4 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
index 77188c4..ba8dbbe 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
index b31198a..2823257 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
index 2c0f2ec..e2a5535 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
index 8409a46..79f2397 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
index 0e1a7ce..2be7cde 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
index e7192dc..5b33f3a 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
index 6f315fd..13449a0 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
index 4da4fd1..2d19b2d 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -59,7 +59,7 @@ SiteconBuildDialogController::SiteconBuildDialogController(SiteconPlugin* pl, QW
{
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "17466212");
+ new HelpButton(this, buttonBox, "17467759");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h
index d853446..c966e6c 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp b/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
index 027cf74..c561f64 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp b/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
index c8c2cd3..c2d6da9 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconIO.h b/src/plugins_3rdparty/sitecon/src/SiteconIO.h
index a6af461..eecaa95 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIO.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIO.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
index c30fefa..5c6ea06 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
index f697dea..44aa276 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
index 1fdccea..81e7950 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
index 018cb0a..5424cc3 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp b/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
index bc166ea..f478e33 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconQuery.h b/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
index 098001e..7ab675e 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
index 47cc569..4432ec1 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -86,7 +86,7 @@ public:
SiteconSearchDialogController::SiteconSearchDialogController(ADVSequenceObjectContext* _ctx, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17466208");
+ new HelpButton(this, buttonBox, "17467755");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h
index c567bf4..cb4f78d 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
index 4c7c670..2a73521 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
index 9d8d000..31910bc 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
index 144c9fa..b74ccfd 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h b/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
index 9b29cd1..77dd286 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
index 403d5dc..6ea4ee5 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
index e3b0f44..e06cb3e 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
index 4a2afb1..f6bb13b 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ MuscleAlignDialogController::MuscleAlignDialogController(QWidget* w, const MAlig
: QDialog(w), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466223");
+ new HelpButton(this, buttonBox, "17467770");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -138,7 +138,7 @@ MuscleAlignWithExtFileSpecifyDialogController::MuscleAlignWithExtFileSpecifyDial
: QDialog(w), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466222");
+ new HelpButton(this, buttonBox, "17467769");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
//this->adjustSize();
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
index a0eed22..1f1a40a 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleConstants.h b/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
index 3bf66b3..0089bf8 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp b/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
index 44c1169..810ed47 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -36,6 +36,7 @@
#include <QtCore/QMutexLocker>
#include <QtCore/QSemaphore>
+#include <limits>
#include "muscle/scorehistory.h"
namespace U2 {
@@ -69,12 +70,14 @@ int MuscleParallelTask::estimateMemoryUsageInMb(const MAlignment& ma) {
qint64 usedBytes = 0;
int availableThreads = workpool->nThreads;
- for(int i = 0; i < rowsLengths.size() && availableThreads > 0; i++) {
- for(int j = 0; j < rowsLengths.size() && availableThreads > 0; j++, availableThreads--) {
- usedBytes += (rowsLengths[i] + 1025) * (rowsLengths[j] + 1025);
+ for (int i = 0; i < rowsLengths.size() && availableThreads > 0; i++) {
+ for (int j = 0; j < rowsLengths.size() && availableThreads > 0; j++, availableThreads--) {
+ usedBytes += qint64((rowsLengths[i] + 1025)) * (rowsLengths[j] + 1025);
}
}
- return usedBytes / 1024 / 1024;
+ const int maxInt = std::numeric_limits<int>::max();
+ usedBytes = usedBytes >= 0 ? usedBytes : maxInt;
+ return qMin(usedBytes / 1024 / 1024, qint64(maxInt));
}
QList<Task*> MuscleParallelTask::onSubTaskFinished(Task* subTask) {
@@ -110,9 +113,9 @@ void MusclePrepareTask::run() {
workpool->ph = new MuscleParamsHelper(workpool->ti, workpool->ctx);
_run();
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
}
}
catch (std::bad_alloc) {
@@ -319,9 +322,9 @@ void ProgressiveAlignTask::run() {
try {
_run();
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
}
}
catch (std::bad_alloc) {
@@ -394,9 +397,9 @@ void ProgressiveAlignWorker::run() {
try {
_run();
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
}
}
catch (std::bad_alloc) {
@@ -526,9 +529,9 @@ void RefineTreeTask::run() {
try {
_run();
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
}
}
catch (std::bad_alloc) {
@@ -587,9 +590,9 @@ void RefineTask::run() {
workpool->mainSem.release(workpool->nThreads);
perfLog.trace(QString("Parallel muscle refine stage complete. Elapsed %1 ms").arg(timer.elapsed()));
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
}
workpool->refineDone = true;
workpool->mainSem.release(workpool->nThreads);
@@ -645,9 +648,9 @@ void RefineWorker::run() {
try {
_run();
}
- catch (MuscleException *e) {
+ catch (const MuscleException& e) {
if (!isCanceled()) {
- workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e->str) );
+ workpool->ti.setError( tr("Internal parallel MUSCLE error: %1").arg(e.str) );
workpool->childSem.release();
}
}
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleParallel.h b/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
index 0543769..9f1d955 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp b/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
index 23b57e4..1ea13bc 100644
--- a/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MusclePlugin.h b/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
index c25712f..ee2e1d9 100644
--- a/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
+++ b/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp b/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
index 3b66d65..2c6f0e2 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -268,6 +268,7 @@ MuscleAddSequencesToProfileTask::MuscleAddSequencesToProfileTask(MAlignmentObjec
setError("Unknown format");
return;
}
+ TaskWatchdog::trackResourceExistence(maObj, this, tr("A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available."));
DocumentFormat* format = detectedFormats.first().format;
IOAdapterFactory* iof = AppContext::getIOAdapterRegistry()->getIOAdapterFactoryById(IOAdapterUtils::url2io(fileWithSequencesOrProfile));
loadTask = new LoadDocumentTask(format->getFormatId(), fileWithSequencesOrProfile, iof);
@@ -394,8 +395,6 @@ void MuscleGObjectTask::prepare() {
return;
}
- TaskWatchdog::trackResourceExistence(obj, this, tr("A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available."));
-
lock = new StateLock(MUSCLE_LOCK_REASON);
obj->lockState(lock);
muscleTask = new MuscleTask(obj->getMAlignment(), config);
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleTask.h b/src/plugins_3rdparty/umuscle/src/MuscleTask.h
index 821996a..541aafa 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleTask.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp b/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
index 3de48e1..35d7775 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleUtils.h b/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
index 018f240..7721d0c 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
index 4ff3d05..2d244a1 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
index 1aa207c..d8b046d 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp b/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
index 0e7680a..1a35a3d 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleWorker.h b/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
index ae76a6a..4a2877f 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
index 00a7f00..75d686f 100644
--- a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
+++ b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
index 2213200..901d431 100644
--- a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
+++ b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
index f2e8e96..4309272 100644
--- a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
index e7ed967..e75cafe 100644
--- a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp b/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
index 3afb7eb..c78285d 100644
--- a/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
+++ b/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/refinevertP.cpp b/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
index 3e58319..fee28a2 100644
--- a/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
+++ b/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
index 67e525c..d179c74 100644
--- a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
+++ b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
index 3f26515..bcfac74 100644
--- a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
+++ b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/umuscle/transl/english.ts b/src/plugins_3rdparty/umuscle/transl/english.ts
index 10eb8e9..a90ce03 100644
--- a/src/plugins_3rdparty/umuscle/transl/english.ts
+++ b/src/plugins_3rdparty/umuscle/transl/english.ts
@@ -315,27 +315,27 @@
<context>
<name>U2::MuscleAddSequencesToProfileTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="268"/>
+ <location filename="../src/MuscleTask.cpp" line="260"/>
<source>MUSCLE align profiles '%1' vs '%2'</source>
<translation>MUSCLE align profiles '%1' vs '%2'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="270"/>
+ <location filename="../src/MuscleTask.cpp" line="262"/>
<source>MUSCLE align '%2' by profile '%1'</source>
<translation>MUSCLE align '%2' by profile '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="311"/>
+ <location filename="../src/MuscleTask.cpp" line="303"/>
<source>Sequences in file have different alphabets %1</source>
<translation>Sequences in file have different alphabets %1</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="332"/>
+ <location filename="../src/MuscleTask.cpp" line="324"/>
<source>No sequences found in file %1</source>
<translation>No sequences found in file %1</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="334"/>
+ <location filename="../src/MuscleTask.cpp" line="326"/>
<source>No alignment found in file %1</source>
<translation>No alignment found in file %1</translation>
</message>
@@ -460,17 +460,17 @@
<context>
<name>U2::MuscleGObjectRunFromSchemaTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="606"/>
+ <location filename="../src/MuscleTask.cpp" line="598"/>
<source>Workflow wrapper '%1'</source>
<translation>Workflow wrapper '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="619"/>
+ <location filename="../src/MuscleTask.cpp" line="611"/>
<source>MUSCLE align '%1'</source>
<translation>MUSCLE align '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="622"/>
+ <location filename="../src/MuscleTask.cpp" line="614"/>
<source>MUSCLE refine '%1'</source>
<translation>MUSCLE refine '%1'</translation>
</message>
@@ -478,32 +478,32 @@
<context>
<name>U2::MuscleGObjectTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="364"/>
+ <location filename="../src/MuscleTask.cpp" line="356"/>
<source>MUSCLE align '%1'</source>
<translation>MUSCLE align '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="367"/>
+ <location filename="../src/MuscleTask.cpp" line="359"/>
<source>MUSCLE refine '%1'</source>
<translation>MUSCLE refine '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="370"/>
+ <location filename="../src/MuscleTask.cpp" line="362"/>
<source>MUSCLE add to profile '%1'</source>
<translation>MUSCLE add to profile '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="373"/>
+ <location filename="../src/MuscleTask.cpp" line="365"/>
<source>MUSCLE align profiles</source>
<translation>MUSCLE align profiles</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="405"/>
+ <location filename="../src/MuscleTask.cpp" line="397"/>
<source>A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="421"/>
+ <location filename="../src/MuscleTask.cpp" line="413"/>
<source>MAlignment object has been changed</source>
<translation>MAlignment object has been changed</translation>
</message>
@@ -541,7 +541,7 @@
<context>
<name>U2::MuscleParallelTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="51"/>
+ <location filename="../src/MuscleParallel.cpp" line="52"/>
<source>MuscleParallelTask</source>
<translation>MuscleParallelTask</translation>
</message>
@@ -567,27 +567,27 @@
<context>
<name>U2::MusclePrepareTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="107"/>
+ <location filename="../src/MuscleParallel.cpp" line="110"/>
<source>Preparing MUSCLE alignment...</source>
<translation>Preparing MUSCLE alignment...</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="115"/>
+ <location filename="../src/MuscleParallel.cpp" line="118"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="124"/>
+ <location filename="../src/MuscleParallel.cpp" line="127"/>
<source>MUSCLE prepared successfully</source>
<translation>MUSCLE prepared successfully</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="161"/>
+ <location filename="../src/MuscleParallel.cpp" line="164"/>
<source>No sequences in input file</source>
<translation>No sequences in input file</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="190"/>
+ <location filename="../src/MuscleParallel.cpp" line="193"/>
<source>Alignment is empty</source>
<translation>Alignment is empty</translation>
</message>
@@ -615,17 +615,17 @@
<translation>Stopping MUSCLE task, because of error in MAlignment::mid function</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="131"/>
+ <location filename="../src/MuscleTask.cpp" line="125"/>
<source>Performing MUSCLE alignment...</source>
<translation>Performing MUSCLE alignment...</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="154"/>
+ <location filename="../src/MuscleTask.cpp" line="148"/>
<source>MUSCLE alignment successfully finished</source>
<translation>MUSCLE alignment successfully finished</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="208"/>
+ <location filename="../src/MuscleTask.cpp" line="201"/>
<source>Unexpected number of rows in the result multiple alignment!</source>
<translation>Unexpected number of rows in the result multiple alignment!</translation>
</message>
@@ -633,17 +633,17 @@
<context>
<name>U2::ProgressiveAlignTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="302"/>
+ <location filename="../src/MuscleParallel.cpp" line="305"/>
<source>ProgressiveAlignTask</source>
<translation>ProgressiveAlignTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="324"/>
+ <location filename="../src/MuscleParallel.cpp" line="327"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="334"/>
+ <location filename="../src/MuscleParallel.cpp" line="337"/>
<source>alignment "%1" Parallel MUSCLE Iter 1 accomplished. Time elapsed %2 ms</source>
<translation>alignment "%1" Parallel MUSCLE Iter 1 accomplished. Time elapsed %2 ms</translation>
</message>
@@ -651,12 +651,12 @@
<context>
<name>U2::ProgressiveAlignWorker</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="385"/>
+ <location filename="../src/MuscleParallel.cpp" line="388"/>
<source>ProgressiveAlignWorker</source>
<translation>ProgressiveAlignWorker</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="399"/>
+ <location filename="../src/MuscleParallel.cpp" line="402"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
@@ -664,17 +664,17 @@
<context>
<name>U2::RefineTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="569"/>
+ <location filename="../src/MuscleParallel.cpp" line="572"/>
<source>RefineTask</source>
<translation>RefineTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="592"/>
+ <location filename="../src/MuscleParallel.cpp" line="595"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="599"/>
+ <location filename="../src/MuscleParallel.cpp" line="602"/>
<source>Can't allocate enough memory to perform aligning, try to use 64bit UGENE version</source>
<translation type="unfinished"></translation>
</message>
@@ -682,12 +682,12 @@
<context>
<name>U2::RefineTreeTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="519"/>
+ <location filename="../src/MuscleParallel.cpp" line="522"/>
<source>RefineTreeTask</source>
<translation>RefineTreeTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="531"/>
+ <location filename="../src/MuscleParallel.cpp" line="534"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
@@ -695,12 +695,12 @@
<context>
<name>U2::RefineWorker</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="650"/>
+ <location filename="../src/MuscleParallel.cpp" line="653"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Internal parallel MUSCLE error: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="656"/>
+ <location filename="../src/MuscleParallel.cpp" line="659"/>
<source>Can't allocate enough memory to perform aligning, try to use 64bit UGENE version</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins_3rdparty/umuscle/transl/russian.ts b/src/plugins_3rdparty/umuscle/transl/russian.ts
index c686d5b..08a4d36 100644
--- a/src/plugins_3rdparty/umuscle/transl/russian.ts
+++ b/src/plugins_3rdparty/umuscle/transl/russian.ts
@@ -315,27 +315,27 @@
<context>
<name>U2::MuscleAddSequencesToProfileTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="268"/>
+ <location filename="../src/MuscleTask.cpp" line="260"/>
<source>MUSCLE align profiles '%1' vs '%2'</source>
<translation>MUSCLE выравнивает '%1' к '%2'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="270"/>
+ <location filename="../src/MuscleTask.cpp" line="262"/>
<source>MUSCLE align '%2' by profile '%1'</source>
<translation>MUSCLE добавляет '%2' к '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="311"/>
+ <location filename="../src/MuscleTask.cpp" line="303"/>
<source>Sequences in file have different alphabets %1</source>
<translation>Последовательности в файле имеют разные алфавиты: %1</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="332"/>
+ <location filename="../src/MuscleTask.cpp" line="324"/>
<source>No sequences found in file %1</source>
<translation>Файл не содержит последовательностей: %1</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="334"/>
+ <location filename="../src/MuscleTask.cpp" line="326"/>
<source>No alignment found in file %1</source>
<translation>Файл не содержит выравниваний: %1</translation>
</message>
@@ -460,17 +460,17 @@
<context>
<name>U2::MuscleGObjectRunFromSchemaTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="606"/>
+ <location filename="../src/MuscleTask.cpp" line="598"/>
<source>Workflow wrapper '%1'</source>
<translation>Workflow wrapper '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="619"/>
+ <location filename="../src/MuscleTask.cpp" line="611"/>
<source>MUSCLE align '%1'</source>
<translation>MUSCLE выравнивает '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="622"/>
+ <location filename="../src/MuscleTask.cpp" line="614"/>
<source>MUSCLE refine '%1'</source>
<translation>MUSCLE улучшает '%1'</translation>
</message>
@@ -478,32 +478,32 @@
<context>
<name>U2::MuscleGObjectTask</name>
<message>
- <location filename="../src/MuscleTask.cpp" line="364"/>
+ <location filename="../src/MuscleTask.cpp" line="356"/>
<source>MUSCLE align '%1'</source>
<translation>MUSCLE выравнивает '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="367"/>
+ <location filename="../src/MuscleTask.cpp" line="359"/>
<source>MUSCLE refine '%1'</source>
<translation>MUSCLE улучшает '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="370"/>
+ <location filename="../src/MuscleTask.cpp" line="362"/>
<source>MUSCLE add to profile '%1'</source>
<translation>MUSCLE добавляет в выравнивание '%1'</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="373"/>
+ <location filename="../src/MuscleTask.cpp" line="365"/>
<source>MUSCLE align profiles</source>
<translation>MUSCLE выравнивает пару выравниваний</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="405"/>
+ <location filename="../src/MuscleTask.cpp" line="397"/>
<source>A problem occurred during aligning profile to profile with MUSCLE. The original alignment is no more available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="421"/>
+ <location filename="../src/MuscleTask.cpp" line="413"/>
<source>MAlignment object has been changed</source>
<translation>Объект множественного выравнивания был изменен</translation>
</message>
@@ -541,7 +541,7 @@
<context>
<name>U2::MuscleParallelTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="51"/>
+ <location filename="../src/MuscleParallel.cpp" line="52"/>
<source>MuscleParallelTask</source>
<translation>MuscleParallelTask</translation>
</message>
@@ -567,27 +567,27 @@
<context>
<name>U2::MusclePrepareTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="107"/>
+ <location filename="../src/MuscleParallel.cpp" line="110"/>
<source>Preparing MUSCLE alignment...</source>
<translation>Preparing MUSCLE alignment...</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="115"/>
+ <location filename="../src/MuscleParallel.cpp" line="118"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="124"/>
+ <location filename="../src/MuscleParallel.cpp" line="127"/>
<source>MUSCLE prepared successfully</source>
<translation>MUSCLE prepared successfully</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="161"/>
+ <location filename="../src/MuscleParallel.cpp" line="164"/>
<source>No sequences in input file</source>
<translation>Выравнивание не содержит данных</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="190"/>
+ <location filename="../src/MuscleParallel.cpp" line="193"/>
<source>Alignment is empty</source>
<translation>Выравнивание не содержит данных</translation>
</message>
@@ -615,17 +615,17 @@
<translation>Stopping MUSCLE task, because of error in MAlignment::mid function</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="131"/>
+ <location filename="../src/MuscleTask.cpp" line="125"/>
<source>Performing MUSCLE alignment...</source>
<translation>Performing MUSCLE alignment...</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="154"/>
+ <location filename="../src/MuscleTask.cpp" line="148"/>
<source>MUSCLE alignment successfully finished</source>
<translation>MUSCLE alignment successfully finished</translation>
</message>
<message>
- <location filename="../src/MuscleTask.cpp" line="208"/>
+ <location filename="../src/MuscleTask.cpp" line="201"/>
<source>Unexpected number of rows in the result multiple alignment!</source>
<translation>Unexpected number of rows in the result multiple alignment!</translation>
</message>
@@ -633,17 +633,17 @@
<context>
<name>U2::ProgressiveAlignTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="302"/>
+ <location filename="../src/MuscleParallel.cpp" line="305"/>
<source>ProgressiveAlignTask</source>
<translation>ProgressiveAlignTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="324"/>
+ <location filename="../src/MuscleParallel.cpp" line="327"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="334"/>
+ <location filename="../src/MuscleParallel.cpp" line="337"/>
<source>alignment "%1" Parallel MUSCLE Iter 1 accomplished. Time elapsed %2 ms</source>
<translation>alignment "%1" Parallel MUSCLE Iter 1 accomplished. Time elapsed %2 ms</translation>
</message>
@@ -651,12 +651,12 @@
<context>
<name>U2::ProgressiveAlignWorker</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="385"/>
+ <location filename="../src/MuscleParallel.cpp" line="388"/>
<source>ProgressiveAlignWorker</source>
<translation>ProgressiveAlignWorker</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="399"/>
+ <location filename="../src/MuscleParallel.cpp" line="402"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
@@ -664,17 +664,17 @@
<context>
<name>U2::RefineTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="569"/>
+ <location filename="../src/MuscleParallel.cpp" line="572"/>
<source>RefineTask</source>
<translation>RefineTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="592"/>
+ <location filename="../src/MuscleParallel.cpp" line="595"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="599"/>
+ <location filename="../src/MuscleParallel.cpp" line="602"/>
<source>Can't allocate enough memory to perform aligning, try to use 64bit UGENE version</source>
<translation type="unfinished"></translation>
</message>
@@ -682,12 +682,12 @@
<context>
<name>U2::RefineTreeTask</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="519"/>
+ <location filename="../src/MuscleParallel.cpp" line="522"/>
<source>RefineTreeTask</source>
<translation>RefineTreeTask</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="531"/>
+ <location filename="../src/MuscleParallel.cpp" line="534"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
@@ -695,12 +695,12 @@
<context>
<name>U2::RefineWorker</name>
<message>
- <location filename="../src/MuscleParallel.cpp" line="650"/>
+ <location filename="../src/MuscleParallel.cpp" line="653"/>
<source>Internal parallel MUSCLE error: %1</source>
<translation>Внутренняя ошибка: %1</translation>
</message>
<message>
- <location filename="../src/MuscleParallel.cpp" line="656"/>
+ <location filename="../src/MuscleParallel.cpp" line="659"/>
<source>Can't allocate enough memory to perform aligning, try to use 64bit UGENE version</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
index becb215..98f16d5 100644
--- a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
+++ b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
index 64f828f..78dbd5d 100644
--- a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
+++ b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
index fc925f3..e1d3529 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
+++ b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ namespace U2 {
namespace LocalWorkflow {
-const QString CallVariantsWorkerFactory::ACTOR_ID("call_variants");
+const QString CallVariantsWorkerFactory::ACTOR_ID("call_variants");
static const QString REF_SEQ_PORT_ID("ref-seq-port-id");
static const QString ASSEMBLY_PORT_ID("assembly-port-id");
@@ -133,7 +133,7 @@ public:
}
}
}
-
+
return true;
}
protected:
@@ -143,12 +143,12 @@ protected:
void CallVariantsWorkerFactory::init() {
//port descriptor
- QList<PortDescriptor*> p;
+ QList<PortDescriptor*> p;
{
QMap<Descriptor, DataTypePtr> refSeqMap;
refSeqMap[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
DataTypePtr inSet(new MapDataType(REF_SEQ_PORT_ID, refSeqMap));
- Descriptor id(BasePorts::IN_SEQ_PORT_ID(), CallVariantsWorker::tr("Input sequences"),
+ Descriptor id(BasePorts::IN_SEQ_PORT_ID(), CallVariantsWorker::tr("Input sequences"),
CallVariantsWorker::tr("A nucleotide reference sequence."));
p << new PortDescriptor(id, inSet, true);
@@ -156,7 +156,7 @@ void CallVariantsWorkerFactory::init() {
assMap[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
assMap[BaseSlots::DATASET_SLOT()] = BaseTypes::STRING_TYPE();
DataTypePtr inAssemblySet(new MapDataType(ASSEMBLY_PORT_ID, assMap));
- Descriptor idA(BasePorts::IN_ASSEMBLY_PORT_ID(), CallVariantsWorker::tr("Input assembly"),
+ Descriptor idA(BasePorts::IN_ASSEMBLY_PORT_ID(), CallVariantsWorker::tr("Input assembly"),
CallVariantsWorker::tr("Position sorted alignment file"));
p << new PortDescriptor(idA, inAssemblySet, true, false, IntegralBusPort::BLIND_INPUT);
@@ -164,13 +164,13 @@ void CallVariantsWorkerFactory::init() {
varMap[BaseSlots::VARIATION_TRACK_SLOT()] = BaseTypes::VARIATION_TRACK_TYPE();
varMap[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
DataTypePtr outVariants(new MapDataType("variants", varMap));
- Descriptor idV(BasePorts::OUT_VARIATION_TRACK_PORT_ID(), CallVariantsWorker::tr("Output variations"),
+ Descriptor idV(BasePorts::OUT_VARIATION_TRACK_PORT_ID(), CallVariantsWorker::tr("Output variations"),
CallVariantsWorker::tr("Output tracks with SNPs and short INDELs"));
p << new PortDescriptor(idV, outVariants, false, true);
}
- Descriptor desc(ACTOR_ID, CallVariantsWorker::tr("Call Variants with SAMtools"),
+ Descriptor desc(ACTOR_ID, CallVariantsWorker::tr("Call Variants with SAMtools"),
CallVariantsWorker::tr("Calls SNPs and INDELS with SAMtools mpileup and bcftools.")
);
@@ -194,12 +194,12 @@ void CallVariantsWorkerFactory::init() {
CallVariantsWorker::tr("Disable BAQ computation"),
CallVariantsWorker::tr("Disable probabilistic realignment for the computation of base "
"alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. "
- "Applying this option greatly helps to reduce false SNPs caused by misalignments (mpileup)(-B)."));
+ "Applying this option greatly helps to reduce false SNPs caused by misalignments. (mpileup)(-B)."));
Descriptor capqThres(CAPQ_THRES,
CallVariantsWorker::tr("Mapping quality downgrading coefficient"),
CallVariantsWorker::tr("Coefficient for downgrading mapping quality for reads containing excessive mismatches. "
- "Given a read with a phred-scaled probability q of being generated from the mapped position, the new mapping quality "
+ "Given a read with a phred-scaled mapping quality q of being generated from the mapped position, the new mapping quality "
"is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C)."));
Descriptor maxDepth(MAX_DEPTH,
@@ -231,7 +231,7 @@ void CallVariantsWorkerFactory::init() {
Descriptor extq(EXTQ,
CallVariantsWorker::tr("Gap extension error"),
CallVariantsWorker::tr("Phred-scaled gap extension sequencing error probability. Reducing INT leads to longer indels (mpileup)(-e)."));
-
+
Descriptor tandemq(TANDEMQ,
CallVariantsWorker::tr("Homopolymer errors coefficient"),
CallVariantsWorker::tr("Coefficient for modeling homopolymer errors. Given an l-long homopolymer run, the sequencing error of an indel of size s is modeled as INT*s/l (mpileup)(-h)."));
@@ -292,7 +292,7 @@ void CallVariantsWorkerFactory::init() {
Descriptor callGt(CALL_GT,
CallVariantsWorker::tr("Per-sample genotypes"),
CallVariantsWorker::tr("Call per-sample genotypes at variant sites (bcf view)(-g)."));
-
+
Descriptor indelFrac(INDEL_FRAC,
CallVariantsWorker::tr("INDEL-to-SNP Ratio"),
CallVariantsWorker::tr("Ratio of INDEL-to-SNP mutation rate (bcf view)(-i)."));
@@ -328,7 +328,7 @@ void CallVariantsWorkerFactory::init() {
CallVariantsWorker::tr("Number of permutations for association test (effective only with -1) (bcf view)(-U)."));
Descriptor min_perm_p(MIN_PERM_P,
- CallVariantsWorker::tr("Min P(chi^2)"),
+ CallVariantsWorker::tr("Max P(chi^2)"),
CallVariantsWorker::tr("Only perform permutations for P(chi^2)<FLOAT (N permutations) (bcf view)(-X)."));
//varFilter
@@ -706,9 +706,14 @@ bool CallVariantsWorker::isReady() const {
bool assemblyEnded = assemblyPort->isEnded();
bool assemblyHasMes = (assemblyPort->hasMessage() > 0);
- if (seqHasMes || assemblyHasMes) {
+ if (seqHasMes && assemblyHasMes) {
+ return true;
+ }
+
+ if ((seqEnded && assemblyHasMes) || (assemblyEnded && seqHasMes)) {
return true;
}
+
return seqEnded && assemblyEnded;
}
@@ -750,7 +755,6 @@ Task* CallVariantsWorker::tick() {
return t;
}
-
return NULL;
}
@@ -773,7 +777,7 @@ void CallVariantsWorker::cleanup() {
}
void CallVariantsWorker::takeAssembly(U2OpStatus &os) {
- Message m = getMessageAndSetupScriptValues(assemblyPort);
+ Message m = assemblyPort->lookMessage();
CHECK(!m.isEmpty(), );
QVariantMap data = m.getData().toMap();
@@ -783,12 +787,18 @@ void CallVariantsWorker::takeAssembly(U2OpStatus &os) {
}
QString dataset = data[BaseSlots::DATASET_SLOT().getId()].toString();
- if (dataset != currentDatasetName) {
+ if (currentDatasetName.isEmpty()) {
+ currentDatasetName = dataset;
+ }
+ if (currentDatasetName == dataset) {
+ assemblyUrls << data.value(BaseSlots::URL_SLOT().getId()).value<QString>();
+ assemblyPort->get();
+ }
+ if (dataset != currentDatasetName && settings.assemblyUrls.isEmpty()) {
settings.assemblyUrls = assemblyUrls;
assemblyUrls.clear();
currentDatasetName = dataset;
}
- assemblyUrls << data.value(BaseSlots::URL_SLOT().getId()).value<QString>();
}
void CallVariantsWorker::takeReference(U2OpStatus &os) {
diff --git a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
index b12636a..e1c00f2 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
+++ b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
index 3119ca2..91f7a4c 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
+++ b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
index a5233bc..405ffe2 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
+++ b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins_3rdparty/variants/transl/english.ts b/src/plugins_3rdparty/variants/transl/english.ts
index a227353..7e2a16d 100644
--- a/src/plugins_3rdparty/variants/transl/english.ts
+++ b/src/plugins_3rdparty/variants/transl/english.ts
@@ -156,8 +156,8 @@
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="195"/>
- <source>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments (mpileup)(-B).</source>
- <translation>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments (mpileup)(-B).</translation>
+ <source>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments. (mpileup)(-B).</source>
+ <translation>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments. (mpileup)(-B).</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="200"/>
@@ -166,8 +166,8 @@
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="201"/>
- <source>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled probability q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</source>
- <translation>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled probability q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</translation>
+ <source>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled mapping quality q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</source>
+ <translation>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled mapping quality q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="206"/>
@@ -455,8 +455,8 @@
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="331"/>
- <source>Min P(chi^2)</source>
- <translation>Min P(chi^2)</translation>
+ <source>Max P(chi^2)</source>
+ <translation>Max P(chi^2)</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="332"/>
diff --git a/src/plugins_3rdparty/variants/transl/russian.ts b/src/plugins_3rdparty/variants/transl/russian.ts
index bd1a24d..d7d525d 100644
--- a/src/plugins_3rdparty/variants/transl/russian.ts
+++ b/src/plugins_3rdparty/variants/transl/russian.ts
@@ -117,7 +117,7 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="174"/>
<source>Calls SNPs and INDELS with SAMtools mpileup and bcftools.</source>
- <translation>Вызов SNP и INDELS при помощи SAMtools mpileup и bcftools.</translation>
+ <translation>этот элемент ищет однонуклеотидные вариации (SNP) и короткие вставки или выпадения (indels) при помощи SAMtools mpileup и bcftools.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="182"/>
@@ -137,167 +137,167 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="187"/>
<source>Assume the quality is in the Illumina 1.3+ encoding (mpileup)(-6).</source>
- <translation>Допустимое качество в кодировании Illumina 1.3+ (-6).</translation>
+ <translation>значения качества в кодировке Illumina 1.3+. Соответствует опции mpileup -6.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="190"/>
<source>Count anomalous read pairs</source>
- <translation>Количество аномальных пар ридов</translation>
+ <translation>Учитывать аномальные пары прочтений</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="191"/>
<source>Do not skip anomalous read pairs in variant calling(mpileup)(-A).</source>
- <translation>Не упускать аномальные пары ридов в вызове вариаций (-A).</translation>
+ <translation>не пропускать аномальные пары прочтений при поиске вариаций. Соответствует опции mpileup -A.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="194"/>
<source>Disable BAQ computation</source>
- <translation>Отключить вычисление BAQ</translation>
+ <translation>Отключить расчет BAQ</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="195"/>
- <source>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments (mpileup)(-B).</source>
- <translation>Отключить вероятностную перестройку для расчета базового качества (BAQ) (- В).</translation>
+ <source>Disable probabilistic realignment for the computation of base alignment quality (BAQ). BAQ is the Phred-scaled probability of a read base being misaligned. Applying this option greatly helps to reduce false SNPs caused by misalignments. (mpileup)(-B).</source>
+ <translation>не выполнять выравнивание для расчета качества выравнивания каждого нуклеотида (base alignment quality, BAQ). BAQ - это приведенная к шкале Phred вероятность того, что данный нуклеотид выровнен неверно. Расчет BAQ сильно снижает вероятность ложного нахождения SNP из-за неверного выравнивания. Соответствует опции mpileup -B.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="200"/>
<source>Mapping quality downgrading coefficient</source>
- <translation>Отображение коэффициента понижения качества</translation>
+ <translation>Коэффициент снижения качества выравнивания</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="201"/>
- <source>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled probability q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</source>
- <translation>Коэффициент для понижения качества отображения для ридов, содержащих большое количество несовпадений (- С).</translation>
+ <source>Coefficient for downgrading mapping quality for reads containing excessive mismatches. Given a read with a phred-scaled mapping quality q of being generated from the mapped position, the new mapping quality is about sqrt((INT-q)/INT)*INT. A zero value disables this functionality; if enabled, the recommended value for BWA is 50 (mpileup)(-C).</source>
+ <translation>применить коэффициент, отражающий снижение качества выравнивания прочтений, содержащих много замен. Если прочтение обладает качеством выравнивания q, новое значение качества выравнивания составит около sqrt[(INT-q)/INT]*INT. Значение 0 отключает эту опцию. Рекомендуемым значением для BWA является 50. Cjjndtncndetn jgwbb ьзшдугз -C INT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="206"/>
<source>Max number of reads per input BAM</source>
- <translation>Максимальное число ридов для входного BAM файла</translation>
+ <translation>Максимальное число прочтений для входного BAM-файла</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="207"/>
<source>At a position, read maximally the number of reads per input BAM (mpileup)(-d).</source>
- <translation>Максимальное число ридов для входного BAM файла (-d).</translation>
+ <translation>максимальное число прочтений, которое следует прочитать для каждой позиции из входного BAM-файла. Соответствует опции mpileup -d.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="210"/>
<source>Extended BAQ computation</source>
- <translation>Расширенные вычисления BAQ</translation>
+ <translation>Расширенный расчет BAQ</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="211"/>
<source>Extended BAQ computation. This option helps sensitivity especially for MNPs, but may hurt specificity a little bit (mpileup)(-E).</source>
- <translation>Расширенные вычисления BAQ.</translation>
+ <translation>Расширенные расчет BAQ. Эта опция увеличивает чувствительность, особенно в случае множественных замен (MNPs), однако может снижать специфичность.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="215"/>
<source>BED or position list file</source>
- <translation>BED или файл со списком позиций</translation>
+ <translation>BED-файл или файл со списком позиций</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="216"/>
<source>BED or position list file containing a list of regions or sites where pileup or BCF should be generated (mpileup)(-l).</source>
- <translation>BED или файл со списком позиций регионов или сайтов где должно быть сгенерировано множество или BCF(-l).</translation>
+ <translation>BED-файл или файл со списком позиций или участков, для которых необходимо сгенерировать pileup или BCF. Соответствует опции mpileup -l.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="220"/>
<source>Pileup region</source>
- <translation>Регион скопления</translation>
+ <translation>Pileup для участка</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="221"/>
<source>Only generate pileup in region STR (mpileup)(-r).</source>
- <translation>Генерировать множество только в регионе STR (-r).</translation>
+ <translation>генерировать pileup только для участка STR. Соответствует опции mpileup -r STR.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="224"/>
<source>Minimum mapping quality</source>
- <translation>Минимальное качество отображения</translation>
+ <translation>Минимальное качество выравнивания</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="225"/>
<source>Minimum mapping quality for an alignment to be used (mpileup)(-q).</source>
- <translation>Минимальное качество отображения для выравнивания(-q).</translation>
+ <translation>использовать выравнивания только с таким или более хорошим качеством. Соответствует опции mpileup -q.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="228"/>
<source>Minimum base quality</source>
- <translation>Минимальное качество базы</translation>
+ <translation>Минимальное качество нуклеотида</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="229"/>
<source>Minimum base quality for a base to be considered (mpileup)(-Q).</source>
- <translation>Минимальное качество базы(-Q).</translation>
+ <translation>учитывать нуклеотиды только с таким или более хорошим качеством. Соответствует опции mpileup -Q.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="232"/>
<source>Gap extension error</source>
- <translation>Ошибка расширения промежутка</translation>
+ <translation>Ошибка расширения пробела</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="233"/>
<source>Phred-scaled gap extension sequencing error probability. Reducing INT leads to longer indels (mpileup)(-e).</source>
- <translation>Вероятность ошибки расширения пропуска. (-e).</translation>
+ <translation>Вероятность ошибки расширения пробела. (-e).</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="236"/>
<source>Homopolymer errors coefficient</source>
- <translation>Коэффициент гомополимерных ошибок</translation>
+ <translation>Коэффициент ошибок в гомополимерных участках</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="237"/>
<source>Coefficient for modeling homopolymer errors. Given an l-long homopolymer run, the sequencing error of an indel of size s is modeled as INT*s/l (mpileup)(-h).</source>
- <translation>Коэффициент для моделирования гомополимерных ошибок (-h).</translation>
+ <translation>Коэффициент для моделирования ошибок в участках гомополимеров. Для гомополимера длиной l ошибка секвенирования для вставки/выпадения длиной s рассчитывается как INT*s/l. Соответствует опции mpileup -h.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="240"/>
<source>No INDELs</source>
- <translation>Нет INDEL</translation>
+ <translation>Не искать INDELs</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="241"/>
<source>Do not perform INDEL calling (mpileup)(-I).</source>
- <translation>Не выполнять вызов INDEL (-I).</translation>
+ <translation>не выполнять поиск вставок/выпадений. Соответствует опции mpileup -l.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="244"/>
<source>Max INDEL depth</source>
- <translation>Максимальная глубина INDEL</translation>
+ <translation>Максимальное покрытие для поиска INDELs</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="245"/>
<source>Skip INDEL calling if the average per-sample depth is above INT (mpileup)(-L).</source>
- <translation>Не выполнять вызов INDEL если средняя глубина больше указанного значения (-L).</translation>
+ <translation>не выполнять поиск вставок/выпадений если среднее покрытие образца превышает INT. Соответствует опции mpileup -L INT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="248"/>
<source>Gap open error</source>
- <translation>Ошибка открытия пропуска</translation>
+ <translation>Ошибка открытия пробела</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="249"/>
<source>Phred-scaled gap open sequencing error probability. Reducing INT leads to more indel calls (mpileup)(-o).</source>
- <translation>Вероятность ошибки открытия пропуска (-e).</translation>
+ <translation>вероятность ошибки секвенирования, приводящей к открытию пробела, в шкале Phred. Снижение значения INT приводит к увеличению числа найденных вставок/выпадений. Соответствует опции mpileup -o INT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="252"/>
<source>List of platforms for indels</source>
- <translation>Список платворм для вставок/удалений</translation>
+ <translation>Список платформ для поиска вставок/выпадений</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="253"/>
<source>Comma dilimited list of platforms (determined by @RG-PL) from which indel candidates are obtained.It is recommended to collect indel candidates from sequencing technologies that have low indel error rate such as ILLUMINA (mpileup)(-P).</source>
- <translation>Список платворм для вставок/удалений.</translation>
+ <translation>список через запятую названий платформ в формате @RG-PL, для которых необходимо проводить поиск возможных вставок/выпадений. Этот анализ рекомендуется проводить для данных платформ секвенирования, обладающих низким уровнем ошибок типа вставка/выпадение (например, ILLUMINA). Соответствует опции mpileup -P.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="258"/>
<source>Retain all possible alternate</source>
- <translation>Сохранить все возможные альтернативы</translation>
+ <translation>Сохранять все альтернативные варианты</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="259"/>
<source>Retain all possible alternate alleles at variant sites. By default, the view command discards unlikely alleles (bcf view)(-A).</source>
- <translation>Сохранить все возможные альтернативные аллели вариационных сайтов (-A).</translation>
+ <translation>сохранять все аллельные варианты в вариабельных позициях. По умолчанию команда view отбрасывает аллели с низкой вероятностью. Соответствует опции bcftools view -A.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="262"/>
@@ -307,17 +307,17 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="263"/>
<source>Indicate PL is generated by r921 or before (ordering is different) (bcf view)(-F).</source>
- <translation>Указать PL сгенерированный r921 или до (-F).</translation>
+ <translation>указать, получены ли данные с помощью r921 или более ранней версии платформы (отличаются сортировкой). Соответствует опции bcftools view -F.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="266"/>
<source>No genotype information</source>
- <translation>Нет информации генотипа</translation>
+ <translation>Не отображать информацию о генотипе</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="267"/>
<source>Suppress all individual genotype information (bcf view)(-G).</source>
- <translation>Подавить всю индивидуальную информацию о генотипе (- G).</translation>
+ <translation>отключить отображение всей информации о генотипе индивидуума. Соответствует опции bcftools view -G.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="270"/>
@@ -327,57 +327,57 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="271"/>
<source>Skip sites where the REF field is not A/C/G/T (bcf view)(-N).</source>
- <translation>Отбрасывать сайты где REF поля не A/C/G/T (-N).</translation>
+ <translation>отбрасывать сайты, где поле REF содержит значение не из списка A/C/G/T. Соответствует опции bcftools view -N.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="274"/>
<source>List of sites</source>
- <translation>Список сайтов</translation>
+ <translation>Список позиций</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="275"/>
<source>List of sites at which information are outputted (bcf view)(-l).</source>
- <translation>Список сайтов, на которых выводится информация (-l).</translation>
+ <translation>список позиций, для которых необходимо вывести информацию. Соответствует опции bcftools view -l STR.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="278"/>
<source>QCALL likelihood</source>
- <translation>Вероятность QCALL</translation>
+ <translation>Вероятность в QCALL</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="279"/>
<source>Output the QCALL likelihood format (bcf view)(-Q).</source>
- <translation>Вывести формат вероятности QCALL (-Q).</translation>
+ <translation>выводить значения вероятности в формате QCALL. Соответствует опции bcftools view -Q.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="282"/>
<source>List of samples</source>
- <translation>Список примеров</translation>
+ <translation>Список образцов</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="283"/>
<source>List of samples to use. The first column in the input gives the sample names and the second gives the ploidy, which can only be 1 or 2. When the 2nd column is absent, the sample ploidy is assumed to be 2. In the output, the ordering of samples will be identical to the one in FILE (bcf view)(-s).</source>
- <translation>Список примеров для использования (-s).</translation>
+ <translation>список образцов, которые необходимо использовать. В первом столбце необходимо перечислить названия образцов, во втором - плоидность. Если второй столбец отсутствует, плоидность считается равной 2. Порядок образцов в выходном файле будет соответствовать порядку во входном файле. Соответствует опции bcftools view -s.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="289"/>
<source>Min samples fraction</source>
- <translation>Минимальная доля примеров</translation>
+ <translation>Минимальная доля образцов</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="290"/>
<source>skip loci where the fraction of samples covered by reads is below FLOAT (bcf view)(-d).</source>
- <translation>пропустить те места, где доля примеров ниже указанного значения(-d).</translation>
+ <translation>пропустить участок если доля образцов, у которых этот участок покрыт прочтениями, ниже указанного значения. Соответствует опции bcftools view -d FLOAT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="293"/>
<source>Per-sample genotypes</source>
- <translation>Генотипы примеров</translation>
+ <translation>Генотип для каждого образца</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="294"/>
<source>Call per-sample genotypes at variant sites (bcf view)(-g).</source>
- <translation>Вызов генотипов примеров на сайты вариаций (- g).</translation>
+ <translation>отобразить генотип для каждого образца и каждой вариабельной позиции. Соответствует опции bcftools view -g.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="297"/>
@@ -387,7 +387,7 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="298"/>
<source>Ratio of INDEL-to-SNP mutation rate (bcf view)(-i).</source>
- <translation>Соотношение INDEL-to-SNP скорости мутаций (-i).</translation>
+ <translation>указать отношение скоростей появления вставок/выпадений и замен. Соответствует опции bcftools view -i FLOAT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="301"/>
@@ -397,37 +397,37 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="302"/>
<source>A site is considered to be a variant if P(ref|D)<FLOAT (bcf view)(-p).</source>
- <translation>Сайт считается вариацией если P(ref|D)меньше указанного значения (-p).</translation>
+ <translation>считать позицию вариабельной, если вероятность совпадения с референсом (P(ref|D)) меньше указанного значения. Соответствует опции bcftools view -p FLOAT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="305"/>
<source>Prior allele frequency spectrum</source>
- <translation>Приоритетный спектр частот аллелей</translation>
+ <translation>Априорное распределение частот аллелей</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="306"/>
<source>If STR can be full, cond2, flat or the file consisting of error output from a previous variant calling run (bcf view)(-P).</source>
- <translation>Приоритетный спектр частот аллелей (-P).</translation>
+ <translation>значение из следующего списка: full, cond2, flat - или файл, содержащий список ошибок в предыдущем запуске. Соответствует опции bcftools view -P STR.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="309"/>
<source>Mutation rate</source>
- <translation>Скорость мутации</translation>
+ <translation>Скорость накоплений мутаций</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="310"/>
<source>Scaled mutation rate for variant calling (bcf view)(-t).</source>
- <translation>Скорость мутации для вызова вариаций (-t).</translation>
+ <translation>нормализованная скорость накопления мутаций для поиска вариаций. Соответствует опции bcftools view -t.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="313"/>
<source>Pair/trio calling</source>
- <translation>Парный/тройной вызов</translation>
+ <translation>Поиск вариаций в парных образцах или трио</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="314"/>
<source>Enable pair/trio calling. For trio calling, option -s is usually needed to be applied to configure the trio members and their ordering. In the file supplied to the option -s, the first sample must be the child, the second the father and the third the mother. The valid values of STR are '‘pair’', '‘trioauto’', '‘trioxd’' and '‘trioxs’', where '‘pair’' calls differences between two input samples, and '‘trioxd’' (&a [...]
- <translation type="unfinished"></translation>
+ <translation>включить поиск вариаций в парах или трио образцов. Для работы с трио необходимо также применить опцию -s для настройки входящих в трио образцов и порядка их сортировки. В файле, переданном опции -s, первому образцу должны соответствовать данные для ребенка, второму - для отца, третьему - для матери. Корректными значениями этого параметра являются '‘pair’', '‘trioauto’', '‘trioxd’' и '‘trioxs’', где '‘pair’' позволяет [...]
</message>
<message>
<source>Enable pair/trio calling. For trio calling, option -s is usually needed to be applied to configure the trio members and their ordering. In the file supplied to the option -s, the first sample must be the child, the second the father and the third the mother. The valid values of STR are '‘pair’', '‘trioauto’', '‘trioxd’' and '‘trioxs’', where '‘pair’' calls differences between two input samples, and '‘trioxd [...]
@@ -436,32 +436,32 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="321"/>
<source>N group-1 samples</source>
- <translation>Примеры N group-1</translation>
+ <translation>Число образцов в группе 1</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="322"/>
<source>Number of group-1 samples. This option is used for dividing the samples into two groups for contrast SNP calling or association test. When this option is in use, the followingVCF INFO will be outputted: PC2, PCHI2 and QCHI2 (bcf view)(-1).</source>
- <translation>Число примеров group-1 (-1).</translation>
+ <translation>число образцов в первой группе. Эта опция используется для разделения образцов на две группы для поиска различающихся SNP или проведения анализа ассоциаций. Если эта опция включена, в выходном файле будут добавлены следующие значения VCF INFO: PC2, PCHI2 и QCHI2. Соответствует опции bcftools view -1.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="327"/>
<source>N permutations</source>
- <translation>Перестановки N</translation>
+ <translation>Число перестановок</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="328"/>
<source>Number of permutations for association test (effective only with -1) (bcf view)(-U).</source>
- <translation>Число перестановок для ассоциативного теста (-U).</translation>
+ <translation>число перестановок для анализа ассоциаций. Работает только в том случае, если включена опция -1. Соответствует опции bcftools view -U.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="331"/>
- <source>Min P(chi^2)</source>
- <translation>Минимальное P(chi^2)</translation>
+ <source>Max P(chi^2)</source>
+ <translation>Максимальное P(chi^2)</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="332"/>
<source>Only perform permutations for P(chi^2)<FLOAT (N permutations) (bcf view)(-X).</source>
- <translation>Выполнять перестановки только для (chi^2) меньше чем указанное значение(-X).</translation>
+ <translation>выполнять перестановки только для меньших значений P(chi^2), чем указанное значение. Соответствует опции bcftools view -X FLOAT.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="336"/>
@@ -471,47 +471,47 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="337"/>
<source>Minimum RMS mapping quality for SNPs (varFilter) (-Q).</source>
- <translation>Минимальное качество отображения RMS для SNP (-Q).</translation>
+ <translation>минимальное качество выравнивания RMS для SNP. Соответствует опции varFilter -Q.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="339"/>
<source>Minimum read depth</source>
- <translation>Минимальная глубина рида</translation>
+ <translation>Минимальная глубина покрытия</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="340"/>
<source>Minimum read depth (varFilter) (-d).</source>
- <translation>Минимальная глубина рида (-d).</translation>
+ <translation>Минимальная глубина покрытия для прочтения. Соответствует опции varFilter -d.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="342"/>
<source>Maximum read depth</source>
- <translation>Максимальная глубина рида</translation>
+ <translation>Максимальная глубина покрытия</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="343"/>
<source>Maximum read depth (varFilter) (-D).</source>
- <translation>Максимальная глубина рида (-D).</translation>
+ <translation>Максимальная глубина покрытия для прочтения. Соответствует опции varFilter -d.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="345"/>
<source>Alternate bases</source>
- <translation>Альтернативные основания</translation>
+ <translation>Альтернативные нуклеотиды</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="346"/>
<source>Minimum number of alternate bases (varFilter) (-a).</source>
- <translation>Минимальное число альтернативных основания (-a).</translation>
+ <translation>минимальное число прочтений, содержащих в этой позиции не соответствующий референсному вариант. Соответствует опции varFilter -a.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="348"/>
<source>Gap size</source>
- <translation>Размер пропуска</translation>
+ <translation>Длина пробела</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="349"/>
<source>SNP within INT bp around a gap to be filtered (varFilter) (-w).</source>
- <translation>Размер пропуска (-w).</translation>
+ <translation>длина участка, включающего вставку/выпадение, на котором следует отбросить SNP. Соответствует опции varFilter -w.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="351"/>
@@ -521,17 +521,17 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="352"/>
<source>Window size for filtering adjacent gaps (varFilter) (-W).</source>
- <translation>Размер окна для фильтрации смежных пропусков (-W).</translation>
+ <translation>Размер окна для фильтрации смежных пробелов. Соответствует опции varFilter -W.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="354"/>
<source>Strand bias</source>
- <translation>Напрвление смещения</translation>
+ <translation>Смещение по разным цепям</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="355"/>
<source>Minimum P-value for strand bias (given PV4) (varFilter) (-1).</source>
- <translation>Минимальное P-значение для направления смещения (-1).</translation>
+ <translation>минимальное P-значение для добавления информации о неравномерном распределении вариаций по двум цепям. Соответствует опции varFilter -1.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="357"/>
@@ -541,7 +541,7 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="358"/>
<source>Minimum P-value for baseQ bias (varFilter) (-2).</source>
- <translation>Минимальное P-значение для смещения baseQ (-2).</translation>
+ <translation>минимальное P-значение для добавления информации о неравномерном распределении качества нуклеотида (baseQ). Соответствует опции varFilter -2.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="360"/>
@@ -551,17 +551,17 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="361"/>
<source>Minimum P-value for mapQ bias (varFilter) (-3).</source>
- <translation>Минимальное P-значение для смещения mapQ (-3).</translation>
+ <translation>минимальное P-значение для добавления информации о неравномерном распределении качества выравнивания (mapQ). Соответствует опции varFilter -3.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="363"/>
<source>End distance bias</source>
- <translation>Концевое смещение</translation>
+ <translation>Смещение расстояния до конца прочтения</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="364"/>
<source>Minimum P-value for end distance bias (varFilter) (-4).</source>
- <translation>Минимальное P-значение для концевого смещения (-4).</translation>
+ <translation>минимальное P-значение для добавления информации о неравномерном распределении расстояния от вариабельного сайта до конца прочтения. Соответствует опции varFilter -4.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="366"/>
@@ -571,7 +571,7 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="367"/>
<source>Minimum P-value for HWE (plus F<0) (varFilter) (-e).</source>
- <translation>Минимальное P-значение для HWE (-e).</translation>
+ <translation>минимальное P-значение для добавления информации о распределении Харди-Вайнберга (HWE). Соответствует опции varFilter -e.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="369"/>
@@ -581,7 +581,7 @@
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="370"/>
<source>Print filtered variants into the log (varFilter) (-p).</source>
- <translation>Выдает отфильтрованные вариации в лог (-p).</translation>
+ <translation>записывать отфильтрованные вариации в лог-файл. Соответствует опции varFilter -p.</translation>
</message>
<message>
<location filename="../src/SamtoolMpileupWorker.cpp" line="781"/>
diff --git a/src/plugins_checker/src/Main.cpp b/src/plugins_checker/src/Main.cpp
index 3f91f5a..e202d49 100644
--- a/src/plugins_checker/src/Main.cpp
+++ b/src/plugins_checker/src/Main.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugene_globals.pri b/src/ugene_globals.pri
index f05add2..57f7899 100644
--- a/src/ugene_globals.pri
+++ b/src/ugene_globals.pri
@@ -149,6 +149,10 @@ defineTest( exclude_list_enabled ) {
contains( UGENE_EXCLUDE_LIST_ENABLED, 1 ) : return (true)
return (false)
}
+if(exclude_list_enabled()|!exists( ./libs_3rdparty/QSpec/QSpec.pro )) {
+ DEFINES += HI_EXCLUDED
+}
+
#Variable enabling exclude list for ugene non-free modules
defineTest( without_non_free ) {
contains( UGENE_WITHOUT_NON_FREE, 1 ) : return (true)
diff --git a/src/ugene_version.pri b/src/ugene_version.pri
index 877af72..3f6d3c4 100644
--- a/src/ugene_version.pri
+++ b/src/ugene_version.pri
@@ -1,7 +1,7 @@
# This file contains UGENE version info
# product version
-UGENE_VERSION=1.20.0
+UGENE_VERSION=1.21.0
# minimum UGENE version whose SQLite databases are compatible with this version
UGENE_MIN_VERSION_SQLITE=1.13.0
@@ -16,5 +16,5 @@ U2_DISTRIBUTION_INFO=sources
# int version levels for executables
UGENE_VER_MAJOR=1
-UGENE_VER_MINOR=20
+UGENE_VER_MINOR=21
UGENE_VER_PATCH=0
diff --git a/src/ugenecl/src/DumpHelpTask.cpp b/src/ugenecl/src/DumpHelpTask.cpp
index 81ac9ad..fbb6b2b 100644
--- a/src/ugenecl/src/DumpHelpTask.cpp
+++ b/src/ugenecl/src/DumpHelpTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/DumpHelpTask.h b/src/ugenecl/src/DumpHelpTask.h
index 5e5688d..ad7efbb 100644
--- a/src/ugenecl/src/DumpHelpTask.h
+++ b/src/ugenecl/src/DumpHelpTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/DumpLicenseTask.cpp b/src/ugenecl/src/DumpLicenseTask.cpp
index b379376..25f4556 100644
--- a/src/ugenecl/src/DumpLicenseTask.cpp
+++ b/src/ugenecl/src/DumpLicenseTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/DumpLicenseTask.h b/src/ugenecl/src/DumpLicenseTask.h
index 230b8e9..5dcc503 100644
--- a/src/ugenecl/src/DumpLicenseTask.h
+++ b/src/ugenecl/src/DumpLicenseTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/DumpVersionTask.cpp b/src/ugenecl/src/DumpVersionTask.cpp
index 1e72900..2f99c42 100644
--- a/src/ugenecl/src/DumpVersionTask.cpp
+++ b/src/ugenecl/src/DumpVersionTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/DumpVersionTask.h b/src/ugenecl/src/DumpVersionTask.h
index 64704d6..fbab0ac 100644
--- a/src/ugenecl/src/DumpVersionTask.h
+++ b/src/ugenecl/src/DumpVersionTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/ForeverTask.cpp b/src/ugenecl/src/ForeverTask.cpp
index de7dda1..acae0dd 100644
--- a/src/ugenecl/src/ForeverTask.cpp
+++ b/src/ugenecl/src/ForeverTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/ForeverTask.h b/src/ugenecl/src/ForeverTask.h
index 8a576dd..831739c 100644
--- a/src/ugenecl/src/ForeverTask.h
+++ b/src/ugenecl/src/ForeverTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/Main.cpp b/src/ugenecl/src/Main.cpp
index 65da2ec..c4bf951 100644
--- a/src/ugenecl/src/Main.cpp
+++ b/src/ugenecl/src/Main.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/TaskStatusBar.cpp b/src/ugenecl/src/TaskStatusBar.cpp
index 10bcbe7..039d17e 100644
--- a/src/ugenecl/src/TaskStatusBar.cpp
+++ b/src/ugenecl/src/TaskStatusBar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/TaskStatusBar.h b/src/ugenecl/src/TaskStatusBar.h
index aeddd51..fcb1ad0 100644
--- a/src/ugenecl/src/TaskStatusBar.h
+++ b/src/ugenecl/src/TaskStatusBar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/TestStarter.cpp b/src/ugenecl/src/TestStarter.cpp
index cd8373b..71cc154 100644
--- a/src/ugenecl/src/TestStarter.cpp
+++ b/src/ugenecl/src/TestStarter.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/src/TestStarter.h b/src/ugenecl/src/TestStarter.h
index 8d0995b..d3df9f8 100644
--- a/src/ugenecl/src/TestStarter.h
+++ b/src/ugenecl/src/TestStarter.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugenecl/ugenecl.pri b/src/ugenecl/ugenecl.pri
index 38019cb..a347c7c 100644
--- a/src/ugenecl/ugenecl.pri
+++ b/src/ugenecl/ugenecl.pri
@@ -15,7 +15,9 @@ DEFINES+= QT_DLL QT_FATAL_ASSERT
INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src
LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
-
+if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimit
+}
!debug_and_release|build_pass {
CONFIG(debug, debug|release) {
@@ -26,6 +28,10 @@ LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Re
OBJECTS_DIR=_tmp/obj/debug
LIBS -= -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lugenedbd -lbreakpadd -lhumimitd
+ if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimitd
+ }
+
}
CONFIG(release, debug|release) {
@@ -33,7 +39,7 @@ LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Re
DESTDIR=../_release
DEFINES+=NDEBUG
MOC_DIR=_tmp/moc/release
- OBJECTS_DIR=_tmp/obj/release
+ OBJECTS_DIR=_tmp/obj/release
}
}
diff --git a/src/ugenem/src/SendReportDialog.cpp b/src/ugenem/src/SendReportDialog.cpp
index 4617cd8..3474cf9 100644
--- a/src/ugenem/src/SendReportDialog.cpp
+++ b/src/ugenem/src/SendReportDialog.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,6 +35,7 @@
#include <QDate>
#include <QDir>
#include <QEventLoop>
+#include <QHostInfo>
#include <QFile>
#include <QHttpPart>
#include <QMessageBox>
@@ -43,7 +44,6 @@
#include <QNetworkReply>
#include <QNetworkRequest>
#include <QProcess>
-#include <QProcess>
#include <QSysInfo>
#include <QThread>
#include <QTime>
@@ -51,6 +51,7 @@
#include "SendReportDialog.h"
#include "Utils.h"
+#include "getMemorySize.c"
#define HOST_URL "http://ugene.unipro.ru"
//#define HOST_URL "http://127.0.0.1:80"
@@ -66,6 +67,8 @@
#define DESTINATION_URL_KEEPER_PAGE "/crash_reports_dest_breakpad.html"
#endif
+ReportSender::ReportSender(bool addGuiTestInfo) : report(""), addGuiTestInfo(addGuiTestInfo), failedTest("UNKNOWN TEST") {}
+
void ReportSender::parse(const QString &htmlReport, const QString &dumpUrl) {
report = "Exception with code ";
@@ -86,6 +89,15 @@ void ReportSender::parse(const QString &htmlReport, const QString &dumpUrl) {
report += "Memory Info: ";
report += QString::number(getTotalPhysicalMemory()) + "Mb\n\n";
+ if (addGuiTestInfo) {
+ report += "User email: ugene at unipro.ru\n\n";
+ report += "Local Host name: ";
+ report += QHostInfo::localHostName() + "\n\n";
+
+ report += "Failed test: ";
+ report += failedTest + "\n\n";
+ }
+
report += "UGENE version: ";
#ifdef UGENE_VERSION_SUFFIX
//Example of usage on linux: DEFINES+='UGENE_VERSION_SUFFIX=\\\"-ppa\\\"'
@@ -113,6 +125,15 @@ void ReportSender::parse(const QString &htmlReport, const QString &dumpUrl) {
report += list.takeLast();
#endif
} else {
+ if (addGuiTestInfo) {
+ report += "\n\n";
+ report += "User email: ugene at unipro.ru\n\n";
+ report += "Local Host name: ";
+ report += QHostInfo::localHostName() + "\n\n";
+
+ report += "Failed test: ";
+ report += failedTest + "\n\n";
+ }
foreach(const QString& str, list) {
report += str + "\n";
}
@@ -398,49 +419,11 @@ QString ReportSender::getOSVersion() {
result = "Unsupported OS";
#endif
-#ifdef Q_OS_MAC
- result += (Utils::isSystem64bit() ? " x64" :" x86");
-#endif
-
return result;
}
int ReportSender::getTotalPhysicalMemory() {
- int totalPhysicalMemory = 0;
-
-#if defined(Q_OS_WIN32)
- MEMORYSTATUSEX memory_status;
- ZeroMemory(&memory_status, sizeof(MEMORYSTATUSEX));
- memory_status.dwLength = sizeof(memory_status);
- if (GlobalMemoryStatusEx(&memory_status)) {
- totalPhysicalMemory = memory_status.ullTotalPhys / (1024 * 1024);
- }
-
-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- long pagesize = sysconf(_SC_PAGESIZE);
- long numpages = sysconf(_SC_PHYS_PAGES);
-
- // Assume that page size is always a multiple of 1024, so it can be
- // divided without losing any precision. On the other hand, number
- // of pages would hardly overflow `long' when multiplied by a small
- // number (number of pages / 1024), so we should be safe here.
- totalPhysicalMemory = (int)(numpages * (pagesize / 1024) / 1024);
-
-#elif defined(Q_OS_MAC)
-// TODO
- QProcess p;
- p.start("sh", QStringList() << "-c" << "sysctl hw.memsize | awk -F ' ' '{print $2}'");
- p.waitForFinished();
- QString system_info = p.readAllStandardOutput();
- p.close();
- bool ok = false;
- qlonglong output_mem = system_info.toLongLong(&ok);
- if (ok) {
- totalPhysicalMemory = output_mem / (1024 * 1024);
- }
-#endif
-
- return totalPhysicalMemory;
+ return getMemorySize() / (1024 * 1024);
}
#ifndef Q_OS_MAC
@@ -517,6 +500,10 @@ QString ReportSender::getCPUInfo() {
return result;
}
+void ReportSender::setFailedTest(const QString &failedTestStr) {
+ failedTest = failedTestStr;
+}
+
QString ReportSender::getUgeneBitCount() const {
#if defined(UGENE_X86_64)
return " x64";
diff --git a/src/ugenem/src/SendReportDialog.h b/src/ugenem/src/SendReportDialog.h
index 6615eae..fe8e938 100644
--- a/src/ugenem/src/SendReportDialog.h
+++ b/src/ugenem/src/SendReportDialog.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ class QNetworkReply;
class ReportSender:public QObject {
Q_OBJECT
public:
- ReportSender(): report("") {}
+ ReportSender(bool addGuiTestInfo = false);
void parse(const QString &str, const QString &dumpUrl);
bool send(const QString &additionalInfo, const QString &dumpUrl);
QString getOSVersion();
@@ -39,6 +39,7 @@ public:
int getTotalPhysicalMemory();
QString getCPUInfo();
QString getUgeneBitCount() const;
+ void setFailedTest(const QString &failedTestStr);
private slots:
void sl_replyFinished(QNetworkReply*);
@@ -46,6 +47,8 @@ private slots:
private:
QString report;
QEventLoop loop;
+ bool addGuiTestInfo;
+ QString failedTest;
};
class SendReportDialog:public QDialog, public Ui_Dialog {
diff --git a/src/ugenem/src/Utils.cpp b/src/ugenem/src/Utils.cpp
index ccadab4..78d31b1 100644
--- a/src/ugenem/src/Utils.cpp
+++ b/src/ugenem/src/Utils.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -31,6 +31,8 @@ const QString Utils::SESSION_DB_UGENE_ARG = "--session-db=";
const QString REPORT_FILE_ARG = "-f";
const QString SESSION_DB_FILE_ARG = "-d";
const QString DUMP_FILE_ARG = "-dump";
+const QString SILENT_SEND_FILE_ARG = "--silent-sending";
+const QString FAILED_TEST_FILE_ARG = "--failed-test";
const int MAX_FILE_SIZE = 512000; // 500 Kb
bool Utils::hasReportUrl() {
@@ -53,6 +55,14 @@ QString Utils::getDumpUrl() {
return getArgumentValue(DUMP_FILE_ARG);
}
+bool Utils::hasSilentModeFlag() {
+ return hasArgument(SILENT_SEND_FILE_ARG);
+}
+
+QString Utils::getFailedTestName() {
+ return getArgumentValue(FAILED_TEST_FILE_ARG);
+}
+
QString Utils::loadReportFromUrl(const QString &url) {
QFile file(url);
if (!file.exists()) {
@@ -68,22 +78,6 @@ QString Utils::loadReportFromUrl(const QString &url) {
return QString::fromUtf8(data);
}
-bool Utils::isSystem64bit() {
-#ifdef Q_OS_MAC
- QProcess p;
- p.start("sysctl", QStringList() << "-n" << "hw.optional.x86_64");
- p.waitForFinished();
- const QString systemInfo = p.readAllStandardOutput();
- p.close();
-
- bool ok = false;
- int is64bit = systemInfo.toInt(&ok);
- return is64bit != 0;
-#endif
-
- return false;
-}
-
bool Utils::hasArgument(const QString &key) {
QStringList args = QCoreApplication::arguments();
int idx = args.indexOf(key);
diff --git a/src/ugenem/src/Utils.h b/src/ugenem/src/Utils.h
index 323f174..104a26c 100644
--- a/src/ugenem/src/Utils.h
+++ b/src/ugenem/src/Utils.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -34,10 +34,10 @@ public:
static bool hasDatabaseUrl();
static QString getDatabaseUrl();
static QString getDumpUrl();
+ static bool hasSilentModeFlag();
+ static QString getFailedTestName();
static QString loadReportFromUrl(const QString &url);
- static bool isSystem64bit();
-
static const QString SESSION_DB_UGENE_ARG;
private:
diff --git a/src/ugenem/src/getMemorySize.c b/src/ugenem/src/getMemorySize.c
new file mode 100644
index 0000000..816db64
--- /dev/null
+++ b/src/ugenem/src/getMemorySize.c
@@ -0,0 +1,97 @@
+/*
+ * Author: David Robert Nadeau
+ * Site: http://NadeauSoftware.com/
+ * License: Creative Commons Attribution 3.0 Unported License
+ * http://creativecommons.org/licenses/by/3.0/deed.en_US
+ */
+
+#if defined(_WIN32)
+#include <Windows.h>
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#if defined(BSD)
+#include <sys/sysctl.h>
+#endif
+
+#else
+#error "Unable to define getMemorySize( ) for an unknown OS."
+#endif
+
+
+
+/**
+ * Returns the size of physical memory (RAM) in bytes.
+ */
+size_t getMemorySize( )
+{
+#if defined(_WIN32) && (defined(__CYGWIN__) || defined(__CYGWIN32__))
+ /* Cygwin under Windows. ------------------------------------ */
+ /* New 64-bit MEMORYSTATUSEX isn't available. Use old 32.bit */
+ MEMORYSTATUS status;
+ status.dwLength = sizeof(status);
+ GlobalMemoryStatus( &status );
+ return (size_t)status.dwTotalPhys;
+
+#elif defined(_WIN32)
+ /* Windows. ------------------------------------------------- */
+ /* Use new 64-bit MEMORYSTATUSEX, not old 32-bit MEMORYSTATUS */
+ MEMORYSTATUSEX status;
+ status.dwLength = sizeof(status);
+ GlobalMemoryStatusEx( &status );
+ return (size_t)status.ullTotalPhys;
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+ /* UNIX variants. ------------------------------------------- */
+ /* Prefer sysctl() over sysconf() except sysctl() HW_REALMEM and HW_PHYSMEM */
+
+#if defined(CTL_HW) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM64))
+ int mib[2];
+ mib[0] = CTL_HW;
+#if defined(HW_MEMSIZE)
+ mib[1] = HW_MEMSIZE; /* OSX. --------------------- */
+#elif defined(HW_PHYSMEM64)
+ mib[1] = HW_PHYSMEM64; /* NetBSD, OpenBSD. --------- */
+#endif
+ int64_t size = 0; /* 64-bit */
+ size_t len = sizeof( size );
+ if ( sysctl( mib, 2, &size, &len, NULL, 0 ) == 0 )
+ return (size_t)size;
+ return 0L; /* Failed? */
+
+#elif defined(_SC_AIX_REALMEM)
+ /* AIX. ----------------------------------------------------- */
+ return (size_t)sysconf( _SC_AIX_REALMEM ) * (size_t)1024L;
+
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+ /* FreeBSD, Linux, OpenBSD, and Solaris. -------------------- */
+ return (size_t)sysconf( _SC_PHYS_PAGES ) *
+ (size_t)sysconf( _SC_PAGESIZE );
+
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
+ /* Legacy. -------------------------------------------------- */
+ return (size_t)sysconf( _SC_PHYS_PAGES ) *
+ (size_t)sysconf( _SC_PAGE_SIZE );
+
+#elif defined(CTL_HW) && (defined(HW_PHYSMEM) || defined(HW_REALMEM))
+ /* DragonFly BSD, FreeBSD, NetBSD, OpenBSD, and OSX. -------- */
+ int mib[2];
+ mib[0] = CTL_HW;
+#if defined(HW_REALMEM)
+ mib[1] = HW_REALMEM; /* FreeBSD. ----------------- */
+#elif defined(HW_PYSMEM)
+ mib[1] = HW_PHYSMEM; /* Others. ------------------ */
+#endif
+ unsigned int size = 0; /* 32-bit */
+ size_t len = sizeof( size );
+ if ( sysctl( mib, 2, &size, &len, NULL, 0 ) == 0 )
+ return (size_t)size;
+ return 0L; /* Failed? */
+#endif /* sysctl and sysconf variants */
+
+#else
+ return 0L; /* Unknown OS. */
+#endif
+}
diff --git a/src/ugenem/src/main.cpp b/src/ugenem/src/main.cpp
index e623b52..3cce3e1 100644
--- a/src/ugenem/src/main.cpp
+++ b/src/ugenem/src/main.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -60,6 +60,16 @@ int main(int argc, char *argv[]) {
const QString message = loadReport(argc, argv);
const QString dumpUrl = Utils::getDumpUrl();
+ bool silentSending = Utils::hasSilentModeFlag();
+
+ if (silentSending) {
+ ReportSender sender(true);
+ sender.setFailedTest(Utils::getFailedTestName());
+ sender.parse(message, dumpUrl);
+ sender.send("", dumpUrl);
+ return 0;
+ }
+
if (useGui) {
SendReportDialog dlg(message, dumpUrl);
diff --git a/src/ugenem/ugenem.pro b/src/ugenem/ugenem.pro
index aba020f..21a5f92 100644
--- a/src/ugenem/ugenem.pro
+++ b/src/ugenem/ugenem.pro
@@ -56,6 +56,7 @@ FORMS += src/ui/SendReportDialog.ui
SOURCES += src/main.cpp \
src/SendReportDialog.cpp \
- src/Utils.cpp
+ src/Utils.cpp \
+ src/getMemorySize.c
RESOURCES += ugenem.qrc
diff --git a/src/ugeneui/html/version_news.html b/src/ugeneui/html/version_news.html
index 1a67e58..b8099eb 100644
--- a/src/ugeneui/html/version_news.html
+++ b/src/ugeneui/html/version_news.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
UGENE - Integrated Bioinformatics Tools.
- Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
http://ugene.unipro.ru
This program is free software; you can redistribute it and/or
@@ -20,14 +20,19 @@
MA 02110-1301, USA.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
-<head profile="http://gmpg.org/xfn/11">
+<head>
+ <link rel="stylesheet" type="text/css" href="qrc:javascript/bootstrap/css/bootstrap.min.css"/>
<style>
+ * {
+ text-indent: 20px;
+ }
h3 {
margin-bottom: 25px;
}
.features_list li {
margin-bottom: 14px;
list-style-type: square;
+ list-style-position: inside;
}
.features_list li:last-child {
margin-bottom: 0;
@@ -50,13 +55,17 @@
</head>
<body>
<div>
- <h3>Major changes in UGENE 1.20</h3>
- <ul class="features_list">
- <li><span class="research_field">Multi-line Sequence View:</span> A new mode for wrapping sequences in the Details View was added.</li>
- <li><span class="research_field">Multiple Alignment:</span> Replacing of characters was added. Click Shift+R on a character to enter the replacement mode, input another character.</li>
- <li><span class="research_field">Proteins:</span> Loading of chain names from PDB files was corrected.</li>
- <li><span class="research_field">Usability:</span> Invertion of annotations selections was improved.</li>
- <li>Distributed Annotation System (DAS) features were removed, as <a href="http://www.ebi.ac.uk/about/news/service-news/das-services-to-retire">DAS services are going to retire</a> at the end of the year.</li>
+ <h3 lang="en">Сhanges in UGENE 1.21</h3>
+ <h3 lang="ru">Изменения в UGENE 1.21</h3>
+ <ul class="features_list" lang="en">
+ <li>Enhancement of the clipboard support in the Sequence View and the Alignment Editor.</li>
+ <li>Bug fixes and minor interface improvements.</li>
+ </ul>
+ <ul class="features_list" lang="ru">
+ <li>Поддержка более удобной работы с буфером обмена в редакторе последовательностей и редакторе множественных выравниваний.</li>
+ <li>Исправление ошибок и улучшение графического интерфейса программы.</li>
</ul>
+ <p lang="en">For details see <a href="http://ugene.net/50-whats-new-in-ugene-1-20-1-21/">video about UGENE 1.20 and 1.21 versions</a>.</p>
+ <p lang="ru">Обзор изменений в версиях UGENE 1.20 и 1.21 можно посмотреть в следующем <a href="http://ugene.net/ru/50-whats-new-in-ugene-1-20-1-21/">видео</a>.</p>
</div>
</body>
diff --git a/src/ugeneui/html/welcome_page.css b/src/ugeneui/html/welcome_page.css
index 0a81ea1..167df1b 100644
--- a/src/ugeneui/html/welcome_page.css
+++ b/src/ugeneui/html/welcome_page.css
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ html, body {
background-color: #B2C4C9;
}
-.welcome_header {
+.welcome_header span {
vertical-align: middle;
padding-left: 40px;
color: #145774;
@@ -82,7 +82,7 @@ html, body {
line-height: 90px;
}
-.button_caption {
+.button_caption span {
color: #145774;
font-size: 18px;
}
@@ -113,7 +113,7 @@ html, body {
overflow: hidden;
}
-.recent_items_header {
+.recent_items_header span {
color: #145774;
font-size: 20px;
}
@@ -153,8 +153,10 @@ html, body {
}
.footer_header {
- text-align: left;
padding-top: 6px;
+}
+.footer_header span {
+ text-align: left;
font-size: 16px;
font-weight: bold;
color: #145774;
diff --git a/src/ugeneui/html/welcome_page.html b/src/ugeneui/html/welcome_page.html
index 4fa2383..e069eb8 100644
--- a/src/ugeneui/html/welcome_page.html
+++ b/src/ugeneui/html/welcome_page.html
@@ -1,6 +1,6 @@
<!--
UGENE - Integrated Bioinformatics Tools.
- Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
http://ugene.unipro.ru
This program is free software; you can redistribute it and/or
@@ -32,7 +32,8 @@
<tr>
<td class="header_block" colspan="2">
<div class="welcome_header">
- Welcome to UGENE
+ <span lang="en">Welcome to UGENE</span>
+ <span lang="ru">Добро пожаловать в UGENE</span>
</div>
</td>
</tr>
@@ -47,7 +48,8 @@
<img align="middle" src="qrc:ugene/images/welcome_page/welcome_btn_open.png"/>
</div>
<div class="button_caption">
- Open File(s)
+ <span lang="en">Open File(s)</span>
+ <span lang="ru">Открыть файл(ы)</span>
</div>
</a>
</div>
@@ -59,7 +61,8 @@
<img src="qrc:ugene/images/welcome_page/welcome_btn_create_seq.png"/>
</div>
<div class="button_caption">
- Create Sequence
+ <span lang="en">Create Sequence</span>
+ <span lang="ru">Создать последовательность</span>
</div>
</a>
</div>
@@ -73,7 +76,8 @@
<img src="qrc:ugene/images/welcome_page/welcome_btn_workflow.png"/>
</div>
<div class="button_caption">
- Create Workflow
+ <span lang="en">Create Workflow</span>
+ <span lang="ru">Создать схему</span>
</div>
</a>
</div>
@@ -85,7 +89,8 @@
<img src="qrc:ugene/images/welcome_page/welcome_btn_help.png"/>
</div>
<div class="button_caption">
- Quick Start Guide
+ <span lang="en">Quick Start Guide</span>
+ <span lang="ru">Краткое руководство</span>
</div>
</a>
</div>
@@ -98,14 +103,16 @@
<div class="recent_items_wrapper">
<div id="recentFilesBlock" class="half_height">
<div class="recent_items_header">
- Recent files
+ <span lang="en">Recent files</span>
+ <span lang="ru">Недавние файлы</span>
</div>
<div id="recent_files" class="recent_items_content">
</div>
</div>
<div id="recentProjectsBlock" class="half_height">
<div class="recent_items_header">
- Recent projects
+ <span lang="en">Recent projects</span>
+ <span lang="ru">Недавние проекты</span>
</div>
<div id="recent_projects" class="recent_items_content">
</div>
@@ -124,7 +131,8 @@
<tr>
<td class="cite_ugene_block">
<div class="footer_header">
- Cite UGENE:
+ <span lang="en">Cite UGENE:</span>
+ <span lang="ru">Чтобы процитировать UGENE, используйте публикацию:</span>
</div>
<div class="footer_content">
"Unipro UGENE: a unified bioinformatics toolkit"<br/>
@@ -134,32 +142,33 @@
</td>
<td class="follow_ugene_block">
<div class="footer_header">
- Follow UGENE:
+ <span lang="en">Follow UGENE:</span>
+ <span lang="ru">UGENE в социальных сетях:</span>
</div>
<div class="footer_content">
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('facebook')"> <img src="qrc:ugene/images/welcome_page/social_icon_facebook.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('facebook')"><img src="qrc:ugene/images/welcome_page/social_icon_facebook.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('twitter')"> <img src="qrc:ugene/images/welcome_page/social_icon_twitter.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('twitter')"><img src="qrc:ugene/images/welcome_page/social_icon_twitter.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('linkedin')"> <img src="qrc:ugene/images/welcome_page/social_icon_linkedin.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('linkedin')"><img src="qrc:ugene/images/welcome_page/social_icon_linkedin.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('google_plus')"> <img src="qrc:ugene/images/welcome_page/social_icon_google_plus.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('google_plus')"><img src="qrc:ugene/images/welcome_page/social_icon_google_plus.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('youtube')"> <img src="qrc:ugene/images/welcome_page/social_icon_youtube.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('youtube')"><img src="qrc:ugene/images/welcome_page/social_icon_youtube.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('vkontakte')"> <img src="qrc:ugene/images/welcome_page/social_icon_vkontakte.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('vkontakte')"><img src="qrc:ugene/images/welcome_page/social_icon_vkontakte.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('mendeley')"> <img src="qrc:ugene/images/welcome_page/social_icon_mendeley.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('mendeley')"><img src="qrc:ugene/images/welcome_page/social_icon_mendeley.png"/></a>
</div>
<div class="social_icon">
- <a href="#" onclick="ugene.openUrl('rss')"> <img src="qrc:ugene/images/welcome_page/social_icon_rss.png"/> </a>
+ <a href="#" onclick="ugene.openUrl('rss')"><img src="qrc:ugene/images/welcome_page/social_icon_rss.png"/></a>
</div>
</div>
</td>
diff --git a/src/ugeneui/src/Main.cpp b/src/ugeneui/src/Main.cpp
index 4221099..ba5891e 100644
--- a/src/ugeneui/src/Main.cpp
+++ b/src/ugeneui/src/Main.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -85,6 +85,7 @@
#include <U2Gui/FeatureKeyFilterTask.h>
#include <U2Gui/ImportDialogsFactories.h>
#include <U2Gui/LogView.h>
+#include <U2Gui/PasteController.h>
#include <U2Gui/MsaContentFilterTask.h>
#include <U2Gui/MsaSeqNameFilterTask.h>
#include <U2Gui/OPWidgetFactoryRegistry.h>
@@ -102,8 +103,10 @@
#include <U2Remote/DistributedComputingUtil.h>
#include <U2Test/GTestFrameworkComponents.h>
-#include <U2Test/GUITestBase.h>
+#ifndef HI_EXCLUDED
+#include <U2Test/UGUITestBase.h>
#include <U2Test/GUITestService.h>
+#endif //HI_EXCLUDED
#include <U2Test/XMLTestFormat.h>
#include <U2View/AnnotHighlightWidgetFactory.h>
@@ -187,7 +190,7 @@ static void setDataSearchPaths() {
QDir::setSearchPaths( PATH_PREFIX_DATA, dataSearchPaths );
//now data files may be opened using QFile( "data:some_data_file" )
-}
+}
static void setSearchPaths() {
setDataSearchPaths();
@@ -337,7 +340,7 @@ void fixMacFonts() {
#endif
}
-int main(int argc, char **argv)
+int main(int argc, char **argv)
{
if (CrashHandler::isEnabled()) {
CrashHandler::setupHandler();
@@ -350,7 +353,7 @@ int main(int argc, char **argv)
#ifdef Q_OS_MACX
fixMacFonts();
#endif
-
+
//QApplication app(argc, argv);
GApplication app(argc, argv);
@@ -377,18 +380,18 @@ int main(int argc, char **argv)
#ifdef Q_OS_WIN
#ifdef _DEBUG
QString devPluginsPath = QDir(AppContext::getWorkingDirectoryPath() + "/../../extras/windows/dotnet_style/_debug").absolutePath();
-#else
+#else
QString devPluginsPath = QDir(AppContext::getWorkingDirectoryPath() + "/../../extras/windows/dotnet_style/_release").absolutePath();
#endif
QCoreApplication::addLibraryPath(devPluginsPath); //dev version
#endif
setSearchPaths();
-
+
// parse all cmdline arguments
- CMDLineRegistry* cmdLineRegistry = new CMDLineRegistry(app.arguments());
+ CMDLineRegistry* cmdLineRegistry = new CMDLineRegistry(app.arguments());
appContext->setCMDLineRegistry(cmdLineRegistry);
-
+
//1 create settings
SettingsImpl* globalSettings = new SettingsImpl(QSettings::SystemScope);
appContext->setGlobalSettings(globalSettings);
@@ -400,7 +403,7 @@ int main(int argc, char **argv)
appContext->setAppSettings(appSettings);
UserAppsSettings* userAppSettings = AppContext::getAppSettings()->getUserAppsSettings();
-
+
bool trOK = false;
QTranslator translator;
@@ -408,6 +411,7 @@ int main(int argc, char **argv)
QString envTranslation = findKey(envList, "UGENE_TRANSLATION");
if (!envTranslation.isEmpty()) {
trOK = translator.load(QString("transl_") + envTranslation, AppContext::getWorkingDirectoryPath());
+ settings->setValue("UGENE_CURR_TRANSL", envTranslation);
}
if (!trOK) {
@@ -421,13 +425,14 @@ int main(int argc, char **argv)
if (!translator.load(transFile[i], AppContext::getWorkingDirectoryPath())) {
fprintf(stderr, "Translation not found: %s\n", transFile[i].toLatin1().constData());
} else {
+ settings->setValue("UGENE_CURR_TRANSL", transFile[i].right(2));
trOK = true;
break;
}
}
if (!trOK) {
fprintf(stderr, "No translations found, exiting\n");
- return 1;
+ return 1;
}
}
@@ -465,8 +470,8 @@ int main(int argc, char **argv)
} else {
uiLog.details(AppContextImpl::tr("Style not available %1").arg(style));
}
- }
-
+ }
+
ResourceTracker* resTrack = new ResourceTracker();
appContext->setResourceTracker(resTrack);
@@ -482,7 +487,7 @@ int main(int argc, char **argv)
GTestFormatRegistry* tfr = AppContext::getTestFramework()->getTestFormatRegistry();
XMLTestFormat *xmlTestFormat = qobject_cast<XMLTestFormat*>(tfr->findFormat("XML"));
QList<XMLTestFactory*> fs = ProjectTests::createTestFactories();
- foreach(XMLTestFactory* f, fs) {
+ foreach(XMLTestFactory* f, fs) {
bool res = xmlTestFormat->registerTestFactory(f);
assert(res); Q_UNUSED(res);
}
@@ -490,18 +495,18 @@ int main(int argc, char **argv)
MainWindowImpl* mw = new MainWindowImpl();
appContext->setMainWindow(mw);
mw->prepare();
-
+
AppSettingsGUI* appSettingsGUI = new AppSettingsGUIImpl();
appContext->setAppSettingsGUI(appSettingsGUI);
AppContext::getMainWindow()->getDockManager()->registerDock(MWDockArea_Bottom, new TaskViewDockWidget(), QKeySequence(Qt::ALT | Qt::Key_2));
-
+
// Initialize logged log view
LogViewWidget* logView = new LogViewWidget(&logsCache);
logView->setObjectName(DOCK_LOG_VIEW);
AppContext::getAppSettingsGUI()->registerPage(new LogSettingsPageController(logView));
AppContext::getMainWindow()->getDockManager()->registerDock(MWDockArea_Bottom, logView, QKeySequence(Qt::ALT | Qt::Key_3));
-
+
GObjectViewFactoryRegistry* ovfr = new GObjectViewFactoryRegistry();
appContext->setObjectViewFactoryRegistry(ovfr);
@@ -510,11 +515,11 @@ int main(int argc, char **argv)
U2DbiRegistry *dbiRegistry = new U2DbiRegistry();
appContext->setDbiRegistry(dbiRegistry);
-
+
DocumentFormatRegistryImpl* dfr = new DocumentFormatRegistryImpl();
appContext->setDocumentFormatRegistry(dfr);
ImportDialogFactories::registerFactories();
-
+
IOAdapterRegistryImpl* io = new IOAdapterRegistryImpl();
appContext->setIOAdapterRegistry(io);
@@ -644,6 +649,9 @@ int main(int argc, char **argv)
appContext->setProjectFilterTaskRegistry(projectFilterTaskRegistry);
initProjectFilterTaskRegistry();
+ PasteFactory *pasteFactory = new PasteFactoryImpl;
+ appContext->setPasteFactory(pasteFactory);
+
Workflow::WorkflowEnv::init(new Workflow::WorkflowEnvImpl());
Workflow::WorkflowEnv::getDomainRegistry()->registerEntry(new LocalWorkflow::LocalDomainFactory());
@@ -655,6 +663,7 @@ int main(int argc, char **argv)
ProjectLoaderImpl* pli = new ProjectLoaderImpl();
appContext->setProjectLoader(pli);
+ QObject::connect(mw, SIGNAL(si_paste()), pli, SLOT(sl_paste()));
CMDLineUtils::init();
@@ -665,9 +674,10 @@ int main(int argc, char **argv)
AutoAnnotationsSupport* aaSupport = new AutoAnnotationsSupport();
appContext->setAutoAnnotationsSupport(aaSupport);
-
- GUITestBase *tb = new GUITestBase();
+#ifndef HI_EXCLUDED
+ UGUITestBase *tb = new UGUITestBase();
appContext->setGUITestBase(tb);
+#endif //HI_EXCLUDED
AppFileStorage *appFileStorage = new AppFileStorage();
U2OpStatusImpl os;
@@ -699,11 +709,12 @@ int main(int argc, char **argv)
}
registerCoreServices();
-
+#ifndef HI_EXCLUDED
if ( envList.contains(ENV_GUI_TEST+QString("=1")) ) {
GUITestService *guiTestService = new GUITestService();
Q_UNUSED(guiTestService);
}
+#endif //HI_EXCLUDED
GReportableCounter launchCounter("ugeneui launch", "", 1);
++launchCounter.totalCount;
@@ -716,7 +727,7 @@ int main(int argc, char **argv)
coreLog.info( QObject::tr( "UGENE started" ));
coreLog.info( QObject::tr( "UGENE version: %1 %2-bit").arg( v.text ).arg( Version::appArchitecture ) );
coreLog.info( QObject::tr( "UGENE distribution: %1").arg( v.distributionInfo ));
-
+
QObject::connect(ts, SIGNAL(si_noTasksInScheduler()), splashScreen, SLOT(sl_close()));
QObject::connect(ts, SIGNAL(si_noTasksInScheduler()), mw, SLOT(sl_show()));
@@ -753,12 +764,17 @@ int main(int argc, char **argv)
delete dcu;
+ appContext->setPasteFactory(NULL);
+ delete pasteFactory;
+
appContext->setProjectFilterTaskRegistry(NULL);
delete projectFilterTaskRegistry;
+#ifndef HI_EXCLUDED
appContext->setGUITestBase(NULL);
delete tb;
-
+#endif //HI_EXCLUDED
+
appContext->setRecentlyDownloadedCache(NULL);
delete rdc;
@@ -924,7 +940,7 @@ int main(int argc, char **argv)
bool deleteSettingsFile = userAppSettings->resetSettings();
QString iniFile = AppContext::getSettings()->fileName();
-
+
appContext->setAppSettingsGUI(NULL);
delete appSettingsGUI;
@@ -944,6 +960,6 @@ int main(int argc, char **argv)
CrashHandler::shutdown();
- return rc;
+ return rc;
}
diff --git a/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp b/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
index 943de7d..fb8e8d0 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/AppSettingsDialogController.h b/src/ugeneui/src/app_settings/AppSettingsDialogController.h
index 5da0946..365e37b 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogController.h
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/AppSettingsDialogTree.h b/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
index f085b75..fc690cc 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
index ad355fc..86fad3d 100644
--- a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
+++ b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
index ff84c8b..4009377 100644
--- a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
+++ b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
index b48c6de..0959ff5 100644
--- a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -82,7 +82,7 @@ AppSettingsGUIPageWidget* DirectoriesSettingsPageController::createWidget(AppSet
return r;
}
-const QString DirectoriesSettingsPageController::helpPageId = QString("17465981");
+const QString DirectoriesSettingsPageController::helpPageId = QString("17467528");
DirectoriesSettingsPageWidget::DirectoriesSettingsPageWidget(DirectoriesSettingsPageController* /*ctrl*/) {
setupUi(this);
diff --git a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h
index 97a6b8e..397276b 100644
--- a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
index 2cba93b..cc2f7fa 100644
--- a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -71,7 +71,7 @@ AppSettingsGUIPageWidget* FormatSettingsGUIPageController::createWidget(AppSetti
return r;
}
-const QString FormatSettingsGUIPageController::helpPageId = QString("17465974");
+const QString FormatSettingsGUIPageController::helpPageId = QString("17467521");
FormatSettingsGUIPageWidget::FormatSettingsGUIPageWidget(FormatSettingsGUIPageController*) {
setupUi(this);
diff --git a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h
index 0c6ffca..9836b85 100644
--- a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
index b4bbca3..c71d8ea 100644
--- a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -69,7 +69,7 @@ AppSettingsGUIPageWidget* LogSettingsPageController::createWidget(AppSettingsGUI
return w;
}
-const QString LogSettingsPageController::helpPageId = QString("17465975");
+const QString LogSettingsPageController::helpPageId = QString("17467522");
//////////////////////////////////////////////////////////////////////////
// widget
diff --git a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
index 4aab155..8e3434d 100644
--- a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
index 105937a..9836c4b 100644
--- a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@ AppSettingsGUIPageWidget* NetworkSettingsPageController::createWidget(AppSetting
return r;
}
-const QString NetworkSettingsPageController::helpPageId = QString("17465973");
+const QString NetworkSettingsPageController::helpPageId = QString("17467520");
NetworkSettingsPageWidget::NetworkSettingsPageWidget() {
setupUi( this );
diff --git a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h
index 089eb04..8310969 100644
--- a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
index 59a0250..588f205 100644
--- a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -59,7 +59,7 @@ AppSettingsGUIPageWidget* ResourceSettingsGUIPageController::createWidget(AppSet
return r;
}
-const QString ResourceSettingsGUIPageController::helpPageId = QString("17465972");
+const QString ResourceSettingsGUIPageController::helpPageId = QString("17467519");
ResourceSettingsGUIPageWidget::ResourceSettingsGUIPageWidget(ResourceSettingsGUIPageController*) {
setupUi(this);
diff --git a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h
index 0b449f4..863151e 100644
--- a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
index 662e4d2..fcf9d99 100644
--- a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -108,7 +108,7 @@ AppSettingsGUIPageWidget* UserApplicationsSettingsPageController::createWidget(A
return r;
}
-const QString UserApplicationsSettingsPageController::helpPageId = QString("17465971");
+const QString UserApplicationsSettingsPageController::helpPageId = QString("17467518");
UserApplicationsSettingsPageWidget::UserApplicationsSettingsPageWidget(UserApplicationsSettingsPageController* ctrl) {
setupUi(this);
diff --git a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h
index 91a374f..4337fa0 100644
--- a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/AboutDialogController.cpp b/src/ugeneui/src/main_window/AboutDialogController.cpp
index 4b71d02..5fd68bd 100644
--- a/src/ugeneui/src/main_window/AboutDialogController.cpp
+++ b/src/ugeneui/src/main_window/AboutDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/AboutDialogController.h b/src/ugeneui/src/main_window/AboutDialogController.h
index 9efca2f..77afe8d 100644
--- a/src/ugeneui/src/main_window/AboutDialogController.h
+++ b/src/ugeneui/src/main_window/AboutDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/CheckUpdatesTask.cpp b/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
index 0956c7f..5edd26e 100644
--- a/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
+++ b/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/CheckUpdatesTask.h b/src/ugeneui/src/main_window/CheckUpdatesTask.h
index c0cbfaf..c76ae97 100644
--- a/src/ugeneui/src/main_window/CheckUpdatesTask.h
+++ b/src/ugeneui/src/main_window/CheckUpdatesTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/DockManagerImpl.cpp b/src/ugeneui/src/main_window/DockManagerImpl.cpp
index d8a021b..286fd4d 100644
--- a/src/ugeneui/src/main_window/DockManagerImpl.cpp
+++ b/src/ugeneui/src/main_window/DockManagerImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/DockManagerImpl.h b/src/ugeneui/src/main_window/DockManagerImpl.h
index 29cb8da..1aeeeb3 100644
--- a/src/ugeneui/src/main_window/DockManagerImpl.h
+++ b/src/ugeneui/src/main_window/DockManagerImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/MDIManagerImpl.cpp b/src/ugeneui/src/main_window/MDIManagerImpl.cpp
index 69c20e6..d355518 100644
--- a/src/ugeneui/src/main_window/MDIManagerImpl.cpp
+++ b/src/ugeneui/src/main_window/MDIManagerImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -384,7 +384,7 @@ void MWMDIManagerImpl::sl_onSubWindowActivated(QMdiSubWindow *w) {
}
if (w == NULL) { // currentWindow is NULL here, mdiContentOwner & it's content cleaned in eventFilter(CloseEvent)
uiLog.trace(QString("Closing active window"));
- clearMDIContent(false);
+ clearMDIContent(true); //UGENE-4987 workaround. It must be 'false' here
emit si_windowActivated(NULL);
return;
}
diff --git a/src/ugeneui/src/main_window/MDIManagerImpl.h b/src/ugeneui/src/main_window/MDIManagerImpl.h
index 3b1110b..cfe7ef2 100644
--- a/src/ugeneui/src/main_window/MDIManagerImpl.h
+++ b/src/ugeneui/src/main_window/MDIManagerImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/MainWindowImpl.cpp b/src/ugeneui/src/main_window/MainWindowImpl.cpp
index 0cd1efc..a2cc717 100644
--- a/src/ugeneui/src/main_window/MainWindowImpl.cpp
+++ b/src/ugeneui/src/main_window/MainWindowImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -232,6 +232,21 @@ void MainWindowImpl::close() {
mw = NULL;
}
+bool MainWindowImpl::eventFilter(QObject *object, QEvent *event) {
+ CHECK(mw == object, false);
+ CHECK(NULL != event, false);
+ CHECK(event->type() == QEvent::KeyPress, false);
+
+ QKeyEvent *keyEvent = dynamic_cast<QKeyEvent*>(event);
+ CHECK(NULL != keyEvent, false);
+
+ if (keyEvent->matches(QKeySequence::Paste)) {
+ uiLog.details(tr("Application paste shortcut is triggered"));
+ emit si_paste();
+ }
+ return false;
+}
+
void MainWindowImpl::createActions() {
exitAction = new QAction(tr("Exit"), this);
exitAction->setShortcutContext(Qt::WindowShortcut);
@@ -321,6 +336,7 @@ void MainWindowImpl::prepareGUI() {
mw->setCentralWidget(mdi);
mw->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
mw->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+ mw->installEventFilter(this);
toolbarManager = new MWToolBarManagerImpl(mw);
diff --git a/src/ugeneui/src/main_window/MainWindowImpl.h b/src/ugeneui/src/main_window/MainWindowImpl.h
index f615681..fa1f794 100644
--- a/src/ugeneui/src/main_window/MainWindowImpl.h
+++ b/src/ugeneui/src/main_window/MainWindowImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -95,6 +95,7 @@ public:
signals:
void si_show();
void si_showWelcomePage();
+ void si_paste();
public slots:
void sl_tempDirPathCheckFailed(QString path);
@@ -112,7 +113,8 @@ private slots:
#ifdef _INSTALL_TO_PATH_ACTION
void sl_installToPathAction();
#endif
-
+protected:
+ bool eventFilter(QObject *object, QEvent *event);
private:
void createActions();
void prepareGUI();
diff --git a/src/ugeneui/src/main_window/MenuManager.cpp b/src/ugeneui/src/main_window/MenuManager.cpp
index 9af9219..9baf330 100644
--- a/src/ugeneui/src/main_window/MenuManager.cpp
+++ b/src/ugeneui/src/main_window/MenuManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/MenuManager.h b/src/ugeneui/src/main_window/MenuManager.h
index 996adb6..d874c9c 100644
--- a/src/ugeneui/src/main_window/MenuManager.h
+++ b/src/ugeneui/src/main_window/MenuManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/ShutdownTask.cpp b/src/ugeneui/src/main_window/ShutdownTask.cpp
index 8d1d7ed..9fdacbe 100644
--- a/src/ugeneui/src/main_window/ShutdownTask.cpp
+++ b/src/ugeneui/src/main_window/ShutdownTask.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/ShutdownTask.h b/src/ugeneui/src/main_window/ShutdownTask.h
index 903cc07..4c8596e 100644
--- a/src/ugeneui/src/main_window/ShutdownTask.h
+++ b/src/ugeneui/src/main_window/ShutdownTask.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/SplashScreen.cpp b/src/ugeneui/src/main_window/SplashScreen.cpp
index 0227b52..49ee568 100644
--- a/src/ugeneui/src/main_window/SplashScreen.cpp
+++ b/src/ugeneui/src/main_window/SplashScreen.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -80,7 +80,7 @@ void SplashScreen::sl_close(){
bool SplashScreen::eventFilter(QObject * /*obj*/, QEvent *ev){
if(ev->type() == QEvent::Close){
ev->ignore();
- return true;
+ return true;
}
return false;
}
@@ -161,7 +161,7 @@ void SplashScreenWidget::drawInfo(){
font.setPixelSize(VERSION_HEIGHT_PX);
p.setFont( font );
p.setPen(QColor(0, 46, 59));
- QString text = "Version " + version + " is loading";
+ QString text = tr("Version ") + version + tr(" is loading");
for (int i = 0; i < dots_number; i++) {
text.append(".");
}
diff --git a/src/ugeneui/src/main_window/SplashScreen.h b/src/ugeneui/src/main_window/SplashScreen.h
index 3b984d6..627824f 100644
--- a/src/ugeneui/src/main_window/SplashScreen.h
+++ b/src/ugeneui/src/main_window/SplashScreen.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp b/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
index 166d7f1..95fed61 100644
--- a/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
+++ b/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/TmpDirChangeDialogController.h b/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
index 4402387..e19da02 100644
--- a/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
+++ b/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/ToolBarManager.cpp b/src/ugeneui/src/main_window/ToolBarManager.cpp
index b356632..b7bea30 100644
--- a/src/ugeneui/src/main_window/ToolBarManager.cpp
+++ b/src/ugeneui/src/main_window/ToolBarManager.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/main_window/ToolBarManager.h b/src/ugeneui/src/main_window/ToolBarManager.h
index a3b736c..6ee1054 100644
--- a/src/ugeneui/src/main_window/ToolBarManager.h
+++ b/src/ugeneui/src/main_window/ToolBarManager.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp b/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
index a5b0c4b..0fc7917 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/plugin_viewer/PluginViewerController.h b/src/ugeneui/src/plugin_viewer/PluginViewerController.h
index 272fe3c..cea6b1c 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerController.h
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
index 347d549..f7435d4 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
index 0371279..6efdf42 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp b/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
index bbf1d40..47790cc 100644
--- a/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -58,7 +58,7 @@ DocumentFormatSelectorController::DocumentFormatSelectorController(QList<FormatD
: QDialog(p), formatDetectionResults(results)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17465952");
+ new HelpButton(this, buttonBox, "17467499");
setObjectName("DocumentFormatSelectorDialog");
}
diff --git a/src/ugeneui/src/project_support/DocumentFormatSelectorController.h b/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
index 9463666..d8e9bb2 100644
--- a/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
index ea5a9cc..9dda3fe 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -99,7 +99,7 @@ DocumentProviderSelectorController::DocumentProviderSelectorController(const QLi
formatDetectionResults(formatDetectionResults)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17466152");
+ new HelpButton(this, buttonBox, "17467699");
}
int DocumentProviderSelectorController::getSelectedFormatIdx() const {
diff --git a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
index ca0c88d..a8f2eba 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
index 1e64b37..365a190 100644
--- a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -80,7 +80,7 @@ bool DocumentReadingModeSelectorController::adjustReadingMode(FormatDetectionRes
d->setModal(true);
ui.setupUi(d.data());
- new HelpButton(d.data(), ui.buttonBox, "17465925");
+ new HelpButton(d.data(), ui.buttonBox, "17467472");
bool canBeShortReads = minSequenceSize > 0 && maxSequenceSize < 2000;
bool haveReadAligners = !AppContext::getDnaAssemblyAlgRegistry()->getRegisteredAlgorithmIds().isEmpty();
diff --git a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h
index bc2d6a9..0fad606 100644
--- a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ExportProjectDialogController.cpp b/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
index d18fb48..3b6ebcd 100644
--- a/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
+++ b/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -55,13 +55,12 @@ ExportProjectDialogController::ExportProjectDialogController(QWidget *p, const Q
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "17465925");
+ new HelpButton(this, buttonBox, "17467472");
setModal(true);
projectFile = fixProjectFile(defaultProjectFileName);
projectFileEdit->setText(projectFile);
Project* proj = AppContext::getProject();
- setFixedHeight(height());
if (proj == NULL || !proj->isItemModified() || proj->getProjectURL().isEmpty()) {
warningLabel->setVisible(false);
}
diff --git a/src/ugeneui/src/project_support/ExportProjectDialogController.h b/src/ugeneui/src/project_support/ExportProjectDialogController.h
index 8972e1b..fd23c79 100644
--- a/src/ugeneui/src/project_support/ExportProjectDialogController.h
+++ b/src/ugeneui/src/project_support/ExportProjectDialogController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
index e6041aa..9568950 100644
--- a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
+++ b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -118,7 +118,7 @@ void MultipleDocumentsReadingModeDialog::setupNewUrl(){
bool MultipleDocumentsReadingModeDialog::setupGUI(QList<GUrl>& _urls, QVariantMap& props, const QMap<QString, qint64>& headerSequenceLengths){
setModal(true);
setupUi(this);
- new HelpButton(this, buttonBox, "17466013");
+ new HelpButton(this, buttonBox, "17467560");
// doesn't matter from what position, because excluded fileName all path of documents are the same
CHECK(!urls.isEmpty(), false);
diff --git a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h
index 5ed0e3f..87d95d6 100644
--- a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h
+++ b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectImpl.cpp b/src/ugeneui/src/project_support/ProjectImpl.cpp
index 9564a16..78c15da 100644
--- a/src/ugeneui/src/project_support/ProjectImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectImpl.h b/src/ugeneui/src/project_support/ProjectImpl.h
index d252735..82c1ef1 100644
--- a/src/ugeneui/src/project_support/ProjectImpl.h
+++ b/src/ugeneui/src/project_support/ProjectImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp b/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
index 3ee577c..2e67972 100644
--- a/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -35,6 +35,7 @@
#include <U2Core/L10n.h>
#include <U2Core/LoadDocumentTask.h>
#include <U2Core/ProjectModel.h>
+#include <U2Core/TaskSignalMapper.h>
#include <U2Core/ServiceTypes.h>
#include <U2Core/Settings.h>
#include <U2Core/U2OpStatusUtils.h>
@@ -47,6 +48,8 @@
#include <U2Gui/MainWindow.h>
#include <U2Gui/ObjectViewModel.h>
#include <U2Gui/OpenViewTask.h>
+#include <U2Gui/PasteController.h>
+#include <U2Gui/ProjectUtils.h>
#include <U2Gui/ProjectView.h>
#include <U2Gui/SearchGenbankSequenceDialogController.h>
#include <U2Gui/SharedConnectionsDialog.h>
@@ -71,7 +74,7 @@ namespace U2 {
//////////////////////////////////////////////////////////////////////////
ProjectLoaderImpl::ProjectLoaderImpl() {
- openProjectAction = newProjectAction = NULL;
+ pasteAction = openProjectAction = newProjectAction = NULL;
recentProjectsMenu = NULL;
assert(AppContext::getProject() == NULL);
@@ -97,6 +100,12 @@ ProjectLoaderImpl::ProjectLoaderImpl() {
newDocumentFromtext->setShortcutContext(Qt::WindowShortcut);
connect(newDocumentFromtext, SIGNAL(triggered()), SLOT(sl_newDocumentFromText()));
+ pasteAction = new QAction(QIcon(":ugene/images/paste.png"), tr("Open from clipboard..."), this);
+ pasteAction->setObjectName(ACTION_PROJECTSUPPORT__PASTE);
+ pasteAction->setShortcut(QKeySequence::Paste);
+ pasteAction->setShortcutContext(Qt::WidgetShortcut);
+ connect(pasteAction, SIGNAL(triggered()), SLOT(sl_paste()));
+
openProjectAction = new QAction(QIcon(":ugene/images/project_open.png"), tr("Open..."), this);
openProjectAction->setObjectName(ACTION_PROJECTSUPPORT__OPEN_PROJECT);
openProjectAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_O));
@@ -150,6 +159,7 @@ ProjectLoaderImpl::ProjectLoaderImpl() {
<< newSectionSeparator
<< openProjectAction
<< addExistingDocumentAction
+ << pasteAction
<< openSectionSeparator
<< downloadRemoteFileAction
<< searchGenbankEntryAction
@@ -465,21 +475,22 @@ Task* ProjectLoaderImpl::openWithProjectTask(const QList<GUrl>& _urls, const QVa
Project* project = AppContext::getProject();
Document * doc = project == NULL ? NULL : project->findDocumentByURL(url);
if (doc != NULL) {
- QWidget *p = AppContext::getMainWindow()->getQMainWindow();
- QString message = tr("The document with the same URL is already added to the project");
- coreLog.details(message);
- QMessageBox::warning(p, tr("warning"), message);
+ coreLog.details(tr("The document with the same URL is already added to the project"));
if (doc->isLoaded()) {
const QList<GObject*>& docObjects = doc->getObjects();
QList<GObjectViewWindow*> viewsList = GObjectViewUtils::findViewsWithAnyOfObjects(docObjects);
- if (!viewsList.isEmpty()) {
- AppContext::getMainWindow()->getMDIManager()->activateWindow(viewsList.first());
+ if (viewsList.isEmpty()) {
+ AppContext::getTaskScheduler()->registerTopLevelTask(new OpenViewTask(doc));
} else {
- AppContext::getProjectView()->highlightItem(doc);
+ AppContext::getMainWindow()->getMDIManager()->activateWindow(viewsList.first());
}
coreLog.info(tr("The document is already loaded and added to project: %1").arg(url.fileName()));
} else if(!doc->isLoaded() && AppContext::getProjectView()) {
- AppContext::getProjectView()->highlightItem(doc);
+ if (NULL == ProjectUtils::findLoadTask(url.getURLString())) {
+ AppContext::getTaskScheduler()->registerTopLevelTask(new LoadUnloadedDocumentAndOpenViewTask(doc));
+ } else {
+ coreLog.details(tr("The document with the same URL is already loading"));
+ }
}
} else {
QList<FormatDetectionResult> formats;
@@ -706,6 +717,15 @@ void ProjectLoaderImpl::updateRecentItemsMenu()
}
+void ProjectLoaderImpl::sl_paste( ){
+ PasteFactory* pasteFactory = AppContext::getPasteFactory();
+ SAFE_POINT(pasteFactory != NULL, "PasteFactory is null", );
+
+ PasteTask* task = pasteFactory->pasteTask(true);
+
+ AppContext::getTaskScheduler()->registerTopLevelTask(task);
+}
+
void ProjectLoaderImpl::sl_documentAdded( Document* doc )
{
bool doNotAddToRecent = doc->getGHints()->get(ProjectLoaderHint_DoNotAddToRecentDocuments, false).toBool();
@@ -803,7 +823,7 @@ void SaveProjectDialogController::sl_clicked(QAbstractButton *button) {
//////////////////////////////////////////////////////////////////////////
ProjectDialogController::ProjectDialogController(ProjectDialogController::Mode m, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "17465949");
+ new HelpButton(this, buttonBox, "17467496");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/ugeneui/src/project_support/ProjectLoaderImpl.h b/src/ugeneui/src/project_support/ProjectLoaderImpl.h
index 356faba..9e04d96 100644
--- a/src/ugeneui/src/project_support/ProjectLoaderImpl.h
+++ b/src/ugeneui/src/project_support/ProjectLoaderImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -87,6 +87,7 @@ private slots:
void sl_openRecentProject();
void sl_serviceStateChanged(Service* s, ServiceState prevState);
void sl_documentAdded(Document* doc);
+ void sl_paste();
void sl_documentStateChanged();
void sl_projectURLChanged(const QString& oldURL);
void sl_onAddExistingDocument();
@@ -103,6 +104,7 @@ private:
QAction* addExistingDocumentAction;
QAction* newProjectAction;
QAction* openProjectAction;
+ QAction* pasteAction;
QAction* downloadRemoteFileAction;
QAction* accessSharedDatabaseAction;
QAction* searchGenbankEntryAction;
diff --git a/src/ugeneui/src/project_support/ProjectServiceImpl.cpp b/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
index 5b51d04..d197e51 100644
--- a/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectServiceImpl.h b/src/ugeneui/src/project_support/ProjectServiceImpl.h
index 4f07b99..fb59742 100644
--- a/src/ugeneui/src/project_support/ProjectServiceImpl.h
+++ b/src/ugeneui/src/project_support/ProjectServiceImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectTasksGui.cpp b/src/ugeneui/src/project_support/ProjectTasksGui.cpp
index 7307587..41ac318 100644
--- a/src/ugeneui/src/project_support/ProjectTasksGui.cpp
+++ b/src/ugeneui/src/project_support/ProjectTasksGui.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ProjectTasksGui.h b/src/ugeneui/src/project_support/ProjectTasksGui.h
index 24dad2c..bf43f41 100644
--- a/src/ugeneui/src/project_support/ProjectTasksGui.h
+++ b/src/ugeneui/src/project_support/ProjectTasksGui.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_support/ui/ExportProjectDialog.ui b/src/ugeneui/src/project_support/ui/ExportProjectDialog.ui
index b5b01a0..0740c1e 100644
--- a/src/ugeneui/src/project_support/ui/ExportProjectDialog.ui
+++ b/src/ugeneui/src/project_support/ui/ExportProjectDialog.ui
@@ -6,17 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
- <width>430</width>
- <height>139</height>
+ <width>416</width>
+ <height>114</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="windowTitle">
<string>Export Project</string>
</property>
+ <property name="sizeGripEnabled">
+ <bool>false</bool>
+ </property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetFixedSize</enum>
+ </property>
<item row="1" column="0">
<widget class="QLabel" name="warningLabel">
<property name="sizePolicy">
@@ -29,8 +41,8 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></string>
+</style></head><body style=" font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></string>
</property>
</widget>
</item>
@@ -44,7 +56,14 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="0" column="1">
- <widget class="QLineEdit" name="exportFolderEdit"/>
+ <widget class="QLineEdit" name="exportFolderEdit">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="browseButton">
@@ -61,7 +80,14 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="projectFileEdit"/>
+ <widget class="QLineEdit" name="projectFileEdit">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
</item>
</layout>
</item>
diff --git a/src/ugeneui/src/project_view/BuiltInObjectViews.cpp b/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
index 2a5738b..2515b4f 100644
--- a/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
+++ b/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_view/ProjectViewDocTree.cpp b/src/ugeneui/src/project_view/ProjectViewDocTree.cpp
index 94df9f0..8f7c128 100644
--- a/src/ugeneui/src/project_view/ProjectViewDocTree.cpp
+++ b/src/ugeneui/src/project_view/ProjectViewDocTree.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_view/ProjectViewDocTree.h b/src/ugeneui/src/project_view/ProjectViewDocTree.h
index 1cfe996..7b00a65 100644
--- a/src/ugeneui/src/project_view/ProjectViewDocTree.h
+++ b/src/ugeneui/src/project_view/ProjectViewDocTree.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_view/ProjectViewImpl.cpp b/src/ugeneui/src/project_view/ProjectViewImpl.cpp
index df75066..3c75013 100644
--- a/src/ugeneui/src/project_view/ProjectViewImpl.cpp
+++ b/src/ugeneui/src/project_view/ProjectViewImpl.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -436,8 +436,6 @@ void DocumentUpdater::reloadDocuments( QList<Document*> docs2Reload ){
}
-QSet<QString> ProjectViewWidget::excludedFilenames = QSet<QString>();
-
ProjectViewWidget::ProjectViewWidget() {
setupUi(this);
setObjectName(DOCK_PROJECT_VIEW);
@@ -445,12 +443,6 @@ ProjectViewWidget::ProjectViewWidget() {
setWindowIcon(QIcon(":ugene/images/project.png"));
updater = new DocumentUpdater(this);
-
- pasteFileFromClipboard = new QAction(tr("Paste file from clipboard"), this);
- pasteFileFromClipboard->setShortcuts(QKeySequence::Paste);
- pasteFileFromClipboard->setShortcutContext(Qt::WidgetWithChildrenShortcut);
- connect(pasteFileFromClipboard, SIGNAL(triggered()), SLOT(sl_pasteFileFromClipboard()));
- addAction(pasteFileFromClipboard);
}
void showWarningAndWriteToLog(const QString& message) {
@@ -458,234 +450,6 @@ void showWarningAndWriteToLog(const QString& message) {
QMessageBox::critical(AppContext::getMainWindow()->getQMainWindow(), L10N::errorTitle(), message);
}
-namespace {
- QString parseUrl(const QString &url) {
- const QString fileString = "file://";
- if (url.startsWith(fileString)) {
- return url.mid(fileString.length());
- }
- return url;
- }
-
- QString joinDirs(const QStringList &dirs, const QString &separator) {
- static const int maxDirsNumber = 4;
- QStringList result = dirs.mid(0, maxDirsNumber);
- if (dirs.size() > maxDirsNumber) {
- result << "...";
- }
- return result.join(separator);
- }
-
- void openUrls(const QList<QUrl> &urls, U2OpStatus &os) {
- QList<GUrl> urlList;
- QStringList dirs;
- foreach (const QUrl &url, urls) {
- QString parsedUrl = parseUrl(url.toLocalFile());
- if (QFileInfo(parsedUrl).isDir()) {
- dirs << parsedUrl;
- continue;
- }
- urlList << GUrl(parsedUrl, GUrl_File);
- }
-
- if (!dirs.isEmpty()) {
- os.setError(ProjectViewWidget::tr("Pasting of directories is not supported:") + "\n" + joinDirs(dirs, "\n"));
- }
- CHECK(!urlList.isEmpty(), );
-
- Task *task = AppContext::getProjectLoader()->openWithProjectTask(urlList);
- CHECK(NULL != task, );
- AppContext::getTaskScheduler()->registerTopLevelTask(task);
- }
-
- QString fetchClipboardText(const QClipboard *clipboard, U2OpStatus &os) {
- QString result;
- try {
- result = clipboard->text();
- } catch (std::bad_alloc) {
- os.setError(ProjectViewWidget::tr("Unable to handle so huge data in clipboard."));
- return result;
- }
- if (result.isEmpty()) {
- os.setError(ProjectViewWidget::tr("UGENE can not recognize current clipboard content as one of supported formats."));
- }
- return result;
- }
-
- QStringList getExtensions(const FormatDetectionResult &dr) {
- if (NULL != dr.format) {
- return dr.format->getSupportedDocumentFileExtensions();
- }
- else if (NULL != dr.importer) {
- return dr.importer->getSupportedFileExtensions();
- }
- return QStringList();
- }
-
- QString generateClipboardUrl(const QStringList &extensions, const QSet<QString> &excludedFilenames) {
- QString result = AppContext::getAppSettings()->getUserAppsSettings()->getDefaultDataDirPath() + "/clipboard";
- if (!extensions.isEmpty()) {
- result += "." + extensions.first();
- }
- return GUrlUtils::rollFileName(result, DocumentUtils::getNewDocFileNameExcludesHint().unite(excludedFilenames));
- }
-
- bool canLoadFromString(DocumentFormat *df, const QVariantMap &hints) {
- return (NULL != df && df->checkFlags(DocumentFormatFlag_SupportWriting)
- && !(
- df->checkFlags(DocumentFormatFlag_LockedIfNotCreatedByUGENE)
- || df->checkFlags(DocumentFormatFlag_CannotBeCreated)
- || hints.contains(DocumentReadingMode_SequenceMergeGapSize)
- || hints.contains(DocumentReadingMode_SequenceAsShortReadsHint)
- ));
- }
-
- AD2P_DocumentInfo prepareDocumentInfo(const GUrl &url, IOAdapterFactory *iof, const DocumentFormatId &formatId, const QVariantMap &hints) {
- AD2P_DocumentInfo info;
- info.url = url;
- info.formatId = formatId;
- info.iof = iof;
- info.hints = hints;
- info.openView = true;
- info.loadDocuments = true;
- info.markLoadedAsModified = true;
- return info;
- }
-
- void loadStoredData(const QString &clipboardText, const GUrl &url, const QVariantMap &hints) {
- QVariantMap additionalHints;
- if (hints.contains(DocumentReadingMode_SequenceMergeGapSize)) {
- additionalHints[DocumentReadingMode_SequenceMergeGapSize] = hints.value(DocumentReadingMode_SequenceMergeGapSize);
- } else if (hints.contains(DocumentReadingMode_SequenceAsAlignmentHint)) {
- additionalHints[DocumentReadingMode_SequenceAsAlignmentHint] = hints.value(DocumentReadingMode_SequenceAsAlignmentHint);
- } else if (hints.contains(DocumentReadingMode_SequenceAsShortReadsHint)) {
- additionalHints[DocumentReadingMode_SequenceAsShortReadsHint] = hints.value(DocumentReadingMode_SequenceAsShortReadsHint);
- } else if (hints.contains(DocumentReadingMode_SequenceAsSeparateHint)) {
- additionalHints[DocumentReadingMode_SequenceAsSeparateHint] = hints.value(DocumentReadingMode_SequenceAsSeparateHint);
- }
-
- // FIXME: data are written to hard disk memory in the main thread
- QFile outputFile(url.getURLString());
- outputFile.open(QIODevice::WriteOnly);
- outputFile.write(clipboardText.toLatin1());
- outputFile.close();
-
- QList<GUrl> urlList;
- urlList << url;
- Task *task = AppContext::getProjectLoader()->openWithProjectTask(urlList, additionalHints);
- CHECK(NULL != task, );
- AppContext::getTaskScheduler()->registerTopLevelTask(task);
- }
-}
-
-void ProjectViewWidget::sl_pasteFileFromClipboard() {
- const QClipboard *clipboard = QApplication::clipboard();
- const QMimeData *mdata = clipboard->mimeData();
- if (mdata->hasUrls()) {
- processUrlsClipboardData(mdata->urls());
- } else {
- processPlainTextClipboardData(clipboard);
- }
-}
-
-void ProjectViewWidget::processUrlsClipboardData(const QList<QUrl> &urls) {
- U2OpStatusImpl os;
- openUrls(urls, os);
- if (os.hasError()) {
- showWarningAndWriteToLog(os.getError());
- }
-}
-
-void ProjectViewWidget::processPlainTextClipboardData(const QClipboard *clipboard) {
- U2OpStatusImpl os;
- QString clipboardText = fetchClipboardText(clipboard, os);
- CHECK_OP_EXT(os, showWarningAndWriteToLog(os.getError()), );
-
- QScopedPointer<IOAdapterFactory> iof(new StringAdapterFactoryWithStringData(clipboardText));
- QScopedPointer<IOAdapter> ioa(iof->createIOAdapter());
- SAFE_POINT(ioa->isOpen(), L10N::internalError("IOAdapter is not opened"), );
-
- QVariantMap hints;
- bool userCancelled = false;
- FormatDetectionResult dr;
- bool detected = detectFormatFromAdapter(ioa.data(), hints, userCancelled, dr);
- CHECK(!userCancelled, );
- if (!detected) {
- showWarningAndWriteToLog(tr("UGENE can not recognize current clipboard content as one of supported formats."));
- return;
- }
-
- QString clipboardUrl = generateClipboardUrl(getExtensions(dr), excludedFilenames);
- excludedFilenames.insert(clipboardUrl);
- GUrl url(clipboardUrl, GUrl_File);
-
- if (canLoadFromString(dr.format, hints)) {
- hints[ProjectLoaderHint_DontCheckForExistence] = true;
- hints[ProjectLoaderHint_DoNotAddToRecentDocuments] = true;
- QList<AD2P_DocumentInfo> docInfoList;
- docInfoList << prepareDocumentInfo(url, iof.take(), dr.format->getFormatId(), hints);
- QList<AD2P_ProviderInfo> empty;
- AddDocumentsToProjectTask *addToProjTask = new AddDocumentsToProjectTask(docInfoList, empty);
- TaskSignalMapper* loadTaskSignalMapper = new TaskSignalMapper(addToProjTask);
- connect(loadTaskSignalMapper, SIGNAL(si_taskFinished(Task *)), SLOT(sl_setLocalFileAdapter()));
- AppContext::getTaskScheduler()->registerTopLevelTask(addToProjTask);
- } else {
- loadStoredData(clipboardText, url, hints);
- }
-}
-
-void ProjectViewWidget::sl_setLocalFileAdapter() {
- TaskSignalMapper* mapper = qobject_cast<TaskSignalMapper*>(sender());
- SAFE_POINT(mapper != NULL, "Incorrect sender", );
-
- AddDocumentsToProjectTask *task = qobject_cast<AddDocumentsToProjectTask*>(mapper->getTask());
- SAFE_POINT(task != NULL, "Can not convert to AddDocumentsToProjectTask", );
-
- QList<AD2P_DocumentInfo> docsInfoList = task->getDocsInfoList();
- SAFE_POINT(docsInfoList.size() == 1, "Incorrect documents number", );
-
- Project* p = AppContext::getProject();
- SAFE_POINT(p != NULL, tr("No active project found!"), );
-
- Document *doc = p->findDocumentByURL(docsInfoList[0].url);
- CHECK(doc != NULL, );
- IOAdapterFactory *actualFactory = AppContext::getIOAdapterRegistry()->getIOAdapterFactoryById(IOAdapterUtils::url2io(doc->getURL()));
- doc->setIOAdapterFactory(actualFactory);
- excludedFilenames.remove(doc->getURLString());
-
- connect(doc, SIGNAL(si_modifiedStateChanged()), AppContext::getProjectLoader(), SLOT(sl_documentStateChanged()));
-}
-
-bool ProjectViewWidget::detectFormatFromAdapter(IOAdapter* io, QVariantMap &hints, bool &canceled, FormatDetectionResult &dr) {
- canceled = false;
- GUrl url;
- QList<FormatDetectionResult> formats;
- FormatDetectionConfig conf;
- conf.useImporters = hints.value(ProjectLoaderHint_UseImporters, true).toBool();
- conf.bestMatchesOnly = false;
- formats = DocumentUtils::detectFormat(io, conf);
- bool detectFormat = ProjectLoaderImpl::detectFormat(url, formats, hints, dr);
- bool shouldBeSelected = ProjectLoaderImpl::shouldFormatBeSelected(formats, hints.value(ProjectLoaderHint_ForceFormatOptions, false).toBool());
- canceled = !detectFormat && shouldBeSelected;
- if ((!detectFormat && formats.isEmpty()) || canceled) {
- return false;
- }
- dr.rawDataCheckResult.properties.unite(hints);
- if (dr.format != NULL ) {
- bool forceReadingOptions = hints.value(ProjectLoaderHint_ForceFormatOptions, false).toBool();
- bool optionsAlreadyChoosen = hints.value((ProjectLoaderHint_MultipleFilesMode_Flag), false).toBool();
- canceled = !DocumentReadingModeSelectorController::adjustReadingMode(dr, forceReadingOptions, optionsAlreadyChoosen);
- if (canceled) {
- return false;
- }
- hints = dr.rawDataCheckResult.properties;
- if (!hints.contains(DocumentReadingMode_MaxObjectsInDoc)) {
- hints[DocumentReadingMode_MaxObjectsInDoc] = ProjectLoaderImpl::maxObjectsInSingleDocument;
- }
- }
- return (NULL != dr.format) || (NULL != dr.importer);
-}
-
static ProjectTreeGroupMode getLastGroupMode() {
int n = AppContext::getSettings()->getValue(ProjectViewImpl::SETTINGS_ROOT + "groupMode", ProjectTreeGroupMode_ByDocument).toInt();
n = qBound((int)ProjectTreeGroupMode_Min, n, (int)ProjectTreeGroupMode_Max);
diff --git a/src/ugeneui/src/project_view/ProjectViewImpl.h b/src/ugeneui/src/project_view/ProjectViewImpl.h
index ef2049f..79d61a1 100644
--- a/src/ugeneui/src/project_view/ProjectViewImpl.h
+++ b/src/ugeneui/src/project_view/ProjectViewImpl.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
#ifndef _U2_PROJECT_VIEW_WIDGET_
#define _U2_PROJECT_VIEW_WIDGET_
+#include <U2Core/ClipboardController.h>
#include <U2Core/DocumentSelection.h>
#include <U2Core/DocumentUtils.h>
#include <U2Core/GObjectSelection.h>
@@ -68,18 +69,8 @@ class ProjectViewWidget : public QWidget, public Ui_ProjectViewWidget {
Q_OBJECT
public:
ProjectViewWidget();
-private slots:
- void sl_pasteFileFromClipboard();
- void sl_setLocalFileAdapter();
private:
- static bool detectFormatFromAdapter(IOAdapter* io, QVariantMap &hints, bool &canceled, FormatDetectionResult &result);
- static QSet<QString> excludedFilenames;
-
- void processUrlsClipboardData(const QList<QUrl> &urls);
- void processPlainTextClipboardData(const QClipboard *clipboard);
-
DocumentUpdater* updater;
- QAction* pasteFileFromClipboard;
};
class ProjectViewImpl: public ProjectView , public LoadDocumentTaskProvider {
diff --git a/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp b/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
index 2774d3d..07a3c88 100644
--- a/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
+++ b/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/project_view/ProjectViewSearchBox.h b/src/ugeneui/src/project_view/ProjectViewSearchBox.h
index 39e5646..8b6964f 100644
--- a/src/ugeneui/src/project_view/ProjectViewSearchBox.h
+++ b/src/ugeneui/src/project_view/ProjectViewSearchBox.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/shtirlitz/Shtirlitz.cpp b/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
index 3836ad9..e4d1b14 100644
--- a/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
+++ b/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
#include <QApplication>
#include <QBuffer>
#include <QDate>
+#include <QMainWindow>
#include <QMessageBox>
#include <QNetworkReply>
#include <QProcess>
@@ -107,7 +108,9 @@ QList<Task*> Shtirlitz::wakeup() {
// and user did not enabled stats before -> ask to enable
// Do not ask to enable it twice for different versions!
if(minorVersionFirstLaunch) {
- QObjectScopedPointer<StatisticalReportController> dialog = new StatisticalReportController(":ugene/html/version_news.html");
+ MainWindow *mainWindow = AppContext::getMainWindow();
+ CHECK(NULL != mainWindow, result);
+ QObjectScopedPointer<StatisticalReportController> dialog = new StatisticalReportController(":ugene/html/version_news.html", mainWindow->getQMainWindow());
dialog->exec();
CHECK(!dialog.isNull(), result);
diff --git a/src/ugeneui/src/shtirlitz/Shtirlitz.h b/src/ugeneui/src/shtirlitz/Shtirlitz.h
index 2d3216f..9ee8146 100644
--- a/src/ugeneui/src/shtirlitz/Shtirlitz.h
+++ b/src/ugeneui/src/shtirlitz/Shtirlitz.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp b/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
index f4dd709..926b870 100644
--- a/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
+++ b/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,35 +20,30 @@
*/
#include <QDesktopServices>
+#include <QDesktopWidget>
#include <QFile>
#include <QScrollBar>
+#include <QWebFrame>
#include <U2Core/Version.h>
+#include <U2Core/U2SafePoints.h>
#include "StatisticalReportController.h"
+#include "utils/MultilingualHtmlView.h"
+
namespace U2 {
-StatisticalReportController::StatisticalReportController(const QString &newHtmlFilepath) : QDialog() {
+StatisticalReportController::StatisticalReportController(const QString &newHtmlFilepath, QWidget *parent) : QDialog(parent) {
setupUi(this);
-
lblStat->setText(tr("<b>Optional:</b> Help make UGENE better by automatically sending anonymous usage statistics."));
Version v = Version::appVersion();
setWindowTitle(tr("Welcome to UGENE %1.%2").arg(v.major).arg(v.minor));
- QFile file(newHtmlFilepath);
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){
- newsTextBrowser->setText(tr("Error loading release new from file"));
- return;
- }
-
- QString htmlText;
- while (!file.atEnd()) {
- htmlText += file.readLine();
- }
- newsTextBrowser->setText(htmlText);
- connect(newsTextBrowser, SIGNAL(anchorClicked(const QUrl &)), SLOT(sl_onAnchorClicked(const QUrl &)));
+ htmlView = new MultilingualHtmlView(newHtmlFilepath, this);
+ frameLayout->addWidget(htmlView);
+ htmlView->setMinimumSize(400, 10);
}
bool StatisticalReportController::isInfoSharingAccepted() const {
@@ -57,19 +52,14 @@ bool StatisticalReportController::isInfoSharingAccepted() const {
void StatisticalReportController::paintEvent(QPaintEvent *event) {
QWidget::paintEvent(event);
- QScrollBar *vBar = newsTextBrowser->verticalScrollBar();
- if(vBar->maximum() == vBar->value()){
- return;
- }
- //adjust QTextEditor size
- while(vBar->maximum() != vBar->value()){
- newsTextBrowser->setMinimumHeight(newsTextBrowser->size().height() + 1);
- }
- newsTextBrowser->setMinimumHeight(newsTextBrowser->size().height() + 10);
-}
+ CHECK(!htmlView->page()->mainFrame()->scrollBarGeometry(Qt::Vertical).isEmpty(), );
-void StatisticalReportController::sl_onAnchorClicked(const QUrl &url) {
- QDesktopServices::openUrl(url);
+ // adjust size to avoid scroll bars
+ while (!htmlView->page()->mainFrame()->scrollBarGeometry(Qt::Vertical).isEmpty()) {
+ htmlView->setMinimumHeight(htmlView->size().height() + 1);
+ }
+ htmlView->setMinimumHeight(htmlView->size().height() + 10);
+ move(x(), (qApp->desktop()->screenGeometry().height() / 2) - htmlView->minimumHeight());
}
}
diff --git a/src/ugeneui/src/shtirlitz/StatisticalReportController.h b/src/ugeneui/src/shtirlitz/StatisticalReportController.h
index ac6d90c..6b2a79c 100644
--- a/src/ugeneui/src/shtirlitz/StatisticalReportController.h
+++ b/src/ugeneui/src/shtirlitz/StatisticalReportController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -26,15 +26,19 @@
namespace U2 {
+class MultilingualHtmlView;
+
class StatisticalReportController : public QDialog, public Ui_StatisticalReport {
Q_OBJECT
public:
- StatisticalReportController(const QString &newHtmlFilepath);
+ StatisticalReportController(const QString &newHtmlFilepath, QWidget *parent);
bool isInfoSharingAccepted() const;
+
protected:
void paintEvent(QPaintEvent *event);
-private slots:
-void sl_onAnchorClicked(const QUrl &url);
+
+private:
+ MultilingualHtmlView* htmlView;
};
}
diff --git a/src/ugeneui/src/shtirlitz/ui/StatisticalReport.ui b/src/ugeneui/src/shtirlitz/ui/StatisticalReport.ui
index ac4d402..7212f80 100644
--- a/src/ugeneui/src/shtirlitz/ui/StatisticalReport.ui
+++ b/src/ugeneui/src/shtirlitz/ui/StatisticalReport.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>491</width>
- <height>214</height>
+ <height>67</height>
</rect>
</property>
<property name="sizePolicy">
@@ -21,38 +21,30 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QTextBrowser" name="newsTextBrowser">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QFrame" name="frame">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="html">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html></string>
- </property>
- <property name="openLinks">
- <bool>false</bool>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
+ <layout class="QVBoxLayout" name="frameLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ </layout>
</widget>
</item>
<item>
diff --git a/src/ugeneui/src/task_view/TaskStatusBar.cpp b/src/ugeneui/src/task_view/TaskStatusBar.cpp
index a6012ce..be19a5f 100644
--- a/src/ugeneui/src/task_view/TaskStatusBar.cpp
+++ b/src/ugeneui/src/task_view/TaskStatusBar.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/task_view/TaskStatusBar.h b/src/ugeneui/src/task_view/TaskStatusBar.h
index 76e057f..7458e40 100644
--- a/src/ugeneui/src/task_view/TaskStatusBar.h
+++ b/src/ugeneui/src/task_view/TaskStatusBar.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/task_view/TaskViewController.cpp b/src/ugeneui/src/task_view/TaskViewController.cpp
index f7f7fd0..2c862b2 100644
--- a/src/ugeneui/src/task_view/TaskViewController.cpp
+++ b/src/ugeneui/src/task_view/TaskViewController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/task_view/TaskViewController.h b/src/ugeneui/src/task_view/TaskViewController.h
index 0d8b469..28f531e 100644
--- a/src/ugeneui/src/task_view/TaskViewController.h
+++ b/src/ugeneui/src/task_view/TaskViewController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/utils/MultilingualHtmlView.cpp b/src/ugeneui/src/utils/MultilingualHtmlView.cpp
new file mode 100644
index 0000000..859ad46
--- /dev/null
+++ b/src/ugeneui/src/utils/MultilingualHtmlView.cpp
@@ -0,0 +1,88 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "MultilingualHtmlView.h"
+
+#include <U2Core/AppContext.h>
+#include <U2Core/Settings.h>
+#include <U2Core/U2SafePoints.h>
+
+#include <QDesktopServices>
+#include <QFile>
+#include <QTextStream>
+#include <QWebElement>
+#include <QWebElementCollection>
+#include <QWebFrame>
+
+
+namespace U2 {
+
+MultilingualHtmlView::MultilingualHtmlView(const QString& htmlPath, QWidget* parent)
+ : QWebView(parent),
+ loaded(false) {
+ setContextMenuPolicy(Qt::NoContextMenu);
+ loadPage(htmlPath);
+ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
+}
+
+bool MultilingualHtmlView::isLoaded() const {
+ return loaded;
+}
+
+void MultilingualHtmlView::sl_loaded(bool ok) {
+ disconnect(this, SIGNAL(loadFinished(bool)), this, SLOT(sl_loaded(bool)));
+ SAFE_POINT(ok, "Can not load page", );
+ loaded = true;
+
+ Settings* s = AppContext::getSettings();
+ SAFE_POINT(s != NULL, "AppContext settings is NULL", );
+ QString lang = s->getValue("UGENE_CURR_TRANSL", "en").toString();
+
+ QWebFrame* frame = page()->mainFrame();
+ SAFE_POINT(frame != NULL, "MainFrame of webView page is NULL", );
+
+ QWebElementCollection otherLangsCollection = frame->findAllElements(QString(":not(:lang(%1))[lang]").arg(lang));
+ for (int i = 0; i < otherLangsCollection.count(); i++) {
+ otherLangsCollection[i].setStyleProperty("display", "none");
+ }
+ emit si_loaded(ok);
+}
+
+void MultilingualHtmlView::sl_linkActivated(const QUrl &url) {
+ QDesktopServices::openUrl(url);
+}
+
+void MultilingualHtmlView::loadPage(const QString& htmlPath) {
+ QFile file(htmlPath);
+ bool opened = file.open(QIODevice::ReadOnly);
+ SAFE_POINT(opened, "Can not load file", );
+
+ QTextStream stream(&file);
+ stream.setCodec("UTF-8");
+ QString html = stream.readAll();
+ file.close();
+
+ connect(this, SIGNAL(loadFinished(bool)), this, SLOT(sl_loaded(bool)));
+ connect(this, SIGNAL(linkClicked(QUrl)), this, SLOT(sl_linkActivated(QUrl)));
+ page()->mainFrame()->setHtml(html);
+}
+
+} // namespace
diff --git a/src/ugeneui/src/utils/MultilingualHtmlView.h b/src/ugeneui/src/utils/MultilingualHtmlView.h
new file mode 100644
index 0000000..c712fe0
--- /dev/null
+++ b/src/ugeneui/src/utils/MultilingualHtmlView.h
@@ -0,0 +1,49 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.unipro.ru
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef _U2_MULTILINGUAL_HTML_VIEW_H_
+#define _U2_MULTILINGUAL_HTML_VIEW_H_
+
+#include <QWebView>
+
+namespace U2 {
+
+class MultilingualHtmlView : public QWebView {
+ Q_OBJECT
+public:
+ MultilingualHtmlView(const QString& htmlPath, QWidget* parent = NULL);
+ bool isLoaded() const;
+
+protected slots:
+ virtual void sl_loaded(bool ok);
+ virtual void sl_linkActivated(const QUrl& url);
+
+signals:
+ void si_loaded(bool ok);
+
+private:
+ void loadPage(const QString& htmlPath);
+ bool loaded;
+};
+
+} // namespace
+
+#endif // _U2_MULTILINGUAL_HTML_VIEW_H_
diff --git a/src/ugeneui/src/welcome_page/WelcomePageController.cpp b/src/ugeneui/src/welcome_page/WelcomePageController.cpp
index 9bcfd7c..1d8a911 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageController.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageController.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/welcome_page/WelcomePageController.h b/src/ugeneui/src/welcome_page/WelcomePageController.h
index 746396f..905e602 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageController.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageController.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp b/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
index 3420ca8..36183fa 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -20,9 +20,10 @@
*/
#include "WelcomePageWidget.h"
-
#include "WelcomePageMdi.h"
+#include <QVBoxLayout>
+
namespace U2 {
WelcomePageMdi::WelcomePageMdi(const QString &title, WelcomePageController *controller)
diff --git a/src/ugeneui/src/welcome_page/WelcomePageMdi.h b/src/ugeneui/src/welcome_page/WelcomePageMdi.h
index 1e56b84..e21ac68 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageMdi.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageMdi.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
diff --git a/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp b/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
index c5f6d0a..66ed553 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -28,6 +28,8 @@
#include <QWebElement>
#include <QWebFrame>
+#include <U2Core/AppContext.h>
+#include <U2Core/Settings.h>
#include <U2Core/U2SafePoints.h>
#include "WelcomePageController.h"
@@ -42,52 +44,30 @@ namespace {
}
WelcomePageWidget::WelcomePageWidget(QWidget *parent, WelcomePageController *controller)
-: QWidget(parent), loaded(false), controller(controller)
+ : MultilingualHtmlView(":ugene/html/welcome_page.html", parent),
+ controller(controller)
{
- setupUi(this);
- webView->setContextMenuPolicy(Qt::NoContextMenu);
- webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
- loadPage();
- webView->installEventFilter(this);
-}
-
-bool WelcomePageWidget::isLoaded() const {
- return loaded;
+ installEventFilter(this);
+ setObjectName("webView");
+ addController();
}
void WelcomePageWidget::sl_loaded(bool ok) {
- disconnect(webView, SIGNAL(loadFinished(bool)), this, SLOT(sl_loaded(bool)));
- SAFE_POINT(ok, "Can not load page", );
- loaded = true;
- webView->page()->mainFrame()->addToJavaScriptWindowObject("ugene", controller);
- controller->onPageLoaded();
-}
-
-void WelcomePageWidget::loadPage() {
- QFile file(":ugene/html/welcome_page.html");
- bool opened = file.open(QIODevice::ReadOnly);
- SAFE_POINT(opened, "Can not load Welcome Page", );
-
- QTextStream stream(&file);
- stream.setCodec("UTF-8");
- QString html = stream.readAll();
- file.close();
-
- connect(webView, SIGNAL(loadFinished(bool)), SLOT(sl_loaded(bool)));
- webView->page()->mainFrame()->setHtml(html);
+ MultilingualHtmlView::sl_loaded(ok);
+ addController();
}
void WelcomePageWidget::updateRecent(const QStringList &recentProjects, const QStringList &recentFiles) {
updateRecentFilesContainer("recent_projects", recentProjects, tr("No opened projects yet"));
updateRecentFilesContainer("recent_files", recentFiles, tr("No opened files yet"));
- webView->page()->mainFrame()->evaluateJavaScript("updateLinksVisibility()");
+ page()->mainFrame()->evaluateJavaScript("updateLinksVisibility()");
}
void WelcomePageWidget::updateRecentFilesContainer(const QString &id, const QStringList &files, const QString &message) {
static const QString divTemplate = "<div id=\"%1\" class=\"recent_items_content\">%2</div>";
static const QString linkTemplate = "<a class=\"recentLink\" href=\"#\" onclick=\"ugene.openFile('%1')\" title=\"%1\">- %2</a>";
- QWebElement doc = webView->page()->mainFrame()->documentElement();
+ QWebElement doc = page()->mainFrame()->documentElement();
QWebElement recentFilesDiv = doc.findFirst("#" + id);
SAFE_POINT(!recentFilesDiv.isNull(), "No recent files container", );
recentFilesDiv.removeAllChildren();
@@ -106,6 +86,11 @@ void WelcomePageWidget::updateRecentFilesContainer(const QString &id, const QStr
recentFilesDiv.setOuterXml(divTemplate.arg(id).arg(result));
}
+void WelcomePageWidget::addController() {
+ page()->mainFrame()->addToJavaScriptWindowObject("ugene", controller);
+ controller->onPageLoaded();
+}
+
void WelcomePageWidget::dragEnterEvent(QDragEnterEvent *event) {
MainWindowDragNDrop::dragEnterEvent(event);
}
@@ -119,7 +104,7 @@ void WelcomePageWidget::dragMoveEvent(QDragMoveEvent *event) {
}
bool WelcomePageWidget::eventFilter(QObject *watched, QEvent *event) {
- CHECK(webView == watched, false);
+ CHECK(this == watched, false);
switch (event->type()) {
case QEvent::DragEnter:
dragEnterEvent(dynamic_cast<QDragEnterEvent*>(event));
diff --git a/src/ugeneui/src/welcome_page/WelcomePageWidget.h b/src/ugeneui/src/welcome_page/WelcomePageWidget.h
index 413d2d9..1355ccc 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageWidget.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageWidget.h
@@ -1,6 +1,6 @@
/**
* UGENE - Integrated Bioinformatics Tools.
- * Copyright (C) 2008-2015 UniPro <ugene at unipro.ru>
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
* http://ugene.unipro.ru
*
* This program is free software; you can redistribute it and/or
@@ -22,19 +22,18 @@
#ifndef _U2_WELCOME_PAGE_WIDGET_H_
#define _U2_WELCOME_PAGE_WIDGET_H_
-#include "ui_WelcomePageWidget.h"
+#include "utils/MultilingualHtmlView.h"
namespace U2 {
class WelcomePageController;
-class WelcomePageWidget : public QWidget, private Ui::WelcomePageWidget {
+class WelcomePageWidget : public MultilingualHtmlView {
Q_OBJECT
public:
WelcomePageWidget(QWidget *parent, WelcomePageController *controller);
void updateRecent(const QStringList &recentProjects, const QStringList &recentFiles);
- bool isLoaded() const;
bool eventFilter(QObject *watched, QEvent *event);
protected:
@@ -46,8 +45,8 @@ private slots:
void sl_loaded(bool ok);
private:
- void loadPage();
void updateRecentFilesContainer(const QString &id, const QStringList &files, const QString &message);
+ void addController();
private:
bool loaded;
diff --git a/src/ugeneui/src/welcome_page/ui/WelcomePageWidget.ui b/src/ugeneui/src/welcome_page/ui/WelcomePageWidget.ui
deleted file mode 100644
index a271508..0000000
--- a/src/ugeneui/src/welcome_page/ui/WelcomePageWidget.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WelcomePageWidget</class>
- <widget class="QWidget" name="WelcomePageWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>1082</width>
- <height>738</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QFrame" name="frame">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QWebView" name="webView">
- <property name="styleSheet">
- <string notr="true">border-width: 2px;
-border-color: beige;</string>
- </property>
- <property name="url">
- <url>
- <string>about:blank</string>
- </url>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>QWebView</class>
- <extends>QWidget</extends>
- <header>QtWebKit/QWebView</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/ugeneui/transl/english.ts b/src/ugeneui/transl/english.ts
index 0813836..5557713 100644
--- a/src/ugeneui/transl/english.ts
+++ b/src/ugeneui/transl/english.ts
@@ -136,35 +136,43 @@
<context>
<name>ExportProjectDialog</name>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="14"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="20"/>
<source>Export Project</source>
<translation>Export Project</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="29"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></source>
- <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="42"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="41"/>
+ <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="54"/>
<source>Destination folder</source>
<translation>Destination folder</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="52"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="71"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="59"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="78"/>
<source>Project file name</source>
<translation>Project file name</translation>
</message>
@@ -445,17 +453,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
- <location filename="../src/Main.cpp" line="704"/>
+ <location filename="../src/Main.cpp" line="726"/>
<source>UGENE started</source>
<translation>UGENE started</translation>
</message>
<message>
- <location filename="../src/Main.cpp" line="705"/>
+ <location filename="../src/Main.cpp" line="727"/>
<source>UGENE version: %1 %2-bit</source>
<translation>UGENE version: %1 %2-bit</translation>
</message>
<message>
- <location filename="../src/Main.cpp" line="706"/>
+ <location filename="../src/Main.cpp" line="728"/>
<source>UGENE distribution: %1</source>
<translation>UGENE distribution: %1</translation>
</message>
@@ -592,13 +600,12 @@ p, li { white-space: pre-wrap; }
<translation>Welcome to UGENE 1.16</translation>
</message>
<message>
- <location filename="../src/shtirlitz/ui/StatisticalReport.ui" line="47"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html></source>
- <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
@@ -664,17 +671,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::AddDocumentsToProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="947"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="960"/>
<source>Loading documents</source>
<translation>Loading documents</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1009"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1022"/>
<source>No active project found!</source>
<translation>No active project found!</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1045"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1058"/>
<source>Load document and add to project: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -682,7 +689,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::AppContextImpl</name>
<message>
- <location filename="../src/Main.cpp" line="448"/>
+ <location filename="../src/Main.cpp" line="471"/>
<source>Style not available %1</source>
<translation type="unfinished">Style not available %1</translation>
</message>
@@ -978,12 +985,12 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::ExportProjectDialogController</name>
<message>
- <location filename="../src/project_support/ExportProjectDialogController.cpp" line="73"/>
+ <location filename="../src/project_support/ExportProjectDialogController.cpp" line="72"/>
<source>Export</source>
<translation>Export</translation>
</message>
<message>
- <location filename="../src/project_support/ExportProjectDialogController.cpp" line="92"/>
+ <location filename="../src/project_support/ExportProjectDialogController.cpp" line="91"/>
<source>Choose Directory</source>
<translation>Choose Directory</translation>
</message>
@@ -1387,12 +1394,12 @@ Do you want view online documentation?</translation>
<context>
<name>U2::OpenWithProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1076"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1089"/>
<source>Opening document: %1</source>
<translation>Opening document: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1078"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1091"/>
<source>Opening %1 documents</source>
<translation>Opening %1 documents</translation>
</message>
@@ -1512,22 +1519,22 @@ Do you want view online documentation?</translation>
<context>
<name>U2::ProjectDialogController</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="817"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="830"/>
<source>Create</source>
<translation>Create</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="818"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="831"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="877"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="890"/>
<source>Choose directory</source>
<translation>Choose directory</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="911"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="924"/>
<source><html><body align="center"><br>Project file already exists.<br>Are you sure you want to overwrite it?<body></html></source>
<translation><html><body align="center"><br>Project file already exists.<br>Are you sure you want to overwrite it?<body></html></translation>
</message>
@@ -1575,84 +1582,87 @@ Do you want view online documentation?</translation>
<context>
<name>U2::ProjectLoaderImpl</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="119"/>
<source>Connect to shared database...</source>
- <translation>Connect to shared database...</translation>
+ <translation type="vanished">Connect to shared database...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="213"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="222"/>
<source>UGENE project file</source>
<translation>UGENE project file</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="219"/>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="223"/>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="927"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="228"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="232"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="940"/>
<source>Select files to open</source>
<translation>Select files to open</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="463"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="472"/>
<source>Project file '%1' ignored</source>
<translation>Project file '%1' ignored</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="470"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="478"/>
<source>The document with the same URL is already added to the project</source>
<translation>The document with the same URL is already added to the project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="472"/>
<source>warning</source>
- <translation>warning</translation>
+ <translation type="vanished">warning</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="481"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="487"/>
<source>The document is already loaded and added to project: %1</source>
<translation>The document is already loaded and added to project: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="558"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="494"/>
+ <source>The document with the same URL is already loading</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="571"/>
<source>Failed to detect file format: %1</source>
<translation>Failed to detect file format: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="561"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="574"/>
<source>File is empty: %1</source>
<translation>File is empty: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="597"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="610"/>
<source>Project is already opened</source>
<translation>Project is already opened</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="603"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="616"/>
<source>New project can either be opened in a new window or replace the project in the existing. How would you like to open the project?</source>
<translation>New project can either be opened in a new window or replace the project in the existing. How would you like to open the project?</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="604"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="617"/>
<source>New Window</source>
<translation>New Window</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="606"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="619"/>
<source>This Window</source>
<translation>This Window</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="617"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="630"/>
<source>Failed to open new instance of UGENE</source>
<translation>Failed to open new instance of UGENE</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="623"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="636"/>
<source>Stopped loading project: %1. Reason: active project found</source>
<translation>Stopped loading project: %1. Reason: active project found</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="899"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="912"/>
<source>New Project</source>
<translation type="unfinished"></translation>
</message>
@@ -1661,62 +1671,67 @@ Do you want view online documentation?</translation>
<translation type="vanished">New Project...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="901"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="914"/>
<source>project</source>
<translation>project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="108"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="109"/>
<source>Open...</source>
<translation>Open...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="91"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="92"/>
<source>Open as...</source>
<translation>Open as...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="827"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="103"/>
+ <source>Open from clipboard...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="120"/>
+ <source>Connect to UGENE shared database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="840"/>
<source>Save project as</source>
<translation>Save project as</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="828"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="841"/>
<source>Save</source>
<translation>Save</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="141"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="135"/>
<source>Recent projects</source>
<translation>Recent projects</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="85"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="86"/>
<source>&New project...</source>
<translation>&New project...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="97"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="98"/>
<source>New document from text...</source>
<translation>New document from text...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="102"/>
- <source>Paste</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="114"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="115"/>
<source>Access remote database...</source>
<translation>Access remote database...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="125"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="126"/>
<source>Search NCBI GenBank...</source>
<translation>Search NCBI GenBank...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="145"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="139"/>
<source>Recent files</source>
<translation>Recent files</translation>
</message>
@@ -1724,7 +1739,7 @@ Do you want view online documentation?</translation>
<context>
<name>U2::ProjectServiceDisableTask</name>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="187"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="192"/>
<source>Disable Project</source>
<translation>Disable Project</translation>
</message>
@@ -1732,27 +1747,27 @@ Do you want view online documentation?</translation>
<context>
<name>U2::ProjectServiceEnableTask</name>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="142"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="143"/>
<source>Enable Project</source>
<translation>Enable Project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="151"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="152"/>
<source>&Save all</source>
<translation>&Save all</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="161"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="162"/>
<source>&Close project</source>
<translation>&Close project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="167"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="168"/>
<source>Export project...</source>
<translation>Export project...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="157"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="158"/>
<source>Save project &as...</source>
<translation>Save project &as...</translation>
</message>
@@ -2003,21 +2018,33 @@ Do you want view online documentation?</translation>
</message>
</context>
<context>
+ <name>U2::SplashScreenWidget</name>
+ <message>
+ <location filename="../src/main_window/SplashScreen.cpp" line="164"/>
+ <source>Version </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/main_window/SplashScreen.cpp" line="164"/>
+ <source> is loading</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::StatisticalReportController</name>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="34"/>
+ <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="42"/>
<source><b>Optional:</b> Help make UGENE better by automatically sending anonymous usage statistics.</source>
<translation><b>Optional:</b> Help make UGENE better by automatically sending anonymous usage statistics.</translation>
</message>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="37"/>
+ <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="45"/>
<source>Welcome to UGENE %1.%2</source>
<translation>Welcome to UGENE %1.%2</translation>
</message>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="40"/>
<source>Error loading release new from file</source>
- <translation>Error loading release new from file</translation>
+ <translation type="vanished">Error loading release new from file</translation>
</message>
</context>
<context>
@@ -2031,47 +2058,47 @@ Do you want view online documentation?</translation>
<context>
<name>U2::TVReportWindow</name>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="433"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="434"/>
<source>Task report [%1]</source>
<translation>Task report [%1]</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Failed</source>
<translation>Failed</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Canceled</source>
<translation>Canceled</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Finished</source>
<translation>Finished</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="446"/>
<source>status</source>
<translation>status</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="447"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="448"/>
<source>error:</source>
<translation>error:</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="452"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="453"/>
<source>time</source>
<translation>time</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="512"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="513"/>
<source>Open containing directory</source>
<translation>Open containing directory</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="519"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="520"/>
<source>Open by operating system</source>
<translation>Open by operating system</translation>
</message>
@@ -2159,12 +2186,12 @@ Do you want view online documentation?</translation>
<translation>Activating task report: %1</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="594"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="595"/>
<source>finished</source>
<translation>Finished</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="576"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="577"/>
<source>Canceling...</source>
<translation>Canceling...</translation>
</message>
@@ -2204,7 +2231,7 @@ Do you want view online documentation?</translation>
<translation>Actions</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="574"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="575"/>
<source>Canceled</source>
<translation>Canceled</translation>
</message>
@@ -2272,7 +2299,7 @@ Do you want view online documentation?</translation>
<context>
<name>U2::UserAppsSettings</name>
<message>
- <location filename="../src/Main.cpp" line="429"/>
+ <location filename="../src/Main.cpp" line="449"/>
<source>UGENE initialization started</source>
<translation type="unfinished">UGENE initialization started</translation>
</message>
@@ -2293,12 +2320,12 @@ Do you want view online documentation?</translation>
<context>
<name>U2::WelcomePageWidget</name>
<message>
- <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="81"/>
+ <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="67"/>
<source>No opened projects yet</source>
<translation>No opened projects yet</translation>
</message>
<message>
- <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="82"/>
+ <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="68"/>
<source>No opened files yet</source>
<translation>No opened files yet</translation>
</message>
@@ -2376,14 +2403,12 @@ Do you want view online documentation?</translation>
<context>
<name>WelcomePageWidget</name>
<message>
- <location filename="../src/welcome_page/ui/WelcomePageWidget.ui" line="14"/>
<source>Form</source>
- <translation>Project View</translation>
+ <translation type="vanished">Project View</translation>
</message>
<message>
- <location filename="../src/welcome_page/ui/WelcomePageWidget.ui" line="43"/>
<source>about:blank</source>
- <translation>about:blank</translation>
+ <translation type="vanished">about:blank</translation>
</message>
</context>
</TS>
diff --git a/src/ugeneui/transl/russian.ts b/src/ugeneui/transl/russian.ts
index 8678cd9..d2cc0af 100644
--- a/src/ugeneui/transl/russian.ts
+++ b/src/ugeneui/transl/russian.ts
@@ -136,35 +136,43 @@
<context>
<name>ExportProjectDialog</name>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="14"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="20"/>
<source>Export Project</source>
<translation>Экспортировать проект</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="29"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></source>
- <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600; color:#a6392e;">Внимание! Все отложенные изменения в активном проекте будут сохранены!</span></p></body></html></translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="42"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="41"/>
+ <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; color:#a6392e;">Warning! All pending changes in the active project will be saved!</span></p></body></html></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="54"/>
<source>Destination folder</source>
<translation>Сохранить в директорию</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="52"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="71"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="59"/>
+ <location filename="../src/project_support/ui/ExportProjectDialog.ui" line="78"/>
<source>Project file name</source>
<translation>Имя файла проекта</translation>
</message>
@@ -445,17 +453,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
- <location filename="../src/Main.cpp" line="704"/>
+ <location filename="../src/Main.cpp" line="726"/>
<source>UGENE started</source>
<translation>UGENE готов к работе</translation>
</message>
<message>
- <location filename="../src/Main.cpp" line="705"/>
+ <location filename="../src/Main.cpp" line="727"/>
<source>UGENE version: %1 %2-bit</source>
<translation>Версия UGENE: %1 %2-бит</translation>
</message>
<message>
- <location filename="../src/Main.cpp" line="706"/>
+ <location filename="../src/Main.cpp" line="728"/>
<source>UGENE distribution: %1</source>
<translation>Распределение UGENE: %1</translation>
</message>
@@ -592,13 +600,12 @@ p, li { white-space: pre-wrap; }
<translation>Добро пожаловать в UGENE 1.16</translation>
</message>
<message>
- <location filename="../src/shtirlitz/ui/StatisticalReport.ui" line="47"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html></source>
- <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
@@ -664,17 +671,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::AddDocumentsToProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="947"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="960"/>
<source>Loading documents</source>
<translation>Loading documents</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1009"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1022"/>
<source>No active project found!</source>
<translation>No active project found!</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1045"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1058"/>
<source>Load document and add to project: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -682,7 +689,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::AppContextImpl</name>
<message>
- <location filename="../src/Main.cpp" line="448"/>
+ <location filename="../src/Main.cpp" line="471"/>
<source>Style not available %1</source>
<translation type="unfinished">Стиль не доступен: %1</translation>
</message>
@@ -978,12 +985,12 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::ExportProjectDialogController</name>
<message>
- <location filename="../src/project_support/ExportProjectDialogController.cpp" line="73"/>
+ <location filename="../src/project_support/ExportProjectDialogController.cpp" line="72"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
<message>
- <location filename="../src/project_support/ExportProjectDialogController.cpp" line="92"/>
+ <location filename="../src/project_support/ExportProjectDialogController.cpp" line="91"/>
<source>Choose Directory</source>
<translation>Выбор директории</translation>
</message>
@@ -1387,12 +1394,12 @@ Do you want view online documentation?</source>
<context>
<name>U2::OpenWithProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1076"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1089"/>
<source>Opening document: %1</source>
<translation>Opening document: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1078"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="1091"/>
<source>Opening %1 documents</source>
<translation>Opening %1 documents</translation>
</message>
@@ -1512,22 +1519,22 @@ Do you want view online documentation?</source>
<context>
<name>U2::ProjectDialogController</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="817"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="830"/>
<source>Create</source>
<translation>Создать</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="818"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="831"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="877"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="890"/>
<source>Choose directory</source>
<translation>Выбрать директорию</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="911"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="924"/>
<source><html><body align="center"><br>Project file already exists.<br>Are you sure you want to overwrite it?<body></html></source>
<translation><html><body align="center"><br>Проект уже существует.<br>Переписать его?<body></html></translation>
</message>
@@ -1574,144 +1581,152 @@ Do you want view online documentation?</source>
<context>
<name>U2::ProjectLoaderImpl</name>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="119"/>
<source>Connect to shared database...</source>
- <translation>Подключение к общей базе данных...</translation>
+ <translation type="vanished">Подключение к общей базе данных...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="213"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="222"/>
<source>UGENE project file</source>
<translation>Файл проекта</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="219"/>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="223"/>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="927"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="228"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="232"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="940"/>
<source>Select files to open</source>
<translation>Открыть файлы</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="463"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="472"/>
<source>Project file '%1' ignored</source>
<translation>Project file '%1' ignored</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="470"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="478"/>
<source>The document with the same URL is already added to the project</source>
<translation>Этот документ уже добавлен в проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="472"/>
<source>warning</source>
- <translation>внимание</translation>
+ <translation type="vanished">внимание</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="481"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="487"/>
<source>The document is already loaded and added to project: %1</source>
<translation>Документ уже загружен и добавлен в проект: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="558"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="494"/>
+ <source>The document with the same URL is already loading</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="571"/>
<source>Failed to detect file format: %1</source>
<translation>Невозможно определить формат файла: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="561"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="574"/>
<source>File is empty: %1</source>
<translation>Файл пуст: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="597"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="610"/>
<source>Project is already opened</source>
<translation>Проект уже открыт</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="603"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="616"/>
<source>New project can either be opened in a new window or replace the project in the existing. How would you like to open the project?</source>
<translation>Новый проект может быть открыт в новом окне или текущий проект может быть переписан. Как открыть проект?</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="604"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="617"/>
<source>New Window</source>
<translation>В новом окне</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="606"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="619"/>
<source>This Window</source>
<translation>В текущем окне</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="617"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="630"/>
<source>Failed to open new instance of UGENE</source>
<translation>Failed to open new instance of UGENE</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="623"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="636"/>
<source>Stopped loading project: %1. Reason: active project found</source>
<translation>Загрузка проекта остановлена: %1, поскольку активен другой проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="899"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="912"/>
<source>New Project</source>
<translation>Новый проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="901"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="914"/>
<source>project</source>
<translation>проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="108"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="109"/>
<source>Open...</source>
<translation>Открыть...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="91"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="92"/>
<source>Open as...</source>
<translation>Открыть как...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="827"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="103"/>
+ <source>Open from clipboard...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="120"/>
+ <source>Connect to UGENE shared database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="840"/>
<source>Save project as</source>
<translation>Сохранить проект как</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="828"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="841"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="141"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="135"/>
<source>Recent projects</source>
<translation>Недавние проекты</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="85"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="86"/>
<source>&New project...</source>
<translation>&Новый проект...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="97"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="98"/>
<source>New document from text...</source>
<translation>Новый документ из текста...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="102"/>
- <source>Paste</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="114"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="115"/>
<source>Access remote database...</source>
<translation>Запрос к удаленной базе данных...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="125"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="126"/>
<source>Search NCBI GenBank...</source>
<translation>Поиск в NCBI GenBank...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="145"/>
+ <location filename="../src/project_support/ProjectLoaderImpl.cpp" line="139"/>
<source>Recent files</source>
<translation>Недавние файлы</translation>
</message>
@@ -1719,7 +1734,7 @@ Do you want view online documentation?</source>
<context>
<name>U2::ProjectServiceDisableTask</name>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="187"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="192"/>
<source>Disable Project</source>
<translation>Остановка сервиса проектов</translation>
</message>
@@ -1727,27 +1742,27 @@ Do you want view online documentation?</source>
<context>
<name>U2::ProjectServiceEnableTask</name>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="142"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="143"/>
<source>Enable Project</source>
<translation>Запуск сервиса проектов</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="151"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="152"/>
<source>&Save all</source>
<translation>&Сохранить проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="161"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="162"/>
<source>&Close project</source>
<translation>&Закрыть проект</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="167"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="168"/>
<source>Export project...</source>
<translation>Экспортировать проект...</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectServiceImpl.cpp" line="157"/>
+ <location filename="../src/project_support/ProjectServiceImpl.cpp" line="158"/>
<source>Save project &as...</source>
<translation>Сохранить проект &как...</translation>
</message>
@@ -1998,21 +2013,33 @@ Do you want view online documentation?</source>
</message>
</context>
<context>
+ <name>U2::SplashScreenWidget</name>
+ <message>
+ <location filename="../src/main_window/SplashScreen.cpp" line="164"/>
+ <source>Version </source>
+ <translation>Версия </translation>
+ </message>
+ <message>
+ <location filename="../src/main_window/SplashScreen.cpp" line="164"/>
+ <source> is loading</source>
+ <translation> загружается</translation>
+ </message>
+</context>
+<context>
<name>U2::StatisticalReportController</name>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="34"/>
+ <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="42"/>
<source><b>Optional:</b> Help make UGENE better by automatically sending anonymous usage statistics.</source>
<translation><b>Опционально:</b> Помогите сделать UGENE лучше, автоматически отправляя анонимную статистику использования.</translation>
</message>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="37"/>
+ <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="45"/>
<source>Welcome to UGENE %1.%2</source>
<translation>Добро пожаловать в UGENE %1.%2</translation>
</message>
<message>
- <location filename="../src/shtirlitz/StatisticalReportController.cpp" line="40"/>
<source>Error loading release new from file</source>
- <translation>Error loading release new from file</translation>
+ <translation type="vanished">Error loading release new from file</translation>
</message>
</context>
<context>
@@ -2026,47 +2053,47 @@ Do you want view online documentation?</source>
<context>
<name>U2::TVReportWindow</name>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="433"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="434"/>
<source>Task report [%1]</source>
<translation>Отчёт выполнения задачи - %1</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Failed</source>
<translation>Провалилась</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Canceled</source>
<translation>Отменена</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="444"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
<source>Finished</source>
<translation>Завершена</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="445"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="446"/>
<source>status</source>
<translation>состояние</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="447"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="448"/>
<source>error:</source>
<translation>ошибка:</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="452"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="453"/>
<source>time</source>
<translation>время выполнения</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="512"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="513"/>
<source>Open containing directory</source>
<translation>Открыть папку, содержащую документ</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="519"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="520"/>
<source>Open by operating system</source>
<translation>Открыть при помощи операционной системы</translation>
</message>
@@ -2153,12 +2180,12 @@ Do you want view online documentation?</source>
<translation>Activating task report: %1</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="594"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="595"/>
<source>finished</source>
<translation>Завершена</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="576"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="577"/>
<source>Canceling...</source>
<translation>Отмена задачи...</translation>
</message>
@@ -2198,7 +2225,7 @@ Do you want view online documentation?</source>
<translation>Операции</translation>
</message>
<message>
- <location filename="../src/task_view/TaskViewController.cpp" line="574"/>
+ <location filename="../src/task_view/TaskViewController.cpp" line="575"/>
<source>Canceled</source>
<translation>Отменена</translation>
</message>
@@ -2266,7 +2293,7 @@ Do you want view online documentation?</source>
<context>
<name>U2::UserAppsSettings</name>
<message>
- <location filename="../src/Main.cpp" line="429"/>
+ <location filename="../src/Main.cpp" line="449"/>
<source>UGENE initialization started</source>
<translation type="unfinished">Инициализация UGENE</translation>
</message>
@@ -2287,12 +2314,12 @@ Do you want view online documentation?</source>
<context>
<name>U2::WelcomePageWidget</name>
<message>
- <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="81"/>
+ <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="67"/>
<source>No opened projects yet</source>
<translation>Нет открытых проектов</translation>
</message>
<message>
- <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="82"/>
+ <location filename="../src/welcome_page/WelcomePageWidget.cpp" line="68"/>
<source>No opened files yet</source>
<translation>Нет открытых файлов</translation>
</message>
@@ -2370,14 +2397,12 @@ Do you want view online documentation?</source>
<context>
<name>WelcomePageWidget</name>
<message>
- <location filename="../src/welcome_page/ui/WelcomePageWidget.ui" line="14"/>
<source>Form</source>
- <translation>Проект</translation>
+ <translation type="vanished">Проект</translation>
</message>
<message>
- <location filename="../src/welcome_page/ui/WelcomePageWidget.ui" line="43"/>
<source>about:blank</source>
- <translation>about:blank</translation>
+ <translation type="vanished">about:blank</translation>
</message>
</context>
</TS>
diff --git a/src/ugeneui/ugeneui.pri b/src/ugeneui/ugeneui.pri
index 904915e..ac77b19 100644
--- a/src/ugeneui/ugeneui.pri
+++ b/src/ugeneui/ugeneui.pri
@@ -13,11 +13,14 @@ equals(QT_MAJOR_VERSION, 5): QT += widgets webkitwidgets
TEMPLATE = app
CONFIG +=qt dll thread debug_and_release
DEFINES+= QT_DLL QT_FATAL_ASSERT
-INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src ../libs_3rdparty/humimit/src
+INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src ../libs_3rdparty/QSpec/src
macx : INCLUDEPATH += /System/Library/Frameworks/Security.framework/Headers
-LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
+LIBS += -L../_release -L../libs_3rdparty/humimit/ -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
macx: LIBS += /System/Library/Frameworks/Security.framework/Security
+if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimit
+}
!debug_and_release|build_pass {
@@ -30,6 +33,9 @@ macx: LIBS += /System/Library/Frameworks/Security.framework/Security
OBJECTS_DIR=_tmp/obj/debug
LIBS -= -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Viewd -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lugenedbd -lbreakpadd -lhumimitd
+ if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+ LIBS -= -lhumimitd
+ }
}
CONFIG(release, debug|release) {
diff --git a/src/ugeneui/ugeneui.pro b/src/ugeneui/ugeneui.pro
index 5696338..9ea78e4 100644
--- a/src/ugeneui/ugeneui.pro
+++ b/src/ugeneui/ugeneui.pro
@@ -4,6 +4,12 @@ include (ugeneui.pri)
HEADERS += src/app_settings/AppSettingsDialogController.h \
src/app_settings/AppSettingsDialogTree.h \
src/app_settings/AppSettingsGUIImpl.h \
+ src/app_settings/directories_settings/DirectoriesSettingsGUIController.h \
+ src/app_settings/format_settings/FormatSettingsGUIController.h \
+ src/app_settings/logview_settings/LogSettingsGUIController.h \
+ src/app_settings/network_settings/NetworkSettingsGUIController.h \
+ src/app_settings/resource_settings/ResourceSettingsGUIController.h \
+ src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h \
src/main_window/AboutDialogController.h \
src/main_window/SplashScreen.h \
src/main_window/CheckUpdatesTask.h \
@@ -12,6 +18,7 @@ HEADERS += src/app_settings/AppSettingsDialogController.h \
src/main_window/MDIManagerImpl.h \
src/main_window/MenuManager.h \
src/main_window/ShutdownTask.h \
+ src/main_window/TmpDirChangeDialogController.h \
src/main_window/ToolBarManager.h \
src/plugin_viewer/PluginViewerController.h \
src/plugin_viewer/PluginViewerImpl.h \
@@ -31,13 +38,7 @@ HEADERS += src/app_settings/AppSettingsDialogController.h \
src/shtirlitz/StatisticalReportController.h \
src/task_view/TaskStatusBar.h \
src/task_view/TaskViewController.h \
- src/app_settings/directories_settings/DirectoriesSettingsGUIController.h \
- src/app_settings/format_settings/FormatSettingsGUIController.h \
- src/app_settings/logview_settings/LogSettingsGUIController.h \
- src/app_settings/network_settings/NetworkSettingsGUIController.h \
- src/app_settings/resource_settings/ResourceSettingsGUIController.h \
- src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h \
- src/main_window/TmpDirChangeDialogController.h \
+ src/utils/MultilingualHtmlView.h \
src/welcome_page/WelcomePageController.h \
src/welcome_page/WelcomePageMdi.h \
src/welcome_page/WelcomePageWidget.h
@@ -59,11 +60,16 @@ FORMS += src/app_settings/directories_settings/ui/DirectoriesSettingsWidget.ui \
src/project_support/ui/SequenceReadingModeSelectorDialog.ui \
src/project_support/ui/SaveProjectDialog.ui \
src/project_view/ui/ProjectViewWidget.ui \
- src/shtirlitz/ui/StatisticalReport.ui \
- src/welcome_page/ui/WelcomePageWidget.ui
+ src/shtirlitz/ui/StatisticalReport.ui
SOURCES += src/Main.cpp \
src/app_settings/AppSettingsDialogController.cpp \
src/app_settings/AppSettingsGUIImpl.cpp \
+ src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp \
+ src/app_settings/format_settings/FormatSettingsGUIController.cpp \
+ src/app_settings/logview_settings/LogSettingsGUIController.cpp \
+ src/app_settings/network_settings/NetworkSettingsGUIController.cpp \
+ src/app_settings/resource_settings/ResourceSettingsGUIController.cpp \
+ src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp \
src/main_window/AboutDialogController.cpp \
src/main_window/SplashScreen.cpp \
src/main_window/CheckUpdatesTask.cpp \
@@ -72,6 +78,7 @@ SOURCES += src/Main.cpp \
src/main_window/MDIManagerImpl.cpp \
src/main_window/MenuManager.cpp \
src/main_window/ShutdownTask.cpp \
+ src/main_window/TmpDirChangeDialogController.cpp \
src/main_window/ToolBarManager.cpp \
src/plugin_viewer/PluginViewerController.cpp \
src/plugin_viewer/PluginViewerImpl.cpp \
@@ -92,13 +99,7 @@ SOURCES += src/Main.cpp \
src/shtirlitz/StatisticalReportController.cpp \
src/task_view/TaskStatusBar.cpp \
src/task_view/TaskViewController.cpp \
- src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp \
- src/app_settings/format_settings/FormatSettingsGUIController.cpp \
- src/app_settings/logview_settings/LogSettingsGUIController.cpp \
- src/app_settings/network_settings/NetworkSettingsGUIController.cpp \
- src/app_settings/resource_settings/ResourceSettingsGUIController.cpp \
- src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp \
- src/main_window/TmpDirChangeDialogController.cpp \
+ src/utils/MultilingualHtmlView.cpp \
src/welcome_page/WelcomePageController.cpp \
src/welcome_page/WelcomePageMdi.cpp \
src/welcome_page/WelcomePageWidget.cpp
diff --git a/src/ugeneui/ugeneui.qrc b/src/ugeneui/ugeneui.qrc
index 8663f4b..aa183b1 100644
--- a/src/ugeneui/ugeneui.qrc
+++ b/src/ugeneui/ugeneui.qrc
@@ -10,6 +10,7 @@
<file>images/plugins.png</file>
<file>images/service.png</file>
<file>images/project_save.png</file>
+ <file>images/paste.png</file>
<file>images/project_new.png</file>
<file>images/project_open.png</file>
<file>images/add_existing_document.png</file>
diff --git a/ugene.pro b/ugene.pro
index ce3a770..5e52993 100644
--- a/ugene.pro
+++ b/ugene.pro
@@ -25,7 +25,7 @@ SUBDIRS += \
src/libs_3rdparty/sqlite3 \
src/libs_3rdparty/gtest \
src/libs_3rdparty/samtools \
- src/libs_3rdparty/humimit \
+ src/libs_3rdparty/QSpec \
src/corelibs/U2Core \
src/corelibs/U2Test \
src/corelibs/U2Algorithm \
@@ -102,7 +102,22 @@ exclude_list_enabled() {
SUBDIRS -= src/plugins/perf_monitor
SUBDIRS -= src/plugins/GUITestBase
SUBDIRS -= src/plugins/api_tests
+ SUBDIRS -= src/libs_3rdparty/QSpec
}
+
+if(exists( ./src/libs_3rdparty/QSpec/QSpec.pro ):!exclude_list_enabled()) {
+ message( "QSpec exists, enable GUI testing..." )
+ !exists( ./src/libs_3rdparty/QSpec/custom.pri) {
+ unix: system( cp ./installer/_common_data/humimit_custom.pri ./src/libs_3rdparty/QSpec/custom.pri )
+ win32: system (copy /B installer\_common_data\humimit_custom.pri src\libs_3rdparty\QSpec\custom.pri)
+ }
+}
+!exists( ./src/libs_3rdparty/QSpec/QSpec.pro ){
+ DEFINES += HI_EXCLUDED
+ SUBDIRS -= src/plugins/GUITestBase
+ SUBDIRS -= src/libs_3rdparty/QSpec
+}
+
without_non_free() {
SUBDIRS -= src/plugins_3rdparty/psipred
SUBDIRS -= src/plugins_3rdparty/phylip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git
More information about the debian-med-commit
mailing list