[med-svn] [ugene] 02/05: Imported Upstream version 1.25.0+dfsg
Andreas Tille
tille at debian.org
Tue Dec 13 17:30:39 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 f12be753d64d61657233eb4dfacd72d6f87e9243
Author: Andreas Tille <tille at debian.org>
Date: Tue Dec 13 14:12:26 2016 +0100
Imported Upstream version 1.25.0+dfsg
---
COPYRIGHT | 2 +-
LICENSE.3rd_party => LICENSE.3rd_party.txt | 25 +-
LICENSE => LICENSE.txt | 0
build.txt | 2 +-
data/DBXRefRegistry.txt | 24 +-
.../NGS/raw_ngs/chipseq/chipseq_paired.uwl | 34 +-
.../NGS/raw_ngs/chipseq/chipseq_single.uwl | 10 +-
.../NGS/raw_ngs/dnaseq/dna_paired.uwl | 32 +-
.../NGS/raw_ngs/dnaseq/dna_single.uwl | 10 +-
.../raw_ngs/rnaseq/rnaseq_filtration_paired.uwl | 22 +-
.../raw_ngs/rnaseq/rnaseq_filtration_single.uwl | 10 +-
.../NGS/raw_ngs/rnaseq/rnaseq_paired.uwl | 20 +-
.../NGS/raw_ngs/rnaseq/rnaseq_single.uwl | 10 +-
LICENSE => installer/_common_data/LICENSE | 0
.../_common_data/LICENSE.3rd_party | 0
.../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 | 10 +-
.../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 | 2 +-
.../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 +-
.../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 +-
.../color_schemes/ColorSchemeUtils.cpp | 2 +-
.../util_msaedit/color_schemes/ColorSchemeUtils.h | 2 +-
.../util_msaedit/color_schemes/MsaColorScheme.cpp | 2 +-
.../util_msaedit/color_schemes/MsaColorScheme.h | 2 +-
.../color_schemes/MsaColorSchemeClustalX.cpp | 2 +-
.../color_schemes/MsaColorSchemeClustalX.h | 2 +-
.../color_schemes/MsaColorSchemeCustom.cpp | 2 +-
.../color_schemes/MsaColorSchemeCustom.h | 2 +-
...saColorSchemePercentageIdententityGrayscale.cpp | 2 +-
.../MsaColorSchemePercentageIdententityGrayscale.h | 2 +-
.../MsaColorSchemePercentageIdentity.cpp | 2 +-
.../MsaColorSchemePercentageIdentity.h | 2 +-
.../color_schemes/MsaColorSchemeStatic.cpp | 2 +-
.../color_schemes/MsaColorSchemeStatic.h | 2 +-
.../highlighting_schemes/MsaHighlightingScheme.cpp | 2 +-
.../highlighting_schemes/MsaHighlightingScheme.h | 2 +-
.../MsaHighlightingSchemeAgreements.cpp | 2 +-
.../MsaHighlightingSchemeAgreements.h | 2 +-
.../MsaHighlightingSchemeConservation.cpp | 2 +-
.../MsaHighlightingSchemeConservation.h | 2 +-
.../MsaHighlightingSchemeDisagreements.cpp | 2 +-
.../MsaHighlightingSchemeDisagreements.h | 2 +-
.../MsaHighlightingSchemeGaps.cpp | 2 +-
.../MsaHighlightingSchemeGaps.h | 2 +-
.../MsaHighlightingSchemeNoColors.cpp | 2 +-
.../MsaHighlightingSchemeNoColors.h | 2 +-
.../MsaHighlightingSchemeTransitions.cpp | 2 +-
.../MsaHighlightingSchemeTransitions.h | 2 +-
.../MsaHighlightingSchemeTransversions.cpp | 2 +-
.../MsaHighlightingSchemeTransversions.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 | 122 +-
src/corelibs/U2Algorithm/transl/russian.ts | 122 +-
src/corelibs/U2Core/CMakeLists.txt | 12 +-
.../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 | 4 +-
src/corelibs/U2Core/src/datatype/BioStruct3D.h | 2 +-
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 | 27 +-
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.cpp | 2 +-
src/corelibs/U2Core/src/datatype/U2Qualifier.h | 6 +-
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.cpp | 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 | 3 +-
src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h | 10 +-
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 | 4 +-
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 | 4 +-
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 | 2 +-
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 | 2 +-
.../U2Core/src/globals/ClipboardController.h | 2 +-
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 | 4 +-
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 | 2 +-
.../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 | 8 +-
.../U2Core/src/globals/UserApplicationsSettings.h | 2 +-
src/corelibs/U2Core/src/globals/Version.cpp | 4 +-
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 | 36 +-
.../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 | 2 +-
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 | 2 +-
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 | 4 +-
.../U2Core/src/tasks/AddSequencesToAlignmentTask.h | 4 +-
.../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/CmdlineInOutTaskRunner.cpp | 2 +-
.../U2Core/src/tasks/CmdlineInOutTaskRunner.h | 2 +-
.../U2Core/src/tasks/CmdlineTaskRunner.cpp | 2 +-
src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.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 | 34 +-
.../U2Core/src/tasks/ExternalToolRunTask.h | 4 +-
.../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 | 8 +-
.../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 | 4 +-
.../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 +-
.../U2Core/src/util/AnnotationCreationPattern.cpp | 2 +-
.../U2Core/src/util/AnnotationCreationPattern.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 | 2 +-
src/corelibs/U2Core/src/util/MSAUtils.h | 2 +-
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/SequenceUtils.cpp | 2 +-
src/corelibs/U2Core/src/util/SequenceUtils.h | 2 +-
src/corelibs/U2Core/src/util/SnpeffDictionary.cpp | 2 +-
src/corelibs/U2Core/src/util/SnpeffDictionary.h | 2 +-
src/corelibs/U2Core/src/util/SyncHttp.cpp | 2 +-
src/corelibs/U2Core/src/util/SyncHttp.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 | 107 +-
src/corelibs/U2Core/src/util/U2AssemblyUtils.h | 27 +-
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 | 2 +-
src/corelibs/U2Core/src/util/U2FeatureUtils.h | 4 +-
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 | 2 +-
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 | 107 +-
src/corelibs/U2Core/transl/russian.ts | 107 +-
.../U2Designer/src/BreakpointHitCountDialog.cpp | 9 +-
.../U2Designer/src/BreakpointHitCountDialog.h | 2 +-
.../U2Designer/src/BreakpointHitCountDialog.ui | 3 +
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 | 8 +-
.../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 | 12 +-
src/corelibs/U2Designer/src/NewGrouperSlotDialog.h | 2 +-
src/corelibs/U2Designer/src/OutputFileDialog.cpp | 12 +-
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 | 2 +-
.../U2Designer/src/wizard/WizardController.h | 4 +-
.../U2Designer/src/wizard/WizardPageController.cpp | 2 +-
.../U2Designer/src/wizard/WizardPageController.h | 2 +-
src/corelibs/U2Designer/transl/english.ts | 69 +-
src/corelibs/U2Designer/transl/russian.ts | 71 +-
src/corelibs/U2Formats/U2Formats.pro | 8 +-
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 | 4 +-
src/corelibs/U2Formats/src/BAMUtils.h | 4 +-
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 | 20 +-
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 | 4 +-
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 | 2 +-
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 | 44 +-
src/corelibs/U2Formats/src/ace/AceImporter.h | 4 +-
.../ace/CloneAssemblyWithReferenceToDbiTask.cpp | 2 +-
.../src/ace/CloneAssemblyWithReferenceToDbiTask.h | 2 +-
.../U2Formats/src/ace/ConvertAceToSqliteTask.cpp | 8 +-
.../U2Formats/src/ace/ConvertAceToSqliteTask.h | 2 +-
.../U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp | 6 +-
.../U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h | 8 +-
.../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 | 39 +-
src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h | 4 +-
.../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 | 7 +-
.../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 | 88 +-
.../src/mysql_dbi/util/MysqlAssemblyUtils.h | 4 +-
.../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 | 6 +-
.../util/MysqlMultiTableAssemblyAdapter.h | 4 +-
.../util/MysqlSingleTableAssemblyAdapter.cpp | 36 +-
.../util/MysqlSingleTableAssemblyAdapter.h | 4 +-
.../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 +-
.../upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp | 2 +-
.../upgraders/MysqlUpgraderFrom_1_16_To_1_24.h | 2 +-
.../upgraders/MysqlUpgraderFrom_1_24_To_1_25.cpp | 110 ++
..._To_1_16.h => MysqlUpgraderFrom_1_24_To_1_25.h} | 18 +-
.../U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp | 94 +-
.../U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h | 6 +-
.../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 | 4 +-
src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h | 2 +-
.../U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp | 2 +-
.../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 | 6 +-
.../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 | 6 +-
.../assembly/MultiTableAssemblyAdapter.h | 4 +-
.../sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp | 6 +-
.../src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h | 4 +-
.../assembly/SingleTableAssemblyAdapter.cpp | 8 +-
.../assembly/SingleTableAssemblyAdapter.h | 4 +-
.../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 +-
.../util/SqliteUpgraderFrom_1_13_To_1_25.cpp | 98 +
...To_1_13.h => SqliteUpgraderFrom_1_13_To_1_25.h} | 14 +-
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 +-
.../ConvertSnpeffVariationsToAnnotationsTask.cpp | 2 +-
.../ConvertSnpeffVariationsToAnnotationsTask.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 | 4 +-
.../U2Formats/src/util/AssemblyPackAlgorithm.cpp | 2 +-
.../U2Formats/src/util/AssemblyPackAlgorithm.h | 2 +-
.../U2Formats/src/util/PairedFastqComparator.cpp | 184 ++
.../U2Formats/src/util/PairedFastqComparator.h | 94 +
.../U2Formats/src/util/SnpeffInfoParser.cpp | 2 +-
src/corelibs/U2Formats/src/util/SnpeffInfoParser.h | 2 +-
src/corelibs/U2Formats/transl/english.ts | 144 +-
src/corelibs/U2Formats/transl/russian.ts | 144 +-
src/corelibs/U2Gui/src/AppSettingsGUI.h | 2 +-
src/corelibs/U2Gui/src/MainWindow.cpp | 2 +-
src/corelibs/U2Gui/src/MainWindow.h | 2 +-
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 | 2 +-
src/corelibs/U2Gui/src/PasteController.h | 2 +-
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 | 2 +-
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 | 5 +-
.../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 | 4 +-
.../util/CreateDocumentFromTextDialogController.h | 2 +-
.../util/CreateObjectRelationDialogController.cpp | 2 +-
.../util/CreateObjectRelationDialogController.h | 2 +-
.../util/CreateSequenceFromTextAndOpenViewTask.cpp | 2 +-
.../util/CreateSequenceFromTextAndOpenViewTask.h | 2 +-
.../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 | 4 +-
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 | 4 +-
.../U2Gui/src/util/ExportAnnotationsDialog.h | 2 +-
.../src/util/ExportDocumentDialogController.cpp | 6 +-
.../src/util/ExportDocumentDialogController.h | 2 +-
src/corelibs/U2Gui/src/util/ExportImageDialog.cpp | 18 +-
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 | 9 +-
.../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 +-
src/corelibs/U2Gui/src/util/MultiClickMenu.cpp | 2 +-
src/corelibs/U2Gui/src/util/MultiClickMenu.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 +-
.../U2Gui/src/util/RegionSelectorController.cpp | 2 +-
.../U2Gui/src/util/RegionSelectorController.h | 2 +-
.../src/util/RegionSelectorWithExcludedRegion.cpp | 2 +-
.../src/util/RegionSelectorWithExcludedRegion.h | 2 +-
.../RemovePartFromSequenceDialogController.cpp | 4 +-
.../util/RemovePartFromSequenceDialogController.h | 2 +-
.../U2Gui/src/util/SaveDocumentController.cpp | 2 +-
.../U2Gui/src/util/SaveDocumentController.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 | 4 +-
.../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 +-
.../U2Gui/src/util/project/EditableTreeView.cpp | 2 +-
.../U2Gui/src/util/project/EditableTreeView.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 | 2 +-
.../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 | 16 +-
.../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 +-
src/corelibs/U2Gui/transl/english.ts | 79 +-
src/corelibs/U2Gui/transl/russian.ts | 79 +-
.../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 | 6 +-
src/corelibs/U2Lang/src/model/DbiDataStorage.h | 4 +-
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 +-
src/corelibs/U2Lang/src/support/DatasetFetcher.cpp | 2 +-
src/corelibs/U2Lang/src/support/DatasetFetcher.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 | 2 +-
.../U2Lang/src/support/SimpleWorkflowTask.h | 2 +-
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 | 2 +-
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/U2Private/src/AppContextImpl.cpp | 2 +-
src/corelibs/U2Private/src/AppContextImpl.h | 2 +-
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 | 5 +-
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 | 270 +--
.../src/crash_handler/CrashHandlerArgsHelper.h | 2 +-
.../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 +-
src/corelibs/U2Private/transl/english.ts | 52 +-
src/corelibs/U2Private/transl/russian.ts | 52 +-
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/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 +-
.../U2Test/src/gui_tests/GUITestLauncher.cpp | 2 +-
.../U2Test/src/gui_tests/GUITestLauncher.h | 2 +-
.../U2Test/src/gui_tests/GUITestService.cpp | 2 +-
src/corelibs/U2Test/src/gui_tests/GUITestService.h | 2 +-
.../U2Test/src/gui_tests/GUITestTeamcityLogger.cpp | 2 +-
.../U2Test/src/gui_tests/GUITestTeamcityLogger.h | 2 +-
.../U2Test/src/gui_tests/GUITestThread.cpp | 2 +-
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/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/U2View/CMakeLists.txt | 2 +-
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 | 86 +-
.../U2View/src/ov_assembly/AssemblyBrowser.h | 6 +-
.../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 | 6 +-
.../U2View/src/ov_assembly/AssemblyCoverageGraph.h | 2 +-
.../U2View/src/ov_assembly/AssemblyInfoWidget.cpp | 43 +-
.../U2View/src/ov_assembly/AssemblyInfoWidget.h | 2 +-
.../U2View/src/ov_assembly/AssemblyModel.cpp | 45 +-
.../U2View/src/ov_assembly/AssemblyModel.h | 6 +-
.../src/ov_assembly/AssemblyNavigationWidget.cpp | 4 +-
.../src/ov_assembly/AssemblyNavigationWidget.h | 2 +-
.../U2View/src/ov_assembly/AssemblyReadsArea.cpp | 102 +-
.../U2View/src/ov_assembly/AssemblyReadsArea.h | 6 +-
.../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 | 8 +-
.../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 | 152 +-
.../src/ov_assembly/CalculateCoveragePerBaseTask.h | 30 +-
.../U2View/src/ov_assembly/CoverageInfo.cpp | 53 +-
src/corelibs/U2View/src/ov_assembly/CoverageInfo.h | 14 +-
.../src/ov_assembly/CoveredRegionsManager.cpp | 6 +-
.../U2View/src/ov_assembly/CoveredRegionsManager.h | 4 +-
.../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 | 43 +-
.../U2View/src/ov_assembly/ExportCoverageTask.h | 19 +-
.../U2View/src/ov_assembly/ExportReadsDialog.cpp | 4 +-
.../U2View/src/ov_assembly/ExportReadsDialog.h | 2 +-
.../ov_assembly/ExtractAssemblyRegionDialog.cpp | 8 +-
.../src/ov_assembly/ExtractAssemblyRegionDialog.h | 2 +-
.../src/ov_assembly/ExtractAssemblyRegionTask.cpp | 12 +-
.../src/ov_assembly/ExtractAssemblyRegionTask.h | 2 +-
.../src/ov_assembly/ZoomableAssemblyOverview.cpp | 6 +-
.../src/ov_assembly/ZoomableAssemblyOverview.h | 2 +-
.../AlignSequencesToAlignmentTask.cpp | 656 +++----
.../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 | 8 +-
.../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 | 2 +-
.../U2View/src/ov_msa/Export/MSAImageExportTask.h | 2 +-
.../ExportConsensus/MSAExportConsensusTab.cpp | 2 +-
.../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 | 4 +-
.../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 | 4 +-
src/corelibs/U2View/src/ov_msa/MSAEditor.h | 2 +-
.../U2View/src/ov_msa/MSAEditorConsensusArea.cpp | 4 +-
.../U2View/src/ov_msa/MSAEditorConsensusArea.h | 2 +-
.../U2View/src/ov_msa/MSAEditorConsensusCache.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorConsensusCache.h | 2 +-
.../U2View/src/ov_msa/MSAEditorFactory.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h | 2 +-
.../U2View/src/ov_msa/MSAEditorNameList.cpp | 2 +-
src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h | 2 +-
.../U2View/src/ov_msa/MSAEditorOffsetsView.cpp | 2 +-
.../U2View/src/ov_msa/MSAEditorOffsetsView.h | 2 +-
.../U2View/src/ov_msa/MSAEditorOverviewArea.cpp | 3 +-
.../U2View/src/ov_msa/MSAEditorOverviewArea.h | 2 +-
.../U2View/src/ov_msa/MSAEditorSequenceArea.cpp | 4 +-
.../U2View/src/ov_msa/MSAEditorSequenceArea.h | 2 +-
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 | 2 +-
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 | 120 +-
.../ov_msa/Overview/MSAGraphCalculationTask.cpp | 2 +-
.../src/ov_msa/Overview/MSAGraphCalculationTask.h | 2 +-
.../src/ov_msa/Overview/MSAGraphOverview.cpp | 6 +-
.../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 | 6 +-
.../src/ov_msa/PhyTrees/MSAEditorTreeViewer.h | 2 +-
.../src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp | 322 +--
.../src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h | 188 +-
...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 | 18 +-
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 | 2 +-
src/corelibs/U2View/src/ov_sequence/ADVClipboard.h | 2 +-
.../U2View/src/ov_sequence/ADVGraphModel.cpp | 14 +-
.../U2View/src/ov_sequence/ADVGraphModel.h | 4 +-
.../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 | 2 +-
.../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 | 6 +-
.../U2View/src/ov_sequence/AnnotatedDNAView.h | 4 +-
.../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 | 2 +-
.../U2View/src/ov_sequence/AnnotationsTreeView.h | 2 +-
.../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 +-
.../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 | 2 +-
.../annot_highlight/AnnotHighlightTree.h | 2 +-
.../annot_highlight/AnnotHighlightTreeItem.cpp | 2 +-
.../annot_highlight/AnnotHighlightTreeItem.h | 2 +-
.../annot_highlight/AnnotHighlightWidget.cpp | 2 +-
.../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 | 2 +-
.../ov_sequence/find_pattern/FindPatternWidget.h | 2 +-
.../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 | 2 +-
.../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 | 8 +-
.../src/phyltree/CreatePhyTreeDialogController.h | 2 +-
.../U2View/src/phyltree/CreatePhyTreeWidget.cpp | 2 +-
.../U2View/src/phyltree/CreatePhyTreeWidget.h | 2 +-
.../src/phyltree/PhyTreeDisplayOptionsWidget.cpp | 2 +-
.../src/phyltree/PhyTreeDisplayOptionsWidget.h | 2 +-
.../U2View/src/phyltree/TextSettingsDialog.cpp | 6 +-
.../U2View/src/phyltree/TextSettingsDialog.h | 2 +-
.../U2View/src/phyltree/TreeSettingsDialog.cpp | 7 +-
.../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 | 101 +-
.../src/util_dna_assembly/DnaAssemblyUtils.h | 21 +-
.../src/util_dna_assembly/GenomeAssemblyDialog.cpp | 80 +-
.../src/util_dna_assembly/GenomeAssemblyDialog.h | 7 +-
.../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 | 3 +-
.../src/util_smith_waterman/SubstMatrixDialog.h | 2 +-
src/corelibs/U2View/transl/english.ts | 598 +++---
src/corelibs/U2View/transl/russian.ts | 596 +++---
src/include/U2Formats/PairedFastqComparator.h | 1 +
src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp | 2 +-
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 | 2 +-
src/plugins/CoreTests/src/DocumentModelTests.h | 2 +-
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 +-
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/src/GTDatabaseConfig.cpp | 2 +-
src/plugins/GUITestBase/src/GTDatabaseConfig.h | 2 +-
.../src/GTUtilsAnnotationsHighlightingTreeView.cpp | 2 +-
.../src/GTUtilsAnnotationsHighlightingTreeView.h | 2 +-
.../GUITestBase/src/GTUtilsAnnotationsTreeView.cpp | 2 +-
.../GUITestBase/src/GTUtilsAnnotationsTreeView.h | 2 +-
.../GUITestBase/src/GTUtilsAssemblyBrowser.cpp | 2 +-
.../GUITestBase/src/GTUtilsAssemblyBrowser.h | 2 +-
.../GUITestBase/src/GTUtilsBookmarksTreeView.cpp | 2 +-
.../GUITestBase/src/GTUtilsBookmarksTreeView.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsDashboard.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsDashboard.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsDocument.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsDocument.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsEscClicker.h | 2 +-
.../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 | 2 +-
src/plugins/GUITestBase/src/GTUtilsMdi.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsMsaEditor.h | 2 +-
.../src/GTUtilsMsaEditorSequenceArea.cpp | 2 +-
.../GUITestBase/src/GTUtilsMsaEditorSequenceArea.h | 2 +-
.../GUITestBase/src/GTUtilsNotifications.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsNotifications.h | 2 +-
.../GUITestBase/src/GTUtilsOptionPanelMSA.cpp | 2 +-
.../GUITestBase/src/GTUtilsOptionPanelMSA.h | 2 +-
.../src/GTUtilsOptionPanelSequenceView.cpp | 2 +-
.../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 | 2 +-
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 | 6 +-
.../GUITestBase/src/GTUtilsProjectTreeView.h | 2 +-
.../GUITestBase/src/GTUtilsQueryDesigner.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h | 2 +-
.../GUITestBase/src/GTUtilsSequenceView.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsSequenceView.h | 2 +-
.../src/GTUtilsSharedDatabaseDocument.cpp | 2 +-
.../src/GTUtilsSharedDatabaseDocument.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsStartPage.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsStartPage.h | 2 +-
src/plugins/GUITestBase/src/GTUtilsTask.cpp | 2 +-
src/plugins/GUITestBase/src/GTUtilsTask.h | 2 +-
.../GUITestBase/src/GTUtilsTaskTreeView.cpp | 2 +-
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 | 8 +-
.../GUITestBase/src/GTUtilsWorkflowDesigner.h | 5 +-
src/plugins/GUITestBase/src/GUITestBasePlugin.cpp | 427 ++--
src/plugins/GUITestBase/src/GUITestBasePlugin.h | 2 +-
.../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 | 2 +-
.../ugene/corelibs/U2Gui/AddFolderDialogFiller.h | 2 +-
.../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 +-
.../ugene/corelibs/U2Gui/BuildIndexDialogFiller.h | 2 +-
.../U2Gui/CommonImportOptionsDialogFiller.cpp | 2 +-
.../U2Gui/CommonImportOptionsDialogFiller.h | 2 +-
.../U2Gui/ConvertAssemblyToSAMDialogFiller.cpp | 2 +-
.../U2Gui/ConvertAssemblyToSAMDialogFiller.h | 2 +-
.../U2Gui/CreateAnnotationWidgetFiller.cpp | 2 +-
.../corelibs/U2Gui/CreateAnnotationWidgetFiller.h | 2 +-
.../U2Gui/CreateDocumentFromTextDialogFiller.cpp | 2 +-
.../U2Gui/CreateDocumentFromTextDialogFiller.h | 2 +-
.../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 +-
.../U2Gui/EditGroupAnnotationsDialogFiller.cpp | 2 +-
.../U2Gui/EditGroupAnnotationsDialogFiller.h | 2 +-
.../corelibs/U2Gui/EditQualifierDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/EditQualifierDialogFiller.h | 2 +-
.../corelibs/U2Gui/EditSequenceDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/EditSequenceDialogFiller.h | 2 +-
.../corelibs/U2Gui/ExportChromatogramFiller.cpp | 2 +-
.../corelibs/U2Gui/ExportChromatogramFiller.h | 2 +-
.../corelibs/U2Gui/ExportDocumentDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/ExportDocumentDialogFiller.h | 2 +-
.../corelibs/U2Gui/ExportImageDialogFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/ExportImageDialogFiller.h | 2 +-
.../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 | 2 +-
.../corelibs/U2Gui/ItemToImportEditDialogFiller.h | 2 +-
.../corelibs/U2Gui/PositionSelectorFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/PositionSelectorFiller.h | 2 +-
.../PredictSecondaryStructureDialogFiller.cpp | 2 +-
.../U2Gui/PredictSecondaryStructureDialogFiller.h | 2 +-
.../U2Gui/ProjectTreeItemSelectorDialogFiller.cpp | 2 +-
.../U2Gui/ProjectTreeItemSelectorDialogFiller.h | 2 +-
.../corelibs/U2Gui/RangeSelectionDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/RangeSelectionDialogFiller.h | 2 +-
.../ugene/corelibs/U2Gui/RangeSelectorFiller.cpp | 2 +-
.../ugene/corelibs/U2Gui/RangeSelectorFiller.h | 2 +-
.../U2Gui/RemovePartFromSequenceDialogFiller.cpp | 2 +-
.../U2Gui/RemovePartFromSequenceDialogFiller.h | 2 +-
.../U2Gui/ReplaceSubsequenceDialogFiller.cpp | 2 +-
.../U2Gui/ReplaceSubsequenceDialogFiller.h | 2 +-
.../U2Gui/SetSequenceOriginDialogFiller.cpp | 2 +-
.../corelibs/U2Gui/SetSequenceOriginDialogFiller.h | 2 +-
.../U2Gui/SharedConnectionsDialogFiller.cpp | 2 +-
.../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 | 2 +-
.../ov_assembly/ExportCoverageDialogFiller.h | 2 +-
.../U2View/ov_assembly/ExportReadsDialogFiller.cpp | 2 +-
.../U2View/ov_assembly/ExportReadsDialogFiller.h | 2 +-
.../ExtractAssemblyRegionDialogFiller.cpp | 36 +-
.../ExtractAssemblyRegionDialogFiller.h | 10 +-
.../U2View/ov_msa/BranchSettingsDialogFiller.cpp | 2 +-
.../U2View/ov_msa/BranchSettingsDialogFiller.h | 2 +-
.../U2View/ov_msa/BuildTreeDialogFiller.cpp | 2 +-
.../corelibs/U2View/ov_msa/BuildTreeDialogFiller.h | 2 +-
.../U2View/ov_msa/DeleteGapsDialogFiller.cpp | 2 +-
.../U2View/ov_msa/DeleteGapsDialogFiller.h | 2 +-
.../U2View/ov_msa/DistanceMatrixDialogFiller.cpp | 2 +-
.../U2View/ov_msa/DistanceMatrixDialogFiller.h | 2 +-
.../ov_msa/ExportHighlightedDialogFiller.cpp | 2 +-
.../U2View/ov_msa/ExportHighlightedDialogFiller.h | 2 +-
.../ov_msa/ExtractSelectedAsMSADialogFiller.cpp | 2 +-
.../ov_msa/ExtractSelectedAsMSADialogFiller.h | 2 +-
.../GenerateAlignmentProfileDialogFiller.cpp | 2 +-
.../ov_msa/GenerateAlignmentProfileDialogFiller.h | 2 +-
.../U2View/ov_msa/LicenseAgreementDialogFiller.cpp | 2 +-
.../U2View/ov_msa/LicenseAgreementDialogFiller.h | 2 +-
.../SmithWatermanDialogBaseFiller.cpp | 2 +-
.../SmithWatermanDialogBaseFiller.h | 2 +-
.../FindAnnotationCollocationsDialogFiller.cpp | 2 +-
.../FindAnnotationCollocationsDialogFiller.h | 2 +-
.../StructuralAlignmentDialogFiller.cpp | 2 +-
.../StructuralAlignmentDialogFiller.h | 2 +-
.../ugene/plugins/cap3/CAP3SupportDialogFiller.cpp | 2 +-
.../ugene/plugins/cap3/CAP3SupportDialogFiller.h | 2 +-
.../dna_export/ExportAnnotationsDialogFiller.cpp | 2 +-
.../dna_export/ExportAnnotationsDialogFiller.h | 2 +-
.../dna_export/ExportBlastResultDialogFiller.cpp | 2 +-
.../dna_export/ExportBlastResultDialogFiller.h | 2 +-
.../dna_export/ExportMSA2MSADialogFiller.cpp | 2 +-
.../plugins/dna_export/ExportMSA2MSADialogFiller.h | 2 +-
.../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 | 2 +-
.../dna_export/ExportSequencesDialogFiller.h | 2 +-
.../dna_export/ImportAnnotationsToCsvFiller.cpp | 2 +-
.../dna_export/ImportAnnotationsToCsvFiller.h | 2 +-
.../plugins/dotplot/BuildDotPlotDialogFiller.cpp | 2 +-
.../plugins/dotplot/BuildDotPlotDialogFiller.h | 2 +-
.../ugene/plugins/dotplot/DotPlotDialogFiller.cpp | 2 +-
.../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 | 2 +-
.../external_tools/BlastAllSupportDialogFiller.h | 2 +-
.../ClustalOSupportRunDialogFiller.cpp | 2 +-
.../ClustalOSupportRunDialogFiller.h | 2 +-
.../external_tools/FormatDBDialogFiller.cpp | 2 +-
.../plugins/external_tools/FormatDBDialogFiller.h | 2 +-
.../external_tools/RemoteBLASTDialogFiller.cpp | 2 +-
.../external_tools/RemoteBLASTDialogFiller.h | 2 +-
.../SpadesGenomeAssemblyDialogFiller.cpp | 27 +-
.../SpadesGenomeAssemblyDialogFiller.h | 21 +-
.../plugins/external_tools/TCoffeeDailogFiller.cpp | 2 +-
.../plugins/external_tools/TCoffeeDailogFiller.h | 2 +-
.../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 | 2 +-
.../workflow_designer/AliasesDialogFiller.h | 2 +-
.../ConfigurationWizardFiller.cpp | 2 +-
.../workflow_designer/ConfigurationWizardFiller.h | 2 +-
.../CreateElementWithCommandLineFiller.cpp | 2 +-
.../CreateElementWithCommandLineToolFiller.h | 2 +-
.../CreateElementWithScriptDialogFiller.cpp | 2 +-
.../CreateElementWithScriptDialogFiller.h | 2 +-
.../DashboardsManagerDialogFiller.cpp | 2 +-
.../DashboardsManagerDialogFiller.h | 2 +-
.../DatasetNameEditDialogFiller.cpp | 2 +-
.../DatasetNameEditDialogFiller.h | 2 +-
.../workflow_designer/DefaultWizardFiller.cpp | 2 +-
.../workflow_designer/DefaultWizardFiller.h | 2 +-
.../workflow_designer/RPackageDialorFiller.cpp | 2 +-
.../workflow_designer/RPackageDialorFiller.h | 2 +-
.../workflow_designer/StartupDialogFiller.cpp | 2 +-
.../workflow_designer/StartupDialogFiller.h | 2 +-
.../plugins/workflow_designer/WizardFiller.cpp | 2 +-
.../ugene/plugins/workflow_designer/WizardFiller.h | 2 +-
.../workflow_designer/WorkflowMetadialogFiller.cpp | 2 +-
.../workflow_designer/WorkflowMetadialogFiller.h | 2 +-
.../MAFFT/MAFFTSupportRunDialogFiller.cpp | 2 +-
.../MAFFT/MAFFTSupportRunDialogFiller.h | 2 +-
.../clustalw/ClustalWDialogFiller.cpp | 2 +-
.../clustalw/ClustalWDialogFiller.h | 2 +-
.../hmm3/UHMM3PhmmerDialogFiller.cpp | 2 +-
.../hmm3/UHMM3PhmmerDialogFiller.h | 2 +-
.../hmm3/UHMM3SearchDialogFiller.cpp | 2 +-
.../hmm3/UHMM3SearchDialogFiller.h | 2 +-
.../plugins_3rdparty/kalign/KalignDialogFiller.cpp | 2 +-
.../plugins_3rdparty/kalign/KalignDialogFiller.h | 2 +-
.../primer3/Primer3DialogFiller.cpp | 2 +-
.../plugins_3rdparty/primer3/Primer3DialogFiller.h | 2 +-
.../umuscle/MuscleDialogFiller.cpp | 2 +-
.../plugins_3rdparty/umuscle/MuscleDialogFiller.h | 2 +-
.../ugeneui/ConvertAceToSqliteDialogFiller.cpp | 2 +-
.../ugene/ugeneui/ConvertAceToSqliteDialogFiller.h | 2 +-
.../ugene/ugeneui/CreateNewProjectWidgetFiller.cpp | 2 +-
.../ugene/ugeneui/CreateNewProjectWidgetFiller.h | 2 +-
.../ugeneui/DocumentFormatSelectorDialogFiller.cpp | 2 +-
.../ugeneui/DocumentFormatSelectorDialogFiller.h | 2 +-
.../DocumentProviderSelectorDialogFiller.cpp | 2 +-
.../ugeneui/DocumentProviderSelectorDialogFiller.h | 2 +-
.../ugene/ugeneui/ExportProjectDialogFiller.cpp | 2 +-
.../ugene/ugeneui/ExportProjectDialogFiller.h | 2 +-
.../ugene/ugeneui/NCBISearchDialogFiller.cpp | 2 +-
.../ugene/ugeneui/NCBISearchDialogFiller.h | 2 +-
.../ugene/ugeneui/SaveProjectDialogFiller.cpp | 2 +-
.../ugene/ugeneui/SaveProjectDialogFiller.h | 2 +-
.../ugeneui/SelectDocumentFormatDialogFiller.cpp | 2 +-
.../ugeneui/SelectDocumentFormatDialogFiller.h | 2 +-
.../SequenceReadingModeSelectorDialogFiller.cpp | 2 +-
.../SequenceReadingModeSelectorDialogFiller.h | 2 +-
.../GUITestBase/src/test_runner/GUITestRunner.cpp | 2 +-
.../GUITestBase/src/test_runner/GUITestRunner.h | 2 +-
.../GUITestBase/src/tests/GUIInitialChecks.cpp | 2 +-
.../GUITestBase/src/tests/GUIInitialChecks.h | 2 +-
.../Assembly_browser/GTTestsAssemblyBrowser.cpp | 2 +-
.../Assembly_browser/GTTestsAssemblyBrowser.h | 2 +-
.../Assembling/bowtie2/GTTestsBowtie2.cpp | 2 +-
.../Assembling/bowtie2/GTTestsBowtie2.h | 2 +-
.../Assembling/dna_assembly/GTTestsDnaAssembly.cpp | 2 +-
.../Assembling/dna_assembly/GTTestsDnaAssembly.h | 2 +-
.../Assembling/dna_assembly/GTTestsIndexReuse.cpp | 2 +-
.../Assembling/dna_assembly/GTTestsIndexReuse.h | 2 +-
.../conversions/GTTestsDnaAssemblyConversions.cpp | 2 +-
.../conversions/GTTestsDnaAssemblyConversions.h | 2 +-
.../common_scenarios/Assembling/sam/GTTestsSAM.cpp | 2 +-
.../common_scenarios/Assembling/sam/GTTestsSAM.h | 2 +-
.../NIAID_pipelines/GTTestsNiaidPipelines.cpp | 2 +-
.../NIAID_pipelines/GTTestsNiaidPipelines.h | 2 +-
.../Query_Designer/GTTestsQuerryDesigner.cpp | 2 +-
.../Query_Designer/GTTestsQuerryDesigner.h | 2 +-
.../annotations/GTTestsAnnotations.cpp | 2 +-
.../annotations/GTTestsAnnotations.h | 2 +-
.../annotations/GTTestsCreateAnnotationWidget.cpp | 2 +-
.../annotations/GTTestsCreateAnnotationWidget.h | 2 +-
.../annotations/edit/GTTestsAnnotationsEdit.cpp | 2 +-
.../annotations/edit/GTTestsAnnotationsEdit.h | 2 +-
.../qualifiers/GTTestsAnnotationsQualifiers.cpp | 2 +-
.../qualifiers/GTTestsAnnotationsQualifiers.h | 2 +-
.../GTTestsAnnotationsImport.cpp | 2 +-
.../annotations_import/GTTestsAnnotationsImport.h | 2 +-
.../circular_view/GTTestsCvGeneral.cpp | 2 +-
.../circular_view/GTTestsCvGeneral.h | 2 +-
.../common_scenarios/cloning/GTTestsCloning.cpp | 2 +-
.../common_scenarios/cloning/GTTestsCloning.h | 2 +-
.../document_from_text/GTTestsDocumentFromText.cpp | 2 +-
.../document_from_text/GTTestsDocumentFromText.h | 2 +-
.../common_scenarios/dp_view/GTTestsDpView.cpp | 2 +-
.../tests/common_scenarios/dp_view/GTTestsDpView.h | 2 +-
.../msa_editor/GTTestsMsaEditor.cpp | 4 +-
.../common_scenarios/msa_editor/GTTestsMsaEditor.h | 2 +-
.../msa_editor/align/GTTestsAlignSequenceToMsa.cpp | 2 +-
.../msa_editor/align/GTTestsAlignSequenceToMsa.h | 2 +-
.../msa_editor/colors/GTTestsMSAEditorColors.cpp | 2 +-
.../msa_editor/colors/GTTestsMSAEditorColors.h | 2 +-
.../consensus/GTTestsMSAEditorConsensus.cpp | 2 +-
.../consensus/GTTestsMSAEditorConsensus.h | 2 +-
.../msa_editor/edit/GTTestsMSAEditorEdit.cpp | 2 +-
.../msa_editor/edit/GTTestsMSAEditorEdit.h | 2 +-
.../overview/GTTestsMSAEditorOverview.cpp | 2 +-
.../msa_editor/overview/GTTestsMSAEditorOverview.h | 2 +-
.../GTTestsMSAEditorReplaceCharacter.cpp | 1128 +++++------
.../GTTestsMSAEditorReplaceCharacter.h | 120 +-
.../options_panel/GTTestsOptionPanel.cpp | 2 +-
.../options_panel/GTTestsOptionPanel.h | 2 +-
.../options_panel/msa/GTTestsOptionPanelMSA.cpp | 29 +-
.../options_panel/msa/GTTestsOptionPanelMSA.h | 2 +-
.../GTTestsOptionPanelSequenceView.cpp | 2 +-
.../sequence_view/GTTestsOptionPanelSequenceView.h | 2 +-
.../common_scenarios/pcr/GTTestsInSilicoPcr.cpp | 2 +-
.../common_scenarios/pcr/GTTestsInSilicoPcr.h | 2 +-
.../common_scenarios/pcr/GTTestsPrimerLibrary.cpp | 2 +-
.../common_scenarios/pcr/GTTestsPrimerLibrary.h | 2 +-
.../common_scenarios/project/GTTestsProject.cpp | 2 +-
.../common_scenarios/project/GTTestsProject.h | 2 +-
.../GTTestsProjectAnonymousProject.cpp | 2 +-
.../GTTestsProjectAnonymousProject.h | 2 +-
.../project/bookmarks/GTTestsBookmarks.cpp | 2 +-
.../project/bookmarks/GTTestsBookmarks.h | 2 +-
.../GTTestsProjectDocumentModifying.cpp | 2 +-
.../GTTestsProjectDocumentModifying.h | 2 +-
.../multiple_docs/GTTestsProjectMultipleDocs.cpp | 2 +-
.../multiple_docs/GTTestsProjectMultipleDocs.h | 2 +-
.../project_filtering/GTTestsProjectFiltering.cpp | 2 +-
.../project_filtering/GTTestsProjectFiltering.h | 2 +-
.../project/relations/GTTestsProjectRelations.cpp | 2 +-
.../project/relations/GTTestsProjectRelations.h | 2 +-
.../remote_request/GTTestsProjectRemoteRequest.cpp | 2 +-
.../remote_request/GTTestsProjectRemoteRequest.h | 2 +-
.../GTTestsProjectSequenceExporting.cpp | 2 +-
.../GTTestsProjectSequenceExporting.h | 2 +-
.../from_project_view/GTTestsFromProjectView.cpp | 2 +-
.../from_project_view/GTTestsFromProjectView.h | 2 +-
.../user_locking/GTTestsProjectUserLocking.cpp | 2 +-
.../user_locking/GTTestsProjectUserLocking.h | 2 +-
.../repeat_finder/GTTestsRepeatFinder.cpp | 2 +-
.../repeat_finder/GTTestsRepeatFinder.h | 2 +-
.../sequence_edit/GTTestsSequenceEdit.cpp | 2 +-
.../sequence_edit/GTTestsSequenceEdit.h | 2 +-
.../sequence_view/GTTestsSequenceView.cpp | 2 +-
.../sequence_view/GTTestsSequenceView.h | 2 +-
.../shared_database/GTTestsSharedDatabase.cpp | 2 +-
.../shared_database/GTTestsSharedDatabase.h | 2 +-
.../smith_waterman_dialog/GTTestsSWDialog.cpp | 2 +-
.../smith_waterman_dialog/GTTestsSWDialog.h | 2 +-
.../start_page/GTTestsStartPage.cpp | 2 +-
.../common_scenarios/start_page/GTTestsStartPage.h | 2 +-
.../toggle_view/GTTestsToggleView.cpp | 2 +-
.../toggle_view/GTTestsToggleView.h | 2 +-
.../GTTestsCommonScenariousTreeviewer.cpp | 2 +-
.../GTTestsCommonScenariousTreeviewer.h | 2 +-
.../common_scenarios/undo_redo/GTTestsUndoRedo.cpp | 2 +-
.../common_scenarios/undo_redo/GTTestsUndoRedo.h | 2 +-
.../workflow_designer/GTTestsWorkflowDesigner.cpp | 10 +-
.../workflow_designer/GTTestsWorkflowDesigner.h | 2 +-
.../estimating/GTTestsWorkflowEstimating.cpp | 6 +-
.../estimating/GTTestsWorkflowEstimating.h | 2 +-
.../name_filter/GTTestsWorkflowNameFilter.cpp | 4 +-
.../name_filter/GTTestsWorkflowNameFilter.h | 2 +-
.../GTTestsWorkflowParemeterValidation.cpp | 12 +-
.../GTTestsWorkflowParemeterValidation.h | 2 +-
.../scripting/GTTestsWorkflowScripting.cpp | 5 +-
.../scripting/GTTestsWorkflowScripting.h | 2 +-
.../shared_db/GTTestsSharedDbWd.cpp | 17 +-
.../shared_db/GTTestsSharedDbWd.h | 2 +-
.../src/tests/crazy_user/GTAbstractGUIAction.cpp | 2 +-
.../src/tests/crazy_user/GTAbstractGUIAction.h | 2 +-
.../tests/crazy_user/GTRandomGUIActionFactory.cpp | 2 +-
.../tests/crazy_user/GTRandomGUIActionFactory.h | 2 +-
.../src/tests/crazy_user/GUICrazyUserTest.cpp | 2 +-
.../src/tests/crazy_user/GUICrazyUserTest.h | 2 +-
.../GTTestsRegressionScenarios_1001_2000.cpp | 63 +-
.../GTTestsRegressionScenarios_1001_2000.h | 2 +-
.../GTTestsRegressionScenarios_1_1000.cpp | 38 +-
.../GTTestsRegressionScenarios_1_1000.h | 2 +-
.../GTTestsRegressionScenarios_2001_3000.cpp | 125 +-
.../GTTestsRegressionScenarios_2001_3000.h | 2 +-
.../GTTestsRegressionScenarios_3001_4000.cpp | 65 +-
.../GTTestsRegressionScenarios_3001_4000.h | 2 +-
.../GTTestsRegressionScenarios_4001_5000.cpp | 88 +-
.../GTTestsRegressionScenarios_4001_5000.h | 3 +-
.../GTTestsRegressionScenarios_5001_6000.cpp | 168 +-
.../GTTestsRegressionScenarios_5001_6000.h | 10 +-
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/assembly/AssemblyDbiUnitTests.cpp | 4 +-
.../src/core/dbi/features/FeatureDbiUnitTests.cpp | 4 +-
.../src/core/dbi/features/FeatureDbiUnitTests.h | 2 +-
.../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 +-
.../biostruct3d_view/src/AnaglyphRenderer.cpp | 2 +-
.../biostruct3d_view/src/AnaglyphRenderer.h | 2 +-
.../src/BallAndStickGLRenderer.cpp | 2 +-
.../biostruct3d_view/src/BallAndStickGLRenderer.h | 2 +-
.../src/BioStruct3DColorScheme.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DColorScheme.h | 2 +-
.../src/BioStruct3DGLImageExportTask.cpp | 2 +-
.../src/BioStruct3DGLImageExportTask.h | 2 +-
.../biostruct3d_view/src/BioStruct3DGLRender.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DGLRender.h | 2 +-
.../biostruct3d_view/src/BioStruct3DGLWidget.cpp | 2 +-
.../biostruct3d_view/src/BioStruct3DGLWidget.h | 2 +-
.../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 | 2 +-
src/plugins/biostruct3d_view/src/GLFrameManager.h | 2 +-
src/plugins/biostruct3d_view/src/GraphicUtils.cpp | 2 +-
src/plugins/biostruct3d_view/src/GraphicUtils.h | 2 +-
.../src/MolecularSurfaceRenderer.cpp | 2 +-
.../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 | 8 +-
.../src/StructuralAlignmentDialog.h | 2 +-
.../biostruct3d_view/src/TubeGLRenderer.cpp | 2 +-
src/plugins/biostruct3d_view/src/TubeGLRenderer.h | 2 +-
.../biostruct3d_view/src/VanDerWaalsGLRenderer.cpp | 2 +-
.../biostruct3d_view/src/VanDerWaalsGLRenderer.h | 2 +-
.../biostruct3d_view/src/WormsGLRenderer.cpp | 2 +-
src/plugins/biostruct3d_view/src/WormsGLRenderer.h | 2 +-
.../src/deprecated/AnaglyphRenderer.cpp | 2 +-
.../src/deprecated/AnaglyphRenderer.h | 2 +-
.../src/deprecated/BallAndStickGLRenderer.cpp | 2 +-
.../src/deprecated/BallAndStickGLRenderer.h | 2 +-
.../src/deprecated/BioStruct3DColorScheme.cpp | 2 +-
.../src/deprecated/BioStruct3DColorScheme.h | 2 +-
.../deprecated/BioStruct3DGLImageExportTask.cpp | 2 +-
.../src/deprecated/BioStruct3DGLImageExportTask.h | 2 +-
.../src/deprecated/BioStruct3DGLRender.cpp | 2 +-
.../src/deprecated/BioStruct3DGLRender.h | 2 +-
.../src/deprecated/BioStruct3DGLWidget.cpp | 2 +-
.../src/deprecated/BioStruct3DGLWidget.h | 2 +-
.../src/deprecated/BioStruct3DSplitter.cpp | 2 +-
.../src/deprecated/BioStruct3DSplitter.h | 2 +-
.../src/deprecated/BioStruct3DSubsetEditor.cpp | 2 +-
.../src/deprecated/BioStruct3DSubsetEditor.h | 2 +-
.../src/deprecated/BioStruct3DViewPlugin.cpp | 2 +-
.../src/deprecated/BioStruct3DViewPlugin.h | 2 +-
.../src/deprecated/GLFrameManager.cpp | 2 +-
.../src/deprecated/GLFrameManager.h | 2 +-
.../src/deprecated/GraphicUtils.cpp | 2 +-
.../biostruct3d_view/src/deprecated/GraphicUtils.h | 2 +-
.../src/deprecated/MolecularSurfaceRenderer.cpp | 2 +-
.../src/deprecated/MolecularSurfaceRenderer.h | 2 +-
.../src/deprecated/SelectModelsDialog.cpp | 4 +-
.../src/deprecated/SelectModelsDialog.h | 2 +-
.../src/deprecated/SettingsDialog.cpp | 4 +-
.../src/deprecated/SettingsDialog.h | 2 +-
.../src/deprecated/StructuralAlignmentDialog.cpp | 4 +-
.../src/deprecated/StructuralAlignmentDialog.h | 2 +-
.../src/deprecated/TubeGLRenderer.cpp | 2 +-
.../src/deprecated/TubeGLRenderer.h | 2 +-
.../src/deprecated/VanDerWaalsGLRenderer.cpp | 2 +-
.../src/deprecated/VanDerWaalsGLRenderer.h | 2 +-
.../src/deprecated/WormsGLRenderer.cpp | 2 +-
.../src/deprecated/WormsGLRenderer.h | 2 +-
src/plugins/biostruct3d_view/transl/english.ts | 13 +
src/plugins/biostruct3d_view/transl/russian.ts | 13 +
.../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 | 2 +-
src/plugins/chroma_view/src/ChromatogramView.h | 2 +-
src/plugins/circular_view/src/CircularItems.cpp | 2 +-
src/plugins/circular_view/src/CircularItems.h | 2 +-
src/plugins/circular_view/src/CircularView.cpp | 2 +-
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 | 21 +-
.../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/circular_view/transl/english.ts | 10 +-
src/plugins/circular_view/transl/russian.ts | 10 +-
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 | 5 +-
src/plugins/dbi_bam/src/BAMDbiPlugin.h | 3 +-
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 | 4 +-
src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h | 2 +-
src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp | 9 +-
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 +-
src/plugins/dna_export/src/BaseContentDialog.ui | 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 | 2 +-
src/plugins/dna_export/src/ExportSequenceTask.h | 2 +-
.../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 | 13 +-
src/plugins/dna_export/transl/russian.ts | 16 +-
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_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/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 | 3 +-
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 | 30 +-
src/plugins/dotplot/src/DotPlotWidget.h | 3 +-
src/plugins/dotplot/transl/english.ts | 47 +-
src/plugins/dotplot/transl/russian.ts | 47 +-
src/plugins/enzymes/src/CloningUtilTasks.cpp | 4 +-
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 | 61 +-
src/plugins/enzymes/transl/russian.ts | 61 +-
.../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 | 4 +-
.../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 | 16 +-
.../src/blast_plus/BlastDBCmdDialog.h | 2 +-
.../src/blast_plus/BlastDBCmdDialog.ui | 57 +-
.../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 | 4 +-
.../src/blast_plus/BlastPlusSupport.h | 2 +-
.../src/blast_plus/BlastPlusSupportCommonTask.cpp | 4 +-
.../src/blast_plus/BlastPlusSupportCommonTask.h | 2 +-
.../src/blast_plus/BlastPlusSupportRunDialog.cpp | 6 +-
.../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 | 14 +-
.../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 | 10 +-
.../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/ClustalOSupportRunDialog.ui | 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/ClustalWSupportRunDialog.ui | 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 | 2 +-
.../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 | 8 +-
.../src/cutadapt/CutadaptWorker.h | 2 +-
.../src/fastqc/FastqcSupport.cpp | 2 +-
.../src/fastqc/FastqcSupport.h | 2 +-
.../src/fastqc/FastqcTask.cpp | 15 +-
.../external_tool_support/src/fastqc/FastqcTask.h | 2 +-
.../src/fastqc/FastqcWorker.cpp | 2 +-
.../src/fastqc/FastqcWorker.h | 2 +-
.../src/hmmer/ConvertAlignment2StockholmTask.cpp | 2 +-
.../src/hmmer/ConvertAlignment2StockholmTask.h | 2 +-
.../src/hmmer/HmmerBuildDialog.cpp | 4 +-
.../src/hmmer/HmmerBuildDialog.h | 2 +-
.../src/hmmer/HmmerBuildFromFileTask.cpp | 2 +-
.../src/hmmer/HmmerBuildFromFileTask.h | 2 +-
.../src/hmmer/HmmerBuildFromMsaTask.cpp | 2 +-
.../src/hmmer/HmmerBuildFromMsaTask.h | 2 +-
.../src/hmmer/HmmerBuildSettings.cpp | 2 +-
.../src/hmmer/HmmerBuildSettings.h | 2 +-
.../src/hmmer/HmmerBuildTask.cpp | 2 +-
.../src/hmmer/HmmerBuildTask.h | 2 +-
.../src/hmmer/HmmerBuildWorker.cpp | 2 +-
.../src/hmmer/HmmerBuildWorker.h | 2 +-
.../src/hmmer/HmmerParseSearchResultsTask.cpp | 2 +-
.../src/hmmer/HmmerParseSearchResultsTask.h | 2 +-
.../src/hmmer/HmmerSearchDialog.cpp | 4 +-
.../src/hmmer/HmmerSearchDialog.h | 6 +-
.../src/hmmer/HmmerSearchSettings.cpp | 2 +-
.../src/hmmer/HmmerSearchSettings.h | 2 +-
.../src/hmmer/HmmerSearchTask.cpp | 2 +-
.../src/hmmer/HmmerSearchTask.h | 2 +-
.../src/hmmer/HmmerSearchWorker.cpp | 664 +++----
.../src/hmmer/HmmerSearchWorker.h | 154 +-
.../src/hmmer/HmmerSupport.cpp | 2 +-
.../external_tool_support/src/hmmer/HmmerSupport.h | 2 +-
.../src/hmmer/PhmmerSearchDialog.cpp | 4 +-
.../src/hmmer/PhmmerSearchDialog.h | 6 +-
.../src/hmmer/PhmmerSearchSettings.cpp | 2 +-
.../src/hmmer/PhmmerSearchSettings.h | 2 +-
.../src/hmmer/PhmmerSearchTask.cpp | 2 +-
.../src/hmmer/PhmmerSearchTask.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/MAFFTSupportRunDialog.ui | 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 | 2 +-
.../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 +-
.../external_tool_support/src/phyml/PhyMLDialog.ui | 16 +
.../src/phyml/PhyMLDialogWidget.cpp | 3 +-
.../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 | 2 +-
.../src/snpeff/SnpEffSupport.h | 4 +-
.../src/snpeff/SnpEffTask.cpp | 2 +-
.../external_tool_support/src/snpeff/SnpEffTask.h | 2 +-
.../src/snpeff/SnpEffWorker.cpp | 2 +-
.../src/snpeff/SnpEffWorker.h | 2 +-
.../src/spades/SpadesSettingsWidget.cpp | 13 +-
.../src/spades/SpadesSettingsWidget.h | 6 +-
.../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/TCoffeeSupportRunDialog.ui | 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 | 18 +-
.../src/utils/BaseShortReadsAlignerWorker.h | 3 +-
.../src/utils/BlastDBSelectorWidget.ui | 15 +-
.../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 | 2 +-
.../src/vcftools/VcfConsensusWorker.h | 2 +-
.../src/vcfutils/VcfutilsSupport.cpp | 2 +-
.../src/vcfutils/VcfutilsSupport.h | 2 +-
.../external_tool_support/transl/english.ts | 2007 +++++++++++++++----
.../external_tool_support/transl/russian.ts | 2041 ++++++++++++++++----
.../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 | 4 +-
.../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 | 22 +-
src/plugins/opencl_support/transl/russian.ts | 22 +-
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 +-
.../repeat_finder/src/FindRepeatsDialog.cpp | 4 +-
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 +-
.../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 | 6 +-
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_cpp.cpp | 2 +-
src/plugins/smith_waterman/src/sw_cuda_cpp.h | 2 +-
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 | 4 +-
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 +-
.../ConvertSnpeffVariationsToAnnotationsWorker.cpp | 2 +-
.../ConvertSnpeffVariationsToAnnotationsWorker.h | 2 +-
.../workflow_designer/src/library/CoreLib.cpp | 2 +-
.../workflow_designer/src/library/CoreLib.h | 2 +-
.../src/library/CreateExternalProcessDialog.cpp | 2 +-
.../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 | 2 +-
.../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 | 58 +-
.../src/library/ReadAnnotationsWorker.h | 7 +-
.../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 | 2 +-
.../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 | 124 +-
.../src/library/WriteAnnotationsWorker.h | 10 +-
.../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/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 | 446 +++--
src/plugins/workflow_designer/transl/russian.ts | 446 +++--
.../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 +-
.../hmm2/src/hmmer2/altivec_algorithms.cpp | 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 +-
src/plugins_3rdparty/kalign/src/KalignAdapter.cpp | 2 +-
src/plugins_3rdparty/kalign/src/KalignAdapter.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignConstants.h | 2 +-
src/plugins_3rdparty/kalign/src/KalignDialog.ui | 4 +-
.../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/english.ts | 5 +
src/plugins_3rdparty/kalign/transl/russian.ts | 5 +
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 | 2 +-
.../phylip/src/NeighborJoinWidget.h | 2 +-
.../phylip/src/PhylipCmdlineTask.cpp | 2 +-
.../phylip/src/PhylipCmdlineTask.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/PhylipTask.cpp | 2 +-
src/plugins_3rdparty/phylip/src/PhylipTask.h | 2 +-
src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp | 2 +-
src/plugins_3rdparty/phylip/src/SeqBootAdapter.h | 2 +-
src/plugins_3rdparty/phylip/transl/english.ts | 4 +-
src/plugins_3rdparty/phylip/transl/russian.ts | 4 +-
.../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/MuscleAlignDialog.ui | 4 +-
.../umuscle/src/MuscleAlignDialogController.cpp | 6 +-
.../umuscle/src/MuscleAlignDialogController.h | 2 +-
src/plugins_3rdparty/umuscle/src/MuscleConstants.h | 2 +-
.../umuscle/src/MuscleParallel.cpp | 2 +-
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 | 2 +-
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 | 5 +
src/plugins_3rdparty/umuscle/transl/russian.ts | 5 +
.../variants/src/AssemblySamtoolsMpileup.cpp | 2 +-
.../variants/src/AssemblySamtoolsMpileup.h | 2 +-
.../variants/src/SamtoolMpileupWorker.cpp | 2 +-
.../variants/src/SamtoolMpileupWorker.h | 2 +-
.../variants/src/SamtoolsPlugin.cpp | 2 +-
src/plugins_3rdparty/variants/src/SamtoolsPlugin.h | 2 +-
src/plugins_checker/src/Main.cpp | 2 +-
src/ugene_version.pri | 10 +-
src/ugenecl/CMakeLists.txt | 2 +-
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/ugenem/src/DetectWin10.cpp | 2 +-
src/ugenem/src/DetectWin10.h | 2 +-
src/ugenem/src/SendReportDialog.cpp | 4 +-
src/ugenem/src/SendReportDialog.h | 2 +-
src/ugenem/src/Utils.cpp | 2 +-
src/ugenem/src/Utils.h | 2 +-
src/ugenem/src/getMemorySize.c | 84 +-
src/ugenem/src/main.cpp | 4 +-
src/ugeneui/CMakeLists.txt | 2 +-
src/ugeneui/html/version_news.html | 46 +-
src/ugeneui/src/Main.cpp | 2 +-
.../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 | 4 +-
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 | 2 +-
src/ugeneui/src/main_window/MDIManagerImpl.h | 2 +-
src/ugeneui/src/main_window/MainWindowImpl.cpp | 12 +-
src/ugeneui/src/main_window/MainWindowImpl.h | 2 +-
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 | 2 +-
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 | 8 +-
.../DocumentFormatSelectorController.h | 2 +-
.../DocumentProviderSelectorController.cpp | 4 +-
.../DocumentProviderSelectorController.h | 2 +-
.../DocumentReadingModeSelectorController.cpp | 4 +-
.../DocumentReadingModeSelectorController.h | 2 +-
.../ExportProjectDialogController.cpp | 4 +-
.../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 | 4 +-
.../src/project_support/ProjectLoaderImpl.h | 2 +-
.../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_view/BuiltInObjectViews.cpp | 2 +-
src/ugeneui/src/project_view/ProjectViewImpl.cpp | 2 +-
src/ugeneui/src/project_view/ProjectViewImpl.h | 2 +-
.../src/project_view/ProjectViewSearchBox.cpp | 2 +-
.../src/project_view/ProjectViewSearchBox.h | 2 +-
src/ugeneui/src/shtirlitz/Shtirlitz.cpp | 4 +-
src/ugeneui/src/shtirlitz/Shtirlitz.h | 2 +-
.../src/shtirlitz/StatisticalReportController.cpp | 2 +-
.../src/shtirlitz/StatisticalReportController.h | 2 +-
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/update/UgeneUpdater.cpp | 4 +-
src/ugeneui/src/update/UgeneUpdater.h | 2 +-
src/ugeneui/src/utils/MultilingualHtmlView.cpp | 2 +-
src/ugeneui/src/utils/MultilingualHtmlView.h | 2 +-
.../src/welcome_page/WelcomePageController.cpp | 4 +-
.../src/welcome_page/WelcomePageController.h | 2 +-
src/ugeneui/src/welcome_page/WelcomePageMdi.cpp | 2 +-
src/ugeneui/src/welcome_page/WelcomePageMdi.h | 2 +-
src/ugeneui/src/welcome_page/WelcomePageWidget.cpp | 2 +-
src/ugeneui/src/welcome_page/WelcomePageWidget.h | 2 +-
src/ugeneui/transl/english.ts | 108 +-
src/ugeneui/transl/russian.ts | 108 +-
3818 files changed, 13940 insertions(+), 9507 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index 6a2fc9b..36be159 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Unipro UGENE - Integrated Bioinformatics Suite
-Copyright (C) 2008-2012 Unipro, Novosibirsk, Russia
+Copyright (C) 2008-2016 Unipro, Novosibirsk, Russia
This suite of programs is free software. You can redistribute it
and/or modify it under the terms of the GNU General Public License as
diff --git a/LICENSE.3rd_party b/LICENSE.3rd_party.txt
similarity index 93%
copy from LICENSE.3rd_party
copy to LICENSE.3rd_party.txt
index 17a01f8..d2fa173 100644
--- a/LICENSE.3rd_party
+++ b/LICENSE.3rd_party.txt
@@ -323,32 +323,9 @@ The Files src/corelibs/U2Private/src/StackWalker.cpp
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-The algorithm "Unique repeats filter"
- Built over original UGENE Repeat finder. Filter results combining them in unique repeats.
- Author: Sergey Yakovlev (tac at inbox.lv, tac1402 at gmail.com)
-
- released under Apache License 2.0
- changed files:
- src\plugins\repeat_finder\transl\russian.ts
- src\plugins\repeat_finder\transl\english.ts
- src\plugins\repeat_finder\src\RepeatQuery.cpp
- src\plugins\repeat_finder\src\FindRepeatsTask.cpp
- src\plugins\repeat_finder\src\RepeatWorker.cpp
- src\plugins\repeat_finder\src\FindRepeatsDialog.cpp
- src\plugins\repeat_finder\src\ui\FindRepeatsDialog.ui
- src\plugins\repeat_finder\src\FindRepeatsTask.h
- src\corelibs\U2Algorithm\src\misc\RepeatFinderSettings.h
-
-
+
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/LICENSE b/LICENSE.txt
similarity index 100%
copy from LICENSE
copy to LICENSE.txt
diff --git a/build.txt b/build.txt
index ee6f9fa..618beeb 100644
--- a/build.txt
+++ b/build.txt
@@ -2,7 +2,7 @@
Prerequisites
===================================
-Make sure the Qt (>= 5.2.1) development libraries are installed:
+Make sure the Qt (>= 5.2.1 and < 5.6) development libraries are installed:
* Ubuntu 16.04: `sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev libqt5svg5-dev libqt5webkit5-dev libprocps4-dev`
* Ubuntu 14.04: `sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev libqt5svg5-dev libqt5webkit5-dev libprocps3-dev`
diff --git a/data/DBXRefRegistry.txt b/data/DBXRefRegistry.txt
index 438cb3e..0fd24b4 100644
--- a/data/DBXRefRegistry.txt
+++ b/data/DBXRefRegistry.txt
@@ -1,6 +1,6 @@
#db_xref_ID|db_xref_PageLink|db_xref_FileLink|db_xref_Comment
#Official site: http://www.ncbi.nlm.nih.gov/genbank/collab/db_xref
-AceView/WormGenes|http://www.ncbi.nlm.nih.gov/IEB/Research/Acembly/av.cgi?exdb=AceView&db=worm&term=%1||AceView Worm Genome
+AceView/WormGenes|https://www.ncbi.nlm.nih.gov/IEB/Research/Acembly/av.cgi?exdb=AceView&db=worm&term=%1||AceView Worm Genome
AFTOL|http://aftol1.biology.duke.edu/pub/primers/getPrimersByAFTOLID?aftol_id=%1||Assembling the Fungal Tree of Life
@@ -42,19 +42,19 @@ CABRI|||Common Access to Biological Resources and Information Project
CCAP|||Culture Collection of Algae and Protozoa
-CDD|http://www.ncbi.nlm.nih.gov/Structure/cdd/cddsrv.cgi?uid=%1||Conserved Domain Database
+CDD|https://www.ncbi.nlm.nih.gov/Structure/cdd/cddsrv.cgi?uid=%1||Conserved Domain Database
CGD|http://www.candidagenome.org/cgi-bin/locus.pl?dbid=%1||Candida Genome Database
-CCDS|http://www.ncbi.nlm.nih.gov/projects/CCDS/CcdsBrowse.cgi?REQUEST=CCDS&DATA=%1&ORGANISM=0&BUILDS=CURRENTBUILDS||The Consensus CDS (CCDS) project is a collaborative effort to identify a core set of human and mouse protein coding regions that are consistently annotated and of high quality.
+CCDS|https://www.ncbi.nlm.nih.gov/projects/CCDS/CcdsBrowse.cgi?REQUEST=CCDS&DATA=%1&ORGANISM=0&BUILDS=CURRENTBUILDS||The Consensus CDS (CCDS) project is a collaborative effort to identify a core set of human and mouse protein coding regions that are consistently annotated and of high quality.
-dbEST|http://www.ncbi.nlm.nih.gov/sites/entrez?db=nucest&term=%1&pmfilter_MDatLimit=10+Years||EST database maintained at the NCBI.
+dbEST|https://www.ncbi.nlm.nih.gov/sites/entrez?db=nucest&term=%1&pmfilter_MDatLimit=10+Years||EST database maintained at the NCBI.
-dbProbe|http://www.ncbi.nlm.nih.gov/sites/entrez?db=probe&cmd=search&term=%1||NCBI Probe database Public registry of nucleic acid reagents
+dbProbe|https://www.ncbi.nlm.nih.gov/sites/entrez?db=probe&cmd=search&term=%1||NCBI Probe database Public registry of nucleic acid reagents
-dbSNP|http://www.ncbi.nlm.nih.gov/sites/entrez?db=snp&cmd=search&term=%1||Variation database maintained at the NCBI.
+dbSNP|https://www.ncbi.nlm.nih.gov/sites/entrez?db=snp&cmd=search&term=%1||Variation database maintained at the NCBI.
-dbSTS|http://www.ncbi.nlm.nih.gov/sites/entrez?db=unists&cmd=search&term=%1||STS database maintained at the NCBI.
+dbSTS|https://www.ncbi.nlm.nih.gov/sites/entrez?db=unists&cmd=search&term=%1||STS database maintained at the NCBI.
dictyBase|http://dictybase.org/db/cgi-bin/gene_page.pl?primary_id=%1||Dictyostelium genome database
@@ -82,9 +82,9 @@ GDB|||Human Genome Database accession numbers
GeneDB|http://www.genedb.org/genedb/Dispatcher?formType=navBar&organism=All%3A*&name=%1&desc=yes||Curated gene database for Schizosaccharomyces pombe, Leishmania major and Trypanosoma brucei
-GeneID|http://www.ncbi.nlm.nih.gov/sites/entrez?db=gene&cmd=search&term=%1||Entrez Gene Database (replaces NCBI Locus Link)
+GeneID|https://www.ncbi.nlm.nih.gov/sites/entrez?db=gene&cmd=search&term=%1||Entrez Gene Database (replaces NCBI Locus Link)
-GI|http://www.ncbi.nlm.nih.gov/sites/gquery?term=%1||GenInfo identifier, used as a unique sequence identifier for nucleotide and proteins
+GI|https://www.ncbi.nlm.nih.gov/sites/gquery?term=%1||GenInfo identifier, used as a unique sequence identifier for nucleotide and proteins
GO|||Gene Ontology Database identifier
@@ -130,11 +130,11 @@ LocusID|||NCBI LocusLink ID **Discontinued March 2005
MaizeGDB|||Maize Genome Database unique identifiers
-MedGen|http://www.ncbi.nlm.nih.gov/medgen/?term=%1||Human Medical Genetics
+MedGen|https://www.ncbi.nlm.nih.gov/medgen/?term=%1||Human Medical Genetics
MGI||| Mouse Genome Informatics
-MIM|http://www.ncbi.nlm.nih.gov/entrez/dispomim.cgi?id=%1|| Mendelian Inheritance in Man numbers
+MIM|https://www.ncbi.nlm.nih.gov/entrez/dispomim.cgi?id=%1|| Mendelian Inheritance in Man numbers
miRBase|http://microrna.sanger.ac.uk/cgi-bin/sequences/mirna_entry.pl?acc=%1||miRBase is the new home of microRNA data on the web, providing data previously accessible from the miRNA Registry.
@@ -224,7 +224,7 @@ UniProtKB/Swiss-Prot|http://www.uniprot.org/uniprot/%1|http://www.uniprot.org/un
UniProtKB/TrEMBL|http://www.uniprot.org/uniprot/%1|http://www.uniprot.org/uniprot/%1.txt|section of the UniProt Knowledgebase, containing computationally analysed records waiting for full manual annotation
-UniSTS|http://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%1||NCBI UniSTS is a comprehensive database of sequence tagged sites (STSs) derived from STS-based maps and other experiments.
+UniSTS|https://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%1||NCBI UniSTS is a comprehensive database of sequence tagged sites (STSs) derived from STS-based maps and other experiments.
UNITE|||Molecular database for the identification of fungi
diff --git a/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_paired.uwl b/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_paired.uwl
index 2c700df..da2d1a4 100644
--- a/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_paired.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_paired.uwl
@@ -485,9 +485,9 @@ workflow "Processing of raw ChIP-Seq paired-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
- QualityTrim.qual-id {
+ QualityTrim.qual-id {
label:"Base quality";
}
QualityTrim.len-id {
@@ -496,20 +496,36 @@ workflow "Processing of raw ChIP-Seq paired-end reads"{
QualityTrim.both-ends {
label:"Trim both ends";
}
+ CutAdaptFastq.adapters-url {
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
+ }
+ }
+ group {
+ title:"Read pairs filtration";
+ label-size:120;
QualityTrim-1.qual-id {
- label:"Base quality for pairs";
+ label:"Base quality";
}
QualityTrim-1.len-id {
- label:"Reads length for pairs";
+ label:"Reads length";
}
QualityTrim-1.both-ends {
- label:"Trim both ends for pairs";
- }
- CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"Trim both ends";
}
CutAdaptFastq-1.adapters-url {
- label:"Adapters for pairs";
+ label:"3' adapters";
+ }
+ CutAdaptFastq-1.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq-1.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_single.uwl b/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_single.uwl
index c9df00e..333a289 100644
--- a/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_single.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/chipseq/chipseq_single.uwl
@@ -348,7 +348,7 @@ workflow "Processing of raw ChIP-Seq single-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -359,7 +359,13 @@ workflow "Processing of raw ChIP-Seq single-end reads"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_paired.uwl b/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_paired.uwl
index c1127ee..becabae 100644
--- a/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_paired.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_paired.uwl
@@ -462,8 +462,8 @@ workflow "Processing of raw DNA-Seq paired-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
label-size:120;
+ title:"Reads filtration";
QualityTrim.qual-id {
label:"Base quality";
}
@@ -473,20 +473,36 @@ workflow "Processing of raw DNA-Seq paired-end reads"{
QualityTrim.both-ends {
label:"Trim both ends";
}
+ CutAdaptFastq.adapters-url {
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
+ }
+ }
+ group {
+ label-size:120;
+ title:"Read pairs filtration";
QualityTrim-1.qual-id {
- label:"Base quality for pairs";
+ label:"Base quality";
}
QualityTrim-1.len-id {
- label:"Reads length for pairs";
+ label:"Reads length";
}
QualityTrim-1.both-ends {
- label:"Trim both ends for pairs";
- }
- CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"Trim both ends";
}
CutAdaptFastq-1.adapters-url {
- label:"Adapters for pairs";
+ label:"3' adapters";
+ }
+ CutAdaptFastq-1.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq-1.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_single.uwl b/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_single.uwl
index b1d894c..957a70d 100644
--- a/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_single.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/dnaseq/dna_single.uwl
@@ -329,7 +329,7 @@ workflow "Processing of raw DNA-Seq single-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -340,7 +340,13 @@ workflow "Processing of raw DNA-Seq single-end reads"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_paired.uwl b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_paired.uwl
index 1d2b786..dbe6d6b 100644
--- a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_paired.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_paired.uwl
@@ -323,7 +323,7 @@ workflow "Processing of raw RNA-Seq paired-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -334,11 +334,17 @@ workflow "Processing of raw RNA-Seq paired-end reads"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
group {
- title:"Filtration for pairs";
+ title:"Read pairs filtration";
label-size:120;
QualityTrim-1.qual-id {
}
@@ -346,10 +352,16 @@ workflow "Processing of raw RNA-Seq paired-end reads"{
label:"Min length";
}
QualityTrim-1.both-ends {
- label:"Trim both ends for pairs";
+ label:"Trim both ends";
}
CutAdaptFastq-1.adapters-url {
- label:"Adapters for pairs";
+ label:"3' adapters";
+ }
+ CutAdaptFastq-1.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq-1.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_single.uwl b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_single.uwl
index 3a60176..6da80bf 100644
--- a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_single.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_filtration_single.uwl
@@ -175,7 +175,7 @@ workflow "Processing of raw RNA-Seq single-end reads"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -186,7 +186,13 @@ workflow "Processing of raw RNA-Seq single-end reads"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_paired.uwl b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_paired.uwl
index 73f3a97..acde402 100644
--- a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_paired.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_paired.uwl
@@ -407,7 +407,7 @@ workflow "Processing of raw RNA-Seq paired-end reads with mapping"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -418,11 +418,17 @@ workflow "Processing of raw RNA-Seq paired-end reads with mapping"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
group {
- title:"Filtration for pairs";
+ title:"Read pairs filtration";
label-size:120;
QualityTrim-1.qual-id {
}
@@ -433,7 +439,13 @@ workflow "Processing of raw RNA-Seq paired-end reads with mapping"{
label:"Trim both ends";
}
CutAdaptFastq-1.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq-1.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq-1.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_single.uwl b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_single.uwl
index 3d0b421..177bbd9 100644
--- a/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_single.uwl
+++ b/data/workflow_samples/NGS/raw_ngs/rnaseq/rnaseq_single.uwl
@@ -234,7 +234,7 @@ workflow "Processing of raw RNA-Seq single-end reads with mapping"{
title:Pre-processing;
parameters-area {
group {
- title:Filtration;
+ title:"Reads filtration";
label-size:120;
QualityTrim.qual-id {
}
@@ -245,7 +245,13 @@ workflow "Processing of raw RNA-Seq single-end reads with mapping"{
label:"Trim both ends";
}
CutAdaptFastq.adapters-url {
- label:Adapters;
+ label:"3' adapters";
+ }
+ CutAdaptFastq.front-url {
+ label:"5' adapters";
+ }
+ CutAdaptFastq.anywhere-url {
+ label:"5' and 3' adapters";
}
}
}
diff --git a/LICENSE b/installer/_common_data/LICENSE
similarity index 100%
rename from LICENSE
rename to installer/_common_data/LICENSE
diff --git a/LICENSE.3rd_party b/installer/_common_data/LICENSE.3rd_party
similarity index 100%
rename from LICENSE.3rd_party
rename to installer/_common_data/LICENSE.3rd_party
diff --git a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
index 0757baa..bf6e79c 100644
--- a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
index 1942735..9204afc 100644
--- a/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
+++ b/src/corelibs/U2Algorithm/src/misc/BinaryFindOpenCL.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/BitsTable.cpp b/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
index 3059428..cedfebc 100644
--- a/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/BitsTable.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/BitsTable.h b/src/corelibs/U2Algorithm/src/misc/BitsTable.h
index c668610..6e4c11f 100644
--- a/src/corelibs/U2Algorithm/src/misc/BitsTable.h
+++ b/src/corelibs/U2Algorithm/src/misc/BitsTable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h b/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
index 6abb409..a5c299c 100644
--- a/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/misc/CDSearchTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
index f323af6..00a3a34 100644
--- a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
index 94e5091..c681840 100644
--- a/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/DnaAssemblyMultiTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/DynTable.h b/src/corelibs/U2Algorithm/src/misc/DynTable.h
index a8b95ab..6267d09 100644
--- a/src/corelibs/U2Algorithm/src/misc/DynTable.h
+++ b/src/corelibs/U2Algorithm/src/misc/DynTable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/EnzymeModel.h b/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
index dd85185..b72daa5 100644
--- a/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
+++ b/src/corelibs/U2Algorithm/src/misc/EnzymeModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
index ce596b7..e8a36ff 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/FindAlgorithm.h b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
index 8d5d57d..d95615b 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
index 226944e..eab458e 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
index 73a57f1..901c3d2 100644
--- a/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/FindAlgorithmTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
index 79db87e..bf94e61 100644
--- a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
index ac2c695..41aa256 100644
--- a/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/GenomeAssemblyMultiTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h b/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
index 7bd7a49..a60c14a 100644
--- a/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
+++ b/src/corelibs/U2Algorithm/src/misc/RepeatFinderSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h b/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
index 0a52d37..0eaa4d2 100644
--- a/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/misc/RepeatFinderTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/RollingArray.h b/src/corelibs/U2Algorithm/src/misc/RollingArray.h
index 9c0483e..d266107 100644
--- a/src/corelibs/U2Algorithm/src/misc/RollingArray.h
+++ b/src/corelibs/U2Algorithm/src/misc/RollingArray.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/RollingMatrix.h b/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
index 4339fe2..7131645 100644
--- a/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
+++ b/src/corelibs/U2Algorithm/src/misc/RollingMatrix.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
index e1cafcd..d18f444 100644
--- a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
+++ b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
index 968e0be..9cf92c2 100644
--- a/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
+++ b/src/corelibs/U2Algorithm/src/misc/SequenceContentFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/misc/SyncSort.h b/src/corelibs/U2Algorithm/src/misc/SyncSort.h
index f0f36a8..acd847a 100644
--- a/src/corelibs/U2Algorithm/src/misc/SyncSort.h
+++ b/src/corelibs/U2Algorithm/src/misc/SyncSort.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
index b085a68..4c1771b 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
index c09118a..0d64a98 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/GeomUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
index c9478b9..8048e0e 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
index 0a90ead..c082606 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurface.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
index 0080702..f7054db 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
index adc5fd7..f6138e4 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/MolecularSurfaceFactoryRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
index 29656ed..d22adce 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
index b2f6bef..7c7b56a 100644
--- a/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
+++ b/src/corelibs/U2Algorithm/src/molecular_geometry/VanDerWaalsSurface.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
index 252ba36..cc3e5ec 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
index 9840bd1..1addf5c 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AbstractAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
index f7041b8..c867625 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
index 4b59943..74b7f5d 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/AlignSequencesToAlignmentTaskSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
index ae7f607..23018a2 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
index 86de42b..911af63 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/BaseAlignmentAlgorithmIds.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
index 6a9e408..da3882f 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
index eed0221..47a8642 100644
--- a/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
+++ b/src/corelibs/U2Algorithm/src/msa_alignment/SimpleAddingToAlignment.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
index 309a62d..2e218fe 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
index 7b9b4f7..b3fc963 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/NWAligner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
index 3f66d4a..6f0e995 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
index 94dc132..c8c4bf4 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAligner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
index f957a1e..7457f42 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
index ffd6722..87c8328 100644
--- a/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/pairwise_alignment/PairwiseAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
index 5ed36a7..2308d50 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
index 59b25dc..2df03d1 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/CreatePhyTreeSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
index fcebb97..421a40e 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGenerator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
index a5ba55d..a6dd13e 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
index fdb1335..08c3ea7 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
index ec3d19f..e09951c 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
index edea693..8921702 100644
--- a/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
+++ b/src/corelibs/U2Algorithm/src/phyltree/PhyTreeGeneratorTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
index c6277d0..2efb09c 100644
--- a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
index b891130..21a79bb 100644
--- a/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/AlignmentAlgorithmsRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
index 15fe6fc..919e346 100644
--- a/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/CDSearchTaskFactoryRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
index 9418cd9..85618bb 100644
--- a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
index e2312fa..e286e4b 100644
--- a/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/CudaGpuRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
index 7011b2c..c462697 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
index 109843c..3244feb 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyAlgRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
index 5630806..810d766 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
index 9346183..2f01fff 100644
--- a/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/DnaAssemblyTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,11 @@ public:
class U2ALGORITHM_EXPORT DnaAssemblyToRefTaskSettings {
public:
- DnaAssemblyToRefTaskSettings() : prebuiltIndex(false), openView(false), samOutput(true) {}
+ DnaAssemblyToRefTaskSettings()
+ : filterUnpaired(false),
+ prebuiltIndex(false),
+ openView(false),
+ samOutput(true) {}
void setCustomSettings(const QMap<QString, QVariant>& settings);
QVariant getCustomValue(const QString& optionName, const QVariant& defaultVal) const;
@@ -70,6 +74,8 @@ public:
QString indexFileName;
QString algName;
bool pairedReads;
+ bool filterUnpaired;
+ QString tmpDirectoryForFilteredFiles;
bool prebuiltIndex;
bool openView;
bool samOutput;
diff --git a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
index d58de16..95b8e54 100644
--- a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
index 4787a6f..cc58d5b 100644
--- a/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/GenomeAssemblyRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
index 0c43f4f..fca5dfb 100644
--- a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
index 4ba3a4a..c4d1dc2 100644
--- a/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/OpenCLGpuRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
index 621d4df..1223135 100644
--- a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
index b6ede46..5a43f92 100644
--- a/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/RepeatFinderTaskFactoryRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
index 9595d32..6b6bcd5 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
index 42cc40d..33970f4 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictAlgRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
index 837d394..74d5aa9 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
index 94c2d5a..d901de6 100644
--- a/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/SecStructPredictTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
index d59ddc7..52dabb0 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
index bcbb5bf..5231d0b 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
index 24d6f23..fc78bbd 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
index ee2028d..fbd8f7f 100644
--- a/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SplicedAlignmentTaskRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
index 3e761cf..8849b79 100644
--- a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
index cd51cd3..9b39b2e 100644
--- a/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
+++ b/src/corelibs/U2Algorithm/src/registry/SubstMatrixRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
index 706012f..8bed344 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
index 5c549aa..018d7f7 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignExternalPropTag.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
index b0eca38..56f5121 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTag.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
index 06cb83e..4ae60f8 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
index 61d2b20..25e2e97 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignResultNamesTagsRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
index 39a7acc..912ee02 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
index cd61aed..a966f4b 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSeqPrefixTag.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
index a590dc6..46c7864 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
index 5ba4f2e..2fbaf1b 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWMulAlignSubseqPropTag.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
index 90c40c8..98c022d 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
index b776004..db5ddcd 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SWResultFilterRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
index b2ddedd..3c26b9c 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
index 5715f81..123b09b 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanReportCallback.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
index 021fb8f..ad9c1c8 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
index 6fe370d..335441a 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResult.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
index cf5d8e9..3c89aea 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
index ab9f2c3..ff7c7bf 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanResultFilters.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
index 0d838fd..65280aa 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
index bd1ed42..b5b26d2 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
index b5e28d9..2807a19 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
index dcaa0b2..8b6298d 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanTaskFactoryRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
index 70848df..2d14617 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
index 8f48575..1f940fd 100644
--- a/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
+++ b/src/corelibs/U2Algorithm/src/smith_waterman/SmithWatermanUtil.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
index 8113a70..ee2add0 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
index f797332..4a6734f 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
index 992def8..0b4a6e3 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
index f386f7c..545cde8 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
index 1e60c84..91f4ac5 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
index fdbd41a..e71b9a5 100644
--- a/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/structural_alignment/StructuralAlignmentAlgorithmRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
index 2b6db75..55c44e0 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
index 985c382..46f6928 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
index f6bd01b..93d77f7 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
index bf7b015..d9a90f1 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmDefault.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
index 2e50179..f911b3f 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
index 14fd964..0e9745d 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
index 8d56ff2..3bbb552 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
index 95fcd19..57afe3d 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusAlgorithmSamtools.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
index b0d7552..d1e2510 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
index f4b831f..c9ba00c 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/AssemblyConsensusUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
index 84d50f0..6b9d70d 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
index 44e5643..0c3c393 100644
--- a/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_assembly_consensus/BuiltInAssemblyConsensusAlgorithms.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
index 3ae04b7..bddb8cf 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
index 5228cca..150ca56 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLHelper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
index 9cda0d1..04e6a05 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
index f542976..94cdd6a 100644
--- a/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_gpu/opencl/OpenCLUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
index 9ec0b0b..2fc4df8 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
index b0e80ab..5f3b4ce 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/BuiltInConsensusAlgorithms.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
index 9268b1a..36da890 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
index 03421c6..7b7f90e 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
index fe61d58..033ba1c 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
index d7b0285..3222781 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmClustal.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
index c1c8459..97bad5c 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
index acbe54b..65b0e10 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmDefault.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
index 97ecc49..afa12cc 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
index d124ba8..db27de3 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmLevitsky.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
index 1b4ff7c..b66f97b 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
index 3d21b95..21511d5 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
index 36ebce3..a39dea9 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
index 87f0c4b..9fe7052 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusAlgorithmStrict.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
index d057538..71ea3f1 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
index c2b6926..95a4b8e 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_consensus/MSAConsensusUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
index 8653231..e30308b 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
index 022c4b8..2984064 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/BuiltInDistanceAlgorithms.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
index 373a069..4165b26 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
index 1afaf36..211ed2c 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
index 97ff7a1..fd0f839 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
index 4ab445d..66f572f 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHamming.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
index 795c299..6cada18 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
index 37645e4..93a93bb 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmHammingRevCompl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
index a578a5c..03e3bfb 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
index a842df3..9a85402 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
index d012450..6183bcb 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
index c762cdd..82b6cc7 100644
--- a/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
+++ b/src/corelibs/U2Algorithm/src/util_msa_distance/MSADistanceAlgorithmSimilarity.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
index e6a3d96..58955f9 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
index fd7600e..d98f5f4 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/CreateSubalignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
index 410ea2d..0bf1454 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
index ff818ee..b96028c 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/MAlignmentUtilTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.cpp
index 420424c..2c0aaed 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.h
index a2356de..3dedce3 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/ColorSchemeUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.cpp
index 48253d8..9d37636 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.h
index 1f2a406..856dbe9 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorScheme.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.cpp
index 11f8f30..de14305 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.h
index 9874966..f21a59e 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeClustalX.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.cpp
index e6989fc..7a2601c 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.h
index 64fa8ff..27e3ecf 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeCustom.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.cpp
index 79358b1..725b4d5 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.h
index 27a53a3..714b533 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdententityGrayscale.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.cpp
index 219c897..4e5339f 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.h
index 90ca51c..df9b96a 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemePercentageIdentity.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.cpp
index 5f5239d..6690ed3 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.h b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.h
index d63023a..8fe5b0d 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/color_schemes/MsaColorSchemeStatic.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp
index edd8679..7287423 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.h
index edcc8c4..966ff2e 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.cpp
index f1967de..136863f 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.h
index 8fa7444..be24a39 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeAgreements.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.cpp
index 3cd4d46..2751106 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.h
index 5126860..b839616 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeConservation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.cpp
index 1c1ab52..2a041c4 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.h
index 850457c..058baba 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeDisagreements.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.cpp
index c506c15..efe2c31 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.h
index bf3671e..9f3a9d4 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeGaps.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.cpp
index 93c67f6..0c691dc 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.h
index d0f93b0..67609a1 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeNoColors.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.cpp
index 4f5a7be..ebdeee7 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.h
index c2fad37..9326ef8 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransitions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.cpp b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.cpp
index 3e61fd3..c1986be 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.cpp
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.h b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.h
index 6674982..17f8d54 100644
--- a/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.h
+++ b/src/corelibs/U2Algorithm/src/util_msaedit/highlighting_schemes/MsaHighlightingSchemeTransversions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
index 4a70568..cc21c90 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
index 7c777d3..41c8540 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFAlgorithmTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
index 455baac..b4f8036 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_orf/ORFFinder.h b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
index cb5ed7d..fb27f91 100644
--- a/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
+++ b/src/corelibs/U2Algorithm/src/util_orf/ORFFinder.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
index 5df88f1..dd5577b 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
index fb3ac43..3943a6f 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayBasedFindTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
index b9a8647..15495ab 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
index 6adb81f..807aa61 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndex.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
index 2c0d4cc..b8e29aa 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
index c5670a2..d86a892 100644
--- a/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
+++ b/src/corelibs/U2Algorithm/src/util_sarray/SArrayIndexSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
index cda769f..f6acf6f 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
index 7892cfc..d72c2be 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/BuiltInPWMConversionAlgorithms.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
index a90f09d..10ffb3d 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
index 35649a4..a6a8454 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
index 8a5d778..128c97a 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
index 547a680..3f9e0ac 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmBVH.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
index 569ec44..2f50006 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
index 3d7a4a7..6c58fa0 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmLOD.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
index c2c0a91..c68bb7d 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
index 4592fa1..353502a 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmMCH.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
index 5bf68e3..381dca1 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
index 02fb67e..0d8094a 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmNLG.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
index 4350fbd..1a9e703 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
index d0d5c73..f463c04 100644
--- a/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
+++ b/src/corelibs/U2Algorithm/src/util_weight_matrix/PWMConversionAlgorithmRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Algorithm/transl/english.ts b/src/corelibs/U2Algorithm/transl/english.ts
index 799fb0a..57b79f7 100644
--- a/src/corelibs/U2Algorithm/transl/english.ts
+++ b/src/corelibs/U2Algorithm/transl/english.ts
@@ -202,7 +202,7 @@
<context>
<name>U2::DnaAssemblyMultiTask</name>
<message>
- <location filename="../src/misc/DnaAssemblyMultiTask.cpp" line="86"/>
+ <location filename="../src/misc/DnaAssemblyMultiTask.cpp" line="84"/>
<source>The short reads can't be mapped to the reference sequence!</source>
<translation>The short reads can't be mapped to the reference sequence!</translation>
</message>
@@ -245,57 +245,6 @@
</message>
</context>
<context>
- <name>U2::MSAColorSchemeRegistry</name>
- <message>
- <source>No colors</source>
- <translation type="vanished">No colors</translation>
- </message>
- <message>
- <source>Jalview</source>
- <translation type="vanished">Jalview</translation>
- </message>
- <message>
- <source>Percentage Identity</source>
- <translation type="vanished">Percentage Identity</translation>
- </message>
- <message>
- <source>Percentage Identity (gray)</source>
- <translation type="vanished">Percentage Identity (gray)</translation>
- </message>
- <message>
- <source>Zappo</source>
- <translation type="vanished">Zappo</translation>
- </message>
- <message>
- <source>Tailor</source>
- <translation type="vanished">Tailor</translation>
- </message>
- <message>
- <source>Hydrophobicity</source>
- <translation type="vanished">Hydrophobicity</translation>
- </message>
- <message>
- <source>Helix propensity</source>
- <translation type="vanished">Helix propensity</translation>
- </message>
- <message>
- <source>Strand propensity</source>
- <translation type="vanished">Strand propensity</translation>
- </message>
- <message>
- <source>Turn propensity</source>
- <translation type="vanished">Turn propensity</translation>
- </message>
- <message>
- <source>Buried index</source>
- <translation type="vanished">Buried index</translation>
- </message>
- <message>
- <source>Clustal X</source>
- <translation type="vanished">Clustal X</translation>
- </message>
-</context>
-<context>
<name>U2::MSAConsensusAlgorithmFactoryClustal</name>
<message>
<location filename="../src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp" line="30"/>
@@ -405,37 +354,6 @@ For every column selects the most rare symbol in the whole alignment with percen
</message>
</context>
<context>
- <name>U2::MSAHighlightingSchemeRegistry</name>
- <message>
- <source>No highlighting</source>
- <translation type="vanished">No highlighting</translation>
- </message>
- <message>
- <source>Agreements</source>
- <translation type="vanished">Agreements</translation>
- </message>
- <message>
- <source>Disagreements</source>
- <translation type="vanished">Disagreements</translation>
- </message>
- <message>
- <source>Gaps</source>
- <translation type="vanished">Gaps</translation>
- </message>
- <message>
- <source>Conservation level</source>
- <translation type="vanished">Conservation level</translation>
- </message>
- <message>
- <source>Transitions</source>
- <translation type="vanished">Transitions</translation>
- </message>
- <message>
- <source>Transversions</source>
- <translation type="vanished">Transversions</translation>
- </message>
-</context>
-<context>
<name>U2::MolecularSurfaceCalcTask</name>
<message>
<location filename="../src/molecular_geometry/MolecularSurface.cpp" line="126"/>
@@ -450,64 +368,64 @@ For every column selects the most rare symbol in the whole alignment with percen
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="511"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="552"/>
<source>No colors</source>
- <translation type="unfinished">No colors</translation>
+ <translation>No colors</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="504"/>
<source>Jalview</source>
- <translation type="unfinished">Jalview</translation>
+ <translation>Jalview</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="506"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="545"/>
<source>Percentage Identity</source>
- <translation type="unfinished">Percentage Identity</translation>
+ <translation>Percentage Identity</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="507"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="546"/>
<source>Percentage Identity (gray)</source>
- <translation type="unfinished">Percentage Identity (gray)</translation>
+ <translation>Percentage Identity (gray)</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="519"/>
<source>Zappo</source>
- <translation type="unfinished">Zappo</translation>
+ <translation>Zappo</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="523"/>
<source>Tailor</source>
- <translation type="unfinished">Tailor</translation>
+ <translation>Tailor</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="527"/>
<source>Hydrophobicity</source>
- <translation type="unfinished">Hydrophobicity</translation>
+ <translation>Hydrophobicity</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="531"/>
<source>Helix propensity</source>
- <translation type="unfinished">Helix propensity</translation>
+ <translation>Helix propensity</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="535"/>
<source>Strand propensity</source>
- <translation type="unfinished">Strand propensity</translation>
+ <translation>Strand propensity</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="539"/>
<source>Turn propensity</source>
- <translation type="unfinished">Turn propensity</translation>
+ <translation>Turn propensity</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="543"/>
<source>Buried index</source>
- <translation type="unfinished">Buried index</translation>
+ <translation>Buried index</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="548"/>
<source>Clustal X</source>
- <translation type="unfinished">Clustal X</translation>
+ <translation>Clustal X</translation>
</message>
</context>
<context>
@@ -517,42 +435,42 @@ For every column selects the most rare symbol in the whole alignment with percen
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="121"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="122"/>
<source>No highlighting</source>
- <translation type="unfinished">No highlighting</translation>
+ <translation>No highlighting</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="124"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="125"/>
<source>Agreements</source>
- <translation type="unfinished">Agreements</translation>
+ <translation>Agreements</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="127"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="128"/>
<source>Disagreements</source>
- <translation type="unfinished">Disagreements</translation>
+ <translation>Disagreements</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="130"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="131"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="132"/>
<source>Gaps</source>
- <translation type="unfinished">Gaps</translation>
+ <translation>Gaps</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="134"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="135"/>
<source>Conservation level</source>
- <translation type="unfinished">Conservation level</translation>
+ <translation>Conservation level</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="137"/>
<source>Transitions</source>
- <translation type="unfinished">Transitions</translation>
+ <translation>Transitions</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="138"/>
<source>Transversions</source>
- <translation type="unfinished">Transversions</translation>
+ <translation>Transversions</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2Algorithm/transl/russian.ts b/src/corelibs/U2Algorithm/transl/russian.ts
index c01f07e..eccb7de 100644
--- a/src/corelibs/U2Algorithm/transl/russian.ts
+++ b/src/corelibs/U2Algorithm/transl/russian.ts
@@ -202,7 +202,7 @@
<context>
<name>U2::DnaAssemblyMultiTask</name>
<message>
- <location filename="../src/misc/DnaAssemblyMultiTask.cpp" line="86"/>
+ <location filename="../src/misc/DnaAssemblyMultiTask.cpp" line="84"/>
<source>The short reads can't be mapped to the reference sequence!</source>
<translation>Короткие риды не могут быть отражены в референсной последовательности!</translation>
</message>
@@ -245,57 +245,6 @@
</message>
</context>
<context>
- <name>U2::MSAColorSchemeRegistry</name>
- <message>
- <source>No colors</source>
- <translation type="vanished">Без цвета</translation>
- </message>
- <message>
- <source>Jalview</source>
- <translation type="vanished">Раскраска Jalview</translation>
- </message>
- <message>
- <source>Percentage Identity</source>
- <translation type="vanished">По процентному соотношению</translation>
- </message>
- <message>
- <source>Percentage Identity (gray)</source>
- <translation type="vanished">По процентному соотношению (серый)</translation>
- </message>
- <message>
- <source>Zappo</source>
- <translation type="vanished">Zappo</translation>
- </message>
- <message>
- <source>Tailor</source>
- <translation type="vanished">Tailor</translation>
- </message>
- <message>
- <source>Hydrophobicity</source>
- <translation type="vanished">Гидрофобность</translation>
- </message>
- <message>
- <source>Helix propensity</source>
- <translation type="vanished">Склонность к спиральности</translation>
- </message>
- <message>
- <source>Strand propensity</source>
- <translation type="vanished">Склонность к линейности</translation>
- </message>
- <message>
- <source>Turn propensity</source>
- <translation type="vanished">Склонность к сворачиванию</translation>
- </message>
- <message>
- <source>Buried index</source>
- <translation type="vanished">Индекс</translation>
- </message>
- <message>
- <source>Clustal X</source>
- <translation type="vanished">Clustal X</translation>
- </message>
-</context>
-<context>
<name>U2::MSAConsensusAlgorithmFactoryClustal</name>
<message>
<location filename="../src/util_msa_consensus/MSAConsensusAlgorithmClustal.cpp" line="30"/>
@@ -407,37 +356,6 @@ For every column selects the most rare symbol in the whole alignment with percen
</message>
</context>
<context>
- <name>U2::MSAHighlightingSchemeRegistry</name>
- <message>
- <source>No highlighting</source>
- <translation type="vanished">Без выделения</translation>
- </message>
- <message>
- <source>Agreements</source>
- <translation type="vanished">Совпадающие нуклеотиды</translation>
- </message>
- <message>
- <source>Disagreements</source>
- <translation type="vanished">Различающиеся нуклеотиды</translation>
- </message>
- <message>
- <source>Gaps</source>
- <translation type="vanished">Пробелы</translation>
- </message>
- <message>
- <source>Conservation level</source>
- <translation type="vanished">Уровень сохранения</translation>
- </message>
- <message>
- <source>Transitions</source>
- <translation type="vanished">Транзиции</translation>
- </message>
- <message>
- <source>Transversions</source>
- <translation type="vanished">Трансверсии</translation>
- </message>
-</context>
-<context>
<name>U2::MolecularSurfaceCalcTask</name>
<message>
<location filename="../src/molecular_geometry/MolecularSurface.cpp" line="126"/>
@@ -452,64 +370,64 @@ For every column selects the most rare symbol in the whole alignment with percen
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="511"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="552"/>
<source>No colors</source>
- <translation type="unfinished">Без цвета</translation>
+ <translation>Без цвета</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="504"/>
<source>Jalview</source>
- <translation type="unfinished">Раскраска Jalview</translation>
+ <translation>Раскраска Jalview</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="506"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="545"/>
<source>Percentage Identity</source>
- <translation type="unfinished">По процентному соотношению</translation>
+ <translation>По процентному соотношению</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="507"/>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="546"/>
<source>Percentage Identity (gray)</source>
- <translation type="unfinished">По процентному соотношению (серый)</translation>
+ <translation>По процентному соотношению (серый)</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="519"/>
<source>Zappo</source>
- <translation type="unfinished">Zappo</translation>
+ <translation>Zappo</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="523"/>
<source>Tailor</source>
- <translation type="unfinished">Tailor</translation>
+ <translation>Tailor</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="527"/>
<source>Hydrophobicity</source>
- <translation type="unfinished">Гидрофобность</translation>
+ <translation>Гидрофобность</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="531"/>
<source>Helix propensity</source>
- <translation type="unfinished">Склонность к спиральности</translation>
+ <translation>Склонность к спиральности</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="535"/>
<source>Strand propensity</source>
- <translation type="unfinished">Склонность к линейности</translation>
+ <translation>Склонность к линейности</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="539"/>
<source>Turn propensity</source>
- <translation type="unfinished">Склонность к сворачиванию</translation>
+ <translation>Склонность к сворачиванию</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="543"/>
<source>Buried index</source>
- <translation type="unfinished">Индекс</translation>
+ <translation>Индекс</translation>
</message>
<message>
<location filename="../src/util_msaedit/color_schemes/MsaColorScheme.cpp" line="548"/>
<source>Clustal X</source>
- <translation type="unfinished">Clustal X</translation>
+ <translation>Clustal X</translation>
</message>
</context>
<context>
@@ -519,42 +437,42 @@ For every column selects the most rare symbol in the whole alignment with percen
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="121"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="122"/>
<source>No highlighting</source>
- <translation type="unfinished">Без выделения</translation>
+ <translation>Без выделения</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="124"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="125"/>
<source>Agreements</source>
- <translation type="unfinished">Совпадающие нуклеотиды</translation>
+ <translation>Совпадающие нуклеотиды</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="127"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="128"/>
<source>Disagreements</source>
- <translation type="unfinished">Различающиеся нуклеотиды</translation>
+ <translation>Различающиеся нуклеотиды</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="130"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="131"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="132"/>
<source>Gaps</source>
- <translation type="unfinished">Пробелы</translation>
+ <translation>Пробелы</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="134"/>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="135"/>
<source>Conservation level</source>
- <translation type="unfinished">Уровень сохранения</translation>
+ <translation>Уровень сохранения</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="137"/>
<source>Transitions</source>
- <translation type="unfinished">Транзиции</translation>
+ <translation>Транзиции</translation>
</message>
<message>
<location filename="../src/util_msaedit/highlighting_schemes/MsaHighlightingScheme.cpp" line="138"/>
<source>Transversions</source>
- <translation type="unfinished">Трансверсии</translation>
+ <translation>Трансверсии</translation>
</message>
</context>
<context>
diff --git a/src/corelibs/U2Core/CMakeLists.txt b/src/corelibs/U2Core/CMakeLists.txt
index 95cba93..d618379 100644
--- a/src/corelibs/U2Core/CMakeLists.txt
+++ b/src/corelibs/U2Core/CMakeLists.txt
@@ -3,11 +3,7 @@ project(U2Core)
set(CMAKE_AUTOMOC ON)
-if (APPLE)
- find_package(Qt5 REQUIRED Core Gui Widgets Script Network Xml)
-else()
- find_package(Qt5 REQUIRED Core Gui Widgets)
-endif ()
+find_package(Qt5 REQUIRED Core Gui Widgets Script Network Xml)
add_definitions(
-DBUILDING_U2CORE_DLL
@@ -25,9 +21,5 @@ add_library(U2Core SHARED ${HDRS} ${SRCS})
target_link_libraries(U2Core
proc
- Qt5::Core Qt5::Gui Qt5::Widgets
+ Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Script Qt5::Xml
ugenedb zlib)
-
-if (APPLE)
- target_link_libraries(U2Core Qt5::Script Qt5::Network Qt5::Xml)
-endif ()
diff --git a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
index be9f18f..d3e26f2 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
index 72a5a8c..978c225 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineCoreOptions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h b/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
index b2127d2..06239bc 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineHelpProvider.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
index be51f4e..6c17fad 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineRegistry.h b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
index 3024a84..3bf8580 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
index f4f8fbd..b70ced7 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/cmdline/CMDLineUtils.h b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
index aa41c0d..7050b88 100644
--- a/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
+++ b/src/corelibs/U2Core/src/cmdline/CMDLineUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Annotation.cpp b/src/corelibs/U2Core/src/datatype/Annotation.cpp
index 27e0bd9..0b52e70 100644
--- a/src/corelibs/U2Core/src/datatype/Annotation.cpp
+++ b/src/corelibs/U2Core/src/datatype/Annotation.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Annotation.h b/src/corelibs/U2Core/src/datatype/Annotation.h
index 6c7910e..efdd6b4 100644
--- a/src/corelibs/U2Core/src/datatype/Annotation.h
+++ b/src/corelibs/U2Core/src/datatype/Annotation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationData.cpp b/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
index f84fc4f..e1fba6c 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationData.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationData.h b/src/corelibs/U2Core/src/datatype/AnnotationData.h
index 1029c49..a18516c 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationData.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationData.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationGroup.cpp b/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
index af0a3b8..b5a5fd7 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationGroup.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationGroup.h b/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
index e4a7d15..8ed457f 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationGroup.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationModification.cpp b/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
index 1287f41..a2537c0 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationModification.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationModification.h b/src/corelibs/U2Core/src/datatype/AnnotationModification.h
index 307158b..a8c408b 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationModification.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationModification.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationSettings.cpp b/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
index 860c360..8bc7c07 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationSettings.h b/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
index 46d3dff..ad64f3a 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
index 68b047a..38c9d9b 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
+++ b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
index 263c41e..da6e96b 100644
--- a/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
+++ b/src/corelibs/U2Core/src/datatype/AnnotationTableObjectConstraints.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/BaseAlphabets.cpp b/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
index 6abe5ba..94d2e1f 100644
--- a/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
+++ b/src/corelibs/U2Core/src/datatype/BaseAlphabets.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/BaseTranslations.cpp b/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
index d0f5282..e9474b7 100644
--- a/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
+++ b/src/corelibs/U2Core/src/datatype/BaseTranslations.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/BioStruct3D.cpp b/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
index 088816f..b1cd489 100644
--- a/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
+++ b/src/corelibs/U2Core/src/datatype/BioStruct3D.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -134,7 +134,7 @@ QMap<int, QList<SharedAnnotationData> > BioStruct3D::generateChainAnnotations()
sd->name = BioStruct3D::MoleculeAnnotationTag;
if ((*iter)->chainId > 0) {
sd->qualifiers.append(U2Qualifier(ChainIdQualifierName, QString("%1").arg((*iter)->chainId)));
- }
+ }
if (!(*iter)->name.isEmpty()) {
sd->qualifiers.append(U2Qualifier(molNameQualifier, (*iter)->name));
}
diff --git a/src/corelibs/U2Core/src/datatype/BioStruct3D.h b/src/corelibs/U2Core/src/datatype/BioStruct3D.h
index 72c9160..48ec1da 100644
--- a/src/corelibs/U2Core/src/datatype/BioStruct3D.h
+++ b/src/corelibs/U2Core/src/datatype/BioStruct3D.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DIProperties.h b/src/corelibs/U2Core/src/datatype/DIProperties.h
index 51a7d5c..408451a 100644
--- a/src/corelibs/U2Core/src/datatype/DIProperties.h
+++ b/src/corelibs/U2Core/src/datatype/DIProperties.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAAlphabet.cpp b/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
index 77f5765..11fb8f3 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabet.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAAlphabet.h b/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
index cb9a3a7..e02fff6 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabet.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
index 0b568a5..3aab1be 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
index bb4ffca..c800350 100644
--- a/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
+++ b/src/corelibs/U2Core/src/datatype/DNAAlphabetRegistryImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAChromatogram.h b/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
index 22b2ed9..2573cab 100644
--- a/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
+++ b/src/corelibs/U2Core/src/datatype/DNAChromatogram.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAInfo.cpp b/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
index eb3ef6a..0828309 100644
--- a/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAInfo.h b/src/corelibs/U2Core/src/datatype/DNAInfo.h
index 8fe5ac4..ca45dba 100644
--- a/src/corelibs/U2Core/src/datatype/DNAInfo.h
+++ b/src/corelibs/U2Core/src/datatype/DNAInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAQuality.cpp b/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
index a81dce5..f5b953b 100644
--- a/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNAQuality.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNAQuality.h b/src/corelibs/U2Core/src/datatype/DNAQuality.h
index 084a57e..51e40a3 100644
--- a/src/corelibs/U2Core/src/datatype/DNAQuality.h
+++ b/src/corelibs/U2Core/src/datatype/DNAQuality.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNASequence.cpp b/src/corelibs/U2Core/src/datatype/DNASequence.cpp
index c1b5487..906b394 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequence.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNASequence.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNASequence.h b/src/corelibs/U2Core/src/datatype/DNASequence.h
index b78475c..62a5ea1 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequence.h
+++ b/src/corelibs/U2Core/src/datatype/DNASequence.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
index ca9c386..89e05a2 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNASequenceUtils.h b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
index 20bf155..60f28b0 100644
--- a/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
+++ b/src/corelibs/U2Core/src/datatype/DNASequenceUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNATranslation.cpp b/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
index bb8b0e8..1705410 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNATranslation.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNATranslation.h b/src/corelibs/U2Core/src/datatype/DNATranslation.h
index a73f18e..8819dd0 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslation.h
+++ b/src/corelibs/U2Core/src/datatype/DNATranslation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
index b9933e9..99b0790 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
+++ b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/DNATranslationImpl.h b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
index 856aca8..6fb8b9f 100644
--- a/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
+++ b/src/corelibs/U2Core/src/datatype/DNATranslationImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/FeatureColors.cpp b/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
index 3a8de4e..094fbe4 100644
--- a/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
+++ b/src/corelibs/U2Core/src/datatype/FeatureColors.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/FeatureColors.h b/src/corelibs/U2Core/src/datatype/FeatureColors.h
index c9e3467..8da5034 100644
--- a/src/corelibs/U2Core/src/datatype/FeatureColors.h
+++ b/src/corelibs/U2Core/src/datatype/FeatureColors.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/MAlignment.cpp b/src/corelibs/U2Core/src/datatype/MAlignment.cpp
index 7bcf4e2..2b537bb 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignment.cpp
+++ b/src/corelibs/U2Core/src/datatype/MAlignment.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/MAlignment.h b/src/corelibs/U2Core/src/datatype/MAlignment.h
index e267e8b..d668038 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignment.h
+++ b/src/corelibs/U2Core/src/datatype/MAlignment.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
index f2f9be7..f20610a 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
+++ b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/MAlignmentInfo.h b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
index d23adc8..8eba88d 100644
--- a/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
+++ b/src/corelibs/U2Core/src/datatype/MAlignmentInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Matrix44.cpp b/src/corelibs/U2Core/src/datatype/Matrix44.cpp
index caec95b..6f07271 100644
--- a/src/corelibs/U2Core/src/datatype/Matrix44.cpp
+++ b/src/corelibs/U2Core/src/datatype/Matrix44.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Matrix44.h b/src/corelibs/U2Core/src/datatype/Matrix44.h
index f2dce4c..8c7a42d 100644
--- a/src/corelibs/U2Core/src/datatype/Matrix44.h
+++ b/src/corelibs/U2Core/src/datatype/Matrix44.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PFMatrix.cpp b/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
index 3bfff90..7467c91 100644
--- a/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/PFMatrix.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PFMatrix.h b/src/corelibs/U2Core/src/datatype/PFMatrix.h
index 455c253..0d794df 100644
--- a/src/corelibs/U2Core/src/datatype/PFMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/PFMatrix.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PWMatrix.cpp b/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
index c58835f..879bcaa 100644
--- a/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/PWMatrix.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PWMatrix.h b/src/corelibs/U2Core/src/datatype/PWMatrix.h
index 76a0168..5fe013a 100644
--- a/src/corelibs/U2Core/src/datatype/PWMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/PWMatrix.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PhyTree.cpp b/src/corelibs/U2Core/src/datatype/PhyTree.cpp
index 10feda0..d169981 100644
--- a/src/corelibs/U2Core/src/datatype/PhyTree.cpp
+++ b/src/corelibs/U2Core/src/datatype/PhyTree.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/PhyTree.h b/src/corelibs/U2Core/src/datatype/PhyTree.h
index 19a24c5..76b544a 100644
--- a/src/corelibs/U2Core/src/datatype/PhyTree.h
+++ b/src/corelibs/U2Core/src/datatype/PhyTree.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/SMatrix.cpp b/src/corelibs/U2Core/src/datatype/SMatrix.cpp
index 0247a57..e086cdd 100644
--- a/src/corelibs/U2Core/src/datatype/SMatrix.cpp
+++ b/src/corelibs/U2Core/src/datatype/SMatrix.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/SMatrix.h b/src/corelibs/U2Core/src/datatype/SMatrix.h
index bfe8d2e..783b77d 100644
--- a/src/corelibs/U2Core/src/datatype/SMatrix.h
+++ b/src/corelibs/U2Core/src/datatype/SMatrix.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Alphabet.h b/src/corelibs/U2Core/src/datatype/U2Alphabet.h
index aa0c53f..7351c45 100644
--- a/src/corelibs/U2Core/src/datatype/U2Alphabet.h
+++ b/src/corelibs/U2Core/src/datatype/U2Alphabet.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Assembly.h b/src/corelibs/U2Core/src/datatype/U2Assembly.h
index 200b4a1..7bb46c3 100644
--- a/src/corelibs/U2Core/src/datatype/U2Assembly.h
+++ b/src/corelibs/U2Core/src/datatype/U2Assembly.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -238,30 +238,7 @@ public:
};
/** Statistics information collected during the reads packing algorithm */
-class U2CORE_EXPORT U2AssemblyCoverageStat {
-public:
- U2AssemblyCoverageStat() {
- coverage = new QVector<U2Range <int> >();
- }
-
- U2AssemblyCoverageStat(const U2AssemblyCoverageStat& toCopy) {
- this->coverage = new QVector<U2Range<int> >(*toCopy.coverage);
- }
-
- ~U2AssemblyCoverageStat() {
- delete coverage;
- }
- const U2AssemblyCoverageStat& operator=(const U2AssemblyCoverageStat& obj) {
- if (this == &obj) {
- return *this;
- }
- delete this->coverage;
- this->coverage = new QVector< U2Range<int> > (*obj.coverage);
- return *this;
- }
-
- QVector< U2Range<int> > *coverage;
-};
+typedef QVector<qint32> U2AssemblyCoverageStat;
} //namespace
diff --git a/src/corelibs/U2Core/src/datatype/U2Attribute.h b/src/corelibs/U2Core/src/datatype/U2Attribute.h
index 6bc2416..82a8a2c 100644
--- a/src/corelibs/U2Core/src/datatype/U2Attribute.h
+++ b/src/corelibs/U2Core/src/datatype/U2Attribute.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
index 17dd65a..729ee14 100644
--- a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2CoreAttributes.h b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
index 8b94759..70469b0 100644
--- a/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
+++ b/src/corelibs/U2Core/src/datatype/U2CoreAttributes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Feature.h b/src/corelibs/U2Core/src/datatype/U2Feature.h
index 22ca16c..8e7fa75 100644
--- a/src/corelibs/U2Core/src/datatype/U2Feature.h
+++ b/src/corelibs/U2Core/src/datatype/U2Feature.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2FeatureKeys.h b/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
index d38fbbe..aba6e17 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureKeys.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2FeatureType.cpp b/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
index a7b32c1..b9dfe80 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureType.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2FeatureType.h b/src/corelibs/U2Core/src/datatype/U2FeatureType.h
index 6215fd6..4c780b0 100644
--- a/src/corelibs/U2Core/src/datatype/U2FeatureType.h
+++ b/src/corelibs/U2Core/src/datatype/U2FeatureType.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2IdTypes.h b/src/corelibs/U2Core/src/datatype/U2IdTypes.h
index 438b53e..0bc7cd2 100644
--- a/src/corelibs/U2Core/src/datatype/U2IdTypes.h
+++ b/src/corelibs/U2Core/src/datatype/U2IdTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Identity.h b/src/corelibs/U2Core/src/datatype/U2Identity.h
index 262e248..afd66e6 100644
--- a/src/corelibs/U2Core/src/datatype/U2Identity.h
+++ b/src/corelibs/U2Core/src/datatype/U2Identity.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Location.h b/src/corelibs/U2Core/src/datatype/U2Location.h
index 614e63f..169175d 100644
--- a/src/corelibs/U2Core/src/datatype/U2Location.h
+++ b/src/corelibs/U2Core/src/datatype/U2Location.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Mod.cpp b/src/corelibs/U2Core/src/datatype/U2Mod.cpp
index 0a661df..e23aed1 100644
--- a/src/corelibs/U2Core/src/datatype/U2Mod.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Mod.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Mod.h b/src/corelibs/U2Core/src/datatype/U2Mod.h
index 46395da..7307d8b 100644
--- a/src/corelibs/U2Core/src/datatype/U2Mod.h
+++ b/src/corelibs/U2Core/src/datatype/U2Mod.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Msa.h b/src/corelibs/U2Core/src/datatype/U2Msa.h
index 4b4e8b0..21b4449 100644
--- a/src/corelibs/U2Core/src/datatype/U2Msa.h
+++ b/src/corelibs/U2Core/src/datatype/U2Msa.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Qualifier.cpp b/src/corelibs/U2Core/src/datatype/U2Qualifier.cpp
index 9c9f0f9..46035d4 100644
--- a/src/corelibs/U2Core/src/datatype/U2Qualifier.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Qualifier.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Qualifier.h b/src/corelibs/U2Core/src/datatype/U2Qualifier.h
index dbbac02..b93d64f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Qualifier.h
+++ b/src/corelibs/U2Core/src/datatype/U2Qualifier.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ public:
/** Constructs new empty (and invalid) qualifier */
U2Qualifier();
-
+
/** Constructs new qualifier instance with name and value set */
U2Qualifier(const QString &name, const QString &value);
@@ -49,7 +49,7 @@ public:
/** Any two qualifiers are equal if their names & values are equal */
bool operator==(const U2Qualifier &q) const;
-
+
/** Any two qualifiers are not equal if either their names or values are not equal */
bool operator!=(const U2Qualifier &q) const;
diff --git a/src/corelibs/U2Core/src/datatype/U2Range.h b/src/corelibs/U2Core/src/datatype/U2Range.h
index 70d42d0..f8fbfdb 100644
--- a/src/corelibs/U2Core/src/datatype/U2Range.h
+++ b/src/corelibs/U2Core/src/datatype/U2Range.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2RawData.h b/src/corelibs/U2Core/src/datatype/U2RawData.h
index 4e529de..24773d7 100644
--- a/src/corelibs/U2Core/src/datatype/U2RawData.h
+++ b/src/corelibs/U2Core/src/datatype/U2RawData.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Region.cpp b/src/corelibs/U2Core/src/datatype/U2Region.cpp
index c24df8f..74221ef 100644
--- a/src/corelibs/U2Core/src/datatype/U2Region.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Region.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Region.h b/src/corelibs/U2Core/src/datatype/U2Region.h
index 154048b..f68bc7a 100644
--- a/src/corelibs/U2Core/src/datatype/U2Region.h
+++ b/src/corelibs/U2Core/src/datatype/U2Region.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Sequence.h b/src/corelibs/U2Core/src/datatype/U2Sequence.h
index 3458d8e..08d7377 100644
--- a/src/corelibs/U2Core/src/datatype/U2Sequence.h
+++ b/src/corelibs/U2Core/src/datatype/U2Sequence.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Type.cpp b/src/corelibs/U2Core/src/datatype/U2Type.cpp
index 3bc7212..a3ac3fe 100644
--- a/src/corelibs/U2Core/src/datatype/U2Type.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Type.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Type.h b/src/corelibs/U2Core/src/datatype/U2Type.h
index 617bbc3..8ef6067 100644
--- a/src/corelibs/U2Core/src/datatype/U2Type.h
+++ b/src/corelibs/U2Core/src/datatype/U2Type.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2TypeIds.h b/src/corelibs/U2Core/src/datatype/U2TypeIds.h
index 7ab327d..5c3a767 100644
--- a/src/corelibs/U2Core/src/datatype/U2TypeIds.h
+++ b/src/corelibs/U2Core/src/datatype/U2TypeIds.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Variant.cpp b/src/corelibs/U2Core/src/datatype/U2Variant.cpp
index 902ce60..b91ad5f 100644
--- a/src/corelibs/U2Core/src/datatype/U2Variant.cpp
+++ b/src/corelibs/U2Core/src/datatype/U2Variant.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/U2Variant.h b/src/corelibs/U2Core/src/datatype/U2Variant.h
index e0eaffa..c0cccc2 100644
--- a/src/corelibs/U2Core/src/datatype/U2Variant.h
+++ b/src/corelibs/U2Core/src/datatype/U2Variant.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrRecord.cpp b/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
index 92560d4..c34a25c 100644
--- a/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrRecord.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrRecord.h b/src/corelibs/U2Core/src/datatype/UdrRecord.h
index 97f274c..76fbe9b 100644
--- a/src/corelibs/U2Core/src/datatype/UdrRecord.h
+++ b/src/corelibs/U2Core/src/datatype/UdrRecord.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrSchema.cpp b/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
index b2c0927..75e3b97 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrSchema.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrSchema.h b/src/corelibs/U2Core/src/datatype/UdrSchema.h
index 5ccb1f2..6be57ce 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchema.h
+++ b/src/corelibs/U2Core/src/datatype/UdrSchema.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
index 8203330..1684317 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
+++ b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
index 6e8ac3c..fbcfad2 100644
--- a/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
+++ b/src/corelibs/U2Core/src/datatype/UdrSchemaRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Vector3D.cpp b/src/corelibs/U2Core/src/datatype/Vector3D.cpp
index a123354..43c1f56 100644
--- a/src/corelibs/U2Core/src/datatype/Vector3D.cpp
+++ b/src/corelibs/U2Core/src/datatype/Vector3D.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/Vector3D.h b/src/corelibs/U2Core/src/datatype/Vector3D.h
index 5756924..e705644 100644
--- a/src/corelibs/U2Core/src/datatype/Vector3D.h
+++ b/src/corelibs/U2Core/src/datatype/Vector3D.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
index d857243..3262eba 100644
--- a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
+++ b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
index b08c9ff..9e18f0c 100644
--- a/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
+++ b/src/corelibs/U2Core/src/datatype/udr/RawDataUdrSchema.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/DbiConnection.cpp b/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
index 1e2fe40..5a44782 100644
--- a/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
+++ b/src/corelibs/U2Core/src/dbi/DbiConnection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/DbiConnection.h b/src/corelibs/U2Core/src/dbi/DbiConnection.h
index 3a926a6..f7ebfde 100644
--- a/src/corelibs/U2Core/src/dbi/DbiConnection.h
+++ b/src/corelibs/U2Core/src/dbi/DbiConnection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
index d8ebafc..3c418ba 100644
--- a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
+++ b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/DbiDocumentFormat.h b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
index 13f3a58..72ad4c5 100644
--- a/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
+++ b/src/corelibs/U2Core/src/dbi/DbiDocumentFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2AbstractDbi.h b/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
index f0e1df0..352a127 100644
--- a/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AbstractDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -136,6 +136,7 @@ public:
}
virtual U2DataId getObject(qint64 objectId, U2OpStatus& os) {
+ Q_UNUSED(objectId)
U2DbiUtils::logNotSupported(U2DbiFeature_RemoveObjects, getRootDbi(), os);
return U2DataId();
}
diff --git a/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h b/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
index 7880649..3cd5acf 100644
--- a/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AssemblyDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -205,13 +205,13 @@ public:
virtual void pack(const U2DataId& assemblyId, U2AssemblyPackStat& stats, U2OpStatus& os) = 0;
/**
- Calculates coverage information for the given region and stores it in 'c' structure.
+ Calculates coverage information for the given region and stores it in 'coverage' vector.
U2Region 'region' passed to the method is split into N sequential windows of equal length,
- where N is 'c.coverage' vector size. Number of reads intersecting each window is guaranteed
- to be in range stored at corresponding index in vector 'c.coverage'.
+ where N is 'coverage' vector size. Number of reads intersecting each window is guaranteed
+ to be in range stored at corresponding index in vector 'coverage'.
*/
- virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) = 0;
+ virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os) = 0;
};
diff --git a/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h b/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
index 83cdfb6..e31de3e 100644
--- a/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2AttributeDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h b/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
index 868ec66..d09adfa 100644
--- a/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2CrossDatabaseReferenceDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2Dbi.cpp b/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
index 7bce5c8..4b3f248 100644
--- a/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2Dbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2Dbi.h b/src/corelibs/U2Core/src/dbi/U2Dbi.h
index d02a647..160a290 100644
--- a/src/corelibs/U2Core/src/dbi/U2Dbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2Dbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
index 9145fcc..c693676 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2DbiPackUtils.h b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
index f942061..25658ab 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiPackUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
index 4a572a5..17cef52 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2DbiRegistry.h b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
index cd2d31d..2a7e0ea 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2DbiUtils.cpp b/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
index b429d82..0785b99 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2DbiUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@ static U2DataId emptyId;
const QString U2DbiUtils::PUBLIC_DATABASE_NAME = QObject::tr("UGENE public database");
const QString U2DbiUtils::PUBLIC_DATABASE_LOGIN = "public";
const QString U2DbiUtils::PUBLIC_DATABASE_PASSWORD = "public";
-const QString U2DbiUtils::PUBLIC_DATABASE_URL = U2DbiUtils::createFullDbiUrl(PUBLIC_DATABASE_LOGIN, "5.9.139.103", 3306, "public_ugene_1_24");
+const QString U2DbiUtils::PUBLIC_DATABASE_URL = U2DbiUtils::createFullDbiUrl(PUBLIC_DATABASE_LOGIN, "5.9.139.103", 3306, "public_ugene_1_25");
void U2DbiUtils::logNotSupported(U2DbiFeature f, U2Dbi* dbi, U2OpStatus& os) {
QString msg = tr("Feature is not supported: %1, dbi: %2").arg(int(f)).arg(dbi == NULL ? QString("<unknown>") : dbi->getDbiId());
diff --git a/src/corelibs/U2Core/src/dbi/U2DbiUtils.h b/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
index 656642f..135b33e 100644
--- a/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
+++ b/src/corelibs/U2Core/src/dbi/U2DbiUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2FeatureDbi.h b/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
index da3e013..795e357 100644
--- a/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2FeatureDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2FormatCheckResult.h b/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
index 85f2fc1..a40309f 100644
--- a/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
+++ b/src/corelibs/U2Core/src/dbi/U2FormatCheckResult.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2ModDbi.h b/src/corelibs/U2Core/src/dbi/U2ModDbi.h
index 526027d..e8cafa3 100644
--- a/src/corelibs/U2Core/src/dbi/U2ModDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ModDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2MsaDbi.h b/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
index b2e0894..af701da 100644
--- a/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2MsaDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -53,7 +53,7 @@ public:
/** Return the MSA alphabet */
virtual U2AlphabetId getMsaAlphabet(const U2DataId& msaId, U2OpStatus& os) = 0;
-
+
/** Return the MSA length */
virtual qint64 getMsaLength(const U2DataId& msaId, U2OpStatus& os) = 0;
diff --git a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
index bb98491..0fac786 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2ObjectDbi.h b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
index fa0d3e7..a7a9611 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
index e38f73f..030e9fb 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
index c06a6b8..e37827f 100644
--- a/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2ObjectRelationsDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
index e88c472..0a90755 100644
--- a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
index 626a078..d98433e 100644
--- a/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
+++ b/src/corelibs/U2Core/src/dbi/U2SQLiteTripleStore.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2SequenceDbi.h b/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
index 0e3ff01..cfa2549 100644
--- a/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2SequenceDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
index bcdec38..ead9f30 100644
--- a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
+++ b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2SqlHelpers.h b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
index 2912962..787fec5 100644
--- a/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
+++ b/src/corelibs/U2Core/src/dbi/U2SqlHelpers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/U2VariantDbi.h b/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
index fb0e7a5..4c4e98c 100644
--- a/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
+++ b/src/corelibs/U2Core/src/dbi/U2VariantDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/UdrDbi.cpp b/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
index f97af68..6289f20 100644
--- a/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
+++ b/src/corelibs/U2Core/src/dbi/UdrDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/dbi/UdrDbi.h b/src/corelibs/U2Core/src/dbi/UdrDbi.h
index 1272758..2998bf5 100644
--- a/src/corelibs/U2Core/src/dbi/UdrDbi.h
+++ b/src/corelibs/U2Core/src/dbi/UdrDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppContext.cpp b/src/corelibs/U2Core/src/globals/AppContext.cpp
index b566deb..96736a7 100644
--- a/src/corelibs/U2Core/src/globals/AppContext.cpp
+++ b/src/corelibs/U2Core/src/globals/AppContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppContext.h b/src/corelibs/U2Core/src/globals/AppContext.h
index 37956be..6ae596f 100644
--- a/src/corelibs/U2Core/src/globals/AppContext.h
+++ b/src/corelibs/U2Core/src/globals/AppContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppFileStorage.cpp b/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
index 959a73a..d1486f6 100644
--- a/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
+++ b/src/corelibs/U2Core/src/globals/AppFileStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppFileStorage.h b/src/corelibs/U2Core/src/globals/AppFileStorage.h
index 9031b3f..340d5ae 100644
--- a/src/corelibs/U2Core/src/globals/AppFileStorage.h
+++ b/src/corelibs/U2Core/src/globals/AppFileStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppGlobalObject.cpp b/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
index e66e6a9..790fc85 100644
--- a/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
+++ b/src/corelibs/U2Core/src/globals/AppGlobalObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppGlobalObject.h b/src/corelibs/U2Core/src/globals/AppGlobalObject.h
index 7af294a..a66482a 100644
--- a/src/corelibs/U2Core/src/globals/AppGlobalObject.h
+++ b/src/corelibs/U2Core/src/globals/AppGlobalObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppResources.cpp b/src/corelibs/U2Core/src/globals/AppResources.cpp
index daebe60..18f4cd1 100644
--- a/src/corelibs/U2Core/src/globals/AppResources.cpp
+++ b/src/corelibs/U2Core/src/globals/AppResources.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppResources.h b/src/corelibs/U2Core/src/globals/AppResources.h
index 0a98045..56a6815 100644
--- a/src/corelibs/U2Core/src/globals/AppResources.h
+++ b/src/corelibs/U2Core/src/globals/AppResources.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AppSettings.h b/src/corelibs/U2Core/src/globals/AppSettings.h
index 022750a..fb2c96d 100644
--- a/src/corelibs/U2Core/src/globals/AppSettings.h
+++ b/src/corelibs/U2Core/src/globals/AppSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
index a5381bc..9076173 100644
--- a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
+++ b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
index 81bfe97..6e21c65 100644
--- a/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
+++ b/src/corelibs/U2Core/src/globals/AutoAnnotationsSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
index 6a2289b..9c4496c 100644
--- a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
+++ b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/BaseDocumentFormats.h b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
index a31aa62..eebf6e8 100644
--- a/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
+++ b/src/corelibs/U2Core/src/globals/BaseDocumentFormats.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ClipboardController.cpp b/src/corelibs/U2Core/src/globals/ClipboardController.cpp
index a0c69ee..321d0b2 100644
--- a/src/corelibs/U2Core/src/globals/ClipboardController.cpp
+++ b/src/corelibs/U2Core/src/globals/ClipboardController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ClipboardController.h b/src/corelibs/U2Core/src/globals/ClipboardController.h
index 6bc1b20..9e18dd6 100644
--- a/src/corelibs/U2Core/src/globals/ClipboardController.h
+++ b/src/corelibs/U2Core/src/globals/ClipboardController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Counter.cpp b/src/corelibs/U2Core/src/globals/Counter.cpp
index c0ad381..478faca 100644
--- a/src/corelibs/U2Core/src/globals/Counter.cpp
+++ b/src/corelibs/U2Core/src/globals/Counter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Counter.h b/src/corelibs/U2Core/src/globals/Counter.h
index 0bccae4..bdde402 100644
--- a/src/corelibs/U2Core/src/globals/Counter.h
+++ b/src/corelibs/U2Core/src/globals/Counter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/CredentialsAsker.cpp b/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
index b788b85..363c3b7 100644
--- a/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
+++ b/src/corelibs/U2Core/src/globals/CredentialsAsker.cpp
@@ -1,6 +1,6 @@
/**
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
* UGENE - Integrated Bioinformatics Tools.
*
* This program is free software; you can redistribute it and/or
diff --git a/src/corelibs/U2Core/src/globals/CredentialsAsker.h b/src/corelibs/U2Core/src/globals/CredentialsAsker.h
index 0163d16..d0ceb9a 100644
--- a/src/corelibs/U2Core/src/globals/CredentialsAsker.h
+++ b/src/corelibs/U2Core/src/globals/CredentialsAsker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DBXRefRegistry.cpp b/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
index 08eba02..018423f 100644
--- a/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DBXRefRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DBXRefRegistry.h b/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
index 3be387b..1b3b46c 100644
--- a/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DBXRefRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DataBaseRegistry.cpp b/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
index e3f45b4..066751d 100644
--- a/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DataBaseRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DataBaseRegistry.h b/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
index 90e59ac..25a5afd 100644
--- a/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DataBaseRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DataPathRegistry.cpp b/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
index e376053..c56e507 100644
--- a/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/DataPathRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/DataPathRegistry.h b/src/corelibs/U2Core/src/globals/DataPathRegistry.h
index 79c1943..cccecd8 100644
--- a/src/corelibs/U2Core/src/globals/DataPathRegistry.h
+++ b/src/corelibs/U2Core/src/globals/DataPathRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
index 59bf348..2ffadc3 100644
--- a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ExternalToolRegistry.h b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
index cc27f96..102591d 100644
--- a/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ExternalToolRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -78,7 +78,7 @@ public:
const QString& getToolKitName() const { return toolKitName; }
const QStrStrMap& getErrorDescriptions() const { return errorDescriptions; }
- virtual void getAdditionalParameters(const QString& output) {};
+ virtual void getAdditionalParameters(const QString& output) { Q_UNUSED(output) };
ExternalToolValidation getToolValidation();
const QList<ExternalToolValidation>& getToolAdditionalValidations() const { return additionalValidators; }
diff --git a/src/corelibs/U2Core/src/globals/FormatSettings.cpp b/src/corelibs/U2Core/src/globals/FormatSettings.cpp
index 23ea22a..8d2880c 100644
--- a/src/corelibs/U2Core/src/globals/FormatSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/FormatSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/FormatSettings.h b/src/corelibs/U2Core/src/globals/FormatSettings.h
index f325bb0..a8dad65 100644
--- a/src/corelibs/U2Core/src/globals/FormatSettings.h
+++ b/src/corelibs/U2Core/src/globals/FormatSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/GUrl.cpp b/src/corelibs/U2Core/src/globals/GUrl.cpp
index 0ab9a73..ab68ceb 100644
--- a/src/corelibs/U2Core/src/globals/GUrl.cpp
+++ b/src/corelibs/U2Core/src/globals/GUrl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/GUrl.h b/src/corelibs/U2Core/src/globals/GUrl.h
index d7a54fb..7ee0b9c 100644
--- a/src/corelibs/U2Core/src/globals/GUrl.h
+++ b/src/corelibs/U2Core/src/globals/GUrl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Identifiable.h b/src/corelibs/U2Core/src/globals/Identifiable.h
index 09b9698..e0144dc 100644
--- a/src/corelibs/U2Core/src/globals/Identifiable.h
+++ b/src/corelibs/U2Core/src/globals/Identifiable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/L10n.h b/src/corelibs/U2Core/src/globals/L10n.h
index e295b4f..b423c11 100644
--- a/src/corelibs/U2Core/src/globals/L10n.h
+++ b/src/corelibs/U2Core/src/globals/L10n.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Log.cpp b/src/corelibs/U2Core/src/globals/Log.cpp
index 4ddf5cc..2a1278b 100644
--- a/src/corelibs/U2Core/src/globals/Log.cpp
+++ b/src/corelibs/U2Core/src/globals/Log.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Log.h b/src/corelibs/U2Core/src/globals/Log.h
index e8386a5..cad948a 100644
--- a/src/corelibs/U2Core/src/globals/Log.h
+++ b/src/corelibs/U2Core/src/globals/Log.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/LogCache.cpp b/src/corelibs/U2Core/src/globals/LogCache.cpp
index 6ffdc2d..f2aa5b6 100644
--- a/src/corelibs/U2Core/src/globals/LogCache.cpp
+++ b/src/corelibs/U2Core/src/globals/LogCache.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/LogCache.h b/src/corelibs/U2Core/src/globals/LogCache.h
index 54f9292..d3c10be 100644
--- a/src/corelibs/U2Core/src/globals/LogCache.h
+++ b/src/corelibs/U2Core/src/globals/LogCache.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/NetworkConfiguration.cpp b/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
index 4f8eeec..4f302c3 100644
--- a/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
+++ b/src/corelibs/U2Core/src/globals/NetworkConfiguration.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/NetworkConfiguration.h b/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
index c783203..25bc151 100644
--- a/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
+++ b/src/corelibs/U2Core/src/globals/NetworkConfiguration.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/PasswordStorage.cpp b/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
index b18f436..843ce16 100644
--- a/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
+++ b/src/corelibs/U2Core/src/globals/PasswordStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/PasswordStorage.h b/src/corelibs/U2Core/src/globals/PasswordStorage.h
index bcdb8d5..ed6b5eb 100644
--- a/src/corelibs/U2Core/src/globals/PasswordStorage.h
+++ b/src/corelibs/U2Core/src/globals/PasswordStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/PluginModel.cpp b/src/corelibs/U2Core/src/globals/PluginModel.cpp
index dc87a4b..c862f96 100644
--- a/src/corelibs/U2Core/src/globals/PluginModel.cpp
+++ b/src/corelibs/U2Core/src/globals/PluginModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/PluginModel.h b/src/corelibs/U2Core/src/globals/PluginModel.h
index 1406b24..17b2b7c 100644
--- a/src/corelibs/U2Core/src/globals/PluginModel.h
+++ b/src/corelibs/U2Core/src/globals/PluginModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
index 20e56ed..5165cdc 100644
--- a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
index 495c157..d6a91b4 100644
--- a/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ProjectFilterTaskRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectService.cpp b/src/corelibs/U2Core/src/globals/ProjectService.cpp
index 029e423..46fd631 100644
--- a/src/corelibs/U2Core/src/globals/ProjectService.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectService.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectService.h b/src/corelibs/U2Core/src/globals/ProjectService.h
index 6d383cd..5c13164 100644
--- a/src/corelibs/U2Core/src/globals/ProjectService.h
+++ b/src/corelibs/U2Core/src/globals/ProjectService.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
index 753a22b..7064b16 100644
--- a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
index 59065db..f17c051 100644
--- a/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
+++ b/src/corelibs/U2Core/src/globals/ProjectTreeControllerModeSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ResourceTracker.cpp b/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
index f63896a..ccc4a84 100644
--- a/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
+++ b/src/corelibs/U2Core/src/globals/ResourceTracker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ResourceTracker.h b/src/corelibs/U2Core/src/globals/ResourceTracker.h
index 61e4517..9d5d08a 100644
--- a/src/corelibs/U2Core/src/globals/ResourceTracker.h
+++ b/src/corelibs/U2Core/src/globals/ResourceTracker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
index 441f8a9..556cf90 100644
--- a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
+++ b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ScriptingToolRegistry.h b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
index 93bc8ca..b5aafeb 100644
--- a/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
+++ b/src/corelibs/U2Core/src/globals/ScriptingToolRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ServiceModel.cpp b/src/corelibs/U2Core/src/globals/ServiceModel.cpp
index d183564..0ddf8e7 100644
--- a/src/corelibs/U2Core/src/globals/ServiceModel.cpp
+++ b/src/corelibs/U2Core/src/globals/ServiceModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ServiceModel.h b/src/corelibs/U2Core/src/globals/ServiceModel.h
index 98e0265..7ee9d7e 100644
--- a/src/corelibs/U2Core/src/globals/ServiceModel.h
+++ b/src/corelibs/U2Core/src/globals/ServiceModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/ServiceTypes.h b/src/corelibs/U2Core/src/globals/ServiceTypes.h
index 9f7da3f..5fbf08b 100644
--- a/src/corelibs/U2Core/src/globals/ServiceTypes.h
+++ b/src/corelibs/U2Core/src/globals/ServiceTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Settings.h b/src/corelibs/U2Core/src/globals/Settings.h
index 745274a..60bd165 100644
--- a/src/corelibs/U2Core/src/globals/Settings.h
+++ b/src/corelibs/U2Core/src/globals/Settings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Task.cpp b/src/corelibs/U2Core/src/globals/Task.cpp
index 567db9a..19b88d8 100644
--- a/src/corelibs/U2Core/src/globals/Task.cpp
+++ b/src/corelibs/U2Core/src/globals/Task.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Task.h b/src/corelibs/U2Core/src/globals/Task.h
index db0041e..c9d65e4 100644
--- a/src/corelibs/U2Core/src/globals/Task.h
+++ b/src/corelibs/U2Core/src/globals/Task.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Timer.cpp b/src/corelibs/U2Core/src/globals/Timer.cpp
index ad350e3..e631050 100644
--- a/src/corelibs/U2Core/src/globals/Timer.cpp
+++ b/src/corelibs/U2Core/src/globals/Timer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Timer.h b/src/corelibs/U2Core/src/globals/Timer.h
index 0f8394f..f0c3162 100644
--- a/src/corelibs/U2Core/src/globals/Timer.h
+++ b/src/corelibs/U2Core/src/globals/Timer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/U2OpStatus.h b/src/corelibs/U2Core/src/globals/U2OpStatus.h
index 16fb5c0..ef678a7 100644
--- a/src/corelibs/U2Core/src/globals/U2OpStatus.h
+++ b/src/corelibs/U2Core/src/globals/U2OpStatus.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/U2SafePoints.h b/src/corelibs/U2Core/src/globals/U2SafePoints.h
index 27e1b2a..21071f7 100644
--- a/src/corelibs/U2Core/src/globals/U2SafePoints.h
+++ b/src/corelibs/U2Core/src/globals/U2SafePoints.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/UserActionsWriter.cpp b/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
index 437cdf3..6c65866 100644
--- a/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
+++ b/src/corelibs/U2Core/src/globals/UserActionsWriter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/UserActionsWriter.h b/src/corelibs/U2Core/src/globals/UserActionsWriter.h
index f40ce04..0f9d6f2 100644
--- a/src/corelibs/U2Core/src/globals/UserActionsWriter.h
+++ b/src/corelibs/U2Core/src/globals/UserActionsWriter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
index 14da0e6..eea9e55 100644
--- a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
+++ b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -184,11 +184,7 @@ void UserAppsSettings::setUserTemporaryDirPath(const QString& newPath) {
QString UserAppsSettings::getDefaultDataDirPath() const{
QString dirpath;
-#if (QT_VERSION >= 0x050000)
- dirpath = AppContext::getSettings()->getValue(SETTINGS_ROOT + DATA_DIR, QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + QDir::separator() + "UGENE_Data").toString();
-#else
- dirpath = AppContext::getSettings()->getValue(SETTINGS_ROOT + DATA_DIR, QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) + QDir::separator() + "UGENE_Data").toString();
-#endif
+ dirpath = AppContext::getSettings()->getValue(SETTINGS_ROOT + DATA_DIR, QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/" + "UGENE_Data").toString();
QDir d(dirpath);
if(!d.exists(dirpath)){
d.mkpath(dirpath);
diff --git a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
index 9ff818d..6b53b49 100644
--- a/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
+++ b/src/corelibs/U2Core/src/globals/UserApplicationsSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/Version.cpp b/src/corelibs/U2Core/src/globals/Version.cpp
index 66ce305..a0c625b 100644
--- a/src/corelibs/U2Core/src/globals/Version.cpp
+++ b/src/corelibs/U2Core/src/globals/Version.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -91,7 +91,7 @@ Version Version::parseVersion(const QString& text) {
}
v.suffix = v.text.mid(textPos);
v.isDevVersion = v.suffix.contains(VERSION_DEV_SUFFIX);
- if(v.suffix.isEmpty()){//See issue UGENE-870 (https://ugene.unipro.ru/tracker/browse/UGENE-870)
+ if(v.suffix.isEmpty()){//See issue UGENE-870 (https://ugene.net/tracker/browse/UGENE-870)
bool ok;
int val = currentNum.toInt(&ok);
if (ok) {
diff --git a/src/corelibs/U2Core/src/globals/Version.h b/src/corelibs/U2Core/src/globals/Version.h
index 27fd29c..3dd6c6f 100644
--- a/src/corelibs/U2Core/src/globals/Version.h
+++ b/src/corelibs/U2Core/src/globals/Version.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/globals/global.h b/src/corelibs/U2Core/src/globals/global.h
index 13cc96b..2264d61 100644
--- a/src/corelibs/U2Core/src/globals/global.h
+++ b/src/corelibs/U2Core/src/globals/global.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
index 8d0f1ed..60e9832 100644
--- a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/AnnotationTableObject.h b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
index e318161..1762a90 100644
--- a/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
+++ b/src/corelibs/U2Core/src/gobjects/AnnotationTableObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/AssemblyObject.cpp b/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
index f2fa5ba..d7f4092 100644
--- a/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/AssemblyObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/AssemblyObject.h b/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
index 9468c74..99adaa0 100644
--- a/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
+++ b/src/corelibs/U2Core/src/gobjects/AssemblyObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
index f2bc820..5474d0f 100644
--- a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/BioStruct3DObject.h b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
index bb3fd9a..ff82191 100644
--- a/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
+++ b/src/corelibs/U2Core/src/gobjects/BioStruct3DObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
index f62129e..b8d2d24 100644
--- a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
index 88e1b80..019d19f 100644
--- a/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
+++ b/src/corelibs/U2Core/src/gobjects/DNAChromatogramObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
index dbd302a..26c1bcb 100644
--- a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/DNASequenceObject.h b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
index 62eda74..0ae04f9 100644
--- a/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
+++ b/src/corelibs/U2Core/src/gobjects/DNASequenceObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
index 0dfd42c..5522b8e 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
index d855686..3947879 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectRelationRoles.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectTypes.cpp b/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
index 2d94a10..f39c561 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectTypes.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectTypes.h b/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
index 76538b5..275e835 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectUtils.cpp b/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
index 466a653..efff930 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
+++ b/src/corelibs/U2Core/src/gobjects/GObjectUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/GObjectUtils.h b/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
index 105077d..4a564e0 100644
--- a/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
+++ b/src/corelibs/U2Core/src/gobjects/GObjectUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
index 7920728..a1b8e58 100644
--- a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -698,25 +698,27 @@ int MAlignmentObject::shiftRegion( int startPos, int startRow, int nBases, int n
int n = 0;
if (shift > 0) {
- // if some trailing gaps are selected --> save them!
- if (startPos + nBases + shift > getLength()) {
- bool increaseAlignmentLen = true;
- for (int i = startRow; i < startRow + nRows; i++) {
- const MAlignmentRow& row = getRow(i);
- int rowLen = row.getRowLengthWithoutTrailing();
- if (rowLen >= startPos + nBases + shift) {
- increaseAlignmentLen = false;
- break;
+ //if last symbol selected - do not add gaps at the end
+ if (!(startPos + nBases == getLength())) {
+ // if some trailing gaps are selected --> save them!
+ if (startPos + nBases + shift > getLength()) {
+ bool increaseAlignmentLen = true;
+ for (int i = startRow; i < startRow + nRows; i++) {
+ const MAlignmentRow& row = getRow(i);
+ int rowLen = row.getRowLengthWithoutTrailing();
+ if (rowLen >= startPos + nBases + shift) {
+ increaseAlignmentLen = false;
+ break;
+ }
+ }
+ if (increaseAlignmentLen) {
+ MsaDbiUtils::updateMsaLength(entityRef, startPos + nBases + shift, os);
+ SAFE_POINT_OP(os, 0);
+ updateCachedMAlignment();
}
- }
- if (increaseAlignmentLen) {
- MsaDbiUtils::updateMsaLength(entityRef, startPos + nBases + shift, os);
- SAFE_POINT_OP( os, 0 );
- updateCachedMAlignment();
}
}
-
- insertGap(U2Region(startRow,nRows), startPos, shift);
+ insertGap(U2Region(startRow, nRows), startPos, shift);
n = shift;
} else if ( 0 < startPos ) {
if (0 > startPos + shift) {
diff --git a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
index f0c5e2e..ce74ee7 100644
--- a/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
+++ b/src/corelibs/U2Core/src/gobjects/MAlignmentObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
index 2dfb9ef..618dd6e 100644
--- a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PFMatrixObject.h b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
index 4c3632c..482a695 100644
--- a/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PFMatrixObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
index c367572..29aa453 100644
--- a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PWMatrixObject.h b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
index e2d6151..5cea5c8 100644
--- a/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PWMatrixObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
index f4e31d5..208adc7 100644
--- a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/PhyTreeObject.h b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
index fc58075..31d9fbe 100644
--- a/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
+++ b/src/corelibs/U2Core/src/gobjects/PhyTreeObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/TextObject.cpp b/src/corelibs/U2Core/src/gobjects/TextObject.cpp
index 2567e23..613a39d 100644
--- a/src/corelibs/U2Core/src/gobjects/TextObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/TextObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/TextObject.h b/src/corelibs/U2Core/src/gobjects/TextObject.h
index 0cab266..475adf9 100644
--- a/src/corelibs/U2Core/src/gobjects/TextObject.h
+++ b/src/corelibs/U2Core/src/gobjects/TextObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/UnloadedObject.cpp b/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
index a253f5c..1b7ad8b 100644
--- a/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/UnloadedObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/UnloadedObject.h b/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
index a7f64c9..53148b1 100644
--- a/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
+++ b/src/corelibs/U2Core/src/gobjects/UnloadedObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
index 51237b7..8d6aade 100644
--- a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
+++ b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/gobjects/VariantTrackObject.h b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
index 137dbc7..ca37af1 100644
--- a/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
+++ b/src/corelibs/U2Core/src/gobjects/VariantTrackObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
index 4f6de72..0cb3296 100644
--- a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
index dcf5482..3e2ccf5 100644
--- a/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
+++ b/src/corelibs/U2Core/src/io/DatabaseConnectionAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/HttpFileAdapter.cpp b/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
index 426e094..8cea7d2 100644
--- a/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/HttpFileAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/HttpFileAdapter.h b/src/corelibs/U2Core/src/io/HttpFileAdapter.h
index 5f1d914..bcabc1d 100644
--- a/src/corelibs/U2Core/src/io/HttpFileAdapter.h
+++ b/src/corelibs/U2Core/src/io/HttpFileAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/IOAdapter.cpp b/src/corelibs/U2Core/src/io/IOAdapter.cpp
index 69f4ff9..465b9ed 100644
--- a/src/corelibs/U2Core/src/io/IOAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/IOAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/IOAdapter.h b/src/corelibs/U2Core/src/io/IOAdapter.h
index c53ea4b..ec9a70a 100644
--- a/src/corelibs/U2Core/src/io/IOAdapter.h
+++ b/src/corelibs/U2Core/src/io/IOAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/InputStream.h b/src/corelibs/U2Core/src/io/InputStream.h
index 00cb24c..1410dca 100644
--- a/src/corelibs/U2Core/src/io/InputStream.h
+++ b/src/corelibs/U2Core/src/io/InputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/LocalFileAdapter.cpp b/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
index f77bf5b..934e6ea 100644
--- a/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/LocalFileAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/LocalFileAdapter.h b/src/corelibs/U2Core/src/io/LocalFileAdapter.h
index 4911d3c..f7cf867 100644
--- a/src/corelibs/U2Core/src/io/LocalFileAdapter.h
+++ b/src/corelibs/U2Core/src/io/LocalFileAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/OutputStream.h b/src/corelibs/U2Core/src/io/OutputStream.h
index 8f0825f..f5ae1bc 100644
--- a/src/corelibs/U2Core/src/io/OutputStream.h
+++ b/src/corelibs/U2Core/src/io/OutputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/StringAdapter.cpp b/src/corelibs/U2Core/src/io/StringAdapter.cpp
index d088662..01e4ba9 100644
--- a/src/corelibs/U2Core/src/io/StringAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/StringAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/StringAdapter.h b/src/corelibs/U2Core/src/io/StringAdapter.h
index f86eec8..6e46c8d 100644
--- a/src/corelibs/U2Core/src/io/StringAdapter.h
+++ b/src/corelibs/U2Core/src/io/StringAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/VFSAdapter.cpp b/src/corelibs/U2Core/src/io/VFSAdapter.cpp
index 9705eff..510dfd3 100644
--- a/src/corelibs/U2Core/src/io/VFSAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/VFSAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/VFSAdapter.h b/src/corelibs/U2Core/src/io/VFSAdapter.h
index 648b18c..9a32a9d 100644
--- a/src/corelibs/U2Core/src/io/VFSAdapter.h
+++ b/src/corelibs/U2Core/src/io/VFSAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/VirtualFileSystem.cpp b/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
index a8b56fd..450b22f 100644
--- a/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
+++ b/src/corelibs/U2Core/src/io/VirtualFileSystem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/VirtualFileSystem.h b/src/corelibs/U2Core/src/io/VirtualFileSystem.h
index d282a18..afee4cf 100644
--- a/src/corelibs/U2Core/src/io/VirtualFileSystem.h
+++ b/src/corelibs/U2Core/src/io/VirtualFileSystem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/ZlibAdapter.cpp b/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
index 361437f..13c8107 100644
--- a/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
+++ b/src/corelibs/U2Core/src/io/ZlibAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/io/ZlibAdapter.h b/src/corelibs/U2Core/src/io/ZlibAdapter.h
index b1bc1cf..3ee8fce 100644
--- a/src/corelibs/U2Core/src/io/ZlibAdapter.h
+++ b/src/corelibs/U2Core/src/io/ZlibAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/BunchMimeData.cpp b/src/corelibs/U2Core/src/models/BunchMimeData.cpp
index adad1a0..29755ce 100644
--- a/src/corelibs/U2Core/src/models/BunchMimeData.cpp
+++ b/src/corelibs/U2Core/src/models/BunchMimeData.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/BunchMimeData.h b/src/corelibs/U2Core/src/models/BunchMimeData.h
index caeca85..32d278b 100644
--- a/src/corelibs/U2Core/src/models/BunchMimeData.h
+++ b/src/corelibs/U2Core/src/models/BunchMimeData.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentImport.cpp b/src/corelibs/U2Core/src/models/DocumentImport.cpp
index 71af220..35748ac 100644
--- a/src/corelibs/U2Core/src/models/DocumentImport.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentImport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentImport.h b/src/corelibs/U2Core/src/models/DocumentImport.h
index 55adde7..58645b6 100644
--- a/src/corelibs/U2Core/src/models/DocumentImport.h
+++ b/src/corelibs/U2Core/src/models/DocumentImport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentModel.cpp b/src/corelibs/U2Core/src/models/DocumentModel.cpp
index 6f05964..8647e57 100644
--- a/src/corelibs/U2Core/src/models/DocumentModel.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentModel.h b/src/corelibs/U2Core/src/models/DocumentModel.h
index 57192fe..5176445 100644
--- a/src/corelibs/U2Core/src/models/DocumentModel.h
+++ b/src/corelibs/U2Core/src/models/DocumentModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentUtils.cpp b/src/corelibs/U2Core/src/models/DocumentUtils.cpp
index b51bc9e..6fd6085 100644
--- a/src/corelibs/U2Core/src/models/DocumentUtils.cpp
+++ b/src/corelibs/U2Core/src/models/DocumentUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/DocumentUtils.h b/src/corelibs/U2Core/src/models/DocumentUtils.h
index 096a442..a276867 100644
--- a/src/corelibs/U2Core/src/models/DocumentUtils.h
+++ b/src/corelibs/U2Core/src/models/DocumentUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/Folder.cpp b/src/corelibs/U2Core/src/models/Folder.cpp
index e8d029b..b0d25c0 100644
--- a/src/corelibs/U2Core/src/models/Folder.cpp
+++ b/src/corelibs/U2Core/src/models/Folder.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/Folder.h b/src/corelibs/U2Core/src/models/Folder.h
index 7aa3716..aec8fc8 100644
--- a/src/corelibs/U2Core/src/models/Folder.h
+++ b/src/corelibs/U2Core/src/models/Folder.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GHints.cpp b/src/corelibs/U2Core/src/models/GHints.cpp
index f9503dd..968d5c6 100644
--- a/src/corelibs/U2Core/src/models/GHints.cpp
+++ b/src/corelibs/U2Core/src/models/GHints.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GHints.h b/src/corelibs/U2Core/src/models/GHints.h
index 5479a43..5a100e1 100644
--- a/src/corelibs/U2Core/src/models/GHints.h
+++ b/src/corelibs/U2Core/src/models/GHints.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GObject.cpp b/src/corelibs/U2Core/src/models/GObject.cpp
index 0b3b298..cdd517c 100644
--- a/src/corelibs/U2Core/src/models/GObject.cpp
+++ b/src/corelibs/U2Core/src/models/GObject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GObject.h b/src/corelibs/U2Core/src/models/GObject.h
index 544316a..dbf5a6c 100644
--- a/src/corelibs/U2Core/src/models/GObject.h
+++ b/src/corelibs/U2Core/src/models/GObject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GObjectReference.cpp b/src/corelibs/U2Core/src/models/GObjectReference.cpp
index 14e3cd3..7f4dd46 100644
--- a/src/corelibs/U2Core/src/models/GObjectReference.cpp
+++ b/src/corelibs/U2Core/src/models/GObjectReference.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/GObjectReference.h b/src/corelibs/U2Core/src/models/GObjectReference.h
index dd3814f..0d97e9f 100644
--- a/src/corelibs/U2Core/src/models/GObjectReference.h
+++ b/src/corelibs/U2Core/src/models/GObjectReference.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/MimeDataIterator.cpp b/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
index b40eee8..5b743d7 100644
--- a/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
+++ b/src/corelibs/U2Core/src/models/MimeDataIterator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/MimeDataIterator.h b/src/corelibs/U2Core/src/models/MimeDataIterator.h
index 8b745e2..43a4c93 100644
--- a/src/corelibs/U2Core/src/models/MimeDataIterator.h
+++ b/src/corelibs/U2Core/src/models/MimeDataIterator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/ProjectModel.cpp b/src/corelibs/U2Core/src/models/ProjectModel.cpp
index 5fda342..90f1eed 100644
--- a/src/corelibs/U2Core/src/models/ProjectModel.cpp
+++ b/src/corelibs/U2Core/src/models/ProjectModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/ProjectModel.h b/src/corelibs/U2Core/src/models/ProjectModel.h
index 48bc862..9ca0552 100644
--- a/src/corelibs/U2Core/src/models/ProjectModel.h
+++ b/src/corelibs/U2Core/src/models/ProjectModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/StateLockableDataModel.cpp b/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
index bab4820..9353ce5 100644
--- a/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
+++ b/src/corelibs/U2Core/src/models/StateLockableDataModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/models/StateLockableDataModel.h b/src/corelibs/U2Core/src/models/StateLockableDataModel.h
index bb14713..0aed55f 100644
--- a/src/corelibs/U2Core/src/models/StateLockableDataModel.h
+++ b/src/corelibs/U2Core/src/models/StateLockableDataModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/AnnotationSelection.cpp b/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
index 46e1cd1..9c1c5ad 100644
--- a/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/AnnotationSelection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/AnnotationSelection.h b/src/corelibs/U2Core/src/selection/AnnotationSelection.h
index 10bae17..92b1fcc 100644
--- a/src/corelibs/U2Core/src/selection/AnnotationSelection.h
+++ b/src/corelibs/U2Core/src/selection/AnnotationSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/DNASequenceSelection.h b/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
index 703b5bb..7b9daa7 100644
--- a/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
+++ b/src/corelibs/U2Core/src/selection/DNASequenceSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/DocumentSelection.cpp b/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
index 4ac3690..86f781b 100644
--- a/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/DocumentSelection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/DocumentSelection.h b/src/corelibs/U2Core/src/selection/DocumentSelection.h
index 8477a86..befd64a 100644
--- a/src/corelibs/U2Core/src/selection/DocumentSelection.h
+++ b/src/corelibs/U2Core/src/selection/DocumentSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/FolderSelection.cpp b/src/corelibs/U2Core/src/selection/FolderSelection.cpp
index 2ce89ed..e42c9b4 100644
--- a/src/corelibs/U2Core/src/selection/FolderSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/FolderSelection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/FolderSelection.h b/src/corelibs/U2Core/src/selection/FolderSelection.h
index d2735b9..171c451 100644
--- a/src/corelibs/U2Core/src/selection/FolderSelection.h
+++ b/src/corelibs/U2Core/src/selection/FolderSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/GObjectSelection.cpp b/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
index 793a889..0dbb507 100644
--- a/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/GObjectSelection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/GObjectSelection.h b/src/corelibs/U2Core/src/selection/GObjectSelection.h
index 27acfe0..4945edd 100644
--- a/src/corelibs/U2Core/src/selection/GObjectSelection.h
+++ b/src/corelibs/U2Core/src/selection/GObjectSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/LRegionsSelection.cpp b/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
index 33a80d2..a053627 100644
--- a/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
+++ b/src/corelibs/U2Core/src/selection/LRegionsSelection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/LRegionsSelection.h b/src/corelibs/U2Core/src/selection/LRegionsSelection.h
index c3875ba..b554fdf 100644
--- a/src/corelibs/U2Core/src/selection/LRegionsSelection.h
+++ b/src/corelibs/U2Core/src/selection/LRegionsSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionModel.cpp b/src/corelibs/U2Core/src/selection/SelectionModel.cpp
index ba3fc5c..0f81711 100644
--- a/src/corelibs/U2Core/src/selection/SelectionModel.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionModel.h b/src/corelibs/U2Core/src/selection/SelectionModel.h
index 6a31293..646df9f 100644
--- a/src/corelibs/U2Core/src/selection/SelectionModel.h
+++ b/src/corelibs/U2Core/src/selection/SelectionModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionTypes.cpp b/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
index 0685f88..c840f8e 100644
--- a/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionTypes.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionTypes.h b/src/corelibs/U2Core/src/selection/SelectionTypes.h
index 7538cbf..563ee14 100644
--- a/src/corelibs/U2Core/src/selection/SelectionTypes.h
+++ b/src/corelibs/U2Core/src/selection/SelectionTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionUtils.cpp b/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
index ae29c53..cfad1cc 100644
--- a/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
+++ b/src/corelibs/U2Core/src/selection/SelectionUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/SelectionUtils.h b/src/corelibs/U2Core/src/selection/SelectionUtils.h
index 6335105..069c73d 100644
--- a/src/corelibs/U2Core/src/selection/SelectionUtils.h
+++ b/src/corelibs/U2Core/src/selection/SelectionUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/selection/TextSelection.h b/src/corelibs/U2Core/src/selection/TextSelection.h
index 60b1da3..fabe82a 100644
--- a/src/corelibs/U2Core/src/selection/TextSelection.h
+++ b/src/corelibs/U2Core/src/selection/TextSelection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
index 27c72b9..17d0d0c 100644
--- a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
index 07cdc5d..67c7cd4 100644
--- a/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
+++ b/src/corelibs/U2Core/src/tasks/AbstractProjectFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AddDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
index 0603f5d..d75bd66 100644
--- a/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AddDocumentTask.h b/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
index 238bae3..8d1205f 100644
--- a/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
index 33772c1..cc866e9 100644
--- a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
index 82f2e3c..bb73b21 100644
--- a/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddObjectsToDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
index 387f073..a8dee3d 100644
--- a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ namespace U2 {
const int AddSequenceObjectsToAlignmentTask::maxErrorListSize = 5;
AddSequenceObjectsToAlignmentTask::AddSequenceObjectsToAlignmentTask(MAlignmentObject* obj, const QList<DNASequence>& seqList)
- : Task("Add sequences to alignment task", TaskFlags(TaskFlags_FOSE_COSC)), seqList(seqList), maObj(obj),
+ : 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();
}
diff --git a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
index 8db22ce..8ac8b4e 100644
--- a/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
+++ b/src/corelibs/U2Core/src/tasks/AddSequencesToAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@ protected:
private:
StateLock* stateLock;
const DNAAlphabet* msaAlphabet;
- QStringList errorList;
+ QStringList errorList;
U2MsaDbi* dbi;
U2EntityRef entityRef;
U2UseCommonUserModStep* modStep;
diff --git a/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h b/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
index 0ebbad2..9df2c09 100644
--- a/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
+++ b/src/corelibs/U2Core/src/tasks/BackgroundTaskRunner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
index 7c0ab3b..afc6200 100644
--- a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
index a8a7b85..65a5af2 100644
--- a/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
+++ b/src/corelibs/U2Core/src/tasks/CleanupFileStorageTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CloneObjectTask.cpp b/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
index 33eabea..a96bfbb 100644
--- a/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CloneObjectTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CloneObjectTask.h b/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
index 5539388..4b9cf87 100644
--- a/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
+++ b/src/corelibs/U2Core/src/tasks/CloneObjectTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.cpp b/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.cpp
index 62d3422..a2e55fc 100644
--- a/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.cpp
+++ b/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.h b/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.h
index 79d3e37..70c25a4 100644
--- a/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.h
+++ b/src/corelibs/U2Core/src/tasks/CmdlineInOutTaskRunner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CmdlineTaskRunner.cpp b/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.cpp
index 96b057a..a03aa55 100644
--- a/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.cpp
+++ b/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CmdlineTaskRunner.h b/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.h
index 4d46ba3..ac7264a 100644
--- a/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.h
+++ b/src/corelibs/U2Core/src/tasks/CmdlineTaskRunner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
index a1d8ac8..b899c48 100644
--- a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
index 0782b5e..765dd30 100644
--- a/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/ConnectSharedDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
index e427baa..d90ccd8 100644
--- a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
index 59b503f..0fcd791 100644
--- a/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
+++ b/src/corelibs/U2Core/src/tasks/ConsoleShutdownTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CopyDataTask.cpp b/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
index 5bab6eb..ef84d3d 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CopyDataTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CopyDataTask.h b/src/corelibs/U2Core/src/tasks/CopyDataTask.h
index c7a751b..72b42ff 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDataTask.h
+++ b/src/corelibs/U2Core/src/tasks/CopyDataTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
index a32299a..a73685c 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CopyDocumentTask.h b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
index 437f7d7..6da8b4a 100644
--- a/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/CopyDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
index e07a35f..db7c97f 100644
--- a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/CreateAnnotationTask.h b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
index 3962cc2..1beda87 100644
--- a/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
+++ b/src/corelibs/U2Core/src/tasks/CreateAnnotationTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
index 3f9b313..815ed41 100644
--- a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/DeleteObjectsTask.h b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
index 52ee07e..caf2c69 100644
--- a/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
+++ b/src/corelibs/U2Core/src/tasks/DeleteObjectsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
index 9f98833..5cc1d53 100644
--- a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/DocumentProviderTask.h b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
index 4d6254e..f178bbf 100644
--- a/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
+++ b/src/corelibs/U2Core/src/tasks/DocumentProviderTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
index 8f5f898..255b9ca 100644
--- a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -144,27 +144,29 @@ void ExternalToolRunTask::run(){
}
void ExternalToolRunTask::killProcess(QProcess *process, QString childProcesses) {
+ Q_UNUSED(childProcesses)
+
#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)) || defined(qdoc)
- long numPid = process->pid();
- Q_UNUSED(numPid);
+ long numPid = process->pid();
+ Q_UNUSED(numPid);
#else
- Q_PID pid = process->pid();
- long numPid = pid->dwProcessId;
- Q_UNUSED(numPid);
+ Q_PID pid = process->pid();
+ long numPid = pid->dwProcessId;
+ Q_UNUSED(numPid);
#endif
#ifdef Q_OS_WIN
- QProcess::execute(QString("taskkill /PID %1 /T /F").arg(numPid));
- if (!childProcesses.isEmpty()) {
- QProcess::execute(QString("taskkill /IM %1 /T /F").arg(childProcesses));
- }
+ QProcess::execute(QString("taskkill /PID %1 /T /F").arg(numPid));
+ if (!childProcesses.isEmpty()) {
+ QProcess::execute(QString("taskkill /IM %1 /T /F").arg(childProcesses));
+ }
#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
}
diff --git a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
index 50578bb..220d93e 100644
--- a/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
+++ b/src/corelibs/U2Core/src/tasks/ExternalToolRunTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@ public:
* 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& workingDirectory = "", const QStringList& additionalPaths = QStringList(),
const QString &additionalProcessToKill = QString(), bool parseOutputFile = false);
~ExternalToolRunTask();
diff --git a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
index 86739dd..77d81e3 100644
--- a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
index 44d51f0..de6a48f 100644
--- a/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
+++ b/src/corelibs/U2Core/src/tasks/ExtractAnnotatedRegionTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/FailTask.h b/src/corelibs/U2Core/src/tasks/FailTask.h
index 94e22d6..ad5b4d0 100644
--- a/src/corelibs/U2Core/src/tasks/FailTask.h
+++ b/src/corelibs/U2Core/src/tasks/FailTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
index ba194b7..f9cc0d8 100644
--- a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/LoadDocumentTask.h b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
index c99ce8b..a083b59 100644
--- a/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/LoadDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
index c048a66..4103464 100644
--- a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -48,9 +48,9 @@
namespace U2 {
-const QString EntrezUtils::NCBI_ESEARCH_URL("http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=%1&term=%2&retmax=%3&tool=UGENE");
-const QString EntrezUtils::NCBI_ESUMMARY_URL("http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=%1&id=%2&tool=UGENE");
-const QString EntrezUtils::NCBI_EFETCH_URL("http://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi?db=%1&id=%2&retmode=text&rettype=%3&tool=UGENE");
+const QString EntrezUtils::NCBI_ESEARCH_URL("https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=%1&term=%2&retmax=%3&tool=UGENE");
+const QString EntrezUtils::NCBI_ESUMMARY_URL("https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=%1&id=%2&tool=UGENE");
+const QString EntrezUtils::NCBI_EFETCH_URL("https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi?db=%1&id=%2&retmode=text&rettype=%3&tool=UGENE");
const QString EntrezUtils::NCBI_DB_NUCLEOTIDE("nucleotide");
const QString EntrezUtils::NCBI_DB_PROTEIN("protein");
diff --git a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
index d3769b4..ab1e1bd 100644
--- a/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/LoadRemoteDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
index 6024f0b..cf272fd 100644
--- a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
index 211fbb6..9f6d297 100644
--- a/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
+++ b/src/corelibs/U2Core/src/tasks/ModifySequenceObjectTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/MultiTask.cpp b/src/corelibs/U2Core/src/tasks/MultiTask.cpp
index 3db5d3b..0211547 100644
--- a/src/corelibs/U2Core/src/tasks/MultiTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/MultiTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/MultiTask.h b/src/corelibs/U2Core/src/tasks/MultiTask.h
index a6ea8c5..a4fc254 100644
--- a/src/corelibs/U2Core/src/tasks/MultiTask.h
+++ b/src/corelibs/U2Core/src/tasks/MultiTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
index 7ad3157..afb658e 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
index 3f6c255..a3359d7 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
+++ b/src/corelibs/U2Core/src/tasks/RemoveAnnotationsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
index 2b77f12..63afdb0 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/RemoveDocumentTask.h b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
index 0a99c1a..8201410 100644
--- a/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/RemoveDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
index a286413..74284a9 100644
--- a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ReverseSequenceTask.h b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
index 0772680..497b81f 100644
--- a/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
+++ b/src/corelibs/U2Core/src/tasks/ReverseSequenceTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
index 44e8e9d..680dc5a 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
index 2f01c3c..a9e37ce 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentStreamingTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
index 9a4fa5b..bab61e4 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SaveDocumentTask.h b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
index 96665df..bbb1149 100644
--- a/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
+++ b/src/corelibs/U2Core/src/tasks/SaveDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ScriptTask.cpp b/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
index ef7960b..365067b 100644
--- a/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/ScriptTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/ScriptTask.h b/src/corelibs/U2Core/src/tasks/ScriptTask.h
index d83977d..664e82c 100644
--- a/src/corelibs/U2Core/src/tasks/ScriptTask.h
+++ b/src/corelibs/U2Core/src/tasks/ScriptTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
index 5db17d9..69949ad 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -56,7 +56,7 @@ QList<SequenceDbiWalkerSubtask*> SequenceDbiWalkerTask::prepareSubtasks() {
}
}
- if (config.walkCircular && static_cast<quint64>(config.range.length) == sequenceObject.getSequenceLength()) {
+ if (config.walkCircular && config.range.length == sequenceObject.getSequenceLength()) {
config.range.length += config.walkCircularDistance * (config.aminoTrans == NULL ? 1 : 3);
}
diff --git a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
index 0793922..52f68fb 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
+++ b/src/corelibs/U2Core/src/tasks/SequenceDbiWalkerTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
index 974252c..58834b1 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/SequenceWalkerTask.h b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
index 8989ca6..956dc59 100644
--- a/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
+++ b/src/corelibs/U2Core/src/tasks/SequenceWalkerTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TLSTask.cpp b/src/corelibs/U2Core/src/tasks/TLSTask.cpp
index 6eaa476..76000e7 100644
--- a/src/corelibs/U2Core/src/tasks/TLSTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/TLSTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TLSTask.h b/src/corelibs/U2Core/src/tasks/TLSTask.h
index c797d9d..7652994 100644
--- a/src/corelibs/U2Core/src/tasks/TLSTask.h
+++ b/src/corelibs/U2Core/src/tasks/TLSTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
index cf10cf7..e2f2fa9 100644
--- a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
+++ b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TaskSignalMapper.h b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
index a7ce077..53824c4 100644
--- a/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
+++ b/src/corelibs/U2Core/src/tasks/TaskSignalMapper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TaskStarter.cpp b/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
index 718a7ec..1649719 100644
--- a/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
+++ b/src/corelibs/U2Core/src/tasks/TaskStarter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TaskStarter.h b/src/corelibs/U2Core/src/tasks/TaskStarter.h
index d6cf4cc..5cfb744 100644
--- a/src/corelibs/U2Core/src/tasks/TaskStarter.h
+++ b/src/corelibs/U2Core/src/tasks/TaskStarter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TmpDirChecker.cpp b/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
index ec708e4..07f88f7 100644
--- a/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
+++ b/src/corelibs/U2Core/src/tasks/TmpDirChecker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/TmpDirChecker.h b/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
index 207ef71..6852b16 100644
--- a/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
+++ b/src/corelibs/U2Core/src/tasks/TmpDirChecker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
index 49d3370..92622db 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
index af622e9..9213f3a 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDirToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
index 4f8a219..1a76601 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
index 30e90e8..e95af61 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportDocumentToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
index 4c6866f..eb9e62c 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
index 3ccfcf5..95db575 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportFileToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
index 02dd0e9..0fc01c5 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
index 056abd1..588b7ab 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportObjectToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
index ecf1061..ce1251e 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
index 9d2a591..c525188 100644
--- a/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
+++ b/src/corelibs/U2Core/src/tasks/shared_db/ImportToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/AnnotationCreationPattern.cpp b/src/corelibs/U2Core/src/util/AnnotationCreationPattern.cpp
index efc2d82..8a2f14a 100644
--- a/src/corelibs/U2Core/src/util/AnnotationCreationPattern.cpp
+++ b/src/corelibs/U2Core/src/util/AnnotationCreationPattern.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/AnnotationCreationPattern.h b/src/corelibs/U2Core/src/util/AnnotationCreationPattern.h
index cb661b3..d814f30 100644
--- a/src/corelibs/U2Core/src/util/AnnotationCreationPattern.h
+++ b/src/corelibs/U2Core/src/util/AnnotationCreationPattern.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/AssemblyImporter.cpp b/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
index e0f2323..c8b4ebb 100644
--- a/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
+++ b/src/corelibs/U2Core/src/util/AssemblyImporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/AssemblyImporter.h b/src/corelibs/U2Core/src/util/AssemblyImporter.h
index 00f16fe..979647a 100644
--- a/src/corelibs/U2Core/src/util/AssemblyImporter.h
+++ b/src/corelibs/U2Core/src/util/AssemblyImporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
index 06660e7..1dd6b9e 100644
--- a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/DatatypeSerializeUtils.h b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
index 7d3c73a..debc221 100644
--- a/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
+++ b/src/corelibs/U2Core/src/util/DatatypeSerializeUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
index 6af8d7e..54bdac7 100644
--- a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FileAndDirectoryUtils.h b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
index a1b4e5d..bfab37e 100644
--- a/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
+++ b/src/corelibs/U2Core/src/util/FileAndDirectoryUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FileStorageUtils.cpp b/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
index 9e35427..20c6c23 100644
--- a/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FileStorageUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FileStorageUtils.h b/src/corelibs/U2Core/src/util/FileStorageUtils.h
index 9015638..f49d27b 100644
--- a/src/corelibs/U2Core/src/util/FileStorageUtils.h
+++ b/src/corelibs/U2Core/src/util/FileStorageUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FilesIterator.cpp b/src/corelibs/U2Core/src/util/FilesIterator.cpp
index 6792093..593c35f 100644
--- a/src/corelibs/U2Core/src/util/FilesIterator.cpp
+++ b/src/corelibs/U2Core/src/util/FilesIterator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FilesIterator.h b/src/corelibs/U2Core/src/util/FilesIterator.h
index c3c6866..a42cc1b 100644
--- a/src/corelibs/U2Core/src/util/FilesIterator.h
+++ b/src/corelibs/U2Core/src/util/FilesIterator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FormatUtils.cpp b/src/corelibs/U2Core/src/util/FormatUtils.cpp
index d036d32..6c2837f 100644
--- a/src/corelibs/U2Core/src/util/FormatUtils.cpp
+++ b/src/corelibs/U2Core/src/util/FormatUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/FormatUtils.h b/src/corelibs/U2Core/src/util/FormatUtils.h
index 4ef4eb8..fc50a6c 100644
--- a/src/corelibs/U2Core/src/util/FormatUtils.h
+++ b/src/corelibs/U2Core/src/util/FormatUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GAutoDeleteList.cpp b/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
index ff419dc..f7bfa04 100644
--- a/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
+++ b/src/corelibs/U2Core/src/util/GAutoDeleteList.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GAutoDeleteList.h b/src/corelibs/U2Core/src/util/GAutoDeleteList.h
index f8a8ac7..c414bf0 100644
--- a/src/corelibs/U2Core/src/util/GAutoDeleteList.h
+++ b/src/corelibs/U2Core/src/util/GAutoDeleteList.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GUrlUtils.cpp b/src/corelibs/U2Core/src/util/GUrlUtils.cpp
index 0937c00..b437145 100644
--- a/src/corelibs/U2Core/src/util/GUrlUtils.cpp
+++ b/src/corelibs/U2Core/src/util/GUrlUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GUrlUtils.h b/src/corelibs/U2Core/src/util/GUrlUtils.h
index a69b8b6..beff2d3 100644
--- a/src/corelibs/U2Core/src/util/GUrlUtils.h
+++ b/src/corelibs/U2Core/src/util/GUrlUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GenbankFeatures.cpp b/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
index 90d83b0..0120157 100644
--- a/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
+++ b/src/corelibs/U2Core/src/util/GenbankFeatures.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/GenbankFeatures.h b/src/corelibs/U2Core/src/util/GenbankFeatures.h
index cc81321..9e1120c 100644
--- a/src/corelibs/U2Core/src/util/GenbankFeatures.h
+++ b/src/corelibs/U2Core/src/util/GenbankFeatures.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/IOAdapterUtils.cpp b/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
index 2c542be..db27e45 100644
--- a/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
+++ b/src/corelibs/U2Core/src/util/IOAdapterUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/IOAdapterUtils.h b/src/corelibs/U2Core/src/util/IOAdapterUtils.h
index d5ec37e..c52406a 100644
--- a/src/corelibs/U2Core/src/util/IOAdapterUtils.h
+++ b/src/corelibs/U2Core/src/util/IOAdapterUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
index fa9adab..2f954a8 100644
--- a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
+++ b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/ImportToDatabaseOptions.h b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
index 987938b..91730de 100644
--- a/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
+++ b/src/corelibs/U2Core/src/util/ImportToDatabaseOptions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentExporter.cpp b/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
index ef1c3a8..5f03819 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentExporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentExporter.h b/src/corelibs/U2Core/src/util/MAlignmentExporter.h
index b85a51d..7ff1cbc 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentExporter.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentExporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentImporter.cpp b/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
index 2745e8c..dd23801 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentImporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentImporter.h b/src/corelibs/U2Core/src/util/MAlignmentImporter.h
index d54958f..e3bb0f7 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentImporter.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentImporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentWalker.cpp b/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
index 1c0ce4c..2971c06 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
+++ b/src/corelibs/U2Core/src/util/MAlignmentWalker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MAlignmentWalker.h b/src/corelibs/U2Core/src/util/MAlignmentWalker.h
index 435499a..b6848ed 100644
--- a/src/corelibs/U2Core/src/util/MAlignmentWalker.h
+++ b/src/corelibs/U2Core/src/util/MAlignmentWalker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MSAUtils.cpp b/src/corelibs/U2Core/src/util/MSAUtils.cpp
index b1d2588..bf1d095 100644
--- a/src/corelibs/U2Core/src/util/MSAUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MSAUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MSAUtils.h b/src/corelibs/U2Core/src/util/MSAUtils.h
index 6e82c6e..df1c576 100644
--- a/src/corelibs/U2Core/src/util/MSAUtils.h
+++ b/src/corelibs/U2Core/src/util/MSAUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MsaDbiUtils.cpp b/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
index 1fab4ce..214d085 100644
--- a/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MsaDbiUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MsaDbiUtils.h b/src/corelibs/U2Core/src/util/MsaDbiUtils.h
index f5e6abf..59f4074 100644
--- a/src/corelibs/U2Core/src/util/MsaDbiUtils.h
+++ b/src/corelibs/U2Core/src/util/MsaDbiUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MsaRowUtils.cpp b/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
index 769abf6..cbccab8 100644
--- a/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
+++ b/src/corelibs/U2Core/src/util/MsaRowUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/MsaRowUtils.h b/src/corelibs/U2Core/src/util/MsaRowUtils.h
index 2a4b473..e7633e7 100644
--- a/src/corelibs/U2Core/src/util/MsaRowUtils.h
+++ b/src/corelibs/U2Core/src/util/MsaRowUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/PMatrixSerializeUtils.h b/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
index 226e86a..9e2606f 100644
--- a/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
+++ b/src/corelibs/U2Core/src/util/PMatrixSerializeUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/QObjectScopedPointer.h b/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
index 9b674ca..ca25bd8 100644
--- a/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
+++ b/src/corelibs/U2Core/src/util/QObjectScopedPointer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/QVariantUtils.cpp b/src/corelibs/U2Core/src/util/QVariantUtils.cpp
index 561ca43..6ecc1ca 100644
--- a/src/corelibs/U2Core/src/util/QVariantUtils.cpp
+++ b/src/corelibs/U2Core/src/util/QVariantUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/QVariantUtils.h b/src/corelibs/U2Core/src/util/QVariantUtils.h
index 0999b6d..f677f85 100644
--- a/src/corelibs/U2Core/src/util/QVariantUtils.h
+++ b/src/corelibs/U2Core/src/util/QVariantUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SequenceUtils.cpp b/src/corelibs/U2Core/src/util/SequenceUtils.cpp
index 08ba950..acae7ee 100644
--- a/src/corelibs/U2Core/src/util/SequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/util/SequenceUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SequenceUtils.h b/src/corelibs/U2Core/src/util/SequenceUtils.h
index 8f5e862..6053d5a 100644
--- a/src/corelibs/U2Core/src/util/SequenceUtils.h
+++ b/src/corelibs/U2Core/src/util/SequenceUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SnpeffDictionary.cpp b/src/corelibs/U2Core/src/util/SnpeffDictionary.cpp
index 1bb7fbc..62f8d27 100644
--- a/src/corelibs/U2Core/src/util/SnpeffDictionary.cpp
+++ b/src/corelibs/U2Core/src/util/SnpeffDictionary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SnpeffDictionary.h b/src/corelibs/U2Core/src/util/SnpeffDictionary.h
index bf84db3..5c69c22 100644
--- a/src/corelibs/U2Core/src/util/SnpeffDictionary.h
+++ b/src/corelibs/U2Core/src/util/SnpeffDictionary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SyncHttp.cpp b/src/corelibs/U2Core/src/util/SyncHttp.cpp
index 4948929..5258970 100644
--- a/src/corelibs/U2Core/src/util/SyncHttp.cpp
+++ b/src/corelibs/U2Core/src/util/SyncHttp.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/SyncHttp.h b/src/corelibs/U2Core/src/util/SyncHttp.h
index 2385298..4853e5c 100644
--- a/src/corelibs/U2Core/src/util/SyncHttp.h
+++ b/src/corelibs/U2Core/src/util/SyncHttp.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/TaskWatchdog.cpp b/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
index c219bc6..750aac8 100644
--- a/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
+++ b/src/corelibs/U2Core/src/util/TaskWatchdog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/TaskWatchdog.h b/src/corelibs/U2Core/src/util/TaskWatchdog.h
index 0f9f18a..71aa14a 100644
--- a/src/corelibs/U2Core/src/util/TaskWatchdog.h
+++ b/src/corelibs/U2Core/src/util/TaskWatchdog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/TextUtils.cpp b/src/corelibs/U2Core/src/util/TextUtils.cpp
index 1031cbd..a6128c1 100644
--- a/src/corelibs/U2Core/src/util/TextUtils.cpp
+++ b/src/corelibs/U2Core/src/util/TextUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/TextUtils.h b/src/corelibs/U2Core/src/util/TextUtils.h
index 52cc131..e3d45c9 100644
--- a/src/corelibs/U2Core/src/util/TextUtils.h
+++ b/src/corelibs/U2Core/src/util/TextUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U1AnnotationUtils.cpp b/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
index 5c93d23..facdac2 100644
--- a/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U1AnnotationUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U1AnnotationUtils.h b/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
index a379458..20aa37d 100644
--- a/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
+++ b/src/corelibs/U2Core/src/util/U1AnnotationUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AlphabetUtils.cpp b/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
index 9ef3422..c770676 100644
--- a/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AlphabetUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AlphabetUtils.h b/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
index 1f0b330..febf1ce 100644
--- a/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AlphabetUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
index ab0a2ce..7b7a750 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
+++ b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AssemblyReadIterator.h b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
index 162a702..a25f471 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
+++ b/src/corelibs/U2Core/src/util/U2AssemblyReadIterator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AssemblyUtils.cpp b/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
index ea01dce..707eb3c 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AssemblyUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -20,12 +20,9 @@
*/
#include "U2AssemblyUtils.h"
-#include "dbi/U2AssemblyDbi.h"
-#include <U2Core/DbiConnection.h>
#include <U2Core/TextUtils.h>
#include <U2Core/U2OpStatus.h>
-#include <U2Core/U2SafePoints.h>
#include <QtCore/QRegExp>
@@ -132,123 +129,29 @@ qint64 U2AssemblyUtils::getCigarExtraLength(const QList<U2CigarToken>& cigar) {
return res;
}
-static QByteArray prepareCigarChars() {
- return QByteArray("0123456789DIHMNPS=X");
-}
-
-QByteArray U2AssemblyUtils::getCigarAlphabetChars() {
- static QByteArray res = prepareCigarChars();
- return res;
-}
-
QByteArray U2AssemblyUtils::serializeCoverageStat(const U2AssemblyCoverageStat& coverageStat) {
QByteArray data;
- for(int index = 0;index < coverageStat.coverage->size();index++) {
+ for(int index = 0;index < coverageStat.size();index++) {
for(int i = 0;i < 4;i++) {
- data.append((char)(coverageStat.coverage->at(index).maxValue >> (i*8)));
+ data.append((char)(coverageStat[index] >> (i*8)));
}
}
return data;
}
void U2AssemblyUtils::deserializeCoverageStat(QByteArray data, U2AssemblyCoverageStat& res, U2OpStatus &os) {
- res.coverage->clear();
+ res.clear();
if(!data.isEmpty() && 0 == (data.size() % 4)) {
for(int index = 0;index < data.size()/4;index++) {
int value = 0;
for(int i = 0;i < 4;i++) {
value |= ((int)data[index*4 + i] & 0xff) << (i*8);
}
- res.coverage->append(U2Range<int>(value, value));
+ res.append(value);
}
} else {
os.setError("Invalid attribute size");
}
}
-QVector<qint64> U2AssemblyUtils::coverageStatToVector(const U2AssemblyCoverageStat &coverageStat) {
- int size = coverageStat.coverage->size();
- QVector<qint64> res(size);
- for(int i = 0; i < size; ++i) {
- res[i] = coverageStat.coverage->at(i).maxValue;
- }
- return res;
-}
-
-U2CigarOp nextCigarOp(const QByteArray &cigarString, int &index, int &insertionsCount, U2OpStatus &os) {
- QString errString;
- U2CigarOp cigarOp = U2CigarOp_Invalid;
-
- do {
- SAFE_POINT_EXT(index < cigarString.length(), os.setError(U2AssemblyUtils::tr("Cigar string: out of bounds")), U2CigarOp_Invalid);
- cigarOp = U2AssemblyUtils::char2Cigar(cigarString[index], errString);
- SAFE_POINT_EXT(errString.isEmpty(), os.setError(errString), U2CigarOp_Invalid);
-
- index++;
-
- if (U2CigarOp_I == cigarOp || U2CigarOp_S == cigarOp) {
- insertionsCount++;
- }
- } while (U2CigarOp_I == cigarOp || U2CigarOp_S == cigarOp || U2CigarOp_P == cigarOp);
-
- return cigarOp;
-}
-
-void U2AssemblyUtils::calculateCoveragePerBase(const U2DbiRef &dbiRef, const U2DataId &assemblyId, const U2Region ®ion, QVector<CoveragePerBaseInfo> *results, U2OpStatus &os) {
- DbiConnection con(dbiRef, os);
- CHECK_OP(os, );
- U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
- SAFE_POINT_EXT(NULL != assemblyDbi, os.setError(tr("Assembly DBI is NULL")), );
-
- results->resize(region.length);
-
- QScopedPointer<U2DbiIterator<U2AssemblyRead> > readsIterator(assemblyDbi->getReads(assemblyId, region, os));
- while (readsIterator->hasNext()) {
- const U2AssemblyRead read = readsIterator->next();
- const qint64 startPos = qMax(read->leftmostPos, region.startPos);
- const qint64 endPos = qMin(read->leftmostPos + read->effectiveLen, region.endPos());
- const U2Region regionToProcess = U2Region(startPos, endPos - startPos);
-
- // we have used effective length of the read, so insertions/deletions are already taken into account
- // cigarString can be longer than needed
- QByteArray cigarString;
- foreach(const U2CigarToken &cigar, read->cigar) {
- cigarString += QByteArray(cigar.count, U2AssemblyUtils::cigar2Char(cigar.op));
- }
-
- if (read->leftmostPos < regionToProcess.startPos) {
- cigarString = cigarString.mid(regionToProcess.startPos - read->leftmostPos);
- }
-
- for (int positionOffset = 0, cigarOffset = 0, deletionsCount = 0, insertionsCount = 0; regionToProcess.startPos + positionOffset < regionToProcess.endPos(); positionOffset++) {
- char currentBase = 'N';
- CoveragePerBaseInfo &info = (*results)[regionToProcess.startPos + positionOffset - region.startPos];
- U2CigarOp cigarOp = nextCigarOp(cigarString, cigarOffset, insertionsCount, os);
- CHECK_OP(os, );
-
-
- switch (cigarOp) {
- case U2CigarOp_I:
- case U2CigarOp_S:
- // skip the insertion
- continue;
- case U2CigarOp_D:
- // skip the deletion
- deletionsCount++;
- continue;
- case U2CigarOp_N:
- // skip the deletion
- deletionsCount++;
- continue;
- default:
- currentBase = read->readSequence[positionOffset - deletionsCount + insertionsCount];
- break;
- }
- info.basesCount[currentBase] = info.basesCount[currentBase] + 1;
- info.coverage++;
- }
- CHECK_OP(os, );
- }
-}
-
} //namespace
diff --git a/src/corelibs/U2Core/src/util/U2AssemblyUtils.h b/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
index 7b663e1..f5556cb 100644
--- a/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AssemblyUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -38,15 +38,6 @@ namespace U2 {
/**
U2Assembly and related structures utility functions
*/
-class U2CORE_EXPORT CoveragePerBaseInfo {
-public:
- CoveragePerBaseInfo() :
- coverage(0) {}
-
- int coverage;
- QMap<char, int> basesCount;
-};
-
class U2CORE_EXPORT U2AssemblyUtils : public QObject {
Q_OBJECT
private:
@@ -86,28 +77,16 @@ public:
static qint64 getEffectiveReadLength(const U2AssemblyRead& read);
/**
- Returns all characters that may appear in CIGAR string
- */
- static QByteArray getCigarAlphabetChars();
-
- /**
- Serializes U2AssemblyCoverageStat to byte array for storing in dbi attribute
+ Serializes Coverage Statistics to byte array for storing in dbi attribute
*/
static QByteArray serializeCoverageStat(const U2AssemblyCoverageStat& coverageStat);
/**
- Deserializes U2AssemblyCoverageStat that was serialized with serializeCoverageStat function
+ Deserializes Coverage Statistics that was serialized with serializeCoverageStat function
*/
static void deserializeCoverageStat(QByteArray data, U2AssemblyCoverageStat& res, U2OpStatus &os);
/**
- Builds a vector where each item is max value of corresponding item of coverageStat
- */
- static QVector<qint64> coverageStatToVector(const U2AssemblyCoverageStat &coverageStat);
-
- static void calculateCoveragePerBase(const U2DbiRef &dbiRef, const U2DataId &assemblyId, const U2Region ®ion, QVector<CoveragePerBaseInfo> *results, U2OpStatus &os);
-
- /**
Size of array of cached coverage
*/
static const int MAX_COVERAGE_VECTOR_SIZE;
diff --git a/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp b/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
index 1548533..1559bf0 100644
--- a/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2AttributeUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2AttributeUtils.h b/src/corelibs/U2Core/src/util/U2AttributeUtils.h
index a3b6a4d..db1e6b7 100644
--- a/src/corelibs/U2Core/src/util/U2AttributeUtils.h
+++ b/src/corelibs/U2Core/src/util/U2AttributeUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2Bits.cpp b/src/corelibs/U2Core/src/util/U2Bits.cpp
index aa7984e..168a49f 100644
--- a/src/corelibs/U2Core/src/util/U2Bits.cpp
+++ b/src/corelibs/U2Core/src/util/U2Bits.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2Bits.h b/src/corelibs/U2Core/src/util/U2Bits.h
index 3c130c0..46a5df5 100644
--- a/src/corelibs/U2Core/src/util/U2Bits.h
+++ b/src/corelibs/U2Core/src/util/U2Bits.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2DbiUpgrader.cpp b/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
index 6118eca..600f535 100644
--- a/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
+++ b/src/corelibs/U2Core/src/util/U2DbiUpgrader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2DbiUpgrader.h b/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
index a2c3994..5017a00 100644
--- a/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
+++ b/src/corelibs/U2Core/src/util/U2DbiUpgrader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2FeatureUtils.cpp b/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
index 060282c..34c9f5d 100644
--- a/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2FeatureUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2FeatureUtils.h b/src/corelibs/U2Core/src/util/U2FeatureUtils.h
index d93600a..ec90fe6 100644
--- a/src/corelibs/U2Core/src/util/U2FeatureUtils.h
+++ b/src/corelibs/U2Core/src/util/U2FeatureUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -131,7 +131,7 @@ 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:
diff --git a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
index 807657c..2ab9288 100644
--- a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2ObjectTypeUtils.h b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
index 799a3d2..bb1f657 100644
--- a/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
+++ b/src/corelibs/U2Core/src/util/U2ObjectTypeUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2OpStatusUtils.h b/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
index cc90d6f..835e420 100644
--- a/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
+++ b/src/corelibs/U2Core/src/util/U2OpStatusUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2SequenceUtils.cpp b/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
index 6621787..efe079e 100644
--- a/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2SequenceUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2SequenceUtils.h b/src/corelibs/U2Core/src/util/U2SequenceUtils.h
index 44b62e6..8aa316e 100644
--- a/src/corelibs/U2Core/src/util/U2SequenceUtils.h
+++ b/src/corelibs/U2Core/src/util/U2SequenceUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2VariationUtils.cpp b/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
index 7dc9b43..7d7b22d 100644
--- a/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
+++ b/src/corelibs/U2Core/src/util/U2VariationUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/U2VariationUtils.h b/src/corelibs/U2Core/src/util/U2VariationUtils.h
index 5dc28ac..5d01262 100644
--- a/src/corelibs/U2Core/src/util/U2VariationUtils.h
+++ b/src/corelibs/U2Core/src/util/U2VariationUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/src/util/VariationPropertiesUtils.h b/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
index 8c5cad5..1530bb3 100644
--- a/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
+++ b/src/corelibs/U2Core/src/util/VariationPropertiesUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Core/transl/english.ts b/src/corelibs/U2Core/transl/english.ts
index 94765c9..4c3d0a1 100644
--- a/src/corelibs/U2Core/transl/english.ts
+++ b/src/corelibs/U2Core/transl/english.ts
@@ -64,14 +64,14 @@
<translation>Loaded sequences have different alphabets. That's why several sequence objects are created, each for specified alphabet. All sequences at one object have the same alphabet and sequences from different objects have different alphabets.</translation>
</message>
<message>
- <location filename="../src/datatype/Annotation.cpp" line="607"/>
- <location filename="../src/datatype/Annotation.cpp" line="610"/>
+ <location filename="../src/datatype/Annotation.cpp" line="606"/>
+ <location filename="../src/datatype/Annotation.cpp" line="609"/>
<source>Sequence</source>
<translation>Sequence</translation>
</message>
<message>
- <location filename="../src/datatype/Annotation.cpp" line="618"/>
- <location filename="../src/datatype/Annotation.cpp" line="621"/>
+ <location filename="../src/datatype/Annotation.cpp" line="617"/>
+ <location filename="../src/datatype/Annotation.cpp" line="620"/>
<source>Translation</source>
<translation>Translation</translation>
</message>
@@ -111,7 +111,7 @@
<translation>Document sequences were merged</translation>
</message>
<message>
- <location filename="../src/dbi/U2DbiUtils.cpp" line="43"/>
+ <location filename="../src/dbi/U2DbiUtils.cpp" line="46"/>
<source>UGENE public database</source>
<translation>UGENE public database</translation>
</message>
@@ -560,6 +560,11 @@
<source>Unexpected error on MSA rows import</source>
<translation>Unexpected error on MSA rows import</translation>
</message>
+ <message>
+ <location filename="../src/util/U2AlphabetUtils.h" line="101"/>
+ <source>Symbol is not belong to alphabet</source>
+ <translation>Symbol is not belong to alphabet</translation>
+ </message>
</context>
<context>
<name>U2::AbstractProjectFilterTask</name>
@@ -783,12 +788,12 @@ The session database file is removed after closing of UGENE.</translation>
<message>
<location filename="../src/tasks/CmdlineInOutTaskRunner.cpp" line="73"/>
<source>An error occurred during the task. See the log for details.</source>
- <translation type="unfinished"></translation>
+ <translation>An error occurred during the task. See the log for details.</translation>
</message>
<message>
<location filename="../src/tasks/CmdlineInOutTaskRunner.cpp" line="93"/>
<source>Wrong database string: </source>
- <translation type="unfinished"></translation>
+ <translation>Wrong database string: </translation>
</message>
</context>
<context>
@@ -796,37 +801,37 @@ The session database file is removed after closing of UGENE.</translation>
<message>
<location filename="../src/tasks/CmdlineTaskRunner.cpp" line="98"/>
<source>Run UGENE command line: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Run UGENE command line: %1</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="135"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="139"/>
<source>Cannot start process '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Cannot start process '%1'</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="205"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="209"/>
<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 type="unfinished"></translation>
+ <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/tasks/CmdlineTaskRunner.cpp" line="209"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="213"/>
<source>The process '%1' crashed some time after starting successfully</source>
- <translation type="unfinished"></translation>
+ <translation>The process '%1' crashed some time after starting successfully</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="213"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="217"/>
<source>Error occurred while reading from or writing to channel</source>
- <translation type="unfinished"></translation>
+ <translation>Error occurred while reading from or writing to channel</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="216"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="220"/>
<source>Unknown error occurred</source>
- <translation type="unfinished"></translation>
+ <translation>Unknown error occurred</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="262"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="265"/>
<source>An error occurred. Process is not finished successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>An error occurred. Process is not finished successfully.</translation>
</message>
</context>
<context>
@@ -1360,47 +1365,47 @@ The session database file is removed after closing of UGENE.</translation>
<context>
<name>U2::ExternalToolSupportUtils</name>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="348"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="350"/>
<source>Can not remove temporary directory: path is empty.</source>
<translation>Can not remove temporary directory: path is empty.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="354"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="356"/>
<source>Can not remove files from temporary directory.</source>
<translation>Can not remove files from temporary directory.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="359"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="361"/>
<source>Can not remove directory for temporary files.</source>
<translation>Can not remove directory for temporary files.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="372"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="374"/>
<source>Can not create directory for temporary files: %1</source>
<translation>Can not create directory for temporary files: %1</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="403"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="405"/>
<source>Can't run an executable file "%1" as it is. Try to run it as a cmd line command: "%2"</source>
<translation>Can't run an executable file "%1" as it is. Try to run it as a cmd line command: "%2"</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="419"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="421"/>
<source>Undefined tool: '%1'</source>
<translation>Undefined tool: '%1'</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="423"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="425"/>
<source>Path for '%1' tool not set</source>
<translation>Path for '%1' tool not set</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="467"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="469"/>
<source>Working directory is "%1"</source>
<translation>Working directory is "%1"</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="476"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="478"/>
<source>Launching %1 tool: %2 %3</source>
<translation>Launching %1 tool: %2 %3</translation>
</message>
@@ -1875,17 +1880,17 @@ The session database file is removed after closing of UGENE.</translation>
<translation>'%1' does not match database folder URL format</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="100"/>
+ <location filename="../src/globals/L10n.h" line="103"/>
<source>Direct</source>
<translation>Direct</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="101"/>
+ <location filename="../src/globals/L10n.h" line="104"/>
<source>Reverse-complementary</source>
<translation>Reverse-complementary</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="103"/>
+ <location filename="../src/globals/L10n.h" line="106"/>
<source>Required</source>
<translation>Required</translation>
</message>
@@ -2216,22 +2221,22 @@ The session database file is removed after closing of UGENE.</translation>
<context>
<name>U2::RelocateDocumentTask</name>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="348"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="358"/>
<source>Relocate document %1 -> %2</source>
<translation>Relocate document %1 -> %2</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="355"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="365"/>
<source>No active project found</source>
<translation>No active project found</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="359"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="369"/>
<source>Project is locked</source>
<translation>Project is locked</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="368"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="378"/>
<source>Only unloaded objects can be relocated</source>
<translation>Only unloaded objects can be relocated</translation>
</message>
@@ -2252,7 +2257,7 @@ The session database file is removed after closing of UGENE.</translation>
<translation>Remove document</translation>
</message>
<message>
- <location filename="../src/tasks/RemoveDocumentTask.cpp" line="94"/>
+ <location filename="../src/tasks/RemoveDocumentTask.cpp" line="98"/>
<source>Cannot remove document %1, since it is locked by some task.</source>
<translation>Cannot remove document %1, since it is locked by some task.</translation>
</message>
@@ -2289,22 +2294,22 @@ The session database file is removed after closing of UGENE.</translation>
<context>
<name>U2::SaveCopyAndAddToProjectTask</name>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="308"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="318"/>
<source>Save a copy %1</source>
<translation>Save a copy %1</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="326"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="336"/>
<source>No active project found</source>
<translation>No active project found</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="327"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="337"/>
<source>Project is locked</source>
<translation>Project is locked</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="331"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="341"/>
<source>Document is already added to the project %1</source>
<translation>Document is already added to the project %1</translation>
</message>
@@ -2381,24 +2386,24 @@ The session database file is removed after closing of UGENE.</translation>
<translation>Question?</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="213"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="214"/>
<source>Save document: %1</source>
<translation>Save document: %1</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="264"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="274"/>
<source>You have no permission to write to '%1' file.
UGENE contains unsaved modifications.</source>
<translation>You have no permission to write to '%1' file.
UGENE contains unsaved modifications.</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="265"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="275"/>
<source>Do you want to save changes to another file?</source>
<translation>Do you want to save changes to another file?</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="286"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="296"/>
<source>Save as</source>
<translation>Save as</translation>
</message>
@@ -2419,12 +2424,20 @@ UGENE contains unsaved modifications.</translation>
<context>
<name>U2::SequenceDbiWalkerSubtask</name>
<message>
- <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="140"/>
+ <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="141"/>
<source>Sequence walker subtask</source>
<translation>Sequence walker subtask</translation>
</message>
</context>
<context>
+ <name>U2::SequenceDbiWalkerTask</name>
+ <message>
+ <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="55"/>
+ <source>Target region out of sequence range</source>
+ <translation>Target region out of sequence range</translation>
+ </message>
+</context>
+<context>
<name>U2::SequenceWalkerSubtask</name>
<message>
<location filename="../src/tasks/SequenceWalkerTask.cpp" line="160"/>
@@ -2593,7 +2606,7 @@ UGENE contains unsaved modifications.</translation>
<context>
<name>U2::U2DbiUtils</name>
<message>
- <location filename="../src/dbi/U2DbiUtils.cpp" line="49"/>
+ <location filename="../src/dbi/U2DbiUtils.cpp" line="52"/>
<source>Feature is not supported: %1, dbi: %2</source>
<translation>Feature is not supported: %1, dbi: %2</translation>
</message>
diff --git a/src/corelibs/U2Core/transl/russian.ts b/src/corelibs/U2Core/transl/russian.ts
index 924622e..f953a9e 100644
--- a/src/corelibs/U2Core/transl/russian.ts
+++ b/src/corelibs/U2Core/transl/russian.ts
@@ -64,14 +64,14 @@
<translation>Загруженные последовательности имеют разные алфавиты. Поэтому создано несколько объектов типа последовательность для каждого алфавита. Все последовательности одного объекта имеют одинаковый афлфавит и последовательности из разных объектов имеют разные алфавиты.</translation>
</message>
<message>
- <location filename="../src/datatype/Annotation.cpp" line="607"/>
- <location filename="../src/datatype/Annotation.cpp" line="610"/>
+ <location filename="../src/datatype/Annotation.cpp" line="606"/>
+ <location filename="../src/datatype/Annotation.cpp" line="609"/>
<source>Sequence</source>
<translation>Последовательность</translation>
</message>
<message>
- <location filename="../src/datatype/Annotation.cpp" line="618"/>
- <location filename="../src/datatype/Annotation.cpp" line="621"/>
+ <location filename="../src/datatype/Annotation.cpp" line="617"/>
+ <location filename="../src/datatype/Annotation.cpp" line="620"/>
<source>Translation</source>
<translation>Трансляция</translation>
</message>
@@ -111,7 +111,7 @@
<translation>Последовательности из документа были соединены</translation>
</message>
<message>
- <location filename="../src/dbi/U2DbiUtils.cpp" line="43"/>
+ <location filename="../src/dbi/U2DbiUtils.cpp" line="46"/>
<source>UGENE public database</source>
<translation>Публичная база данных UGENE</translation>
</message>
@@ -560,6 +560,11 @@
<source>Unexpected error on MSA rows import</source>
<translation>Unexpected error on MSA rows import</translation>
</message>
+ <message>
+ <location filename="../src/util/U2AlphabetUtils.h" line="101"/>
+ <source>Symbol is not belong to alphabet</source>
+ <translation>Symbol is not belong to alphabet</translation>
+ </message>
</context>
<context>
<name>U2::AbstractProjectFilterTask</name>
@@ -783,12 +788,12 @@ The session database file is removed after closing of UGENE.</source>
<message>
<location filename="../src/tasks/CmdlineInOutTaskRunner.cpp" line="73"/>
<source>An error occurred during the task. See the log for details.</source>
- <translation type="unfinished"></translation>
+ <translation>An error occurred during the task. See the log for details.</translation>
</message>
<message>
<location filename="../src/tasks/CmdlineInOutTaskRunner.cpp" line="93"/>
<source>Wrong database string: </source>
- <translation type="unfinished"></translation>
+ <translation>Wrong database string: </translation>
</message>
</context>
<context>
@@ -796,37 +801,37 @@ The session database file is removed after closing of UGENE.</source>
<message>
<location filename="../src/tasks/CmdlineTaskRunner.cpp" line="98"/>
<source>Run UGENE command line: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Run UGENE command line: %1</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="135"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="139"/>
<source>Cannot start process '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Cannot start process '%1'</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="205"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="209"/>
<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 type="unfinished"></translation>
+ <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/tasks/CmdlineTaskRunner.cpp" line="209"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="213"/>
<source>The process '%1' crashed some time after starting successfully</source>
- <translation type="unfinished"></translation>
+ <translation>The process '%1' crashed some time after starting successfully</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="213"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="217"/>
<source>Error occurred while reading from or writing to channel</source>
- <translation type="unfinished"></translation>
+ <translation>Error occurred while reading from or writing to channel</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="216"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="220"/>
<source>Unknown error occurred</source>
- <translation type="unfinished"></translation>
+ <translation>Unknown error occurred</translation>
</message>
<message>
- <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="262"/>
+ <location filename="../src/tasks/CmdlineTaskRunner.cpp" line="265"/>
<source>An error occurred. Process is not finished successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>An error occurred. Process is not finished successfully.</translation>
</message>
</context>
<context>
@@ -1362,47 +1367,47 @@ The session database file is removed after closing of UGENE.</source>
<context>
<name>U2::ExternalToolSupportUtils</name>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="348"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="350"/>
<source>Can not remove temporary directory: path is empty.</source>
<translation>Невозможно удалить временную директорию: пустой путь.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="354"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="356"/>
<source>Can not remove files from temporary directory.</source>
<translation>Невозможно удалить файлы из временной директории.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="359"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="361"/>
<source>Can not remove directory for temporary files.</source>
<translation>Невозможно удалить директорию для временных файлов.</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="372"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="374"/>
<source>Can not create directory for temporary files: %1</source>
<translation>Невозможно создать директорию для временных файлов: %1</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="403"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="405"/>
<source>Can't run an executable file "%1" as it is. Try to run it as a cmd line command: "%2"</source>
<translation>Невозможно запустить исполняемый файл "%1". Попробуйте запустить его из командной строки: "%2"</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="419"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="421"/>
<source>Undefined tool: '%1'</source>
<translation>Неопределенный инструмент: '%1'</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="423"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="425"/>
<source>Path for '%1' tool not set</source>
<translation>Путь до инструмента '%1' не установлен</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="467"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="469"/>
<source>Working directory is "%1"</source>
<translation>Рабочая директория "%1"</translation>
</message>
<message>
- <location filename="../src/tasks/ExternalToolRunTask.cpp" line="476"/>
+ <location filename="../src/tasks/ExternalToolRunTask.cpp" line="478"/>
<source>Launching %1 tool: %2 %3</source>
<translation>Запуск инструмента %1: %2 %3</translation>
</message>
@@ -1933,17 +1938,17 @@ The session database file is removed after closing of UGENE.</source>
<translation> п.о</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="100"/>
+ <location filename="../src/globals/L10n.h" line="103"/>
<source>Direct</source>
<translation>Прямая</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="101"/>
+ <location filename="../src/globals/L10n.h" line="104"/>
<source>Reverse-complementary</source>
<translation>Обратно-комплементарная</translation>
</message>
<message>
- <location filename="../src/globals/L10n.h" line="103"/>
+ <location filename="../src/globals/L10n.h" line="106"/>
<source>Required</source>
<translation>Требуемый</translation>
</message>
@@ -2219,22 +2224,22 @@ The session database file is removed after closing of UGENE.</source>
<context>
<name>U2::RelocateDocumentTask</name>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="348"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="358"/>
<source>Relocate document %1 -> %2</source>
<translation>Перемещение документа %1 -> %2</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="355"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="365"/>
<source>No active project found</source>
<translation>Нет проекта</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="359"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="369"/>
<source>Project is locked</source>
<translation>Проект заблокирован</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="368"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="378"/>
<source>Only unloaded objects can be relocated</source>
<translation>Можно перемещать только выгруженные документы</translation>
</message>
@@ -2255,7 +2260,7 @@ The session database file is removed after closing of UGENE.</source>
<translation>Удаление документа</translation>
</message>
<message>
- <location filename="../src/tasks/RemoveDocumentTask.cpp" line="94"/>
+ <location filename="../src/tasks/RemoveDocumentTask.cpp" line="98"/>
<source>Cannot remove document %1, since it is locked by some task.</source>
<translation>Невозможно удалить документ %1, т.к. он заблокирован другой задачей.</translation>
</message>
@@ -2292,22 +2297,22 @@ The session database file is removed after closing of UGENE.</source>
<context>
<name>U2::SaveCopyAndAddToProjectTask</name>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="308"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="318"/>
<source>Save a copy %1</source>
<translation>Сохранение копии %1</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="326"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="336"/>
<source>No active project found</source>
<translation>Нет проекта</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="327"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="337"/>
<source>Project is locked</source>
<translation>Проект заблокирован</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="331"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="341"/>
<source>Document is already added to the project %1</source>
<translation>Документ уже добавлен в проект: %1</translation>
</message>
@@ -2384,24 +2389,24 @@ The session database file is removed after closing of UGENE.</source>
<translation>Вопрос?</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="213"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="214"/>
<source>Save document: %1</source>
<translation>Сохранить документ: %1</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="264"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="274"/>
<source>You have no permission to write to '%1' file.
UGENE contains unsaved modifications.</source>
<translation>У вас недостаточно прав для записи в '%1' файл.
UGENE содержит несохраненные изменения.</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="265"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="275"/>
<source>Do you want to save changes to another file?</source>
<translation>Хотите сохранить изменения в другой файл?</translation>
</message>
<message>
- <location filename="../src/tasks/SaveDocumentTask.cpp" line="286"/>
+ <location filename="../src/tasks/SaveDocumentTask.cpp" line="296"/>
<source>Save as</source>
<translation>Сохранить как</translation>
</message>
@@ -2422,12 +2427,20 @@ UGENE содержит несохраненные изменения.</translati
<context>
<name>U2::SequenceDbiWalkerSubtask</name>
<message>
- <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="140"/>
+ <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="141"/>
<source>Sequence walker subtask</source>
<translation>Обход части последовательности</translation>
</message>
</context>
<context>
+ <name>U2::SequenceDbiWalkerTask</name>
+ <message>
+ <location filename="../src/tasks/SequenceDbiWalkerTask.cpp" line="55"/>
+ <source>Target region out of sequence range</source>
+ <translation>Target region out of sequence range</translation>
+ </message>
+</context>
+<context>
<name>U2::SequenceWalkerSubtask</name>
<message>
<location filename="../src/tasks/SequenceWalkerTask.cpp" line="160"/>
@@ -2596,7 +2609,7 @@ UGENE содержит несохраненные изменения.</translati
<context>
<name>U2::U2DbiUtils</name>
<message>
- <location filename="../src/dbi/U2DbiUtils.cpp" line="49"/>
+ <location filename="../src/dbi/U2DbiUtils.cpp" line="52"/>
<source>Feature is not supported: %1, dbi: %2</source>
<translation>Функция не поддерживается: %1, dbi: %2</translation>
</message>
diff --git a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
index 8b3b2f1..5292fa6 100644
--- a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
+++ b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ BreakpointHitCountDialog::BreakpointHitCountDialog(const QStringList &hitCountCo
{
ui = new Ui_BreakpointHitCountDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220911");
+ new HelpButton(this, ui->buttonBox, "18223551");
ui->hitConditionCombo->addItems(hitCountConditions);
ui->hitConditionCombo->setCurrentIndex(hitCountConditions.indexOf(conditionOnLaunch));
@@ -69,6 +69,11 @@ BreakpointHitCountDialog::BreakpointHitCountDialog(const QStringList &hitCountCo
QPushButton *resetButton = ui->buttonBox->button(QDialogButtonBox::Reset);
QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok);
+ QPushButton *cancelButton = ui->buttonBox->button(QDialogButtonBox::Cancel);
+
+ resetButton->setText(tr("Reset"));
+ okButton->setText(tr("OK"));
+ cancelButton->setText(tr("Cancel"));
connect(resetButton, SIGNAL(clicked()), this, SLOT(sl_resetHitCount()));
connect(okButton, SIGNAL(clicked()), this, SLOT(sl_dialogAccepted()));
diff --git a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
index 536d9ee..dd3867a 100644
--- a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
+++ b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/BreakpointHitCountDialog.ui b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.ui
index aece280..084055c 100644
--- a/src/corelibs/U2Designer/src/BreakpointHitCountDialog.ui
+++ b/src/corelibs/U2Designer/src/BreakpointHitCountDialog.ui
@@ -117,6 +117,9 @@
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
+ <property name="locale">
+ <locale language="English" country="UnitedStates"/>
+ </property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
diff --git a/src/corelibs/U2Designer/src/DatasetWidget.cpp b/src/corelibs/U2Designer/src/DatasetWidget.cpp
index 425c370..95ec33a 100644
--- a/src/corelibs/U2Designer/src/DatasetWidget.cpp
+++ b/src/corelibs/U2Designer/src/DatasetWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DatasetWidget.h b/src/corelibs/U2Designer/src/DatasetWidget.h
index b43afac..b702fbe 100644
--- a/src/corelibs/U2Designer/src/DatasetWidget.h
+++ b/src/corelibs/U2Designer/src/DatasetWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DatasetsController.cpp b/src/corelibs/U2Designer/src/DatasetsController.cpp
index c5d202d..0a70aa0 100644
--- a/src/corelibs/U2Designer/src/DatasetsController.cpp
+++ b/src/corelibs/U2Designer/src/DatasetsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DatasetsController.h b/src/corelibs/U2Designer/src/DatasetsController.h
index 104ea50..1b95df2 100644
--- a/src/corelibs/U2Designer/src/DatasetsController.h
+++ b/src/corelibs/U2Designer/src/DatasetsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DatasetsListWidget.cpp b/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
index 3cca7bc..bb1c168 100644
--- a/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
+++ b/src/corelibs/U2Designer/src/DatasetsListWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DatasetsListWidget.h b/src/corelibs/U2Designer/src/DatasetsListWidget.h
index c56b6b6..03f4d30 100644
--- a/src/corelibs/U2Designer/src/DatasetsListWidget.h
+++ b/src/corelibs/U2Designer/src/DatasetsListWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DbFolderItem.cpp b/src/corelibs/U2Designer/src/DbFolderItem.cpp
index 34fe07e..754dad6 100644
--- a/src/corelibs/U2Designer/src/DbFolderItem.cpp
+++ b/src/corelibs/U2Designer/src/DbFolderItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DbFolderItem.h b/src/corelibs/U2Designer/src/DbFolderItem.h
index 6ba8372..90bfb56 100644
--- a/src/corelibs/U2Designer/src/DbFolderItem.h
+++ b/src/corelibs/U2Designer/src/DbFolderItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DbObjectItem.cpp b/src/corelibs/U2Designer/src/DbObjectItem.cpp
index 7623783..753c83a 100644
--- a/src/corelibs/U2Designer/src/DbObjectItem.cpp
+++ b/src/corelibs/U2Designer/src/DbObjectItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DbObjectItem.h b/src/corelibs/U2Designer/src/DbObjectItem.h
index 3b2e821..9412bc3 100644
--- a/src/corelibs/U2Designer/src/DbObjectItem.h
+++ b/src/corelibs/U2Designer/src/DbObjectItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/DelegateEditors.cpp b/src/corelibs/U2Designer/src/DelegateEditors.cpp
index c8bc91d..a79f33f 100644
--- a/src/corelibs/U2Designer/src/DelegateEditors.cpp
+++ b/src/corelibs/U2Designer/src/DelegateEditors.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DelegateEditors.h b/src/corelibs/U2Designer/src/DelegateEditors.h
index 5c1bb6a..7d39358 100644
--- a/src/corelibs/U2Designer/src/DelegateEditors.h
+++ b/src/corelibs/U2Designer/src/DelegateEditors.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DesignerUtils.cpp b/src/corelibs/U2Designer/src/DesignerUtils.cpp
index b76270c..88354fa 100644
--- a/src/corelibs/U2Designer/src/DesignerUtils.cpp
+++ b/src/corelibs/U2Designer/src/DesignerUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DesignerUtils.h b/src/corelibs/U2Designer/src/DesignerUtils.h
index 525b21d..1a31d31 100644
--- a/src/corelibs/U2Designer/src/DesignerUtils.h
+++ b/src/corelibs/U2Designer/src/DesignerUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DirectoryItem.cpp b/src/corelibs/U2Designer/src/DirectoryItem.cpp
index 512c378..4f9e2eb 100644
--- a/src/corelibs/U2Designer/src/DirectoryItem.cpp
+++ b/src/corelibs/U2Designer/src/DirectoryItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/DirectoryItem.h b/src/corelibs/U2Designer/src/DirectoryItem.h
index cab6f18..ba9fcc6 100644
--- a/src/corelibs/U2Designer/src/DirectoryItem.h
+++ b/src/corelibs/U2Designer/src/DirectoryItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
index bce6790..72175e3 100644
--- a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
+++ b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ EditBreakpointLabelsDialog::EditBreakpointLabelsDialog(const QStringList &existi
ui(new Ui_EditBreakpointLabelsDialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220911");
+ new HelpButton(this, ui->buttonBox, "18223551");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
index 632d8fa..33f4dbc 100644
--- a/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
+++ b/src/corelibs/U2Designer/src/EditBreakpointLabelsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
index 1b4c014..f6f6b57 100644
--- a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
+++ b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,10 +39,10 @@ namespace U2 {
/* EditMarkerGroupDialog */
/************************************************************************/
EditMarkerGroupDialog::EditMarkerGroupDialog(bool isNew, Marker *marker, Workflow::MarkerGroupListCfgModel *_allModel, QWidget *parent)
-: QDialog(parent), isNew(isNew), marker(NULL), allModel(_allModel)
+ : QDialog(parent), isNew(isNew), marker(NULL), allModel(_allModel), currentTypeIndex(-1)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220806");
+ new HelpButton(this, buttonBox, "18223446");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
{
@@ -397,7 +397,7 @@ 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, "18220806");
+ new HelpButton(this, buttonBox, "18223446");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (!isNew) {
diff --git a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
index a32ec06..c523766 100644
--- a/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
+++ b/src/corelibs/U2Designer/src/EditMarkerGroupDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/EstimationReporter.cpp b/src/corelibs/U2Designer/src/EstimationReporter.cpp
index 6e7cdf3..bd1399b 100644
--- a/src/corelibs/U2Designer/src/EstimationReporter.cpp
+++ b/src/corelibs/U2Designer/src/EstimationReporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/EstimationReporter.h b/src/corelibs/U2Designer/src/EstimationReporter.h
index 515ad8c..904bbad 100644
--- a/src/corelibs/U2Designer/src/EstimationReporter.h
+++ b/src/corelibs/U2Designer/src/EstimationReporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/FileItem.cpp b/src/corelibs/U2Designer/src/FileItem.cpp
index 2429aff..6c661a9 100644
--- a/src/corelibs/U2Designer/src/FileItem.cpp
+++ b/src/corelibs/U2Designer/src/FileItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/FileItem.h b/src/corelibs/U2Designer/src/FileItem.h
index 1c48b0b..63b1714 100644
--- a/src/corelibs/U2Designer/src/FileItem.h
+++ b/src/corelibs/U2Designer/src/FileItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/GrouperEditor.cpp b/src/corelibs/U2Designer/src/GrouperEditor.cpp
index 4e7dd3c..0bc4724 100644
--- a/src/corelibs/U2Designer/src/GrouperEditor.cpp
+++ b/src/corelibs/U2Designer/src/GrouperEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/GrouperEditor.h b/src/corelibs/U2Designer/src/GrouperEditor.h
index b7866f6..cf70d37 100644
--- a/src/corelibs/U2Designer/src/GrouperEditor.h
+++ b/src/corelibs/U2Designer/src/GrouperEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/GrouperEditorWidget.cpp b/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
index 20c21ef..8247ba4 100644
--- a/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
+++ b/src/corelibs/U2Designer/src/GrouperEditorWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/GrouperEditorWidget.h b/src/corelibs/U2Designer/src/GrouperEditorWidget.h
index b6ef4e7..e7272cb 100644
--- a/src/corelibs/U2Designer/src/GrouperEditorWidget.h
+++ b/src/corelibs/U2Designer/src/GrouperEditorWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/MarkerEditor.cpp b/src/corelibs/U2Designer/src/MarkerEditor.cpp
index 24826ec..b4b7026 100644
--- a/src/corelibs/U2Designer/src/MarkerEditor.cpp
+++ b/src/corelibs/U2Designer/src/MarkerEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/MarkerEditor.h b/src/corelibs/U2Designer/src/MarkerEditor.h
index 739434b..5b6295b 100644
--- a/src/corelibs/U2Designer/src/MarkerEditor.h
+++ b/src/corelibs/U2Designer/src/MarkerEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/MarkerEditorWidget.cpp b/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
index c7ba933..ab02235 100644
--- a/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
+++ b/src/corelibs/U2Designer/src/MarkerEditorWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/MarkerEditorWidget.h b/src/corelibs/U2Designer/src/MarkerEditorWidget.h
index 3e937ed..177eb4a 100644
--- a/src/corelibs/U2Designer/src/MarkerEditorWidget.h
+++ b/src/corelibs/U2Designer/src/MarkerEditorWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/NewBreakpointDialog.cpp b/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
index cf0568a..4eff7a5 100644
--- a/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
+++ b/src/corelibs/U2Designer/src/NewBreakpointDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,7 +30,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, "18220910");
+ new HelpButton(this, ui->buttonBox, "18223550");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
ui->elementCombo->addItems(elementsNames);
diff --git a/src/corelibs/U2Designer/src/NewBreakpointDialog.h b/src/corelibs/U2Designer/src/NewBreakpointDialog.h
index b05cb74..f664217 100644
--- a/src/corelibs/U2Designer/src/NewBreakpointDialog.h
+++ b/src/corelibs/U2Designer/src/NewBreakpointDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
index 7035723..b2b3ea4 100644
--- a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
+++ b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@ NewGrouperSlotDialog::NewGrouperSlotDialog(QWidget *parent, QList<Descriptor> &i
: QDialog(parent), inSlots(inSlots), names(names)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220804");
+ new HelpButton(this, buttonBox, "18223444");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -105,7 +105,7 @@ AnnsActionDialog::AnnsActionDialog(QWidget *parent, GrouperSlotAction *action, Q
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220804");
+ new HelpButton(this, buttonBox, "18223444");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -152,7 +152,7 @@ SequeceActionDialog::SequeceActionDialog(QWidget *parent, GrouperSlotAction *act
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220804");
+ new HelpButton(this, buttonBox, "18223444");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -217,7 +217,7 @@ MsaActionDialog::MsaActionDialog(QWidget *parent, GrouperSlotAction *action)
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220804");
+ new HelpButton(this, buttonBox, "18223444");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (NULL != action) {
@@ -251,7 +251,7 @@ StringActionDialog::StringActionDialog(QWidget *parent, GrouperSlotAction *actio
: ActionDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220804");
+ new HelpButton(this, buttonBox, "18223444");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
if (NULL != action) {
diff --git a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
index 5f9533f..eeb8b8e 100644
--- a/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
+++ b/src/corelibs/U2Designer/src/NewGrouperSlotDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/OutputFileDialog.cpp b/src/corelibs/U2Designer/src/OutputFileDialog.cpp
index 0d49535..e91aa77 100644
--- a/src/corelibs/U2Designer/src/OutputFileDialog.cpp
+++ b/src/corelibs/U2Designer/src/OutputFileDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,6 +47,11 @@ OutputFileDialog::OutputFileDialog(RunFileSystem *_rfs, bool _saveDir, Completio
addDirButton->setIcon(QIcon(":U2Designer/images/add_directory.png"));
absolutePathButton->setIcon(QIcon(":U2Designer/images/outside.png"));
settingsButton->setIcon(QIcon(":U2Designer/images/settings.png"));
+ QPushButton *saveButton = buttonBox->button(QDialogButtonBox::Save);
+ QPushButton *cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
+ saveButton->setText(tr("Save"));
+ cancelButton->setText(tr("Cancel"));
+
if (saveDir) {
nameWidget->setVisible(false);
setWindowTitle(tr("Save a directory"));
@@ -203,6 +208,11 @@ CreateDirectoryDialog::CreateDirectoryDialog(RunFileSystem *_rfs, const QString
: QDialog(parent), rfs(_rfs), parentDir(_parentDir)
{
setupUi(this);
+ QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+ QPushButton *cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
+
+ okButton->setText(tr("OK"));
+ cancelButton->setText(tr("Cancel"));
if (parentDir.isEmpty()) {
dirLabel->setText(OUT_DIR);
diff --git a/src/corelibs/U2Designer/src/OutputFileDialog.h b/src/corelibs/U2Designer/src/OutputFileDialog.h
index 68c972c..f17d8c4 100644
--- a/src/corelibs/U2Designer/src/OutputFileDialog.h
+++ b/src/corelibs/U2Designer/src/OutputFileDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/PropertyWidget.cpp b/src/corelibs/U2Designer/src/PropertyWidget.cpp
index f519b97..927f443 100644
--- a/src/corelibs/U2Designer/src/PropertyWidget.cpp
+++ b/src/corelibs/U2Designer/src/PropertyWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/PropertyWidget.h b/src/corelibs/U2Designer/src/PropertyWidget.h
index 2490f9a..0312a31 100644
--- a/src/corelibs/U2Designer/src/PropertyWidget.h
+++ b/src/corelibs/U2Designer/src/PropertyWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/QDScheduler.cpp b/src/corelibs/U2Designer/src/QDScheduler.cpp
index f0575ee..b9cb6e1 100644
--- a/src/corelibs/U2Designer/src/QDScheduler.cpp
+++ b/src/corelibs/U2Designer/src/QDScheduler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/QDScheduler.h b/src/corelibs/U2Designer/src/QDScheduler.h
index 5299f90..be347d0 100644
--- a/src/corelibs/U2Designer/src/QDScheduler.h
+++ b/src/corelibs/U2Designer/src/QDScheduler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/UrlItem.cpp b/src/corelibs/U2Designer/src/UrlItem.cpp
index 50deaa4..f6fb67e 100644
--- a/src/corelibs/U2Designer/src/UrlItem.cpp
+++ b/src/corelibs/U2Designer/src/UrlItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/UrlItem.h b/src/corelibs/U2Designer/src/UrlItem.h
index 4b2aa77..03183f6 100644
--- a/src/corelibs/U2Designer/src/UrlItem.h
+++ b/src/corelibs/U2Designer/src/UrlItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Designer/src/WorkflowGUIUtils.cpp b/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
index 0b4edd3..4b4f822 100644
--- a/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
+++ b/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/WorkflowGUIUtils.h b/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
index 4e526a5..2b05b39 100644
--- a/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
+++ b/src/corelibs/U2Designer/src/WorkflowGUIUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/Dashboard.cpp b/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
index e3c94ff..87336dd 100644
--- a/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/Dashboard.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/Dashboard.h b/src/corelibs/U2Designer/src/dashboard/Dashboard.h
index 90a860d..7c73340 100644
--- a/src/corelibs/U2Designer/src/dashboard/Dashboard.h
+++ b/src/corelibs/U2Designer/src/dashboard/Dashboard.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
index 72006e5..1a4f735 100644
--- a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
index b470e2a..142bc61 100644
--- a/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ExternalToolsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
index be6c932..1741c0c 100644
--- a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
index cff22c4..1ff4b7e 100644
--- a/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/OutputFilesWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
index e3be6c6..009a2b3 100644
--- a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ParametersWidget.h b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
index 8607a9e..0dff363 100644
--- a/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ParametersWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
index fdebf6e..35b5e64 100644
--- a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ProblemsWidget.h b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
index 72f7854..a74d289 100644
--- a/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ProblemsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
index b49810c..d5a31eb 100644
--- a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/ResourcesWidget.h b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
index 7bd54fd..d214479 100644
--- a/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/ResourcesWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
index fdd3414..a884a7e 100644
--- a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/StatisticsWidget.h b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
index 90dfff4..42e35c2 100644
--- a/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/StatisticsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/TableWidget.cpp b/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
index 76bc253..a2c093d 100644
--- a/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
+++ b/src/corelibs/U2Designer/src/dashboard/TableWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/dashboard/TableWidget.h b/src/corelibs/U2Designer/src/dashboard/TableWidget.h
index 5739207..e934fac 100644
--- a/src/corelibs/U2Designer/src/dashboard/TableWidget.h
+++ b/src/corelibs/U2Designer/src/dashboard/TableWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
index 70870a0..d865f15 100644
--- a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
+++ b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/support/OutputDirectoryWidget.h b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
index fc0e756..96009aa 100644
--- a/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
+++ b/src/corelibs/U2Designer/src/support/OutputDirectoryWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/support/URLLineEdit.cpp b/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
index 70a338e..a9ffb82 100644
--- a/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
+++ b/src/corelibs/U2Designer/src/support/URLLineEdit.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/support/URLLineEdit.h b/src/corelibs/U2Designer/src/support/URLLineEdit.h
index 445de26..2c7f290 100644
--- a/src/corelibs/U2Designer/src/support/URLLineEdit.h
+++ b/src/corelibs/U2Designer/src/support/URLLineEdit.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
index 856887c..1ba1c78 100644
--- a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/BowtieWidgetController.h b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
index 457bc3f..6d446fa 100644
--- a/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/BowtieWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
index 99085a8..82cbdcb 100644
--- a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/ElementSelectorController.h b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
index 8c32f36..2047d05 100644
--- a/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
+++ b/src/corelibs/U2Designer/src/wizard/ElementSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
index 16dd1ce..85ba8dd 100644
--- a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/PairedDatasetsController.h b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
index cce8def..f97fc9a 100644
--- a/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
+++ b/src/corelibs/U2Designer/src/wizard/PairedDatasetsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
index 5c6835d..09cc634 100644
--- a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/PropertyWizardController.h b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
index 0f9cf63..e1c0013 100644
--- a/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/PropertyWizardController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/RadioController.cpp b/src/corelibs/U2Designer/src/wizard/RadioController.cpp
index 67150b3..abe609e 100644
--- a/src/corelibs/U2Designer/src/wizard/RadioController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/RadioController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/RadioController.h b/src/corelibs/U2Designer/src/wizard/RadioController.h
index 67cca57..8651137 100644
--- a/src/corelibs/U2Designer/src/wizard/RadioController.h
+++ b/src/corelibs/U2Designer/src/wizard/RadioController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/SelectorActors.cpp b/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
index 58d1e84..828bb67 100644
--- a/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
+++ b/src/corelibs/U2Designer/src/wizard/SelectorActors.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/SelectorActors.h b/src/corelibs/U2Designer/src/wizard/SelectorActors.h
index 470dee3..c5079d8 100644
--- a/src/corelibs/U2Designer/src/wizard/SelectorActors.h
+++ b/src/corelibs/U2Designer/src/wizard/SelectorActors.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/SettingsController.cpp b/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
index 631b379..dcbb277 100644
--- a/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/SettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/SettingsController.h b/src/corelibs/U2Designer/src/wizard/SettingsController.h
index 1f96478..c6f756a 100644
--- a/src/corelibs/U2Designer/src/wizard/SettingsController.h
+++ b/src/corelibs/U2Designer/src/wizard/SettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
index c9c0637..2f714f4 100644
--- a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
index 6966d37..11e14f2 100644
--- a/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/TophatSamplesWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
index f1079b3..7d79353 100644
--- a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
index 308532d..1a7eb80 100644
--- a/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/UrlAndDatasetWizardController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WDWizardPage.cpp b/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
index 0c7af64..6ba9634 100644
--- a/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WDWizardPage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WDWizardPage.h b/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
index cb64b51..fd0c00b 100644
--- a/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
+++ b/src/corelibs/U2Designer/src/wizard/WDWizardPage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WidgetController.cpp b/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
index 79bb098..86a0a3d 100644
--- a/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WidgetController.h b/src/corelibs/U2Designer/src/wizard/WidgetController.h
index 1ae68c7..2d0ecd9 100644
--- a/src/corelibs/U2Designer/src/wizard/WidgetController.h
+++ b/src/corelibs/U2Designer/src/wizard/WidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WizardController.cpp b/src/corelibs/U2Designer/src/wizard/WizardController.cpp
index 5b74e0d..6fc890a 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WizardController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WizardController.h b/src/corelibs/U2Designer/src/wizard/WizardController.h
index c001a8c..a06693d 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardController.h
+++ b/src/corelibs/U2Designer/src/wizard/WizardController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -118,7 +118,7 @@ private:
void replaceCurrentActor(const QString &actorId, const QString &selectorValue);
void assignParameters();
void applySettings();
- void saveDelegateTags();
+ void saveDelegateTags();
void run();
void defaults(QWizardPage *wPage);
WizardPage * findPage(QWizardPage *wPage);
diff --git a/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp b/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
index d4fd678..6738f03 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
+++ b/src/corelibs/U2Designer/src/wizard/WizardPageController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/src/wizard/WizardPageController.h b/src/corelibs/U2Designer/src/wizard/WizardPageController.h
index e87e942..cfefac4 100644
--- a/src/corelibs/U2Designer/src/wizard/WizardPageController.h
+++ b/src/corelibs/U2Designer/src/wizard/WizardPageController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Designer/transl/english.ts b/src/corelibs/U2Designer/transl/english.ts
index ddf0fd1..7178014 100644
--- a/src/corelibs/U2Designer/transl/english.ts
+++ b/src/corelibs/U2Designer/transl/english.ts
@@ -670,6 +670,24 @@ bowtie index file</translation>
</message>
</context>
<context>
+ <name>U2::BreakpointHitCountDialog</name>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="74"/>
+ <source>Reset</source>
+ <translation>Reset</translation>
+ </message>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="75"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="76"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::ComboBoxWidget</name>
<message>
<location filename="../src/PropertyWidget.cpp" line="178"/>
@@ -704,6 +722,19 @@ bowtie index file</translation>
</message>
</context>
<context>
+ <name>U2::CreateDirectoryDialog</name>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="214"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="215"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::Dashboard</name>
<message>
<location filename="../src/dashboard/Dashboard.cpp" line="170"/>
@@ -1095,11 +1126,21 @@ bowtie index file</translation>
<name>U2::OutputFileDialog</name>
<message>
<location filename="../src/OutputFileDialog.cpp" line="52"/>
+ <source>Save</source>
+ <translation>Save</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="53"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="57"/>
<source>Save a directory</source>
<translation>Save a directory</translation>
</message>
<message>
- <location filename="../src/OutputFileDialog.cpp" line="54"/>
+ <location filename="../src/OutputFileDialog.cpp" line="59"/>
<source>Save a file</source>
<translation>Save a file</translation>
</message>
@@ -1292,12 +1333,12 @@ bowtie index file</translation>
<context>
<name>U2::SchemaRunModeDelegate</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="551"/>
+ <location filename="../src/DelegateEditors.cpp" line="555"/>
<source>This computer</source>
<translation>This computer</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="552"/>
+ <location filename="../src/DelegateEditors.cpp" line="556"/>
<source>Remote computer</source>
<translation>Remote computer</translation>
</message>
@@ -1349,17 +1390,17 @@ bowtie index file</translation>
<context>
<name>U2::StringListDelegate</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="682"/>
+ <location filename="../src/DelegateEditors.cpp" line="686"/>
<source>Enter items</source>
<translation>Enter items</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="684"/>
+ <location filename="../src/DelegateEditors.cpp" line="688"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="686"/>
+ <location filename="../src/DelegateEditors.cpp" line="690"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
@@ -1398,19 +1439,19 @@ bowtie index file</translation>
<context>
<name>U2::URLLineEdit</name>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="183"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="190"/>
<source>Select a directory</source>
<translation>Select a directory</translation>
</message>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="186"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="193"/>
<source>Select file(s)</source>
<translation>Select file(s)</translation>
</message>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="201"/>
- <location filename="../src/support/URLLineEdit.cpp" line="206"/>
- <location filename="../src/support/URLLineEdit.cpp" line="209"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="208"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="213"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="216"/>
<source>Select a file</source>
<translation>Select a file</translation>
</message>
@@ -1497,17 +1538,17 @@ bowtie index file</translation>
<context>
<name>U2::WorkflowUtils</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="541"/>
+ <location filename="../src/DelegateEditors.cpp" line="545"/>
<source>Overwrite</source>
<translation>Overwrite</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="542"/>
+ <location filename="../src/DelegateEditors.cpp" line="546"/>
<source>Rename</source>
<translation>Rename</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="544"/>
+ <location filename="../src/DelegateEditors.cpp" line="548"/>
<source>Append</source>
<translation>Append</translation>
</message>
diff --git a/src/corelibs/U2Designer/transl/russian.ts b/src/corelibs/U2Designer/transl/russian.ts
index 251fb2c..2231aa8 100644
--- a/src/corelibs/U2Designer/transl/russian.ts
+++ b/src/corelibs/U2Designer/transl/russian.ts
@@ -51,7 +51,7 @@ this merge sequence slot:</source>
<message>
<location filename="../src/BreakpointHitCountDialog.ui" line="43"/>
<source>A breakpoint is hit when the breakpoint location is reached and the condition is<br>satisfied. The hit count is the number of times the breakpoint has been hit.</source>
- <translation>Остановкапроизойдет когда текущее состояние достигнет критической точки и условия <br>будут выполнены. Количество совпадений это сколько раз сработала точка остановки.</translation>
+ <translation>Остановка произойдет когда текущее состояние достигнет критической точки и условия <br>будут выполнены. Количество совпадений - это сколько раз сработала точка остановки.</translation>
</message>
</context>
<context>
@@ -670,6 +670,24 @@ bowtie index file</source>
</message>
</context>
<context>
+ <name>U2::BreakpointHitCountDialog</name>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="74"/>
+ <source>Reset</source>
+ <translation>Сбросить</translation>
+ </message>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="75"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/BreakpointHitCountDialog.cpp" line="76"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::ComboBoxWidget</name>
<message>
<location filename="../src/PropertyWidget.cpp" line="178"/>
@@ -704,6 +722,19 @@ bowtie index file</source>
</message>
</context>
<context>
+ <name>U2::CreateDirectoryDialog</name>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="214"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="215"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::Dashboard</name>
<message>
<location filename="../src/dashboard/Dashboard.cpp" line="170"/>
@@ -1095,11 +1126,21 @@ bowtie index file</source>
<name>U2::OutputFileDialog</name>
<message>
<location filename="../src/OutputFileDialog.cpp" line="52"/>
+ <source>Save</source>
+ <translation>Сохранить</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="53"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/OutputFileDialog.cpp" line="57"/>
<source>Save a directory</source>
<translation>Сохранить директорию</translation>
</message>
<message>
- <location filename="../src/OutputFileDialog.cpp" line="54"/>
+ <location filename="../src/OutputFileDialog.cpp" line="59"/>
<source>Save a file</source>
<translation>Сохранить файл</translation>
</message>
@@ -1292,12 +1333,12 @@ bowtie index file</source>
<context>
<name>U2::SchemaRunModeDelegate</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="551"/>
+ <location filename="../src/DelegateEditors.cpp" line="555"/>
<source>This computer</source>
<translation>Данный компьютер</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="552"/>
+ <location filename="../src/DelegateEditors.cpp" line="556"/>
<source>Remote computer</source>
<translation>Удаленный компьютер</translation>
</message>
@@ -1349,17 +1390,17 @@ bowtie index file</source>
<context>
<name>U2::StringListDelegate</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="682"/>
+ <location filename="../src/DelegateEditors.cpp" line="686"/>
<source>Enter items</source>
<translation>Введите элементы</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="684"/>
+ <location filename="../src/DelegateEditors.cpp" line="688"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="686"/>
+ <location filename="../src/DelegateEditors.cpp" line="690"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -1399,19 +1440,19 @@ bowtie index file</source>
<context>
<name>U2::URLLineEdit</name>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="183"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="190"/>
<source>Select a directory</source>
<translation>Укажите директорию</translation>
</message>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="201"/>
- <location filename="../src/support/URLLineEdit.cpp" line="206"/>
- <location filename="../src/support/URLLineEdit.cpp" line="209"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="208"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="213"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="216"/>
<source>Select a file</source>
<translation>Выберите файл</translation>
</message>
<message>
- <location filename="../src/support/URLLineEdit.cpp" line="186"/>
+ <location filename="../src/support/URLLineEdit.cpp" line="193"/>
<source>Select file(s)</source>
<translation>Выберите файл(ы)</translation>
</message>
@@ -1498,17 +1539,17 @@ bowtie index file</source>
<context>
<name>U2::WorkflowUtils</name>
<message>
- <location filename="../src/DelegateEditors.cpp" line="541"/>
+ <location filename="../src/DelegateEditors.cpp" line="545"/>
<source>Overwrite</source>
<translation>Переписать</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="542"/>
+ <location filename="../src/DelegateEditors.cpp" line="546"/>
<source>Rename</source>
<translation>Переименовать</translation>
</message>
<message>
- <location filename="../src/DelegateEditors.cpp" line="544"/>
+ <location filename="../src/DelegateEditors.cpp" line="548"/>
<source>Append</source>
<translation>Дописать</translation>
</message>
diff --git a/src/corelibs/U2Formats/U2Formats.pro b/src/corelibs/U2Formats/U2Formats.pro
index 4814a8d..c8ae523 100644
--- a/src/corelibs/U2Formats/U2Formats.pro
+++ b/src/corelibs/U2Formats/U2Formats.pro
@@ -75,6 +75,7 @@ HEADERS += src/ABIFormat.h \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h \
+ src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.h \
src/sqlite_dbi/SQLiteAssemblyDbi.h \
src/sqlite_dbi/SQLiteAttributeDbi.h \
src/sqlite_dbi/SQLiteBlobInputStream.h \
@@ -92,7 +93,8 @@ HEADERS += src/ABIFormat.h \
src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h \
src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h \
src/sqlite_dbi/util/SqliteUpgrader.h \
- src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp \
+ src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h \
+ src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.h \
src/tasks/BgzipTask.h \
src/tasks/ConvertAssemblyToSamTask.h \
src/tasks/ConvertFileTask.h \
@@ -101,6 +103,7 @@ HEADERS += src/ABIFormat.h \
src/tasks/MysqlUpgradeTask.h \
src/util/AssemblyAdapter.h \
src/util/AssemblyPackAlgorithm.h \
+ src/util/PairedFastqComparator.h \
src/util/SnpeffInfoParser.h
SOURCES += src/ABIFormat.cpp \
@@ -175,6 +178,7 @@ SOURCES += src/ABIFormat.cpp \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.cpp \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.cpp \
src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp \
+ src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.cpp \
src/sqlite_dbi/SQLiteAssemblyDbi.cpp \
src/sqlite_dbi/SQLiteAttributeDbi.cpp \
src/sqlite_dbi/SQLiteBlobInputStream.cpp \
@@ -193,6 +197,7 @@ SOURCES += src/ABIFormat.cpp \
src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp \
src/sqlite_dbi/util/SqliteUpgrader.cpp \
src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.cpp \
+ src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.cpp \
src/tasks/BgzipTask.cpp \
src/tasks/ConvertAssemblyToSamTask.cpp \
src/tasks/ConvertFileTask.cpp \
@@ -200,6 +205,7 @@ SOURCES += src/ABIFormat.cpp \
src/tasks/MergeBamTask.cpp \
src/tasks/MysqlUpgradeTask.cpp \
src/util/AssemblyPackAlgorithm.cpp \
+ src/util/PairedFastqComparator.cpp \
src/util/SnpeffInfoParser.cpp
RESOURCES += U2Formats.qrc
diff --git a/src/corelibs/U2Formats/src/ABIFormat.cpp b/src/corelibs/U2Formats/src/ABIFormat.cpp
index 2796e74..7ca8af0 100644
--- a/src/corelibs/U2Formats/src/ABIFormat.cpp
+++ b/src/corelibs/U2Formats/src/ABIFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ABIFormat.h b/src/corelibs/U2Formats/src/ABIFormat.h
index 8f6c128..eae1417 100644
--- a/src/corelibs/U2Formats/src/ABIFormat.h
+++ b/src/corelibs/U2Formats/src/ABIFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ASNFormat.cpp b/src/corelibs/U2Formats/src/ASNFormat.cpp
index 8442cb6..f8ae027 100644
--- a/src/corelibs/U2Formats/src/ASNFormat.cpp
+++ b/src/corelibs/U2Formats/src/ASNFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ASNFormat.h b/src/corelibs/U2Formats/src/ASNFormat.h
index a67aa45..2194ee7 100644
--- a/src/corelibs/U2Formats/src/ASNFormat.h
+++ b/src/corelibs/U2Formats/src/ASNFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/AbstractVariationFormat.cpp b/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
index 4c30d21..eefb90e 100644
--- a/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/AbstractVariationFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/AbstractVariationFormat.h b/src/corelibs/U2Formats/src/AbstractVariationFormat.h
index 893ba0d..6a93810 100644
--- a/src/corelibs/U2Formats/src/AbstractVariationFormat.h
+++ b/src/corelibs/U2Formats/src/AbstractVariationFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/BAMUtils.cpp b/src/corelibs/U2Formats/src/BAMUtils.cpp
index e02f03b..f2104fc 100644
--- a/src/corelibs/U2Formats/src/BAMUtils.cpp
+++ b/src/corelibs/U2Formats/src/BAMUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -804,7 +804,7 @@ DNASequence FASTQIterator::next(){
return DNASequence();
}
-bool FASTQIterator::hasNext(){
+bool FASTQIterator::hasNext() const{
return seq != NULL;
}
diff --git a/src/corelibs/U2Formats/src/BAMUtils.h b/src/corelibs/U2Formats/src/BAMUtils.h
index a92fe6e..829c2f8 100644
--- a/src/corelibs/U2Formats/src/BAMUtils.h
+++ b/src/corelibs/U2Formats/src/BAMUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -93,7 +93,7 @@ public:
virtual ~FASTQIterator();
DNASequence next();
- bool hasNext();
+ bool hasNext() const;
private:
void fetchNext();
diff --git a/src/corelibs/U2Formats/src/BedFormat.cpp b/src/corelibs/U2Formats/src/BedFormat.cpp
index 70e65c9..afd7df5 100644
--- a/src/corelibs/U2Formats/src/BedFormat.cpp
+++ b/src/corelibs/U2Formats/src/BedFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/BedFormat.h b/src/corelibs/U2Formats/src/BedFormat.h
index 73e3247..ce31cf5 100644
--- a/src/corelibs/U2Formats/src/BedFormat.h
+++ b/src/corelibs/U2Formats/src/BedFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ClustalWAlnFormat.cpp b/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
index 831c17b..d1b221f 100644
--- a/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
+++ b/src/corelibs/U2Formats/src/ClustalWAlnFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ClustalWAlnFormat.h b/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
index 061c036..14fb3ba 100644
--- a/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
+++ b/src/corelibs/U2Formats/src/ClustalWAlnFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ColumnDataParser.cpp b/src/corelibs/U2Formats/src/ColumnDataParser.cpp
index d880caf..d74955a 100644
--- a/src/corelibs/U2Formats/src/ColumnDataParser.cpp
+++ b/src/corelibs/U2Formats/src/ColumnDataParser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ColumnDataParser.h b/src/corelibs/U2Formats/src/ColumnDataParser.h
index c9333ea..aa05e49 100644
--- a/src/corelibs/U2Formats/src/ColumnDataParser.h
+++ b/src/corelibs/U2Formats/src/ColumnDataParser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DNAQualityIOUtils.cpp b/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
index 127d26e..cf7f423 100644
--- a/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
+++ b/src/corelibs/U2Formats/src/DNAQualityIOUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DNAQualityIOUtils.h b/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
index 275c342..c91447e 100644
--- a/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
+++ b/src/corelibs/U2Formats/src/DNAQualityIOUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/Database.cpp b/src/corelibs/U2Formats/src/Database.cpp
index e843e30..57e1786 100644
--- a/src/corelibs/U2Formats/src/Database.cpp
+++ b/src/corelibs/U2Formats/src/Database.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/Database.h b/src/corelibs/U2Formats/src/Database.h
index 3e77c05..fd4fab6 100644
--- a/src/corelibs/U2Formats/src/Database.h
+++ b/src/corelibs/U2Formats/src/Database.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
index b4bb891..6eb8a35 100644
--- a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
+++ b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DatabaseConnectionFormat.h b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
index f98abc1..679822d 100644
--- a/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
+++ b/src/corelibs/U2Formats/src/DatabaseConnectionFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DifferentialFormat.cpp b/src/corelibs/U2Formats/src/DifferentialFormat.cpp
index 481a954..6977a3d 100644
--- a/src/corelibs/U2Formats/src/DifferentialFormat.cpp
+++ b/src/corelibs/U2Formats/src/DifferentialFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DifferentialFormat.h b/src/corelibs/U2Formats/src/DifferentialFormat.h
index 39882bc..ba5309a 100644
--- a/src/corelibs/U2Formats/src/DifferentialFormat.h
+++ b/src/corelibs/U2Formats/src/DifferentialFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DocumentFormatUtils.cpp b/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
index 849f970..4f3b37a 100644
--- a/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
+++ b/src/corelibs/U2Formats/src/DocumentFormatUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/DocumentFormatUtils.h b/src/corelibs/U2Formats/src/DocumentFormatUtils.h
index 4a59c1e..fe7131e 100644
--- a/src/corelibs/U2Formats/src/DocumentFormatUtils.h
+++ b/src/corelibs/U2Formats/src/DocumentFormatUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
index fde2e32..e36273f 100644
--- a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
+++ b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
index a09a1be..989ab63 100644
--- a/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
+++ b/src/corelibs/U2Formats/src/EMBLGenbankAbstractDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
index 308c25a..a8c1746 100644
--- a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/EMBLPlainTextFormat.h b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
index 79e2ab7..2f1e666 100644
--- a/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/EMBLPlainTextFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/FastaFormat.cpp b/src/corelibs/U2Formats/src/FastaFormat.cpp
index b248ca6..b014395 100644
--- a/src/corelibs/U2Formats/src/FastaFormat.cpp
+++ b/src/corelibs/U2Formats/src/FastaFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/FastaFormat.h b/src/corelibs/U2Formats/src/FastaFormat.h
index 536808e..a4d19f3 100644
--- a/src/corelibs/U2Formats/src/FastaFormat.h
+++ b/src/corelibs/U2Formats/src/FastaFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/FastqFormat.cpp b/src/corelibs/U2Formats/src/FastqFormat.cpp
index 66bcd1b..bc43744 100644
--- a/src/corelibs/U2Formats/src/FastqFormat.cpp
+++ b/src/corelibs/U2Formats/src/FastqFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -226,7 +226,7 @@ static bool errorLoggingBreak(U2OpStatus& os, QMap<QString, QString>& skippedLin
/**
* FASTQ format specification: http://maq.sourceforge.net/fastq.shtml
*/
-static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints, const GUrl& docUrl, QList<GObject*>& objects, U2OpStatus& os,
+static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints, QList<GObject*>& objects, U2OpStatus& os,
int gapSize, int predictedSize, QString& writeLockReason, QMap<QString, QString>& skippedLines) {
DbiOperationsBlock opBlock(dbiRef, os);
CHECK_OP(os, );
@@ -284,7 +284,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
seqImporter.startSequence(dbiRef, folder, objName, false, warningOs);
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
}
@@ -296,7 +296,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
sequenceStart+=gapSize;
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
}
@@ -305,7 +305,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
readSequence(warningOs, io, sequence);
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
MemoryLocker lSequence(os, qCeil(sequence.size()/(1000*1000)));
@@ -315,7 +315,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
seqImporter.addBlock(sequence.data(),sequence.length(), warningOs);
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
@@ -327,7 +327,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
}
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
}
@@ -337,7 +337,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
readQuality(warningOs, io, qualityScores, sequence.size());
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
@@ -347,7 +347,7 @@ static void load(IOAdapter* io, const U2DbiRef& dbiRef, const QVariantMap& hints
}
if(errorLoggingBreak(warningOs, skippedLines, sequenceName)){
U2OpStatusImpl seqOs;
- U2Sequence u2seq = seqImporter.finalizeSequenceAndValidate(seqOs);
+ seqImporter.finalizeSequenceAndValidate(seqOs);
continue;
}
@@ -416,7 +416,7 @@ Document* FastqFormat::loadDocument(IOAdapter* io, const U2DbiRef& dbiRef, const
int predictedSize = qMax(100*1000, DocumentFormatUtils::getMergedSize(hints, gapSize==-1 ? 0 : io->left()));
QString lockReason;
- load(io, dbiRef, _hints, io->getURL(), objects, os, gapSize, predictedSize, lockReason, skippedLines);
+ load(io, dbiRef, _hints, objects, os, gapSize, predictedSize, lockReason, skippedLines);
if (skippedLines.size() > 0){
QMapIterator<QString, QString> i(skippedLines);
QStringList errors;
diff --git a/src/corelibs/U2Formats/src/FastqFormat.h b/src/corelibs/U2Formats/src/FastqFormat.h
index 45d47c5..f96aeae 100644
--- a/src/corelibs/U2Formats/src/FastqFormat.h
+++ b/src/corelibs/U2Formats/src/FastqFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/FpkmTrackingFormat.cpp b/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
index f5b9652..d78c4a3 100644
--- a/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
+++ b/src/corelibs/U2Formats/src/FpkmTrackingFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/FpkmTrackingFormat.h b/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
index 75d80f5..8cfddb8 100644
--- a/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
+++ b/src/corelibs/U2Formats/src/FpkmTrackingFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GFFFormat.cpp b/src/corelibs/U2Formats/src/GFFFormat.cpp
index d226a2a..34b2555 100644
--- a/src/corelibs/U2Formats/src/GFFFormat.cpp
+++ b/src/corelibs/U2Formats/src/GFFFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -63,7 +63,7 @@ Document* GFFFormat::loadDocument(IOAdapter* io, const U2DbiRef& dbiRef, const Q
load(io, dbiRef, objects, fs, os);
CHECK_OP_EXT(os, qDeleteAll(objects), NULL);
-
+
DocumentFormatUtils::updateFormatHints(objects, fs);
fs[DocumentReadingMode_LoadAsModified] = os.hasWarnings();
diff --git a/src/corelibs/U2Formats/src/GFFFormat.h b/src/corelibs/U2Formats/src/GFFFormat.h
index 5ab5ea9..1024da1 100644
--- a/src/corelibs/U2Formats/src/GFFFormat.h
+++ b/src/corelibs/U2Formats/src/GFFFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GTFFormat.cpp b/src/corelibs/U2Formats/src/GTFFormat.cpp
index 8d86cce..901819a 100644
--- a/src/corelibs/U2Formats/src/GTFFormat.cpp
+++ b/src/corelibs/U2Formats/src/GTFFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GTFFormat.h b/src/corelibs/U2Formats/src/GTFFormat.h
index 5102dbd..179c5fb 100644
--- a/src/corelibs/U2Formats/src/GTFFormat.h
+++ b/src/corelibs/U2Formats/src/GTFFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GenbankLocationParser.cpp b/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
index f36ec02..0a36e6b 100644
--- a/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
+++ b/src/corelibs/U2Formats/src/GenbankLocationParser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GenbankLocationParser.h b/src/corelibs/U2Formats/src/GenbankLocationParser.h
index bab6af6..68eec83 100644
--- a/src/corelibs/U2Formats/src/GenbankLocationParser.h
+++ b/src/corelibs/U2Formats/src/GenbankLocationParser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
index 3413a21..d77b8b9 100644
--- a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/GenbankPlainTextFormat.h b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
index 47e5102..f6c47ed 100644
--- a/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/GenbankPlainTextFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/MSFFormat.cpp b/src/corelibs/U2Formats/src/MSFFormat.cpp
index 05b6db0..7b44aa9 100644
--- a/src/corelibs/U2Formats/src/MSFFormat.cpp
+++ b/src/corelibs/U2Formats/src/MSFFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/MSFFormat.h b/src/corelibs/U2Formats/src/MSFFormat.h
index ddb0177..72ac3cd 100644
--- a/src/corelibs/U2Formats/src/MSFFormat.h
+++ b/src/corelibs/U2Formats/src/MSFFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/MegaFormat.cpp b/src/corelibs/U2Formats/src/MegaFormat.cpp
index 3000cc3..efed6d9 100644
--- a/src/corelibs/U2Formats/src/MegaFormat.cpp
+++ b/src/corelibs/U2Formats/src/MegaFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/MegaFormat.h b/src/corelibs/U2Formats/src/MegaFormat.h
index 9ff45c4..d2d3196 100644
--- a/src/corelibs/U2Formats/src/MegaFormat.h
+++ b/src/corelibs/U2Formats/src/MegaFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/NEXUSFormat.cpp b/src/corelibs/U2Formats/src/NEXUSFormat.cpp
index 624f125..091ea90 100644
--- a/src/corelibs/U2Formats/src/NEXUSFormat.cpp
+++ b/src/corelibs/U2Formats/src/NEXUSFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/NEXUSFormat.h b/src/corelibs/U2Formats/src/NEXUSFormat.h
index a454229..9716e32 100644
--- a/src/corelibs/U2Formats/src/NEXUSFormat.h
+++ b/src/corelibs/U2Formats/src/NEXUSFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/NEXUSParser.h b/src/corelibs/U2Formats/src/NEXUSParser.h
index 5e9441f..06ea695 100644
--- a/src/corelibs/U2Formats/src/NEXUSParser.h
+++ b/src/corelibs/U2Formats/src/NEXUSParser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/NewickFormat.cpp b/src/corelibs/U2Formats/src/NewickFormat.cpp
index 4f75c13..8ab58ad 100644
--- a/src/corelibs/U2Formats/src/NewickFormat.cpp
+++ b/src/corelibs/U2Formats/src/NewickFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/NewickFormat.h b/src/corelibs/U2Formats/src/NewickFormat.h
index 8e50198..5617ad2 100644
--- a/src/corelibs/U2Formats/src/NewickFormat.h
+++ b/src/corelibs/U2Formats/src/NewickFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PDBFormat.cpp b/src/corelibs/U2Formats/src/PDBFormat.cpp
index d1ca0a7..e382c42 100644
--- a/src/corelibs/U2Formats/src/PDBFormat.cpp
+++ b/src/corelibs/U2Formats/src/PDBFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PDBFormat.h b/src/corelibs/U2Formats/src/PDBFormat.h
index 694b4e7..4caed67 100644
--- a/src/corelibs/U2Formats/src/PDBFormat.h
+++ b/src/corelibs/U2Formats/src/PDBFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PDWFormat.cpp b/src/corelibs/U2Formats/src/PDWFormat.cpp
index d0598cb..35bc32e 100644
--- a/src/corelibs/U2Formats/src/PDWFormat.cpp
+++ b/src/corelibs/U2Formats/src/PDWFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PDWFormat.h b/src/corelibs/U2Formats/src/PDWFormat.h
index 62a3f92..851903b 100644
--- a/src/corelibs/U2Formats/src/PDWFormat.h
+++ b/src/corelibs/U2Formats/src/PDWFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PhylipFormat.cpp b/src/corelibs/U2Formats/src/PhylipFormat.cpp
index 4b5189d..1ad77a7 100644
--- a/src/corelibs/U2Formats/src/PhylipFormat.cpp
+++ b/src/corelibs/U2Formats/src/PhylipFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PhylipFormat.h b/src/corelibs/U2Formats/src/PhylipFormat.h
index 8de8008..0eeae17 100644
--- a/src/corelibs/U2Formats/src/PhylipFormat.h
+++ b/src/corelibs/U2Formats/src/PhylipFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PlainTextFormat.cpp b/src/corelibs/U2Formats/src/PlainTextFormat.cpp
index a74a06e..2cbe795 100644
--- a/src/corelibs/U2Formats/src/PlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/PlainTextFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/PlainTextFormat.h b/src/corelibs/U2Formats/src/PlainTextFormat.h
index 7bd5e7d..c9f0e91 100644
--- a/src/corelibs/U2Formats/src/PlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/PlainTextFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/RawDNASequenceFormat.cpp b/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
index eae3668..1c4caa3 100644
--- a/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
+++ b/src/corelibs/U2Formats/src/RawDNASequenceFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/RawDNASequenceFormat.h b/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
index 0f2d93f..f5525df 100644
--- a/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
+++ b/src/corelibs/U2Formats/src/RawDNASequenceFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SAMFormat.cpp b/src/corelibs/U2Formats/src/SAMFormat.cpp
index 0a789be..c2192ce 100644
--- a/src/corelibs/U2Formats/src/SAMFormat.cpp
+++ b/src/corelibs/U2Formats/src/SAMFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SAMFormat.h b/src/corelibs/U2Formats/src/SAMFormat.h
index 044441f..49072a7 100644
--- a/src/corelibs/U2Formats/src/SAMFormat.h
+++ b/src/corelibs/U2Formats/src/SAMFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SCFFormat.cpp b/src/corelibs/U2Formats/src/SCFFormat.cpp
index 6e7be59..9f3ef9d 100644
--- a/src/corelibs/U2Formats/src/SCFFormat.cpp
+++ b/src/corelibs/U2Formats/src/SCFFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SCFFormat.h b/src/corelibs/U2Formats/src/SCFFormat.h
index a706629..5807754 100644
--- a/src/corelibs/U2Formats/src/SCFFormat.h
+++ b/src/corelibs/U2Formats/src/SCFFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SNPDatabaseUtils.cpp b/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
index b58ff98..67973ac 100644
--- a/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
+++ b/src/corelibs/U2Formats/src/SNPDatabaseUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SNPDatabaseUtils.h b/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
index 21dc3c9..8944626 100644
--- a/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
+++ b/src/corelibs/U2Formats/src/SNPDatabaseUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
index 9ef1c37..db30b04 100644
--- a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SimpleSNPVariationFormat.h b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
index 730f473..360193b 100644
--- a/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
+++ b/src/corelibs/U2Formats/src/SimpleSNPVariationFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StdResidueDictionary.cpp b/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
index 63665a2..ffac90d 100644
--- a/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
+++ b/src/corelibs/U2Formats/src/StdResidueDictionary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StdResidueDictionary.h b/src/corelibs/U2Formats/src/StdResidueDictionary.h
index 5a8d999..4e529a0 100644
--- a/src/corelibs/U2Formats/src/StdResidueDictionary.h
+++ b/src/corelibs/U2Formats/src/StdResidueDictionary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StockholmFormat.cpp b/src/corelibs/U2Formats/src/StockholmFormat.cpp
index 392d021..e378843 100644
--- a/src/corelibs/U2Formats/src/StockholmFormat.cpp
+++ b/src/corelibs/U2Formats/src/StockholmFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StockholmFormat.h b/src/corelibs/U2Formats/src/StockholmFormat.h
index a902fbc..6ed63e2 100644
--- a/src/corelibs/U2Formats/src/StockholmFormat.h
+++ b/src/corelibs/U2Formats/src/StockholmFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StreamSequenceReader.cpp b/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
index 228081b..bc56dc9 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
+++ b/src/corelibs/U2Formats/src/StreamSequenceReader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StreamSequenceReader.h b/src/corelibs/U2Formats/src/StreamSequenceReader.h
index 598954c..9008b37 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceReader.h
+++ b/src/corelibs/U2Formats/src/StreamSequenceReader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StreamSequenceWriter.cpp b/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
index ff5f18c..68413e6 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
+++ b/src/corelibs/U2Formats/src/StreamSequenceWriter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/StreamSequenceWriter.h b/src/corelibs/U2Formats/src/StreamSequenceWriter.h
index 2fdea18..c6e39a0 100644
--- a/src/corelibs/U2Formats/src/StreamSequenceWriter.h
+++ b/src/corelibs/U2Formats/src/StreamSequenceWriter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
index 7fa9b15..e490148 100644
--- a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
+++ b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/SwissProtPlainTextFormat.h b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
index ae182ad..7c9e360 100644
--- a/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
+++ b/src/corelibs/U2Formats/src/SwissProtPlainTextFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/VCF4VariationFormat.cpp b/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
index eae31cc..5209615 100644
--- a/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
+++ b/src/corelibs/U2Formats/src/VCF4VariationFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/VCF4VariationFormat.h b/src/corelibs/U2Formats/src/VCF4VariationFormat.h
index 2b2b353..f551bde 100644
--- a/src/corelibs/U2Formats/src/VCF4VariationFormat.h
+++ b/src/corelibs/U2Formats/src/VCF4VariationFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
index aaa08cb..f28d297 100644
--- a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
+++ b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/VectorNtiSequenceFormat.h b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
index 76097a3..10c3cd0 100644
--- a/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
+++ b/src/corelibs/U2Formats/src/VectorNtiSequenceFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/AceFormat.cpp b/src/corelibs/U2Formats/src/ace/AceFormat.cpp
index 1ccd4ae..678da43 100644
--- a/src/corelibs/U2Formats/src/ace/AceFormat.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/AceFormat.h b/src/corelibs/U2Formats/src/ace/AceFormat.h
index 5654396..e6c0768 100644
--- a/src/corelibs/U2Formats/src/ace/AceFormat.h
+++ b/src/corelibs/U2Formats/src/ace/AceFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/AceImportUtils.cpp b/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
index 2034726..e4da2bb 100644
--- a/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceImportUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/AceImportUtils.h b/src/corelibs/U2Formats/src/ace/AceImportUtils.h
index 22fa4a4..12a722a 100644
--- a/src/corelibs/U2Formats/src/ace/AceImportUtils.h
+++ b/src/corelibs/U2Formats/src/ace/AceImportUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/AceImporter.cpp b/src/corelibs/U2Formats/src/ace/AceImporter.cpp
index 103e2dc..9899d89 100644
--- a/src/corelibs/U2Formats/src/ace/AceImporter.cpp
+++ b/src/corelibs/U2Formats/src/ace/AceImporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -56,10 +56,6 @@ AceImporterTask::AceImporterTask(const GUrl& url, const QVariantMap& settings, c
hints(hints),
srcUrl(url)
{
- if (settings.contains(AceImporter::DEST_URL)) {
- destUrl = GUrl(settings.value(AceImporter::DEST_URL).toString());
- }
-
documentDescription = srcUrl.fileName();
}
@@ -67,28 +63,25 @@ void AceImporterTask::prepare() {
startTime = GTimer::currentTimeMicros();
hintedDbiRef = hints.value(DocumentFormat::DBI_REF_HINT).value<U2DbiRef>();
- isSqliteDbTransit = hintedDbiRef.isValid() && SQLITE_DBI_ID != hintedDbiRef.dbiFactoryId;
+ SAFE_POINT_EXT(hintedDbiRef.isValid(), setError(tr("Dbi ref is invalid")), );
- if (destUrl.isEmpty()) {
- if (!isSqliteDbTransit) {
- localDbiRef = U2DbiRef(SQLITE_DBI_ID, srcUrl.dirPath() + QDir::separator() + srcUrl.fileName() + ".ugenedb");
- } else {
- const QString tmpDir = AppContext::getAppSettings()->getUserAppsSettings()->getCurrentProcessTemporaryDirPath("assembly_conversion") + QDir::separator();
- QDir().mkpath(tmpDir);
+ isSqliteDbTransit = SQLITE_DBI_ID != hintedDbiRef.dbiFactoryId;
+ if (!isSqliteDbTransit) {
+ localDbiRef = hintedDbiRef;
+ } else {
+ const QString tmpDir = AppContext::getAppSettings()->getUserAppsSettings()->getCurrentProcessTemporaryDirPath("assembly_conversion") + QDir::separator();
+ QDir().mkpath(tmpDir);
- const QString pattern = tmpDir + "XXXXXX.ugenedb";
- QTemporaryFile *tempLocalDb = new QTemporaryFile(pattern, this);
+ const QString pattern = tmpDir + "XXXXXX.ugenedb";
+ QTemporaryFile *tempLocalDb = new QTemporaryFile(pattern, this);
- tempLocalDb->open();
- const QString filePath = tempLocalDb->fileName();
- tempLocalDb->close();
+ tempLocalDb->open();
+ const QString filePath = tempLocalDb->fileName();
+ tempLocalDb->close();
- SAFE_POINT_EXT(QFile::exists(filePath), setError(tr("Can't create a temporary database")), );
+ SAFE_POINT_EXT(QFile::exists(filePath), setError(tr("Can't create a temporary database")), );
- localDbiRef = U2DbiRef(SQLITE_DBI_ID, filePath);
- }
- } else {
- localDbiRef = U2DbiRef(SQLITE_DBI_ID, destUrl.getURLString());
+ localDbiRef = U2DbiRef(SQLITE_DBI_ID, filePath);
}
convertTask = new ConvertAceToSqliteTask(srcUrl, localDbiRef);
@@ -155,7 +148,6 @@ void AceImporterTask::initLoadDocumentTask() {
const QString AceImporter::ID = "ace-importer";
const QString AceImporter::SRC_URL = "source_url";
-const QString AceImporter::DEST_URL = "destination_url";
AceImporter::AceImporter() :
DocumentImporter(ID, tr("ACE file importer")) {
@@ -184,7 +176,11 @@ DocumentProviderTask* AceImporter::createImportTask(const FormatDetectionResult&
CHECK(!dialog.isNull(), NULL);
settings = dialog->getSettings();
- task = new AceImporterTask(res.url, settings, hints);
+ QVariantMap extendedHints(hints);
+ if (settings.contains(DocumentFormat::DBI_REF_HINT)) {
+ extendedHints.insert(DocumentFormat::DBI_REF_HINT, settings[DocumentFormat::DBI_REF_HINT]);
+ }
+ task = new AceImporterTask(res.url, settings, extendedHints);
if (result == QDialog::Rejected) {
task->cancel();
}
diff --git a/src/corelibs/U2Formats/src/ace/AceImporter.h b/src/corelibs/U2Formats/src/ace/AceImporter.h
index 022d0cb..8b07a5d 100644
--- a/src/corelibs/U2Formats/src/ace/AceImporter.h
+++ b/src/corelibs/U2Formats/src/ace/AceImporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,6 @@ private:
U2DbiRef localDbiRef;
U2DbiRef hintedDbiRef;
GUrl srcUrl;
- GUrl destUrl;
qint64 startTime;
};
@@ -75,7 +74,6 @@ public:
static const QString ID;
static const QString SRC_URL;
- static const QString DEST_URL;
};
} // namespace U2
diff --git a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
index 683134b..4b0a5e9 100644
--- a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
+++ b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
index f7f616e..8415848 100644
--- a/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
+++ b/src/corelibs/U2Formats/src/ace/CloneAssemblyWithReferenceToDbiTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
index e360616..48ae309 100644
--- a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
+++ b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -262,7 +262,7 @@ void ConvertAceToSqliteTask::updateAttributeDbi() {
U2AssemblyReadsImportInfo & importInfo = importInfos[assemblyNum];
qint64 maxProw = importInfo.packStat.maxProw;
qint64 readsCount = importInfo.packStat.readsCount;
- const U2AssemblyCoverageStat & coverageStat = importInfo.coverageInfo.coverage;
+ const U2AssemblyCoverageStat& coverageStat = importInfo.coverageInfo.coverage;
if (maxProw > 0) {
U2IntegerAttribute maxProwAttr;
maxProwAttr.objectId = assembly.id;
@@ -285,8 +285,7 @@ void ConvertAceToSqliteTask::updateAttributeDbi() {
attrDbi->createIntegerAttribute(countReadsAttr, stateInfo);
CHECK_OP(stateInfo, );
}
- /*
- if (!coverageStat.coverage->isEmpty()) {
+ if (!coverageStat.isEmpty()) {
U2ByteArrayAttribute attribute;
attribute.objectId = assembly.id;
attribute.name = U2BaseAttributeName::coverage_statistics;
@@ -295,7 +294,6 @@ void ConvertAceToSqliteTask::updateAttributeDbi() {
attrDbi->createByteArrayAttribute(attribute, stateInfo);
CHECK_OP(stateInfo, );
}
- */
stateInfo.setProgress(stateInfo.getProgress() + progressStep);
}
}
diff --git a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
index 8848d27..63e3672 100644
--- a/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
+++ b/src/corelibs/U2Formats/src/ace/ConvertAceToSqliteTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
index 33d60c5..72d0218 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -361,7 +361,7 @@ void MysqlAssemblyDbi::pack(const U2DataId& assemblyId, U2AssemblyPackStat& stat
perfLog.trace(QString("Assembly: full pack time: %1 seconds").arg((GTimer::currentTimeMicros() - t0) / float(1000*1000)));
}
-void MysqlAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) {
+void MysqlAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
GTIMER(c2, t2, "MysqlAssemblyDbi::calculateCoverage");
quint64 t0 = GTimer::currentTimeMicros();
@@ -370,7 +370,7 @@ void MysqlAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Reg
if ( a == NULL ) {
return;
}
- a->calculateCoverage(region, c, os);
+ a->calculateCoverage(region, coverage, os);
perfLog.trace(QString("Assembly: full coverage calculation time for %2..%3: %1 seconds").arg((GTimer::currentTimeMicros() - t0) / float(1000*1000)).arg(region.startPos).arg(region.endPos()));
}
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
index ab87a7a..50fdbf7 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAssemblyDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -119,10 +119,10 @@ public:
virtual void pack(const U2DataId& assemblyId, U2AssemblyPackStat& stat, U2OpStatus& os);
/**
- Calculates coverage information for the given region. Saves result to 'c.coverage' vector.
- Note: Coverage window size depends on 'c.coverage' vector size passed to the method call.
+ Calculates coverage information for the given region. Saves result to 'coverage' vector.
+ Note: Coverage window size depends on 'coverage' vector size passed to the method call.
*/
- virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
private:
virtual void addReads(MysqlAssemblyAdapter* a, U2DbiIterator<U2AssemblyRead>* it, U2AssemblyReadsImportInfo& ii, U2OpStatus& os);
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
index dbc5d9d..d2390c8 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
index aa721d3..d9652cd 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlAttributeDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright ( C ) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
index 658721d..7d2dc05 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
index 786c40b..ec863d4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobInputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
index d4ed9ce..179e9b7 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
index a8bf0bb..ffd85b9 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlBlobOutputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
index a8cfea5..eef6cf4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
index 016688d..4e7c41b 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlCrossDatabaseReferenceDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
index abaeca1..67fd0b8 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,6 +43,7 @@
#include "util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h"
#include "util/upgraders/MysqlUpgraderFrom_1_16_To_1_17.h"
#include "util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h"
+#include "util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.h"
namespace U2 {
@@ -69,6 +70,7 @@ MysqlDbi::MysqlDbi()
upgraders << new MysqlUpgraderFrom_1_15_To_1_16(this);
upgraders << new MysqlUpgraderFrom_1_16_To_1_17(this);
upgraders << new MysqlUpgraderFrom_1_16_To_1_24(this);
+ upgraders << new MysqlUpgraderFrom_1_24_To_1_25(this);
}
MysqlDbi::~MysqlDbi() {
@@ -347,9 +349,6 @@ void MysqlDbi::populateDefaultSchema(U2OpStatus& os) {
setVersionProperties(Version::minVersionForMySQL(), os);
CHECK_DB_INIT(os);
-
- setupStoredFunctions(os);
- CHECK_DB_INIT(os);
}
void MysqlDbi::internalInit(const QHash<QString, QString>& props, U2OpStatus& os) {
@@ -486,38 +485,6 @@ void MysqlDbi::setupTransactions(U2OpStatus &os) {
U2SqlQuery("SET autocommit = 0", db, os).execute();
}
-void MysqlDbi::setupStoredFunctions(U2OpStatus &os) {
- // "Create Index If Not Exists" procedure
- const QString queryString = "CREATE PROCEDURE `%1`.`CreateIndex` "
- "( "
- "given_database VARCHAR(64), "
- "given_table VARCHAR(64), "
- "given_index VARCHAR(64), "
- "given_columns VARCHAR(64) "
- ") "
- "SQL SECURITY INVOKER "
- "BEGIN "
- "DECLARE IndexIsThere INTEGER; "
- "SELECT COUNT(1) INTO IndexIsThere "
- "FROM INFORMATION_SCHEMA.STATISTICS "
- "WHERE table_schema = given_database "
- "AND table_name = given_table "
- "AND index_name = given_index; "
- "IF IndexIsThere = 0 THEN "
- "SET @sqlstmt = CONCAT('CREATE INDEX ',given_index,' ON ', "
- "given_database,'.',given_table,' (',given_columns,')'); "
- "PREPARE st FROM @sqlstmt; "
- "EXECUTE st; "
- "DEALLOCATE PREPARE st; "
- "ELSE "
- "SELECT CONCAT('Index ',given_index,' already exists on Table ', "
- "given_database,'.',given_table) CreateindexErrorMessage; "
- "END IF; "
- "END";
-
- U2SqlQuery(queryString.arg(db->handle.databaseName()), db, os).execute();
-}
-
void MysqlDbi::init(const QHash<QString, QString>& props, const QVariantMap&, U2OpStatus& os) {
createHandle(props);
QMutexLocker(&db->mutex);
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
index 50d2533..1896756 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -134,8 +134,6 @@ private:
void setupTransactions(U2OpStatus& os);
- void setupStoredFunctions(U2OpStatus& os);
-
void checkUserPermissions(U2OpStatus& os);
static QString getConnectionName();
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
index aed4167..226fc45 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
index c081433..cc20afc 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlFeatureDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
index d505e30..58fbdd4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
index bdfb82b..02f10e5 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlModDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
index 78d4236..e2ceebc 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
index 555ab7f..bf4018d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlMsaDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
index db9b6a4..be6a59f 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -99,12 +99,12 @@ void MysqlObjectDbi::initSqlSchema(U2OpStatus& os) {
#define TOP_LEVEL_FILTER ("rank = " + QString::number(U2DbiObjectRank_TopLevel))
qint64 MysqlObjectDbi::countObjects(U2OpStatus& os) {
- static const QString queryString = "COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER;
+ static const QString queryString = "SELECT COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER;
return U2SqlQuery(queryString, db, os).selectInt64();
}
qint64 MysqlObjectDbi::countObjects(U2DataType type, U2OpStatus& os) {
- static const QString queryString = "COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER + " AND type = :type";
+ static const QString queryString = "SELECT COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER + " AND type = :type";
U2SqlQuery q(queryString, db, os);
q.bindType(":type", type);
return q.selectInt64();
@@ -312,6 +312,7 @@ QString createDeleteObjectQueryStr(int objectCount) {
}
bool MysqlObjectDbi::removeObjects(const QList<U2DataId>& dataIds, bool force, U2OpStatus& os) {
+ Q_UNUSED(force)
CHECK(!dataIds.isEmpty(), true);
MysqlTransaction t(db, os);
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
index 5febfd3..f210953 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
index 059c0f7..9968e48 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
index cc74511..667d865 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlObjectRelationsDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
index d93eb85..c53e68f 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
index ab75f6a..189aa59 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlSequenceDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
index 854d975..ca277c2 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
index 9f18531..703bba9 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlUdrDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
index 742d49d..8acc37a 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
index bfb7a99..3fd8493 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/MysqlVariantDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
index 75c23fe..ab4c066 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
index 88ce8cf..785f2a4 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
index 0de8276..4d2d6ac 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -205,16 +205,36 @@ void MysqlAssemblyUtils::unpackData(const QByteArray& packedData, U2AssemblyRead
os.setError(err);
}
}
+#if (QT_VERSION < 0x050400) //Qt 5.4
+namespace {
+int removeAll(QVector<U2CigarOp> *vector,const U2CigarOp &t)
+{
+ const QVector<U2CigarOp>::const_iterator ce = vector->cend(), cit = std::find(vector->cbegin(), ce, t);
+ if (cit == ce)
+ return 0;
+ // next operation detaches, so ce, cit may become invalidated:
+ const int firstFoundIdx = std::distance(vector->cbegin(), cit);
+ const QVector<U2CigarOp>::iterator e = vector->end(), it = std::remove(vector->begin() + firstFoundIdx, e, t);
+ const int result = std::distance(it, e);
+ vector->erase(it, e);
+ return result;
+}
+}
+#endif
-void MysqlAssemblyUtils::calculateCoverage(U2SqlQuery& q, const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os) {
- int csize = c.coverage->size();
+void MysqlAssemblyUtils::calculateCoverage(U2SqlQuery& q, const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
+ int csize = coverage.size();
SAFE_POINT(csize > 0, "illegal coverage vector size!", );
- U2Range<int>* cdata = c.coverage->data();
double basesPerRange = double(r.length) / csize;
while (q.step() && !os.isCoR()) {
qint64 startPos = q.getInt64(0);
qint64 len = q.getInt64(1);
+ //read data and convert to data with cigar
+ QByteArray data = q.getBlob(2);
+ U2AssemblyRead read(new U2AssemblyReadData());
+ unpackData(data,read,os);
+
U2Region readRegion(startPos, len);
U2Region readCroppedRegion = readRegion.intersect(r);
@@ -222,11 +242,36 @@ void MysqlAssemblyUtils::calculateCoverage(U2SqlQuery& q, const U2Region& r, U2A
continue;
}
- int firstCoverageIdx = (int)((readCroppedRegion.startPos - r.startPos) / basesPerRange);
- int lastCoverageIdx = (int)((readCroppedRegion.startPos + readCroppedRegion.length - 1 - r.startPos ) / basesPerRange);
+ // we have used effective length of the read, so insertions/deletions are already taken into account
+ // cigarString can be longer than needed
+ QVector<U2CigarOp> cigarVector;
+ foreach (const U2CigarToken &cigar, read->cigar) {
+ cigarVector += QVector<U2CigarOp>(cigar.count, cigar.op);
+ }
+#if (QT_VERSION < 0x050400) //Qt 5.4
+ removeAll(&cigarVector,U2CigarOp_I);
+ removeAll(&cigarVector,U2CigarOp_S);
+ removeAll(&cigarVector,U2CigarOp_P);
+#else
+ cigarVector.removeAll(U2CigarOp_I);
+ cigarVector.removeAll(U2CigarOp_S);
+ cigarVector.removeAll(U2CigarOp_P);
+#endif
+ if(r.startPos > startPos){
+ cigarVector = cigarVector.mid(r.startPos - startPos);//cut unneeded cigar string
+ }
+
+ int firstCoverageIdx = (int)((readCroppedRegion.startPos - r.startPos)/ basesPerRange);
+ int lastCoverageIdx = (int)((readCroppedRegion.startPos + readCroppedRegion.length - r.startPos ) / basesPerRange) - 1;
for (int i = firstCoverageIdx; i <= lastCoverageIdx && i < csize; i++) {
- cdata[i].minValue++;
- cdata[i].maxValue++;
+ switch (cigarVector[(i-firstCoverageIdx)*basesPerRange]){
+ case U2CigarOp_D: // skip the deletion
+ case U2CigarOp_N: // skip the skiped
+ continue;
+ default:
+ coverage[i]++;
+ }
+
}
}
}
@@ -236,7 +281,21 @@ void MysqlAssemblyUtils::addToCoverage(U2AssemblyCoverageImportInfo& ii, const U
return;
}
- int csize = ii.coverage.coverage->size();
+ int csize = ii.coverage.size();
+
+ QVector<U2CigarOp> cigarVector;
+ foreach (const U2CigarToken &cigar, read->cigar) {
+ cigarVector += QVector<U2CigarOp>(cigar.count, cigar.op);
+ }
+#if (QT_VERSION < 0x050400) //Qt 5.4
+ removeAll(&cigarVector,U2CigarOp_I);
+ removeAll(&cigarVector,U2CigarOp_S);
+ removeAll(&cigarVector,U2CigarOp_P);
+#else
+ cigarVector.removeAll(U2CigarOp_I);
+ cigarVector.removeAll(U2CigarOp_S);
+ cigarVector.removeAll(U2CigarOp_P);
+#endif
int startPos = (int)(read->leftmostPos / ii.coverageBasesPerPoint);
int endPos = (int)((read->leftmostPos + read->effectiveLen - 1) / ii.coverageBasesPerPoint);
@@ -244,10 +303,15 @@ void MysqlAssemblyUtils::addToCoverage(U2AssemblyCoverageImportInfo& ii, const U
coreLog.trace(QString("addToCoverage: endPos > csize - 1: %1 > %2").arg(endPos).arg(csize-1));
endPos = csize - 1;
}
- U2Range<int>* coverageData = ii.coverage.coverage->data();
+ int* coverageData = ii.coverage.data();
for (int i = startPos; i <= endPos && i < csize; i++) {
- coverageData[i].minValue++;
- coverageData[i].maxValue++;
+ switch (cigarVector[(i-startPos)*ii.coverageBasesPerPoint]){
+ case U2CigarOp_D: // skip the deletion
+ case U2CigarOp_N: // skip the skiped
+ continue;
+ default:
+ coverageData[i]++;
+ }
}
}
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
index 9552af9..38d3cfb 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlAssemblyUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ public:
static void unpackData(const QByteArray& packed, U2AssemblyRead &read, U2OpStatus& os);
- static void calculateCoverage(U2SqlQuery& q, const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ static void calculateCoverage(U2SqlQuery& q, const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
static void addToCoverage(U2AssemblyCoverageImportInfo& cii, const U2AssemblyRead& read);
};
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
index 38e193c..24a896d 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
index 78e643e..2d8c4d8 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlDbiUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
index a9d5ed4..5b24822 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
index 8f99c8b..631a7ec 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlHelpers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
index a456400..87b7169 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
index f388425..ffabb85 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlModificationAction.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
index 8d89c27..f3e5070 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -335,10 +335,10 @@ void MysqlMultiTableAssemblyAdapter::pack(U2AssemblyPackStat& stat, U2OpStatus&
flushTables(os);
}
-void MysqlMultiTableAssemblyAdapter::calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) {
+void MysqlMultiTableAssemblyAdapter::calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
for (int i = 0; i < adapters.size(); ++i) {
MysqlMtaSingleTableAdapter * a = adapters.at(i);
- a->singleTableAdapter->calculateCoverage(region, c, os);
+ a->singleTableAdapter->calculateCoverage(region, coverage, os);
CHECK_OP(os, );
os.setProgress((double(i + 1) / adapters.size()) * 100);
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
index 6e16959..32fac61 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlMultiTableAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -65,7 +65,7 @@ public:
virtual void dropReadsTables(U2OpStatus& os);
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os);
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
virtual void createReadsIndexes(U2OpStatus& os);
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
index f19e95b..74cfecf 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,8 +19,6 @@
* MA 02110-1301, USA.
*/
-//#include <QtSql/MysqlDbRef>
-
#include <U2Core/U2AssemblyUtils.h>
#include <U2Core/U2SafePoints.h>
@@ -80,15 +78,33 @@ void MysqlSingleTableAssemblyAdapter::createReadsTables(U2OpStatus& os) {
inited = true;
}
+//! %1 - database, %2 - table name, %3 - index name, %4 - index column
+//! Example of working query:
+// select if (EXISTS(SELECT distinct index_name FROM INFORMATION_SCHEMA.STATISTICS
+// WHERE table_schema = 'uu' AND table_name = 'AssemblyRead_M2_800_4000_0' and index_name like 'AssemblyRead_M2_800_4000_0_name'),
+// "SELECT id FROM AssemblyRead_M2_800_4000_0;", "CREATE INDEX AssemblyRead_M2_800_4000_0_name ON uu.AssemblyRead_M2_800_4000_0(name);") into @a;
+// prepare smt from @a; execute smt; deallocate prepare smt;
+static const QString CREATE_INDEX_IF_NOT_EXISTS_QUERY =
+ "select if"
+ "("
+ "EXISTS(SELECT distinct index_name FROM INFORMATION_SCHEMA.STATISTICS "
+ "WHERE table_schema = '%1' AND table_name = '%2' and index_name like '%3')"
+ ","
+ "\"SELECT %4 FROM %2;\""
+ ","
+ "\"CREATE INDEX %3 ON %1.%2(%4);\""
+ ") into @a; prepare smt from @a; execute smt; deallocate prepare smt;";
+
void MysqlSingleTableAssemblyAdapter::createReadsIndexes(U2OpStatus& os) {
MysqlTransaction t(db, os);
Q_UNUSED(t);
- static QString q1 = "call CreateIndex ('%1', '%2', '%2_gstart', 'gstart')";
- U2SqlQuery(q1.arg(db->handle.databaseName()).arg(readsTable), db, os).execute();
+ U2SqlQuery(CREATE_INDEX_IF_NOT_EXISTS_QUERY.arg(db->handle.databaseName())
+ .arg(readsTable).arg(readsTable + "_gstart").arg("gstart"), db, os).execute();
+ CHECK_OP(os, );
- static QString q2 = "call CreateIndex ('%1', '%2', '%2_name', 'name')";
- U2SqlQuery(q2.arg(db->handle.databaseName()).arg(readsTable), db, os).execute();
+ U2SqlQuery(CREATE_INDEX_IF_NOT_EXISTS_QUERY.arg(db->handle.databaseName())
+ .arg(readsTable).arg(readsTable + "_name").arg("name"), db, os).execute();
}
qint64 MysqlSingleTableAssemblyAdapter::countReads(const U2Region& r, U2OpStatus& os) {
@@ -226,8 +242,8 @@ void MysqlSingleTableAssemblyAdapter::pack(U2AssemblyPackStat& stat, U2OpStatus&
createReadsIndexes(os);
}
-void MysqlSingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os) {
- QString queryString = "SELECT gstart, elen FROM " + readsTable;
+void MysqlSingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
+ QString queryString = "SELECT gstart, elen, data FROM " + readsTable;
bool rangeArgs = (r != U2_REGION_MAX);
if (rangeArgs) {
@@ -240,7 +256,7 @@ void MysqlSingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2Ass
bindRegion(q, r, false);
}
- MysqlAssemblyUtils::calculateCoverage(q, r, c, os);
+ MysqlAssemblyUtils::calculateCoverage(q, r, coverage, os);
}
const QString& MysqlSingleTableAssemblyAdapter::getReadsTableName() const {
diff --git a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
index 8868561..319186a 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/MysqlSingleTableAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ public:
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os);
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
const QString& getReadsTableName() const;
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 516e090..36660b8 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
index a3b8615..6f1d3b3 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgrader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 debd1f0..fed91e5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 0e4408d..7788511 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 51c9abb..8f13594 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 dd7f006..4528384 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 0495cda..38b14a8 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 ee96f3c..c5993c9 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp
index e0de2cb..653cc8c 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h
index 938a27f..98619c3 100644
--- a/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_16_To_1_24.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.cpp b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.cpp
new file mode 100644
index 0000000..8288370
--- /dev/null
+++ b/src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.cpp
@@ -0,0 +1,110 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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/U2AssemblyUtils.h>
+#include <U2Core/U2AttributeUtils.h>
+#include <U2Core/U2CoreAttributes.h>
+#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2SafePoints.h>
+
+
+#include "MysqlUpgraderFrom_1_24_To_1_25.h"
+#include "mysql_dbi/MysqlDbi.h"
+#include "mysql_dbi/util/MysqlHelpers.h"
+
+namespace U2 {
+
+MysqlUpgraderFrom_1_24_To_1_25::MysqlUpgraderFrom_1_24_To_1_25(MysqlDbi *dbi) :
+ MysqlUpgrader(Version::parseVersion("1.24.0"), Version::parseVersion("1.25.0"), dbi)
+{
+
+}
+
+void MysqlUpgraderFrom_1_24_To_1_25::upgrade(U2OpStatus &os) const {
+ MysqlTransaction t(dbi->getDbRef(), os);
+ Q_UNUSED(t);
+
+ dropOldPrecedure(os, dbi->getDbRef());
+ CHECK_OP(os, );
+
+ upgradeCoverageAttribute(os);
+ CHECK_OP(os, );
+
+ dbi->setProperty(U2DbiOptions::APP_MIN_COMPATIBLE_VERSION, versionTo.text, os);
+}
+
+void MysqlUpgraderFrom_1_24_To_1_25::dropOldPrecedure(U2OpStatus &os, MysqlDbRef *dbRef) const {
+ U2OpStatus2Log nonCriticalOs;
+ U2SqlQuery("DROP PROCEDURE IF EXISTS CreateIndex", dbRef, nonCriticalOs).execute();
+
+ CHECK_OP(os, );
+}
+
+void MysqlUpgraderFrom_1_24_To_1_25::upgradeCoverageAttribute(U2OpStatus &os) const {
+ //get assembly ids
+ QList<U2DataId> assemblyIds = dbi->getObjectDbi()->getObjects(U2Type::Assembly, 0, U2DbiOptions::U2_DBI_NO_LIMIT, os);
+ CHECK_OP(os, );
+ CHECK(!assemblyIds.isEmpty(),);
+
+ U2AttributeDbi * attributeDbi = dbi->getAttributeDbi();
+ CHECK_EXT(attributeDbi != NULL, os.setError("Attribute dbi is NULL"),);
+
+ foreach (const U2DataId &id, assemblyIds) {
+ //find and remove coverage attribute from ByteArrayAttribute table
+ U2ByteArrayAttribute attr = U2AttributeUtils::findByteArrayAttribute(attributeDbi, id, U2BaseAttributeName::coverage_statistics, os);
+
+ if (!attr.value.isEmpty()){//if empty, then nothing to remove
+ U2AttributeUtils::removeAttribute(attributeDbi, attr.id, os);
+ }
+
+ //calculate new coverage
+ U2AssemblyDbi* assemblyDbi = dbi->getAssemblyDbi();
+ CHECK_EXT(attributeDbi != NULL, os.setError("Assembly dbi is NULL"),);
+ U2Assembly assembly = assemblyDbi->getAssemblyObject(id, os);
+ CHECK_OP(os, );
+
+ U2IntegerAttribute lengthAttr = U2AttributeUtils::findIntegerAttribute(attributeDbi, id, U2BaseAttributeName::reference_length, os);
+ CHECK_OP(os, );
+ if (lengthAttr.value == 0){//Nothing to calculate
+ continue;
+ }
+ static const qint64 MAX_COVERAGE_CACHE_SIZE = 1000*1000;
+ int coverageSize = (int)qMin(MAX_COVERAGE_CACHE_SIZE, lengthAttr.value);
+ U2AssemblyCoverageStat coverageStat;
+ coverageStat.resize(coverageSize);
+
+ assemblyDbi->calculateCoverage(id, U2Region(0, lengthAttr.value), coverageStat, os);
+ CHECK_OP(os, );
+
+ //write new coverage attribute to ByteArrayAttribute table
+ U2ByteArrayAttribute attribute;
+ attribute.objectId = id;
+ attribute.name = U2BaseAttributeName::coverage_statistics;
+ attribute.value = U2AssemblyUtils::serializeCoverageStat(coverageStat);
+ attribute.version = assembly.version;
+ attributeDbi->createByteArrayAttribute(attribute, os);
+ CHECK_OP(os, );
+ }
+}
+
+
+} // namespace U2
+
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_24_To_1_25.h
similarity index 70%
copy from src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_15_To_1_16.h
copy to src/corelibs/U2Formats/src/mysql_dbi/util/upgraders/MysqlUpgraderFrom_1_24_To_1_25.h
index dd7f006..3ab2e36 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_24_To_1_25.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,8 +19,8 @@
* MA 02110-1301, USA.
*/
-#ifndef _U2_MYSQL_UPGRADER_FROM_1_15_TO_1_16_H_
-#define _U2_MYSQL_UPGRADER_FROM_1_15_TO_1_16_H_
+#ifndef _U2_MYSQL_UPGRADER_FROM_1_24_TO_1_25_H_
+#define _U2_MYSQL_UPGRADER_FROM_1_24_TO_1_25_H_
#include "MysqlUpgrader.h"
@@ -28,16 +28,18 @@ namespace U2 {
class MysqlDbRef;
-class MysqlUpgraderFrom_1_15_To_1_16 : public MysqlUpgrader {
+class MysqlUpgraderFrom_1_24_To_1_25 : public MysqlUpgrader {
public:
- MysqlUpgraderFrom_1_15_To_1_16(MysqlDbi *dbi);
+ MysqlUpgraderFrom_1_24_To_1_25(MysqlDbi *dbi);
void upgrade(U2OpStatus &os) const;
private:
- void upgradeFeatureDbi(U2OpStatus &os, MysqlDbRef *dbRef) const;
+ void dropOldPrecedure(U2OpStatus &os, MysqlDbRef *dbRef) const;
+ void upgradeCoverageAttribute(U2OpStatus &os) const;
};
-} // namespace U2
+}
+
+#endif // _U2_MYSQL_UPGRADER_FROM_1_24_TO_1_25_H_
-#endif // _U2_MYSQL_UPGRADER_FROM_1_15_TO_1_16_H_
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
index cb5457f..2008bf8 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -334,7 +334,7 @@ void SQLiteAssemblyDbi::pack(const U2DataId& assemblyId, U2AssemblyPackStat& sta
perfLog.trace(QString("Assembly: full pack time: %1 seconds").arg((GTimer::currentTimeMicros() - t0) / float(1000*1000)));
}
-void SQLiteAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) {
+void SQLiteAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat & coverage, U2OpStatus& os) {
GTIMER(c2, t2, "SQLiteAssemblyDbi::calculateCoverage");
quint64 t0 = GTimer::currentTimeMicros();
@@ -343,7 +343,7 @@ void SQLiteAssemblyDbi::calculateCoverage(const U2DataId& assemblyId, const U2Re
if ( a == NULL ) {
return;
}
- a->calculateCoverage(region, c, os);
+ a->calculateCoverage(region, coverage, os);
perfLog.trace(QString("Assembly: full coverage calculation time for %2..%3: %1 seconds").arg((GTimer::currentTimeMicros() - t0) / float(1000*1000)).arg(region.startPos).arg(region.endPos()));
}
@@ -542,16 +542,35 @@ void SQLiteAssemblyUtils::unpackData(const QByteArray& packedData, U2AssemblyRea
os.setError(err);
}
}
-
-void SQLiteAssemblyUtils::calculateCoverage(SQLiteQuery& q, const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os) {
- int csize = c.coverage->size();
+#if (QT_VERSION < 0x050400) //Qt 5.4
+namespace {
+int removeAll(QVector<U2CigarOp> *vector,const U2CigarOp &t)
+{
+ const QVector<U2CigarOp>::const_iterator ce = vector->cend(), cit = std::find(vector->cbegin(), ce, t);
+ if (cit == ce)
+ return 0;
+ // next operation detaches, so ce, cit may become invalidated:
+ const int firstFoundIdx = std::distance(vector->cbegin(), cit);
+ const QVector<U2CigarOp>::iterator e = vector->end(), it = std::remove(vector->begin() + firstFoundIdx, e, t);
+ const int result = std::distance(it, e);
+ vector->erase(it, e);
+ return result;
+}
+}
+#endif
+void SQLiteAssemblyUtils::calculateCoverage(SQLiteQuery& q, const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
+ int csize = coverage.size();
SAFE_POINT(csize > 0, "illegal coverage vector size!", );
- U2Range<int>* cdata = c.coverage->data();
double basesPerRange = double(r.length) / csize;
while (q.step() && !os.isCoR()) {
qint64 startPos = q.getInt64(0);
qint64 len = q.getInt64(1);
+ //read data and convert to data with cigar
+ QByteArray data = q.getBlob(2);
+ U2AssemblyRead read(new U2AssemblyReadData());
+ unpackData(data,read,os);
+
U2Region readRegion(startPos, len);
U2Region readCroppedRegion = readRegion.intersect(r);
@@ -559,11 +578,37 @@ void SQLiteAssemblyUtils::calculateCoverage(SQLiteQuery& q, const U2Region& r, U
continue;
}
+ // we have used effective length of the read, so insertions/deletions are already taken into account
+ // cigarString can be longer than needed
+ QVector<U2CigarOp> cigarVector;
+ foreach (const U2CigarToken &cigar, read->cigar) {
+ cigarVector += QVector<U2CigarOp>(cigar.count, cigar.op);
+ }
+#if (QT_VERSION < 0x050400) //Qt 5.4
+ removeAll(&cigarVector,U2CigarOp_I);
+ removeAll(&cigarVector,U2CigarOp_S);
+ removeAll(&cigarVector,U2CigarOp_P);
+#else
+ cigarVector.removeAll(U2CigarOp_I);
+ cigarVector.removeAll(U2CigarOp_S);
+ cigarVector.removeAll(U2CigarOp_P);
+#endif
+
+ if(r.startPos > startPos){
+ cigarVector = cigarVector.mid(r.startPos - startPos);//cut unneeded cigar string
+ }
+
int firstCoverageIdx = (int)((readCroppedRegion.startPos - r.startPos)/ basesPerRange);
- int lastCoverageIdx = (int)((readCroppedRegion.startPos + readCroppedRegion.length - 1 - r.startPos ) / basesPerRange);
+ int lastCoverageIdx = (int)((readCroppedRegion.startPos + readCroppedRegion.length - r.startPos ) / basesPerRange) - 1;
for (int i = firstCoverageIdx; i <= lastCoverageIdx && i < csize; i++) {
- cdata[i].minValue++;
- cdata[i].maxValue++;
+ switch (cigarVector[(i-firstCoverageIdx)*basesPerRange]){
+ case U2CigarOp_D: // skip the deletion
+ case U2CigarOp_N: // skip the skiped
+ continue;
+ default:
+ coverage[i]++;
+ }
+
}
}
}
@@ -572,18 +617,37 @@ void SQLiteAssemblyUtils::addToCoverage(U2AssemblyCoverageImportInfo& ii, const
if (!ii.computeCoverage) {
return;
}
- int csize = ii.coverage.coverage->size();
+ int csize = ii.coverage.size();
+
+ QVector<U2CigarOp> cigarVector;
+ foreach (const U2CigarToken &cigar, read->cigar) {
+ cigarVector += QVector<U2CigarOp>(cigar.count, cigar.op);
+ }
+#if (QT_VERSION < 0x050400) //Qt 5.4
+ removeAll(&cigarVector,U2CigarOp_I);
+ removeAll(&cigarVector,U2CigarOp_S);
+ removeAll(&cigarVector,U2CigarOp_P);
+#else
+ cigarVector.removeAll(U2CigarOp_I);
+ cigarVector.removeAll(U2CigarOp_S);
+ cigarVector.removeAll(U2CigarOp_P);
+#endif
int startPos = (int)(read->leftmostPos / ii.coverageBasesPerPoint);
- int endPos = (int)((read->leftmostPos + read->effectiveLen - 1) / ii.coverageBasesPerPoint);
+ int endPos = (int)((read->leftmostPos + read->effectiveLen) / ii.coverageBasesPerPoint) - 1;
if(endPos > csize - 1) {
coreLog.trace(QString("addToCoverage: endPos > csize - 1: %1 > %2").arg(endPos).arg(csize-1));
endPos = csize - 1;
}
- U2Range<int>* coverageData = ii.coverage.coverage->data();
+ int* coverageData = ii.coverage.data();
for (int i = startPos; i <= endPos && i < csize; i++) {
- coverageData[i].minValue++;
- coverageData[i].maxValue++;
+ switch (cigarVector[(i-startPos)*ii.coverageBasesPerPoint]){
+ case U2CigarOp_D: // skip the deletion
+ case U2CigarOp_N: // skip the skiped
+ continue;
+ default:
+ coverageData[i]++;
+ }
}
}
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
index 537bb61..b6c77be 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAssemblyDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -120,7 +120,7 @@ public:
Calculates coverage information for the given region. Saves result to 'c.coverage' vector.
Note: Coverage window size depends on 'c.coverage' vector size passed to the method call.
*/
- virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2DataId& assemblyId, const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
virtual void initSqlSchema(U2OpStatus& os);
virtual void shutdown(U2OpStatus& os);
@@ -163,7 +163,7 @@ public:
static void unpackData(const QByteArray& packed, U2AssemblyRead &read, U2OpStatus& os);
- static void calculateCoverage(SQLiteQuery& q, const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ static void calculateCoverage(SQLiteQuery& q, const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
static void addToCoverage(U2AssemblyCoverageImportInfo& cii, const U2AssemblyRead& read);
};
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
index 88aaed6..10614a1 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
index aa57a88..9d98523 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteAttributeDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
index 19f01a9..637203b 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
index 5a4bc71..14e8d45 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobInputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
index fc88cff..4b2557a 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
index 66032e3..83d5c23 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteBlobOutputStream.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
index c7e2ead..a736be2 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -31,6 +31,7 @@
#include "SQLiteModDbi.h"
#include "SQLiteUdrDbi.h"
#include "util/SqliteUpgraderFrom_0_To_1_13.h"
+#include "util/SqliteUpgraderFrom_1_13_To_1_25.h"
#include <U2Core/U2SafePoints.h>
#include <U2Core/U2SqlHelpers.h>
@@ -63,6 +64,7 @@ SQLiteDbi::SQLiteDbi()
udrDbi = new SQLiteUdrDbi(this);
upgraders << new SqliteUpgraderFrom_0_To_1_13(this);
+ upgraders << new SqliteUpgraderFrom_1_13_To_1_25(this);
}
SQLiteDbi::~SQLiteDbi() {
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
index 47bfaba..e65da95 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
index c1afe99..5409607 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
index 2a92e6f..f27c02b 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteFeatureDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
index 8e500e4..67d6320 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
index 6f850f9..c1621a8 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteModDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
index ec2d950..c1b7409 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
index c1cbcd4..982a810 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteMsaDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
index 0368aae..2df2a7e 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -79,11 +79,11 @@ void SQLiteObjectDbi::initSqlSchema(U2OpStatus& os) {
#define TOP_LEVEL_FILTER ("rank = " + QString::number(U2DbiObjectRank_TopLevel))
qint64 SQLiteObjectDbi::countObjects(U2OpStatus& os) {
- return SQLiteQuery("COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER, db, os).selectInt64();
+ return SQLiteQuery("SELECT COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER, db, os).selectInt64();
}
qint64 SQLiteObjectDbi::countObjects(U2DataType type, U2OpStatus& os) {
- SQLiteQuery q("COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER + " AND type = ?1", db, os);
+ SQLiteQuery q("SELECT COUNT (*) FROM Object WHERE " + TOP_LEVEL_FILTER + " AND type = ?1", db, os);
q.bindType(1, type);
return q.selectInt64();
}
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
index 558a01e..47937fc 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
index 54ad8f9..fc17c18 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
index b01f77c..be14cce 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteObjectRelationsDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
index b4a4944..b64af05 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
index beeafa3..5c86a3c 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteSequenceDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
index 64a1b1c..6de1fed 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
index 6166b38..ffdb0a6 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteUdrDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
index dddf9f9..73185a9 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
index b1d88b5..128ba47 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/SQLiteVariantDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
index 2f6ac97..42d21dd 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -559,10 +559,10 @@ void MultiTableAssemblyAdapter::pack(U2AssemblyPackStat& stat, U2OpStatus& os) {
flushTables(os);
}
-void MultiTableAssemblyAdapter::calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) {
+void MultiTableAssemblyAdapter::calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
for(int i = 0; i < adapters.size(); ++i) {
MTASingleTableAdapter * a = adapters.at(i);
- a->singleTableAdapter->calculateCoverage(region, c, os);
+ a->singleTableAdapter->calculateCoverage(region, coverage, os);
if (os.isCoR()) {
break;
}
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
index a3b939d..a8a2dcd 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/MultiTableAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -63,7 +63,7 @@ public:
virtual void dropReadsTables(U2OpStatus& os);
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os);
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
virtual void createReadsIndexes(U2OpStatus& os);
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
index 03ddb1d..93c1740 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -209,7 +209,7 @@ void RTreeAssemblyAdapter::pack(U2AssemblyPackStat& stat, U2OpStatus& os) {
AssemblyPackAlgorithm::pack(packAdapter, stat, os);
}
-void RTreeAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os) {
+void RTreeAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
QString queryString = "SELECT gstart, gend - gstart FROM " + indexTable;
bool rangeArgs = false;
if (r != U2_REGION_MAX) {
@@ -221,7 +221,7 @@ void RTreeAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCovera
q.bindInt64(1, r.endPos());
q.bindInt64(2, r.startPos);
}
- SQLiteAssemblyUtils::calculateCoverage(q, r, c, os);
+ SQLiteAssemblyUtils::calculateCoverage(q, r, coverage, os);
}
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
index 2b59f40..06143f0 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/RTreeAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -51,7 +51,7 @@ public:
virtual void dropReadsTables(U2OpStatus& os);
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os);
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
protected:
SQLiteDbi* dbi;
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
index d56dce9..24b04b8 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -236,8 +236,8 @@ void SingleTableAssemblyAdapter::pack(U2AssemblyPackStat& stat, U2OpStatus& os)
AssemblyPackAlgorithm::pack(packAdapter, stat, os);
}
-void SingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& c, U2OpStatus& os) {
- QString queryString = "SELECT gstart, elen FROM " + readsTable;
+void SingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2AssemblyCoverageStat& coverage, U2OpStatus& os) {
+ QString queryString = "SELECT gstart, elen, data FROM " + readsTable;
bool rangeArgs = r != U2_REGION_MAX;
if (rangeArgs) {
@@ -247,7 +247,7 @@ void SingleTableAssemblyAdapter::calculateCoverage(const U2Region& r, U2Assembly
if (rangeArgs) {
bindRegion(q, r, false);
}
- SQLiteAssemblyUtils::calculateCoverage(q, r, c, os);
+ SQLiteAssemblyUtils::calculateCoverage(q, r, coverage, os);
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
index 2382122..aac3d1d 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/assembly/SingleTableAssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@ public:
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os);
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os);
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os);
const QString& getReadsTableName() const {return readsTable;}
diff --git a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
index 45a6ab0..b6cffc4 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
index 410c16d..3f596ab 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgrader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 b1f7b95..f55d63b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 5ea378b..edd84b5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.cpp b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.cpp
new file mode 100644
index 0000000..d6800a7
--- /dev/null
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.cpp
@@ -0,0 +1,98 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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/L10n.h>
+#include <U2Core/U2AssemblyUtils.h>
+#include <U2Core/U2AttributeUtils.h>
+#include <U2Core/U2CoreAttributes.h>
+#include <U2Core/U2Dbi.h>
+#include <U2Core/U2SafePoints.h>
+#include <U2Core/U2SqlHelpers.h>
+
+#include "SqliteUpgraderFrom_1_13_To_1_25.h"
+#include "../SQLiteDbi.h"
+#include "../SQLiteAssemblyDbi.h"
+#include "../SQLiteObjectRelationsDbi.h"
+
+namespace U2 {
+
+SqliteUpgraderFrom_1_13_To_1_25::SqliteUpgraderFrom_1_13_To_1_25(SQLiteDbi *dbi) :
+ SqliteUpgrader(Version::parseVersion("1.13.0"), Version::parseVersion("1.25.0"), dbi)
+{
+}
+
+void SqliteUpgraderFrom_1_13_To_1_25::upgrade(U2OpStatus &os) const {
+ SQLiteTransaction t(dbi->getDbRef(), os);
+ Q_UNUSED(t);
+
+ upgradeCoverageAttribute(os);
+ CHECK_OP(os, );
+
+ dbi->setProperty(U2DbiOptions::APP_MIN_COMPATIBLE_VERSION, versionTo.text, os);
+}
+
+void SqliteUpgraderFrom_1_13_To_1_25::upgradeCoverageAttribute(U2OpStatus &os) const {
+ //get assembly ids
+ QList<U2DataId> assemblyIds = dbi->getObjectDbi()->getObjects(U2Type::Assembly, 0, U2DbiOptions::U2_DBI_NO_LIMIT, os);
+ CHECK_OP(os, );
+ CHECK(!assemblyIds.isEmpty(),);
+ U2AttributeDbi * attributeDbi = dbi->getAttributeDbi();
+ CHECK_EXT(attributeDbi != NULL, os.setError("Attribute dbi is NULL"),);
+
+ foreach (const U2DataId &id, assemblyIds) {
+ //find and remove coverage attribute from ByteArrayAttribute table
+ U2ByteArrayAttribute attr = U2AttributeUtils::findByteArrayAttribute(attributeDbi, id, U2BaseAttributeName::coverage_statistics, os);
+
+ if (!attr.value.isEmpty()){//if empty, then nothing to remove
+ U2AttributeUtils::removeAttribute(attributeDbi, attr.id, os);
+ }
+
+ //calculate new coverage
+ U2AssemblyDbi* assemblyDbi = dbi->getAssemblyDbi();
+ CHECK_EXT(attributeDbi != NULL, os.setError("Assembly dbi is NULL"),);
+ U2Assembly assembly = assemblyDbi->getAssemblyObject(id, os);
+ CHECK_OP(os, );
+
+ U2IntegerAttribute lengthAttr = U2AttributeUtils::findIntegerAttribute(attributeDbi, id, U2BaseAttributeName::reference_length, os);
+ CHECK_OP(os, );
+ if (lengthAttr.value == 0){//Nothing to calculate
+ continue;
+ }
+ static const qint64 MAX_COVERAGE_CACHE_SIZE = 1000*1000;
+ int coverageSize = (int)qMin(MAX_COVERAGE_CACHE_SIZE, lengthAttr.value);
+ U2AssemblyCoverageStat coverageStat;
+ coverageStat.resize(coverageSize);
+
+ assemblyDbi->calculateCoverage(id, U2Region(0, lengthAttr.value), coverageStat, os);
+ CHECK_OP(os, );
+
+ //write new coverage attribute to ByteArrayAttribute table
+ U2ByteArrayAttribute attribute;
+ attribute.objectId = id;
+ attribute.name = U2BaseAttributeName::coverage_statistics;
+ attribute.value = U2AssemblyUtils::serializeCoverageStat(coverageStat);
+ attribute.version = assembly.version;
+ attributeDbi->createByteArrayAttribute(attribute, os);
+ CHECK_OP(os, );
+ }
+}
+
+} // namespace U2
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_1_13_To_1_25.h
similarity index 72%
copy from src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h
copy to src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.h
index 5ea378b..b8fcacb 100644
--- a/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_0_To_1_13.h
+++ b/src/corelibs/U2Formats/src/sqlite_dbi/util/SqliteUpgraderFrom_1_13_To_1_25.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,23 +19,21 @@
* MA 02110-1301, USA.
*/
-#ifndef _U2_SQLITE_UPGRADER_FROM_0_TO_1_13_H_
-#define _U2_SQLITE_UPGRADER_FROM_0_TO_1_13_H_
+#ifndef _U2_SQLITE_UPGRADER_FROM_1_13_TO_1_25_H_
+#define _U2_SQLITE_UPGRADER_FROM_1_13_TO_1_25_H_
#include "SqliteUpgrader.h"
namespace U2 {
-class SqliteUpgraderFrom_0_To_1_13 : public SqliteUpgrader {
+class SqliteUpgraderFrom_1_13_To_1_25 : public SqliteUpgrader {
public:
- SqliteUpgraderFrom_0_To_1_13(SQLiteDbi *dbi);
+ SqliteUpgraderFrom_1_13_To_1_25(SQLiteDbi *dbi);
void upgrade(U2OpStatus &os) const;
private:
- void upgradeObjectDbi(U2OpStatus &os) const;
- void upgradeObjectRelationsDbi(U2OpStatus &os) const;
- void upgradeAssemblyDbi(U2OpStatus &os) const;
+ void upgradeCoverageAttribute(U2OpStatus &os) const;
};
} // namespace U2
diff --git a/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp b/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
index e3316ed..9c6b0ef 100644
--- a/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/BgzipTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/BgzipTask.h b/src/corelibs/U2Formats/src/tasks/BgzipTask.h
index 1623ba8..5a4b134 100644
--- a/src/corelibs/U2Formats/src/tasks/BgzipTask.h
+++ b/src/corelibs/U2Formats/src/tasks/BgzipTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
index 06459a5..a4bb4c0 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
index e502deb..5c08d8b 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
+++ b/src/corelibs/U2Formats/src/tasks/ConvertAssemblyToSamTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
index 30cf59a..a8fed00 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertFileTask.h b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
index a464eca..b9123a2 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
+++ b/src/corelibs/U2Formats/src/tasks/ConvertFileTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp b/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp
index 4da5ac4..b2adb73 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.h b/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.h
index 8ba59d9..369337e 100644
--- a/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.h
+++ b/src/corelibs/U2Formats/src/tasks/ConvertSnpeffVariationsToAnnotationsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/MergeBamTask.cpp b/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
index f3d32d4..0c7275c 100644
--- a/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/MergeBamTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/MergeBamTask.h b/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
index 29f597f..56372df 100644
--- a/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
+++ b/src/corelibs/U2Formats/src/tasks/MergeBamTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
index 9714f6f..b94f9bc 100644
--- a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
+++ b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
index 2908bc6..fc2d3f0 100644
--- a/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
+++ b/src/corelibs/U2Formats/src/tasks/MysqlUpgradeTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/util/AssemblyAdapter.h b/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
index c15e1a4..c2b184b 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
+++ b/src/corelibs/U2Formats/src/util/AssemblyAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -59,7 +59,7 @@ public:
virtual void pack(U2AssemblyPackStat& stat, U2OpStatus& os) = 0;
- virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& c, U2OpStatus& os) = 0;
+ virtual void calculateCoverage(const U2Region& region, U2AssemblyCoverageStat& coverage, U2OpStatus& os) = 0;
protected:
U2DataId assemblyId;
diff --git a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
index be764c7..17c7aa2 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
+++ b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
index 3551973..3aa583c 100644
--- a/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
+++ b/src/corelibs/U2Formats/src/util/AssemblyPackAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/util/PairedFastqComparator.cpp b/src/corelibs/U2Formats/src/util/PairedFastqComparator.cpp
new file mode 100644
index 0000000..afb740e
--- /dev/null
+++ b/src/corelibs/U2Formats/src/util/PairedFastqComparator.cpp
@@ -0,0 +1,184 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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 "PairedFastqComparator.h"
+
+#include <U2Core/U2SafePoints.h>
+#include <U2Core/IOAdapterUtils.h>
+#include <U2Core/IOAdapter.h>
+
+#include <U2Formats/FastqFormat.h>
+
+
+namespace U2 {
+
+const int UNPAIRED_LIMIT = 100000;
+
+FastqSequenceInfo::FastqSequenceInfo(const DNASequence& seq)
+ : seq(seq) {
+
+}
+
+bool FastqSequenceInfo::isValid() const {
+ return !seq.isNull();
+}
+
+QString FastqSequenceInfo::getSeqName() const {
+ return seq.getName();
+}
+
+bool FastqSequenceInfo::operator ==(const FastqSequenceInfo& other) const {
+ return seq.getName() == other.getSeqName();
+}
+
+bool FastqSequenceInfo::operator !=(const FastqSequenceInfo& other) const {
+ return !(*this == other);
+}
+
+PairedFastqComparator::PairedFastqComparator(const QString &inputFile_1, const QString &inputFile_2,
+ const QString &outputFile_1, const QString &outputFile_2,
+ U2OpStatus &os)
+ : it_1(inputFile_1, os),
+ it_2(inputFile_2, os),
+ out_1(qobject_cast<LocalFileAdapter*>(IOAdapterUtils::open(GUrl(outputFile_1), os, IOAdapterMode_Write))),
+ out_2(qobject_cast<LocalFileAdapter*>(IOAdapterUtils::open(GUrl(outputFile_2), os, IOAdapterMode_Write))),
+ pairsCounter(0),
+ droppedCounter(0)
+{
+ SAFE_POINT_OP(os, );
+}
+
+void PairedFastqComparator::compare(U2OpStatus &os) {
+
+ QList<FastqSequenceInfo> unpaired_1;
+ QList<FastqSequenceInfo> unpaired_2;
+
+ FastqSequenceInfo tmp;
+ while (it_1.hasNext() && it_2.hasNext() && !os.isCoR()) {
+ CHECK_EXT(unpaired_1.size() + unpaired_2.size() < UNPAIRED_LIMIT,
+ os.setError(tr("Too much reads without a pair (>%1). Check the input data is set correctly.").arg(UNPAIRED_LIMIT)), );
+
+ FastqSequenceInfo seqInfo_1(it_1.next());
+ FastqSequenceInfo seqInfo_2(it_2.next());
+
+ if (seqInfo_1 == seqInfo_2) {
+ writePair(os, seqInfo_1, seqInfo_2);
+ CHECK_OP(os, );
+
+ droppedCounter += unpaired_1.size();
+ droppedCounter += unpaired_2.size();
+
+ unpaired_1.clear();
+ unpaired_2.clear();
+ continue;
+ }
+
+ if ((tmp = tryToFindPair(os, unpaired_1, seqInfo_1, unpaired_2)).isValid() && !os.isCoR()) {
+ writePair(os, seqInfo_1, tmp);
+ unpaired_2 << seqInfo_2;
+ continue;
+ }
+ CHECK_OP(os, );
+
+ if ((tmp = tryToFindPair(os, unpaired_2, seqInfo_2, unpaired_1)).isValid() && !os.isCoR()) {
+ writePair(os, tmp, seqInfo_2);
+ unpaired_1 << seqInfo_1;
+ continue;
+ }
+ CHECK_OP(os, );
+
+ unpaired_1 << seqInfo_1;
+ unpaired_2 << seqInfo_2;
+ }
+ CHECK_OP(os, );
+
+ // for correct counters info
+ tryToFindPairInTail(os, it_1, unpaired_2, true);
+ CHECK_OP(os, );
+ tryToFindPairInTail(os, it_2, unpaired_1, false);
+ CHECK_OP(os, );
+
+ out_1->close();
+ out_2->close();
+}
+
+void PairedFastqComparator::dropUntilItem(U2OpStatus& os, QList<FastqSequenceInfo>& list, const FastqSequenceInfo& untilItem) {
+ CHECK(!list.isEmpty(), );
+ SAFE_POINT_EXT(list.contains(untilItem), os.setError(tr("The list doesn't contains the item")), );
+
+ FastqSequenceInfo item;
+ do {
+ item = list.takeFirst();
+ droppedCounter++;
+ } while (item != untilItem && !list.isEmpty());
+ droppedCounter--; // the sequence that is in the pair was count
+}
+
+const FastqSequenceInfo PairedFastqComparator::tryToFindPair(U2OpStatus& os, QList<FastqSequenceInfo>& initializer, const FastqSequenceInfo& info, QList<FastqSequenceInfo>& searchIn) {
+ int index = searchIn.indexOf(info);
+ if (index != -1) {
+ FastqSequenceInfo result = searchIn.at(index);
+ droppedCounter += initializer.size();
+ initializer.clear();
+
+ dropUntilItem(os, searchIn, info);
+ return result;
+ }
+ return FastqSequenceInfo();
+}
+
+void PairedFastqComparator::tryToFindPairInTail(U2OpStatus& os, FASTQIterator& reads,
+ QList<FastqSequenceInfo>& unpaired, bool iteratorContentIsFirst) {
+ QList<FastqSequenceInfo> emptyList;
+ while (reads.hasNext() && !os.isCoR()) {
+ const FastqSequenceInfo seqInfo_1(reads.next());
+ const FastqSequenceInfo seqInfo_2 = tryToFindPair(os, emptyList, seqInfo_1, unpaired);
+ if (!seqInfo_2.isValid()) {
+ droppedCounter++;
+ } else {
+ if (iteratorContentIsFirst) {
+ writePair(os, seqInfo_1, seqInfo_2);
+ CHECK_OP(os, );
+ } else {
+ writePair(os, seqInfo_2, seqInfo_1);
+ CHECK_OP(os, );
+ }
+ }
+ }
+}
+
+void writeSequence(U2OpStatus& os, const DNASequence& seq, IOAdapter* ioAdapter) {
+ FastqFormat::writeEntry(seq.getName(), seq, ioAdapter, "Writing error", os);
+}
+
+void PairedFastqComparator::writePair(U2OpStatus &os, const FastqSequenceInfo &seqInfo_1, const FastqSequenceInfo &seqInfo_2) {
+ SAFE_POINT_EXT(seqInfo_1.isValid() && seqInfo_2.isValid(), os.setError(tr("Invalid sequence info")), );
+
+ writeSequence(os, seqInfo_1.getDNASeq(), out_1.data());
+ CHECK_OP(os, );
+
+ writeSequence(os, seqInfo_2.getDNASeq(), out_2.data());
+ CHECK_OP(os, );
+
+ pairsCounter++;
+}
+
+} // namespace
diff --git a/src/corelibs/U2Formats/src/util/PairedFastqComparator.h b/src/corelibs/U2Formats/src/util/PairedFastqComparator.h
new file mode 100644
index 0000000..e36ab1d
--- /dev/null
+++ b/src/corelibs/U2Formats/src/util/PairedFastqComparator.h
@@ -0,0 +1,94 @@
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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_PAIRED_FASTQ_COMPARATOR_H_
+#define _U2_PAIRED_FASTQ_COMPARATOR_H_
+
+#include <U2Core/global.h>
+#include <U2Core/LocalFileAdapter.h>
+#include <U2Core/U2OpStatus.h>
+
+#include <U2Formats/BAMUtils.h>
+
+#include <QFile>
+
+
+namespace U2 {
+
+/**
+ * The FastqSequenceInfo class
+ */
+class FastqSequenceInfo {
+ friend class FastqFileIterator;
+public:
+ FastqSequenceInfo() {}
+ FastqSequenceInfo(const DNASequence& seq);
+
+ bool isValid() const;
+
+ QString getSeqName() const;
+ const DNASequence& getDNASeq() const { return seq; }
+
+ bool operator == (const FastqSequenceInfo& other) const;
+ bool operator !=(const FastqSequenceInfo& other) const;
+
+private:
+ DNASequence seq;
+};
+
+/**
+ * The PairedFastqComparator class
+ */
+class U2FORMATS_EXPORT PairedFastqComparator : public QObject {
+public:
+ PairedFastqComparator(const QString& inputFile_1, const QString& inputFile_2,
+ const QString& outputFile_1, const QString& outputFile_2,
+ U2OpStatus &os);
+ void compare(U2OpStatus& os);
+
+ int getPairsCount() const { return pairsCounter; }
+ int getUnpairedCount() const { return droppedCounter; }
+
+private:
+ void dropUntilItem(U2OpStatus& os, QList<FastqSequenceInfo>& list, const FastqSequenceInfo& untilItem);
+
+ const FastqSequenceInfo tryToFindPair(U2OpStatus& os, QList<FastqSequenceInfo>& initializer, const FastqSequenceInfo& info, QList<FastqSequenceInfo>& searchIn);
+
+ void tryToFindPairInTail(U2OpStatus& os, FASTQIterator& reads,
+ QList<FastqSequenceInfo>& unpaired, bool iteratorContentIsFirst);
+
+ void writePair(U2OpStatus& os, const FastqSequenceInfo& seqInfo_1, const FastqSequenceInfo& seqInfo_2);
+
+private:
+ FASTQIterator it_1;
+ FASTQIterator it_2;
+
+ QScopedPointer<LocalFileAdapter> out_1;
+ QScopedPointer<LocalFileAdapter> out_2;
+
+ int pairsCounter;
+ int droppedCounter;
+};
+
+} // namespace
+
+#endif // _U2_PAIRED_FASTQ_COMPARATOR_H_
+
diff --git a/src/corelibs/U2Formats/src/util/SnpeffInfoParser.cpp b/src/corelibs/U2Formats/src/util/SnpeffInfoParser.cpp
index 833eb21..6091154 100644
--- a/src/corelibs/U2Formats/src/util/SnpeffInfoParser.cpp
+++ b/src/corelibs/U2Formats/src/util/SnpeffInfoParser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/src/util/SnpeffInfoParser.h b/src/corelibs/U2Formats/src/util/SnpeffInfoParser.h
index 93d8a8e..a244e5e 100644
--- a/src/corelibs/U2Formats/src/util/SnpeffInfoParser.h
+++ b/src/corelibs/U2Formats/src/util/SnpeffInfoParser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Formats/transl/english.ts b/src/corelibs/U2Formats/transl/english.ts
index 39b57ce..a61a018 100644
--- a/src/corelibs/U2Formats/transl/english.ts
+++ b/src/corelibs/U2Formats/transl/english.ts
@@ -65,7 +65,12 @@
<translation>Truncated file: "%1"</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="475"/>
+ <location filename="../src/BAMUtils.cpp" line="775"/>
+ <source>Can't open file with given url: %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="476"/>
<source>Invalid database user permissions set, so UGENE unable to use this database. Connect to your system administrator to fix the issue.</source>
<translation>Invalid database user permissions set, so UGENE unable to use this database. Connect to your system administrator to fix the issue.</translation>
</message>
@@ -95,7 +100,7 @@
<translation>GTF</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="766"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="767"/>
<source>Unexpected number of modified objects. Expected: 1, actual: %1</source>
<translation>Unexpected number of modified objects. Expected: 1, actual: %1</translation>
</message>
@@ -305,13 +310,12 @@
<context>
<name>U2::AbstractVariationFormat</name>
<message>
- <location filename="../src/AbstractVariationFormat.cpp" line="61"/>
+ <location filename="../src/AbstractVariationFormat.cpp" line="65"/>
<source>SNP formats are used to store single-nucleotide polymorphism data</source>
<translation>SNP formats are used to store single-nucleotide polymorphism data</translation>
</message>
<message>
- <location filename="../src/AbstractVariationFormat.cpp" line="119"/>
- <location filename="../src/AbstractVariationFormat.cpp" line="132"/>
+ <location filename="../src/AbstractVariationFormat.cpp" line="140"/>
<source>Line %1: There are too few columns in this line. The line was skipped.</source>
<translation>Line %1: There are too few columns in this line. The line was skipped.</translation>
</message>
@@ -319,12 +323,12 @@
<context>
<name>U2::AceImporter</name>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="161"/>
+ <location filename="../src/ace/AceImporter.cpp" line="153"/>
<source>ACE file importer</source>
<translation>ACE file importer</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="165"/>
+ <location filename="../src/ace/AceImporter.cpp" line="157"/>
<source>ACE files importer is used to convert conventional ACE files into UGENE database format.Having ACE file converted into UGENE DB format you get an fast and efficient interface to your data with an option to change the content</source>
<translation>ACE files importer is used to convert conventional ACE files into UGENE database format.Having ACE file converted into UGENE DB format you get an fast and efficient interface to your data with an option to change the content</translation>
</message>
@@ -337,12 +341,17 @@
<translation>ACE file import: %1</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="86"/>
+ <location filename="../src/ace/AceImporter.cpp" line="66"/>
+ <source>Dbi ref is invalid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ace/AceImporter.cpp" line="82"/>
<source>Can't create a temporary database</source>
<translation>Can't create a temporary database</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="146"/>
+ <location filename="../src/ace/AceImporter.cpp" line="139"/>
<source>Failed to get load task for : %1</source>
<translation>Failed to get load task for : %1</translation>
</message>
@@ -722,6 +731,14 @@
</message>
</context>
<context>
+ <name>U2::ConvertSnpeffVariationsToAnnotationsTask</name>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="49"/>
+ <source>Convert SnpEff variations to annotations task</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::DNAQualityIOUtils</name>
<message>
<location filename="../src/DNAQualityIOUtils.cpp" line="67"/>
@@ -1687,6 +1704,37 @@ The following sequences are empty:</translation>
</message>
</context>
<context>
+ <name>U2::InfoPartParser</name>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="114"/>
+ <source>Too few values in the entry: '%1'. Expected at least %2 values.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="134"/>
+ <source>Too many values in the entry '%1', extra entries are ignored</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LoadConvertAndSaveSnpeffVariationsToAnnotationsTask</name>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="117"/>
+ <source>Load file and convert SnpEff variations to annotations task</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="157"/>
+ <source>'%1' load failed, the result document is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="161"/>
+ <source>File '%1' doesn't contain variation tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::MSFFormat</name>
<message>
<location filename="../src/MSFFormat.cpp" line="64"/>
@@ -2077,6 +2125,14 @@ The following sequences are empty:</translation>
</message>
</context>
<context>
+ <name>U2::SnpeffInfoParser</name>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="48"/>
+ <source>Can't parse the next INFO part: '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::StockholmFormat</name>
<message>
<location filename="../src/StockholmFormat.cpp" line="451"/>
@@ -2209,50 +2265,50 @@ The following sequences are empty:</translation>
<translation>Required attribute is not found</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="264"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="268"/>
<source>Database url is incorrect</source>
<translation>Database url is incorrect</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="270"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="274"/>
<source>User login is not specified</source>
<translation>User login is not specified</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="276"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="280"/>
<source>Host is not specified</source>
<translation>Host is not specified</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="282"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="286"/>
<source>Database name is not specified</source>
<translation>Database name is not specified</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="298"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="302"/>
<source>Error opening MySQL database: %1</source>
<translation>Error opening MySQL database: %1</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="382"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="383"/>
<source>Not a %1 MySQL database: %2, %3</source>
<translation>Not a %1 MySQL database: %2, %3</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="388"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="273"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="389"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="275"/>
<source>Warning! The database was created with a newer %1 version: %2. Not all database features may be supported! Current %1 version: %3.</source>
<translation>Warning! The database was created with a newer %1 version: %2. Not all database features may be supported! Current %1 version: %3.</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="523"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="328"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="492"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="330"/>
<source>Illegal database state: %1</source>
<translation>Illegal database state: %1</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="554"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="410"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="523"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="412"/>
<source>Can't synchronize database state</source>
<translation>Can't synchronize database state</translation>
</message>
@@ -2320,8 +2376,8 @@ The following sequences are empty:</translation>
<message>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="600"/>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="633"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1113"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1122"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1114"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1123"/>
<source>Unexpected modification type '%1'</source>
<translation>Unexpected modification type '%1'</translation>
</message>
@@ -2391,54 +2447,54 @@ The following sequences are empty:</translation>
<translation>An error occurred during addition of a row</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="586"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="587"/>
<source>Can't undo an operation for the object</source>
<translation>Can't undo an operation for the object</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="649"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="650"/>
<source>Can't redo an operation for the object</source>
<translation>Can't redo an operation for the object</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="791"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="896"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="792"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="897"/>
<source>Object not found</source>
<translation>Object not found</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="845"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="846"/>
<source>Folder not found: %1 (canonical: %2)</source>
<translation>Folder not found: %1 (canonical: %2)</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1026"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1027"/>
<source>Not an object, id: %1, type: %2</source>
<translation>Not an object, id: %1, type: %2</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1049"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1050"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="289"/>
<source>Unknown object type! Id: %1, type: %2</source>
<translation>Unknown object type! Id: %1, type: %2</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1091"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1092"/>
<source>Can't undo an unknown operation: '%1'</source>
<translation>Can't undo an unknown operation: '%1'</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1104"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1105"/>
<source>Can't redo an unknown operation: '%1'</source>
<translation>Can't redo an unknown operation: '%1'</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1135"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1136"/>
<source>An error occurred during updating an object name</source>
<translation>An error occurred during updating an object name</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1153"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1154"/>
<source>An error occurred during updating an object name!</source>
<translation>An error occurred during updating an object name!</translation>
</message>
@@ -2576,47 +2632,47 @@ The following sequences are empty:</translation>
<translation>Packed data is empty!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="222"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="224"/>
<source>Error checking SQLite database: %1!</source>
<translation>Error checking SQLite database: %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="235"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="237"/>
<source>Error creating table: %1, error: %2</source>
<translation>Error creating table: %1, error: %2</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="267"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="269"/>
<source>Not a %1 SQLite database: %2</source>
<translation>Not a %1 SQLite database: %2</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="324"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="326"/>
<source>Database is already opened!</source>
<translation>Database is already opened!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="334"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="336"/>
<source>URL is not specified</source>
<translation>URL is not specified</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="348"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="350"/>
<source>Error opening SQLite database: %1!</source>
<translation>Error opening SQLite database: %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="400"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="402"/>
<source>Database is already closed!</source>
<translation>Database is already closed!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="404"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="406"/>
<source>Illegal database state %1!</source>
<translation>Illegal database state %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="429"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="431"/>
<source>Failed to close database: %1, err: %2</source>
<translation>Failed to close database: %1, err: %2</translation>
</message>
@@ -2665,7 +2721,7 @@ The following sequences are empty:</translation>
<translation>Object not found!</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="803"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="804"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="918"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="930"/>
<source>Object not found.</source>
diff --git a/src/corelibs/U2Formats/transl/russian.ts b/src/corelibs/U2Formats/transl/russian.ts
index 1e6e846..849d4c5 100644
--- a/src/corelibs/U2Formats/transl/russian.ts
+++ b/src/corelibs/U2Formats/transl/russian.ts
@@ -102,7 +102,12 @@
<translation>Обрезанный файл: "%1"</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="475"/>
+ <location filename="../src/BAMUtils.cpp" line="775"/>
+ <source>Can't open file with given url: %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="476"/>
<source>Invalid database user permissions set, so UGENE unable to use this database. Connect to your system administrator to fix the issue.</source>
<translation>Установлены неверные права пользователя базы данных, таким образом UGENE не может использовать эту базу данных. Свяжитесь с вашим администратором для устранения проблемы.</translation>
</message>
@@ -132,7 +137,7 @@
<translation>GTF</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="766"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="767"/>
<source>Unexpected number of modified objects. Expected: 1, actual: %1</source>
<translation>Unexpected number of modified objects. Expected: 1, actual: %1</translation>
</message>
@@ -342,13 +347,12 @@
<context>
<name>U2::AbstractVariationFormat</name>
<message>
- <location filename="../src/AbstractVariationFormat.cpp" line="61"/>
+ <location filename="../src/AbstractVariationFormat.cpp" line="65"/>
<source>SNP formats are used to store single-nucleotide polymorphism data</source>
<translation>SNP форматы используются для сохранения полиморфизма однонуклеотидных данных</translation>
</message>
<message>
- <location filename="../src/AbstractVariationFormat.cpp" line="119"/>
- <location filename="../src/AbstractVariationFormat.cpp" line="132"/>
+ <location filename="../src/AbstractVariationFormat.cpp" line="140"/>
<source>Line %1: There are too few columns in this line. The line was skipped.</source>
<translation>Строка %1: Слишком мало столбцов в этой строке. Строка была проигнорирована.</translation>
</message>
@@ -356,12 +360,12 @@
<context>
<name>U2::AceImporter</name>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="161"/>
+ <location filename="../src/ace/AceImporter.cpp" line="153"/>
<source>ACE file importer</source>
<translation>Импорт ACE файла</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="165"/>
+ <location filename="../src/ace/AceImporter.cpp" line="157"/>
<source>ACE files importer is used to convert conventional ACE files into UGENE database format.Having ACE file converted into UGENE DB format you get an fast and efficient interface to your data with an option to change the content</source>
<translation>Импорт ACE файлов используется для преобразования обычных ACE файлов в формат базы данных UGENE. Преобразовав ACE файл в формат UGENE DB вы получите быстрый и эффективный интерфейс к вашим данным с возможностью изменять содержимое файла</translation>
</message>
@@ -374,12 +378,17 @@
<translation>Импорт ACE файла: %1</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="86"/>
+ <location filename="../src/ace/AceImporter.cpp" line="66"/>
+ <source>Dbi ref is invalid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ace/AceImporter.cpp" line="82"/>
<source>Can't create a temporary database</source>
<translation>Невозможно создать временную базу данных</translation>
</message>
<message>
- <location filename="../src/ace/AceImporter.cpp" line="146"/>
+ <location filename="../src/ace/AceImporter.cpp" line="139"/>
<source>Failed to get load task for : %1</source>
<translation>Не удалось получить загрузку задачи для: %1</translation>
</message>
@@ -759,6 +768,14 @@
</message>
</context>
<context>
+ <name>U2::ConvertSnpeffVariationsToAnnotationsTask</name>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="49"/>
+ <source>Convert SnpEff variations to annotations task</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::DNAQualityIOUtils</name>
<message>
<location filename="../src/DNAQualityIOUtils.cpp" line="67"/>
@@ -1724,6 +1741,37 @@ The following sequences are empty:</translation>
</message>
</context>
<context>
+ <name>U2::InfoPartParser</name>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="114"/>
+ <source>Too few values in the entry: '%1'. Expected at least %2 values.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="134"/>
+ <source>Too many values in the entry '%1', extra entries are ignored</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LoadConvertAndSaveSnpeffVariationsToAnnotationsTask</name>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="117"/>
+ <source>Load file and convert SnpEff variations to annotations task</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="157"/>
+ <source>'%1' load failed, the result document is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/tasks/ConvertSnpeffVariationsToAnnotationsTask.cpp" line="161"/>
+ <source>File '%1' doesn't contain variation tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::MSFFormat</name>
<message>
<location filename="../src/MSFFormat.cpp" line="64"/>
@@ -2118,6 +2166,14 @@ The following sequences are empty:</translation>
</message>
</context>
<context>
+ <name>U2::SnpeffInfoParser</name>
+ <message>
+ <location filename="../src/util/SnpeffInfoParser.cpp" line="48"/>
+ <source>Can't parse the next INFO part: '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::StockholmFormat</name>
<message>
<location filename="../src/StockholmFormat.cpp" line="677"/>
@@ -2250,50 +2306,50 @@ The following sequences are empty:</translation>
<translation>Требуемый атрибут не найдет</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="264"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="268"/>
<source>Database url is incorrect</source>
<translation>Неправильный путь базы данных</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="270"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="274"/>
<source>User login is not specified</source>
<translation>Не указано имя пользователя</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="276"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="280"/>
<source>Host is not specified</source>
<translation>Не указан хост</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="282"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="286"/>
<source>Database name is not specified</source>
<translation>Не указано имя базы данных</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="298"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="302"/>
<source>Error opening MySQL database: %1</source>
<translation>Ошибка открытия базы данных MySQL: %1</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="382"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="383"/>
<source>Not a %1 MySQL database: %2, %3</source>
<translation>Не %1 MySQL база данных: %2, %3</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="388"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="273"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="389"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="275"/>
<source>Warning! The database was created with a newer %1 version: %2. Not all database features may be supported! Current %1 version: %3.</source>
<translation>Предупреждение! База данных была создана с более новой %1 версией: %2. Не все возможности базы данных могут быть выполнены! Текущая %1 версия: %3.</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="523"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="328"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="492"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="330"/>
<source>Illegal database state: %1</source>
<translation>Неправильное состояние базы данных: %1</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="554"/>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="410"/>
+ <location filename="../src/mysql_dbi/MysqlDbi.cpp" line="523"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="412"/>
<source>Can't synchronize database state</source>
<translation>Невозможно синхронизовать состояние базы данных</translation>
</message>
@@ -2361,8 +2417,8 @@ The following sequences are empty:</translation>
<message>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="600"/>
<location filename="../src/mysql_dbi/MysqlMsaDbi.cpp" line="633"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1113"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1122"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1114"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1123"/>
<source>Unexpected modification type '%1'</source>
<translation>Неожиданный тип модификации '%1'</translation>
</message>
@@ -2432,54 +2488,54 @@ The following sequences are empty:</translation>
<translation>Возникла ошибка во время добавления столбца</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="586"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="587"/>
<source>Can't undo an operation for the object</source>
<translation>Невозможно отменить операцию для объекта</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="649"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="650"/>
<source>Can't redo an operation for the object</source>
<translation>Невозможно передвинуться на одну операцию вперед для объекта</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="791"/>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="896"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="792"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="897"/>
<source>Object not found</source>
<translation>Объект не найден</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="845"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="846"/>
<source>Folder not found: %1 (canonical: %2)</source>
<translation>Папка не найдена: %1 (каноническое: %2)</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1026"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1027"/>
<source>Not an object, id: %1, type: %2</source>
<translation>Не является объектом, id: %1, тип: %2</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1049"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1050"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="289"/>
<source>Unknown object type! Id: %1, type: %2</source>
<translation>Unknown object type! Id: %1, type: %2</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1091"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1092"/>
<source>Can't undo an unknown operation: '%1'</source>
<translation>Can't undo an unknown operation: '%1'</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1104"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1105"/>
<source>Can't redo an unknown operation: '%1'</source>
<translation>Can't redo an unknown operation: '%1'</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1135"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1136"/>
<source>An error occurred during updating an object name</source>
<translation>An error occurred during updating an object name</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1153"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="1154"/>
<source>An error occurred during updating an object name!</source>
<translation>An error occurred during updating an object name!</translation>
</message>
@@ -2617,47 +2673,47 @@ The following sequences are empty:</translation>
<translation>Packed data is empty!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="222"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="224"/>
<source>Error checking SQLite database: %1!</source>
<translation>Error checking SQLite database: %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="235"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="237"/>
<source>Error creating table: %1, error: %2</source>
<translation>Error creating table: %1, error: %2</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="267"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="269"/>
<source>Not a %1 SQLite database: %2</source>
<translation>Not a %1 SQLite database: %2</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="324"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="326"/>
<source>Database is already opened!</source>
<translation>База данных уже открыта!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="334"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="336"/>
<source>URL is not specified</source>
<translation>Не задан путь</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="348"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="350"/>
<source>Error opening SQLite database: %1!</source>
<translation>Error opening SQLite database: %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="400"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="402"/>
<source>Database is already closed!</source>
<translation>База данных уже закрыта!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="404"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="406"/>
<source>Illegal database state %1!</source>
<translation>Illegal database state %1!</translation>
</message>
<message>
- <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="429"/>
+ <location filename="../src/sqlite_dbi/SQLiteDbi.cpp" line="431"/>
<source>Failed to close database: %1, err: %2</source>
<translation>Failed to close database: %1, err: %2</translation>
</message>
@@ -2706,7 +2762,7 @@ The following sequences are empty:</translation>
<translation>Object not found!</translation>
</message>
<message>
- <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="803"/>
+ <location filename="../src/mysql_dbi/MysqlObjectDbi.cpp" line="804"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="918"/>
<location filename="../src/sqlite_dbi/SQLiteObjectDbi.cpp" line="930"/>
<source>Object not found.</source>
diff --git a/src/corelibs/U2Gui/src/AppSettingsGUI.h b/src/corelibs/U2Gui/src/AppSettingsGUI.h
index e51460d..e9c899b 100644
--- a/src/corelibs/U2Gui/src/AppSettingsGUI.h
+++ b/src/corelibs/U2Gui/src/AppSettingsGUI.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/MainWindow.cpp b/src/corelibs/U2Gui/src/MainWindow.cpp
index 7f14975..a144b10 100644
--- a/src/corelibs/U2Gui/src/MainWindow.cpp
+++ b/src/corelibs/U2Gui/src/MainWindow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/MainWindow.h b/src/corelibs/U2Gui/src/MainWindow.h
index 5e3113c..d7ae2e1 100644
--- a/src/corelibs/U2Gui/src/MainWindow.h
+++ b/src/corelibs/U2Gui/src/MainWindow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/Notification.cpp b/src/corelibs/U2Gui/src/Notification.cpp
index 8511aa0..1c7f39d 100644
--- a/src/corelibs/U2Gui/src/Notification.cpp
+++ b/src/corelibs/U2Gui/src/Notification.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/Notification.h b/src/corelibs/U2Gui/src/Notification.h
index f4d5722..2a6ec0f 100644
--- a/src/corelibs/U2Gui/src/Notification.h
+++ b/src/corelibs/U2Gui/src/Notification.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/NotificationWidget.cpp b/src/corelibs/U2Gui/src/NotificationWidget.cpp
index 2396cfc..9b09bd7 100644
--- a/src/corelibs/U2Gui/src/NotificationWidget.cpp
+++ b/src/corelibs/U2Gui/src/NotificationWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/NotificationWidget.h b/src/corelibs/U2Gui/src/NotificationWidget.h
index f1af063..8470bdf 100644
--- a/src/corelibs/U2Gui/src/NotificationWidget.h
+++ b/src/corelibs/U2Gui/src/NotificationWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/NotificationsTypes.h b/src/corelibs/U2Gui/src/NotificationsTypes.h
index 00d3e1b..6690c82 100644
--- a/src/corelibs/U2Gui/src/NotificationsTypes.h
+++ b/src/corelibs/U2Gui/src/NotificationsTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ObjectViewModel.cpp b/src/corelibs/U2Gui/src/ObjectViewModel.cpp
index adba0a9..245851c 100644
--- a/src/corelibs/U2Gui/src/ObjectViewModel.cpp
+++ b/src/corelibs/U2Gui/src/ObjectViewModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ObjectViewModel.h b/src/corelibs/U2Gui/src/ObjectViewModel.h
index 729541c..6daef32 100644
--- a/src/corelibs/U2Gui/src/ObjectViewModel.h
+++ b/src/corelibs/U2Gui/src/ObjectViewModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ObjectViewTasks.cpp b/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
index f7ba9f0..50aa12b 100644
--- a/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
+++ b/src/corelibs/U2Gui/src/ObjectViewTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ObjectViewTasks.h b/src/corelibs/U2Gui/src/ObjectViewTasks.h
index 8f5b845..e450b63 100644
--- a/src/corelibs/U2Gui/src/ObjectViewTasks.h
+++ b/src/corelibs/U2Gui/src/ObjectViewTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/OpenViewTask.cpp b/src/corelibs/U2Gui/src/OpenViewTask.cpp
index c21d819..e4dcbf3 100644
--- a/src/corelibs/U2Gui/src/OpenViewTask.cpp
+++ b/src/corelibs/U2Gui/src/OpenViewTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/OpenViewTask.h b/src/corelibs/U2Gui/src/OpenViewTask.h
index 07c82a8..8a30770 100644
--- a/src/corelibs/U2Gui/src/OpenViewTask.h
+++ b/src/corelibs/U2Gui/src/OpenViewTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/PasteController.cpp b/src/corelibs/U2Gui/src/PasteController.cpp
index 41f1426..ccd1efb 100644
--- a/src/corelibs/U2Gui/src/PasteController.cpp
+++ b/src/corelibs/U2Gui/src/PasteController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/PasteController.h b/src/corelibs/U2Gui/src/PasteController.h
index b3e17cb..5bac445 100644
--- a/src/corelibs/U2Gui/src/PasteController.h
+++ b/src/corelibs/U2Gui/src/PasteController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/PluginViewer.h b/src/corelibs/U2Gui/src/PluginViewer.h
index 424245d..22e4863 100644
--- a/src/corelibs/U2Gui/src/PluginViewer.h
+++ b/src/corelibs/U2Gui/src/PluginViewer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ProjectParsing.cpp b/src/corelibs/U2Gui/src/ProjectParsing.cpp
index e7aa348..34438b5 100644
--- a/src/corelibs/U2Gui/src/ProjectParsing.cpp
+++ b/src/corelibs/U2Gui/src/ProjectParsing.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ProjectParsing.h b/src/corelibs/U2Gui/src/ProjectParsing.h
index 5feb27f..9dffa5f 100644
--- a/src/corelibs/U2Gui/src/ProjectParsing.h
+++ b/src/corelibs/U2Gui/src/ProjectParsing.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ProjectView.h b/src/corelibs/U2Gui/src/ProjectView.h
index a7a3932..5e7ba7c 100644
--- a/src/corelibs/U2Gui/src/ProjectView.h
+++ b/src/corelibs/U2Gui/src/ProjectView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ToolsMenu.cpp b/src/corelibs/U2Gui/src/ToolsMenu.cpp
index 20428c9..0015f8c 100644
--- a/src/corelibs/U2Gui/src/ToolsMenu.cpp
+++ b/src/corelibs/U2Gui/src/ToolsMenu.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/ToolsMenu.h b/src/corelibs/U2Gui/src/ToolsMenu.h
index 865874d..f34726e 100644
--- a/src/corelibs/U2Gui/src/ToolsMenu.h
+++ b/src/corelibs/U2Gui/src/ToolsMenu.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/U2SavableWidget.cpp b/src/corelibs/U2Gui/src/U2SavableWidget.cpp
index 6fceca7..6e39189 100644
--- a/src/corelibs/U2Gui/src/U2SavableWidget.cpp
+++ b/src/corelibs/U2Gui/src/U2SavableWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/U2SavableWidget.h b/src/corelibs/U2Gui/src/U2SavableWidget.h
index 5bd73c7..9e6abc0 100644
--- a/src/corelibs/U2Gui/src/U2SavableWidget.h
+++ b/src/corelibs/U2Gui/src/U2SavableWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/U2WidgetStateStorage.cpp b/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
index 9d99257..4b16efd 100644
--- a/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
+++ b/src/corelibs/U2Gui/src/U2WidgetStateStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/U2WidgetStateStorage.h b/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
index 633dae8..c4861d1 100644
--- a/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
+++ b/src/corelibs/U2Gui/src/U2WidgetStateStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/UnloadDocumentTask.cpp b/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
index 286d0da..331253d 100644
--- a/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
+++ b/src/corelibs/U2Gui/src/UnloadDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/UnloadDocumentTask.h b/src/corelibs/U2Gui/src/UnloadDocumentTask.h
index 48c6bc8..29cce12 100644
--- a/src/corelibs/U2Gui/src/UnloadDocumentTask.h
+++ b/src/corelibs/U2Gui/src/UnloadDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/WelcomePageAction.cpp b/src/corelibs/U2Gui/src/WelcomePageAction.cpp
index 7919879..949ea41 100644
--- a/src/corelibs/U2Gui/src/WelcomePageAction.cpp
+++ b/src/corelibs/U2Gui/src/WelcomePageAction.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/WelcomePageAction.h b/src/corelibs/U2Gui/src/WelcomePageAction.h
index 19cd746..379133b 100644
--- a/src/corelibs/U2Gui/src/WelcomePageAction.h
+++ b/src/corelibs/U2Gui/src/WelcomePageAction.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
index 2002451..ecde59f 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
index f4046f2..ef1a7af 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/GroupHeaderImageWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
index 6bec23b..642c81b 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
index b9b60b7..ca26634 100644
--- a/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/GroupOptionsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
index 811c4f3..f2b32dc 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
index 9fa8166..cff7edb 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
index 038710a..3d50cf9 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
index 2bef9cd..7afb5c6 100644
--- a/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
+++ b/src/corelibs/U2Gui/src/options_panel/OPWidgetFactoryRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
index b936057..806cccb 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanel.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
index 0149983..9641acb 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
index e7c8b77..1d85f85 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
index d67e4f6..634313b 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelGroup.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
index 1131aeb..1e92c88 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
index 3c2f47a..663a9fa 100644
--- a/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/OptionsPanelWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
index 231f555..be0d54e 100644
--- a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
+++ b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
index 48a3c06..6623ae8 100644
--- a/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
+++ b/src/corelibs/U2Gui/src/options_panel/ShowHideSubgroupWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
index 1e2ed3c..36953ee 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
index aaae206..a85a2d1 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -50,7 +50,7 @@ AddNewDocumentDialogImpl::AddNewDocumentDialogImpl(QWidget* p, AddNewDocumentDia
model(m)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220388");
+ new HelpButton(this, buttonBox, "18223028");
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 86c790f..4dc4e29 100644
--- a/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h
+++ b/src/corelibs/U2Gui/src/util/AddNewDocumentDialogImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/AuthenticationDialog.cpp b/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
index ac05874..8e45d6a 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/AuthenticationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ AuthenticationDialog::AuthenticationDialog(const QString &text, QWidget* parent)
authenticationWidget(new AuthenticationWidget)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220658");
+ new HelpButton(this, ui->buttonBox, "18223298");
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 7745675..6b2da5c 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationDialog.h
+++ b/src/corelibs/U2Gui/src/util/AuthenticationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/AuthenticationWidget.cpp b/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
index e2493fd..8315a86 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/AuthenticationWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/AuthenticationWidget.h b/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
index 1db8143..da27717 100644
--- a/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
+++ b/src/corelibs/U2Gui/src/util/AuthenticationWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
index bd3b69c..1790f99 100644
--- a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@ BreakpointConditionEditDialog::BreakpointConditionEditDialog(QWidget *parent,
{
ui = new Ui_BreakpointConditionEditDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220911");
+ new HelpButton(this, ui->buttonBox, "18223551");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
index 0ef561e..4bb995f 100644
--- a/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
+++ b/src/corelibs/U2Gui/src/util/BreakpointConditionEditDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
index 2d75b48..db0b17d 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@ CreateAnnotationDialog::CreateAnnotationDialog(QWidget* p, CreateAnnotationModel
ui->setupUi(this);
annWidgetController = new CreateAnnotationWidgetController(m, this, CreateAnnotationWidgetController::Full);
- helpButton = new HelpButton(this, ui->buttonBox, "18220354");
+ helpButton = new HelpButton(this, ui->buttonBox, "18222994");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
ui->mainLayout->insertWidget(0, annWidgetController->getWidget());
@@ -61,6 +61,7 @@ CreateAnnotationDialog::~CreateAnnotationDialog() {
void CreateAnnotationDialog::updateAppearance(const QString &newTitle, const QString &newHelpPage, const QString &newOkButtonName) {
setWindowTitle(newTitle);
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(newOkButtonName);
+ ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
helpButton->updatePageId(newHelpPage);
}
diff --git a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
index 2e74db1..33b9e28 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
index 996ca23..6b2c0c8 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
index a4f2521..706bc04 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationFullWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
index 42de605..2ab39f2 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
index 8ddc579..65ae246 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationNormalWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
index 50f88c9..8165903 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
index d5f3d77..892b50e 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationOptionsPanelWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
index 97edb34..856b5d1 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationWidget.h b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
index 921c49b..fcf7dc5 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
index 8b23be8..b3dc9b4 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
index b0acbde..e83ff4e 100644
--- a/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
+++ b/src/corelibs/U2Gui/src/util/CreateAnnotationWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
index 38f1ab8..01c497b 100644
--- a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -49,7 +49,7 @@ CreateDocumentFromTextDialogController::CreateDocumentFromTextDialogController(Q
saveController(NULL) {
ui = new Ui_CreateDocumentFromTextDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220289");
+ new HelpButton(this, ui->buttonBox, "18222929");
initSaveController();
diff --git a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
index 0dbd2e2..b5447c0 100644
--- a/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
+++ b/src/corelibs/U2Gui/src/util/CreateDocumentFromTextDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
index 8909f3c..bfd96f8 100644
--- a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
index eeb70dc..55a8a15 100644
--- a/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
+++ b/src/corelibs/U2Gui/src/util/CreateObjectRelationDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
index ee5d6b8..e83ab99 100644
--- a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
+++ b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
index a93afb3..907f1f7 100644
--- a/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
+++ b/src/corelibs/U2Gui/src/util/CreateSequenceFromTextAndOpenViewTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
index 1e45cf8..2bb06a3 100644
--- a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
+++ b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/CredentialsAskerGui.h b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
index 989694f..f695169 100644
--- a/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
+++ b/src/corelibs/U2Gui/src/util/CredentialsAskerGui.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/DialogUtils.cpp b/src/corelibs/U2Gui/src/util/DialogUtils.cpp
index add01d7..c2214c3 100644
--- a/src/corelibs/U2Gui/src/util/DialogUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/DialogUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/DialogUtils.h b/src/corelibs/U2Gui/src/util/DialogUtils.h
index 7bde0be..180aa87 100644
--- a/src/corelibs/U2Gui/src/util/DialogUtils.h
+++ b/src/corelibs/U2Gui/src/util/DialogUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
index 66b4e0e..fa62dca 100644
--- a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
+++ b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
index 1c9aea5..c168dc8 100644
--- a/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
+++ b/src/corelibs/U2Gui/src/util/DocumentFormatComboboxController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
index 7a9b2ad..3e5d181 100644
--- a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -60,7 +60,7 @@ QString DownloadRemoteFileDialog::defaultDB("");
DownloadRemoteFileDialog::DownloadRemoteFileDialog(QWidget *p):QDialog(p), isQueryDB(false) {
ui = new Ui_DownloadRemoteFileDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220303");
+ new HelpButton(this, ui->buttonBox, "18222943");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -97,7 +97,7 @@ DownloadRemoteFileDialog::DownloadRemoteFileDialog( const QString& id, const QSt
{
ui = new Ui_DownloadRemoteFileDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220316");
+ new HelpButton(this, ui->buttonBox, "18222956");
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 36d7627..cf269c3 100644
--- a/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h
+++ b/src/corelibs/U2Gui/src/util/DownloadRemoteFileDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/EditQualifierDialog.cpp b/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
index f51ff39..7957d0e 100644
--- a/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/EditQualifierDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ EditQualifierDialog::EditQualifierDialog(QWidget* p, const U2Qualifier& q, bool
{
ui = new Ui_EditQualifierDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220361");
+ new HelpButton(this, ui->buttonBox, "18223001");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/EditQualifierDialog.h b/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
index 0864900..1a7f224 100644
--- a/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
+++ b/src/corelibs/U2Gui/src/util/EditQualifierDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
index bf09a51..153e95a 100644
--- a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ EditSequenceDialogController::EditSequenceDialogController(const EditSequencDial
{
ui = new Ui_EditSequenceDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220344");
+ new HelpButton(this, ui->buttonBox, "18222984");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
index 1b6449e..32e5872 100644
--- a/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/EditSequenceDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
index b760d99..1449f35 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
index c0d69f4..b526f8a 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotations2CSVTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
index ddf32ba..44a2aa0 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,7 +43,7 @@ ExportAnnotationsDialog::ExportAnnotationsDialog( const QString &filename, QWidg
: QDialog( parent ), ui( new Ui_ExportAnnotationsDialog( ) )
{
ui->setupUi( this );
- new HelpButton(this, ui->buttonBox, "18220366");
+ new HelpButton(this, ui->buttonBox, "18223006");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
index 457745c..d69e096 100644
--- a/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
+++ b/src/corelibs/U2Gui/src/util/ExportAnnotationsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
index 594e7f2..7396d1a 100644
--- a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ ExportDocumentDialogController::ExportDocumentDialogController(Document* d, QWid
{
ui = new Ui_ExportDocumentDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220290");
+ new HelpButton(this, ui->buttonBox, "18222930");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -62,7 +62,7 @@ ExportDocumentDialogController::ExportDocumentDialogController(GObject *object,
QList<GObject *> objectList = QList<GObject *>() << sourceObject;
initSaveController(objectList, initUrl);
- new HelpButton(this, ui->buttonBox, "18220290");
+ new HelpButton(this, ui->buttonBox, "18222930");
}
void ExportDocumentDialogController::initSaveController(const QList<GObject *> &objects, const QString &fileUrl) {
diff --git a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
index 1b716a7..3f74225 100644
--- a/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
+++ b/src/corelibs/U2Gui/src/util/ExportDocumentDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportImageDialog.cpp b/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
index 7616a8b..d95beed 100644
--- a/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportImageDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -148,28 +148,28 @@ void ExportImageDialog::init() {
switch (source) {
case WD:
- new HelpButton(this, ui->buttonBox, "18220693");
+ new HelpButton(this, ui->buttonBox, "18223333");
break;
case CircularView:
- new HelpButton(this, ui->buttonBox, "18220371");
+ new HelpButton(this, ui->buttonBox, "18223011");
break;
case MSA:
- new HelpButton(this, ui->buttonBox, "18220444");
+ new HelpButton(this, ui->buttonBox, "18223084");
break;
case SequenceView:
- new HelpButton(this, ui->buttonBox, "18220331");
+ new HelpButton(this, ui->buttonBox, "18222971");
break;
case AssemblyView:
- new HelpButton(this, ui->buttonBox, "18220480");
+ new HelpButton(this, ui->buttonBox, "18223120");
break;
case PHYTreeView:
- new HelpButton(this, ui->buttonBox, "18220509");
+ new HelpButton(this, ui->buttonBox, "18223149");
break;
case DotPlot:
- new HelpButton(this, ui->buttonBox, "18220402");
+ new HelpButton(this, ui->buttonBox, "18223042");
break;
case MolView:
- new HelpButton(this, ui->buttonBox, "18220385");
+ new HelpButton(this, ui->buttonBox, "18223025");
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 00dafe1..b6dfc8b 100644
--- a/src/corelibs/U2Gui/src/util/ExportImageDialog.h
+++ b/src/corelibs/U2Gui/src/util/ExportImageDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportObjectUtils.cpp b/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
index 38b3a44..c295e89 100644
--- a/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/ExportObjectUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ExportObjectUtils.h b/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
index 73b9178..2240ac6 100644
--- a/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
+++ b/src/corelibs/U2Gui/src/util/ExportObjectUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
index 6f4f834..9bf68dd 100644
--- a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
+++ b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GObjectComboBoxController.h b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
index 58f3e07..8da1693 100644
--- a/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
+++ b/src/corelibs/U2Gui/src/util/GObjectComboBoxController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GScrollBar.cpp b/src/corelibs/U2Gui/src/util/GScrollBar.cpp
index 2f7fdc0..50d9211 100644
--- a/src/corelibs/U2Gui/src/util/GScrollBar.cpp
+++ b/src/corelibs/U2Gui/src/util/GScrollBar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GScrollBar.h b/src/corelibs/U2Gui/src/util/GScrollBar.h
index 7278a66..7ac9b91 100644
--- a/src/corelibs/U2Gui/src/util/GScrollBar.h
+++ b/src/corelibs/U2Gui/src/util/GScrollBar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GUIUtils.cpp b/src/corelibs/U2Gui/src/util/GUIUtils.cpp
index 19cdd16..f365dca 100644
--- a/src/corelibs/U2Gui/src/util/GUIUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/GUIUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GUIUtils.h b/src/corelibs/U2Gui/src/util/GUIUtils.h
index 28c5ce8..26c2702 100644
--- a/src/corelibs/U2Gui/src/util/GUIUtils.h
+++ b/src/corelibs/U2Gui/src/util/GUIUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
index fc68116..576db70 100644
--- a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
+++ b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GenbankLocationValidator.h b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
index afe4485..903e7bf 100644
--- a/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
+++ b/src/corelibs/U2Gui/src/util/GenbankLocationValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GlassView.cpp b/src/corelibs/U2Gui/src/util/GlassView.cpp
index 8950660..f0ee7dd 100644
--- a/src/corelibs/U2Gui/src/util/GlassView.cpp
+++ b/src/corelibs/U2Gui/src/util/GlassView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GlassView.h b/src/corelibs/U2Gui/src/util/GlassView.h
index 0d866b8..0f4c947 100644
--- a/src/corelibs/U2Gui/src/util/GlassView.h
+++ b/src/corelibs/U2Gui/src/util/GlassView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GraphUtils.cpp b/src/corelibs/U2Gui/src/util/GraphUtils.cpp
index 2cea3e6..4df2a5f 100644
--- a/src/corelibs/U2Gui/src/util/GraphUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/GraphUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/GraphUtils.h b/src/corelibs/U2Gui/src/util/GraphUtils.h
index 82b368d..a2f8452 100644
--- a/src/corelibs/U2Gui/src/util/GraphUtils.h
+++ b/src/corelibs/U2Gui/src/util/GraphUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/HelpButton.cpp b/src/corelibs/U2Gui/src/util/HelpButton.cpp
index 7cea4be..35a6671 100644
--- a/src/corelibs/U2Gui/src/util/HelpButton.cpp
+++ b/src/corelibs/U2Gui/src/util/HelpButton.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/HelpButton.h b/src/corelibs/U2Gui/src/util/HelpButton.h
index a7f855b..57fb767 100644
--- a/src/corelibs/U2Gui/src/util/HelpButton.h
+++ b/src/corelibs/U2Gui/src/util/HelpButton.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
index 3142f50..b3a5e23 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -27,7 +27,9 @@
#include <U2Core/DocumentModel.h>
#include <U2Core/GUrlUtils.h>
#include <U2Core/ProjectModel.h>
+#include <U2Core/U2DbiRegistry.h>
#include <U2Core/U2SafePoints.h>
+#include <U2Core/U2OpStatusUtils.h>
#include <U2Formats/AceImporter.h>
@@ -48,7 +50,7 @@ AceImportDialog::AceImportDialog(const QVariantMap& _settings) :
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220492");
+ new HelpButton(this, buttonBox, "18223132");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -117,7 +119,8 @@ bool AceImportDialog::isValid() {
}
void AceImportDialog::applySettings() {
- settings.insert(AceImporter::DEST_URL, saveController->getSaveFileName());
+ U2DbiRef ref(SQLITE_DBI_ID, saveController->getSaveFileName());
+ settings.insert(DocumentFormat::DBI_REF_HINT, qVariantFromValue(ref));
}
void AceImportDialog::initSaveController() {
diff --git a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
index e745f3c..1071914 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
+++ b/src/corelibs/U2Gui/src/util/ImportDialogs/AceImportDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
index fd94282..671ebd2 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ImportDialogsFactories.h b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
index 693004c..b140c91 100644
--- a/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
+++ b/src/corelibs/U2Gui/src/util/ImportDialogsFactories.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
index 8dbd954..fd2d3ff 100644
--- a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
+++ b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
index b6b8b47..c29b049 100644
--- a/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
+++ b/src/corelibs/U2Gui/src/util/ImportSequenceFromRawDataTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
index 91f44df..1bd02af 100644
--- a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
+++ b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/InputWidgetsControllers.h b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
index d3f77f4..d892c90 100644
--- a/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
+++ b/src/corelibs/U2Gui/src/util/InputWidgetsControllers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
index ec3464d..33af8db 100644
--- a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
+++ b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LabelClickTransmitter.h b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
index 842fe24..879c10a 100644
--- a/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
+++ b/src/corelibs/U2Gui/src/util/LabelClickTransmitter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
index 67d5019..f18fee9 100644
--- a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
+++ b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LastUsedDirHelper.h b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
index d7eac71..ad6e86b 100644
--- a/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
+++ b/src/corelibs/U2Gui/src/util/LastUsedDirHelper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LocalToolbar.cpp b/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
index 5d3f03d..f877b97 100644
--- a/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/LocalToolbar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/LocalToolbar.h b/src/corelibs/U2Gui/src/util/LocalToolbar.h
index 84129fd..44ecc15 100644
--- a/src/corelibs/U2Gui/src/util/LocalToolbar.h
+++ b/src/corelibs/U2Gui/src/util/LocalToolbar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/MultiClickMenu.cpp b/src/corelibs/U2Gui/src/util/MultiClickMenu.cpp
index 5c36b89..53b844d 100644
--- a/src/corelibs/U2Gui/src/util/MultiClickMenu.cpp
+++ b/src/corelibs/U2Gui/src/util/MultiClickMenu.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/MultiClickMenu.h b/src/corelibs/U2Gui/src/util/MultiClickMenu.h
index 8edcbdf..49c861a 100644
--- a/src/corelibs/U2Gui/src/util/MultiClickMenu.h
+++ b/src/corelibs/U2Gui/src/util/MultiClickMenu.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
index bcf3070..905429c 100644
--- a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
+++ b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ObjectViewTreeController.h b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
index 379fee0..76ea771 100644
--- a/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
+++ b/src/corelibs/U2Gui/src/util/ObjectViewTreeController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/OrderedToolbar.cpp b/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
index bf9ef92..be4b82e 100644
--- a/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/OrderedToolbar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/OrderedToolbar.h b/src/corelibs/U2Gui/src/util/OrderedToolbar.h
index 9cfaf77..028e060 100644
--- a/src/corelibs/U2Gui/src/util/OrderedToolbar.h
+++ b/src/corelibs/U2Gui/src/util/OrderedToolbar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/PositionSelector.cpp b/src/corelibs/U2Gui/src/util/PositionSelector.cpp
index 221a782..4c945e1 100644
--- a/src/corelibs/U2Gui/src/util/PositionSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/PositionSelector.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/PositionSelector.h b/src/corelibs/U2Gui/src/util/PositionSelector.h
index 8801dc7..db09d5e 100644
--- a/src/corelibs/U2Gui/src/util/PositionSelector.h
+++ b/src/corelibs/U2Gui/src/util/PositionSelector.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
index 72e8050..8a8bd99 100644
--- a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
+++ b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
index 5fa0097..6a1ad66 100644
--- a/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
+++ b/src/corelibs/U2Gui/src/util/ProjectDocumentComboBoxController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
index eb2dd3a..de0e6cd 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
index 9153007..f6f6d1b 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
index 0ab3b1a..7da152c 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialogImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RangeSelector.cpp b/src/corelibs/U2Gui/src/util/RangeSelector.cpp
index fefc789..e8876f6 100644
--- a/src/corelibs/U2Gui/src/util/RangeSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/RangeSelector.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -240,7 +240,7 @@ MultipleRangeSelector::MultipleRangeSelector(QWidget* _parent, const QVector<U2R
ui = new Ui_RangeSelectionDialog;
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220336");
+ new HelpButton(this, ui->buttonBox, "18222976");
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 5680ee0..3345735 100644
--- a/src/corelibs/U2Gui/src/util/RangeSelector.h
+++ b/src/corelibs/U2Gui/src/util/RangeSelector.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelector.cpp b/src/corelibs/U2Gui/src/util/RegionSelector.cpp
index 6a06108..2c937ad 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelector.cpp
+++ b/src/corelibs/U2Gui/src/util/RegionSelector.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelector.h b/src/corelibs/U2Gui/src/util/RegionSelector.h
index 6e45947..370ab43 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelector.h
+++ b/src/corelibs/U2Gui/src/util/RegionSelector.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelectorController.cpp b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
index e0f5e1e..0348cd3 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelectorController.h b/src/corelibs/U2Gui/src/util/RegionSelectorController.h
index caa2d71..18f70f1 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelectorController.h
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.cpp b/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.cpp
index 18789f1..bb44354 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.cpp
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.h b/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.h
index 5fad0c4..9797982 100644
--- a/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.h
+++ b/src/corelibs/U2Gui/src/util/RegionSelectorWithExcludedRegion.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
index 1c13017..3031a2e 100644
--- a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@ RemovePartFromSequenceDialogController::RemovePartFromSequenceDialogController(U
saveController(NULL)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220344");
+ new HelpButton(this, ui->buttonBox, "18222984");
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 162c7b0..c913d3e 100644
--- a/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/RemovePartFromSequenceDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SaveDocumentController.cpp b/src/corelibs/U2Gui/src/util/SaveDocumentController.cpp
index 3aaed9c..60115c8 100644
--- a/src/corelibs/U2Gui/src/util/SaveDocumentController.cpp
+++ b/src/corelibs/U2Gui/src/util/SaveDocumentController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SaveDocumentController.h b/src/corelibs/U2Gui/src/util/SaveDocumentController.h
index 1016743..4e11a06 100644
--- a/src/corelibs/U2Gui/src/util/SaveDocumentController.h
+++ b/src/corelibs/U2Gui/src/util/SaveDocumentController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScaleBar.cpp b/src/corelibs/U2Gui/src/util/ScaleBar.cpp
index 83546c9..9fd6beb 100644
--- a/src/corelibs/U2Gui/src/util/ScaleBar.cpp
+++ b/src/corelibs/U2Gui/src/util/ScaleBar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScaleBar.h b/src/corelibs/U2Gui/src/util/ScaleBar.h
index bab4617..9ce0ccf 100644
--- a/src/corelibs/U2Gui/src/util/ScaleBar.h
+++ b/src/corelibs/U2Gui/src/util/ScaleBar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
index c68fdd6..693bf82 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptEditorDelegate.h b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
index caa303d..fe2549e 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDelegate.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
index 27e8f3d..eaba60b 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220701");
+ new HelpButton(this, ui->buttonBox, "18223341");
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 13a29cd..d8a1d9c 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
index d2d79a9..1559671 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptEditorWidget.h b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
index 0bf1ff5..1fd33ca 100644
--- a/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
+++ b/src/corelibs/U2Gui/src/util/ScriptEditorWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptHighlighter.cpp b/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
index c29af28..b8e1ff8 100644
--- a/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
+++ b/src/corelibs/U2Gui/src/util/ScriptHighlighter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/ScriptHighlighter.h b/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
index e3aebfa..e259222 100644
--- a/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
+++ b/src/corelibs/U2Gui/src/util/ScriptHighlighter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
index 2c907d2..7c09669 100644
--- a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
+++ b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ SearchGenbankSequenceDialogController::SearchGenbankSequenceDialogController(QWi
{
ui = new Ui_SearchGenbankSequenceDialog();
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220316");
+ new HelpButton(this, ui->buttonBox, "18222956");
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 c5bde20..8204195 100644
--- a/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h
+++ b/src/corelibs/U2Gui/src/util/SearchGenbankSequenceDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
index cbf2dbc..f503ddc 100644
--- a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
+++ b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SeqPasterWidgetController.h b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
index 012df40..44133e3 100644
--- a/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
+++ b/src/corelibs/U2Gui/src/util/SeqPasterWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SequenceTextEdit.cpp b/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
index ee66d04..13b5df8 100644
--- a/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
+++ b/src/corelibs/U2Gui/src/util/SequenceTextEdit.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SequenceTextEdit.h b/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
index 432f288..e798984 100644
--- a/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
+++ b/src/corelibs/U2Gui/src/util/SequenceTextEdit.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SuggestCompleter.cpp b/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
index cc77d89..0d77435 100644
--- a/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
+++ b/src/corelibs/U2Gui/src/util/SuggestCompleter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/SuggestCompleter.h b/src/corelibs/U2Gui/src/util/SuggestCompleter.h
index d4f7094..b65c71c 100644
--- a/src/corelibs/U2Gui/src/util/SuggestCompleter.h
+++ b/src/corelibs/U2Gui/src/util/SuggestCompleter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
index f6482a2..fcc223f 100644
--- a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/TreeWidgetUtils.h b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
index 4a492c0..46ba86f 100644
--- a/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
+++ b/src/corelibs/U2Gui/src/util/TreeWidgetUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/U2FileDialog.cpp b/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
index fb33f8c..3721857 100644
--- a/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/U2FileDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/U2FileDialog.h b/src/corelibs/U2Gui/src/util/U2FileDialog.h
index 2739a8a..fbc42fb 100644
--- a/src/corelibs/U2Gui/src/util/U2FileDialog.h
+++ b/src/corelibs/U2Gui/src/util/U2FileDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/U2LongLongValidator.cpp b/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
index 115ab04..a39321c 100644
--- a/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
+++ b/src/corelibs/U2Gui/src/util/U2LongLongValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/U2LongLongValidator.h b/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
index 87fea6c..0569f67 100644
--- a/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
+++ b/src/corelibs/U2Gui/src/util/U2LongLongValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
index 080e089..a7d8506 100644
--- a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
+++ b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,6 +42,8 @@ WidgetWithLocalToolbar::WidgetWithLocalToolbar(QWidget *p)
layout->addWidget(toolBar);
layout->addWidget(contentWidget);
+ contentWidget->setMouseTracking(true);
+ setMouseTracking(true);
QWidget::setLayout(layout);
}
diff --git a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
index 9c75132..711a07a 100644
--- a/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
+++ b/src/corelibs/U2Gui/src/util/WidgetWithLocalToolbar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
index c7fe61a..003d980 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
+++ b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
index 67ef24f..e67a7fb 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
+++ b/src/corelibs/U2Gui/src/util/imageExport/ImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
index 12f6649..f9a7e76 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
+++ b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
index 497ba69..cdf2ab9 100644
--- a/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
+++ b/src/corelibs/U2Gui/src/util/imageExport/WidgetScreenshotExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/logview/LogView.cpp b/src/corelibs/U2Gui/src/util/logview/LogView.cpp
index f6a1885..a816315 100644
--- a/src/corelibs/U2Gui/src/util/logview/LogView.cpp
+++ b/src/corelibs/U2Gui/src/util/logview/LogView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/logview/LogView.h b/src/corelibs/U2Gui/src/util/logview/LogView.h
index 338679f..b748b90 100644
--- a/src/corelibs/U2Gui/src/util/logview/LogView.h
+++ b/src/corelibs/U2Gui/src/util/logview/LogView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
index 3f20abe..754556e 100644
--- a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ConnectionHelper.h b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
index 2a7c16b..62f230f 100644
--- a/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
+++ b/src/corelibs/U2Gui/src/util/project/ConnectionHelper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/DocumentFolders.cpp b/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
index dead81e..103c62a 100644
--- a/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
+++ b/src/corelibs/U2Gui/src/util/project/DocumentFolders.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/DocumentFolders.h b/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
index e16263b..d6a57ec 100644
--- a/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
+++ b/src/corelibs/U2Gui/src/util/project/DocumentFolders.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/EditableTreeView.cpp b/src/corelibs/U2Gui/src/util/project/EditableTreeView.cpp
index e008b3e..bc8e868 100644
--- a/src/corelibs/U2Gui/src/util/project/EditableTreeView.cpp
+++ b/src/corelibs/U2Gui/src/util/project/EditableTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/EditableTreeView.h b/src/corelibs/U2Gui/src/util/project/EditableTreeView.h
index 383ecc7..8d96a8b 100644
--- a/src/corelibs/U2Gui/src/util/project/EditableTreeView.h
+++ b/src/corelibs/U2Gui/src/util/project/EditableTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
index 70aac3a..9867abb 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
index 481f2ce..82a92c6 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectGroup.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
index 596c779..65bfb64 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
index 194a4c4..8b48de5 100644
--- a/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
+++ b/src/corelibs/U2Gui/src/util/project/FilteredProjectItemDelegate.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
index 905afd9..f789dcf 100644
--- a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/FolderNameDialog.h b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
index e665c8f..0b46aa9 100644
--- a/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
+++ b/src/corelibs/U2Gui/src/util/project/FolderNameDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h b/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
index d972063..ab7ac8a 100644
--- a/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
+++ b/src/corelibs/U2Gui/src/util/project/LoadDocumentTaskProvider.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
index f6e291e..dbc0ef4 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilterNames.h b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
index 3c29dd8..cb42a5f 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterNames.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
index 90dde55..4b54a93 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
index fe9b29d..e9915eb 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilterProxyModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
index 5ea85da..e43382c 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectFilteringController.h b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
index 7a4a56b..f37842b 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectFilteringController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
index 2492962..6c80dc4 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectTreeController.h b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
index f48fcfd..7dcbd27 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectTreeController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
index c445b25..78dbf2d 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectUpdater.h b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
index 763208f..c6416ac 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUpdater.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectUtils.cpp b/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
index 7bf9196..1634766 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectUtils.h b/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
index 01fc401..796c79b 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
index e60f24a..bfa378d 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
index 0635486..ed169f9 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewFilterModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
index 033c606..b549c37 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1105,9 +1105,13 @@ QVariant ProjectViewModel::getDocumentDisplayData(Document *doc) const {
if (!doc->isLoaded()) {
LoadUnloadedDocumentTask *t = LoadUnloadedDocumentTask::findActiveLoadingTask(doc);
if (t == NULL) {
- text += ProjectViewModel::tr("[unloaded]");
+ text += ProjectViewModel::tr("[unloaded] ");
} else {
- text += ProjectViewModel::tr("[loading %1%]").arg(t->getProgress());
+ if (t->getProgress() == -1){
+ text += ProjectViewModel::tr("[loading] ");
+ } else {
+ text += ProjectViewModel::tr("[loading %1%] ").arg(t->getProgress());
+ }
}
}
return text + doc->getName();
@@ -1212,7 +1216,11 @@ QVariant ProjectViewModel::getObjectDisplayData(GObject *obj, Document *parentDo
if (unloaded && parentDoc->getObjects().size() < ProjectUtils::MAX_OBJS_TO_SHOW_LOAD_PROGRESS) {
LoadUnloadedDocumentTask* t = LoadUnloadedDocumentTask::findActiveLoadingTask(parentDoc);
if (t != NULL) {
- text += ProjectViewModel::tr("[loading %1%]").arg(t->getProgress());
+ if (t->getProgress() == -1){
+ text += ProjectViewModel::tr("[loading] ");
+ } else {
+ text += ProjectViewModel::tr("[loading %1%] ").arg(t->getProgress());
+ }
}
}
diff --git a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
index a38b713..7a50e32 100644
--- a/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
+++ b/src/corelibs/U2Gui/src/util/project/ProjectViewModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
index f1a5798..5f835f7 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
index 40eb6e6..6473210 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/FeatureKeyFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
index 31c3c69..0792ac4 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
index 063bc8b..5ed3c2b 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaContentFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
index a819542..1c4d852 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
index 8ed1aed..66ffdd6 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/MsaSeqNameFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
index d721357..142c60c 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
index 29acc62..4a9a9f0 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/ObjectNameFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
index 21dc188..fc5637f 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
index 9729b80..4986398 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/SequenceAccFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
index 04989fd..1696e57 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
index 32b3d5c..34d7ec2 100644
--- a/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
+++ b/src/corelibs/U2Gui/src/util/project/filter_tasks/TextContentFilterTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
index 9f3e07c..5824f32 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@ CommonImportOptionsDialog::CommonImportOptionsDialog(const QString& baseFolder,
QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220660");
+ new HelpButton(this, buttonBox, "18223300");
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 7ed6e61..d5495ed 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/CommonImportOptionsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
index 6e53d1e..3a0fd9a 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -45,7 +45,7 @@ EditConnectionDialog::EditConnectionDialog(QWidget *parent, const QString &dbiUr
ui(new Ui_EditConnectionDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220658");
+ new HelpButton(this, ui->buttonBox, "18223298");
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 8b8e95e..e3db588 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/EditConnectionDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
index ba3522f..a626ca8 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
index 88500f6..edac9e4 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportOptionsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
index 4048b7e..d2ab632 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -61,7 +61,7 @@ ImportToDatabaseDialog::ImportToDatabaseDialog(Document *dbConnection, const QSt
baseFolder(U2DbiUtils::makeFolderCanonical(defaultFolder))
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220660");
+ new HelpButton(this, ui->buttonBox, "18223300");
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 4b86e27..2e05128 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ImportToDatabaseDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
index 8bb561e..3f18acb 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ ItemToImportEditDialog::ItemToImportEditDialog(const QString &item, const QStrin
ui(new Ui_ItemToImportEditDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220660");
+ new HelpButton(this, ui->buttonBox, "18223300");
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 f0de431..3d257bf 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/ItemToImportEditDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
index 3a82a76..cadbd07 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -84,7 +84,7 @@ SharedConnectionsDialog::SharedConnectionsDialog(QWidget *parent) :
ui(new Ui_SharedConnectionsDialog)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220658");
+ new HelpButton(this, ui->buttonBox, "18223298");
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), "18220658");
+ HelpButton(question.data(), question->button(QMessageBox::Help), "18223298");
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 065697b..0a0e539 100644
--- a/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h
+++ b/src/corelibs/U2Gui/src/util/shared_db/SharedConnectionsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Gui/transl/english.ts b/src/corelibs/U2Gui/transl/english.ts
index eaa76fb..592372f 100644
--- a/src/corelibs/U2Gui/transl/english.ts
+++ b/src/corelibs/U2Gui/transl/english.ts
@@ -1506,39 +1506,39 @@ The items cannot be recovered once deleted.</translation>
<context>
<name>U2::AceImportDialog</name>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="132"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="135"/>
<source>Destination UGENEDB file</source>
<translation>Destination UGENEDB file</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="66"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="68"/>
<source>Destination URL is not specified</source>
<translation>Destination URL is not specified</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="52"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="54"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="72"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="74"/>
<source>Destination URL must point to a local file</source>
<translation>Destination URL must point to a local file</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="80"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="82"/>
<source>There is opened view with destination file.
Close it or choose different file</source>
<translation>There is opened view with destination file.
Close it or choose different file</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="90"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="92"/>
<source>Destination directory '%1' is not writable, please choose different destination URL</source>
<translation>Destination directory '%1' is not writable, please choose different destination URL</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="98"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="100"/>
<source>Destination file already exists.
To overwrite the file, press 'Replace'.
To append data to existing file press 'Append'.</source>
@@ -1547,23 +1547,23 @@ To overwrite the file, press 'Replace'.
To append data to existing file press 'Append'.</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="101"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="103"/>
<source>Replace</source>
<translation>Replace</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="102"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="104"/>
<source>Append</source>
<translation>Append</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="53"/>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="103"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="55"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="105"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="107"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="109"/>
<source>Destination file '%1' cannot be removed</source>
<translation>Destination file '%1' cannot be removed</translation>
</message>
@@ -1687,13 +1687,18 @@ To append data to existing file press 'Append'.</translation>
<translation>Create</translation>
</message>
<message>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="70"/>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="75"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="64"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="71"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="76"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="75"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="76"/>
<source>Cannot create an annotation object. Please check settings</source>
<translation>Cannot create an annotation object. Please check settings</translation>
</message>
@@ -2841,23 +2846,37 @@ complement(5..15)</translation>
<context>
<name>U2::ProjectViewModel</name>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1108"/>
<source>[unloaded]</source>
- <translation>[unloaded]</translation>
+ <translation type="vanished">[unloaded]</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1110"/>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1215"/>
<source>[loading %1%]</source>
- <translation>[loading %1%]</translation>
+ <translation type="vanished">[loading %1%]</translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1108"/>
+ <source>[unloaded] </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1111"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1220"/>
+ <source>[loading] </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1113"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1222"/>
+ <source>[loading %1%] </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1142"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1146"/>
<source>Locks:</source>
<translation>Locks:</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1145"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1149"/>
<source>Project is locked</source>
<translation>Project is locked</translation>
</message>
@@ -3232,42 +3251,42 @@ check connection settings</translation>
<context>
<name>U2::ToolsMenu</name>
<message>
- <location filename="../src/ToolsMenu.cpp" line="107"/>
+ <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="117"/>
+ <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="144"/>
+ <location filename="../src/ToolsMenu.cpp" line="146"/>
<source>BLAST</source>
<translation>BLAST</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="158"/>
+ <location filename="../src/ToolsMenu.cpp" line="160"/>
<source>Multiple sequence alignment</source>
<translation>Multiple sequence alignment</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="170"/>
+ <location filename="../src/ToolsMenu.cpp" line="172"/>
<source>Cloning</source>
<translation>Cloning</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="178"/>
+ <location filename="../src/ToolsMenu.cpp" line="180"/>
<source>Primer</source>
<translation>Primer</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="184"/>
+ <location filename="../src/ToolsMenu.cpp" line="186"/>
<source>Search for TFBS</source>
<translation>Search for TFBS</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="193"/>
+ <location filename="../src/ToolsMenu.cpp" line="195"/>
<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 a840380..2151509 100644
--- a/src/corelibs/U2Gui/transl/russian.ts
+++ b/src/corelibs/U2Gui/transl/russian.ts
@@ -1506,39 +1506,39 @@ The items cannot be recovered once deleted.</source>
<context>
<name>U2::AceImportDialog</name>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="132"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="135"/>
<source>Destination UGENEDB file</source>
<translation>Место назначения UGENEDB файла</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="66"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="68"/>
<source>Destination URL is not specified</source>
<translation>Не указан путь места назначения</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="52"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="54"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="72"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="74"/>
<source>Destination URL must point to a local file</source>
<translation>Место назначения должно указывать на локальный файл</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="80"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="82"/>
<source>There is opened view with destination file.
Close it or choose different file</source>
<translation>Указанный файл используется.
Закройте его или выберите другой файл</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="90"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="92"/>
<source>Destination directory '%1' is not writable, please choose different destination URL</source>
<translation>Директория места назначения '%1' недоступна для записи, выберите другое место назначения</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="98"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="100"/>
<source>Destination file already exists.
To overwrite the file, press 'Replace'.
To append data to existing file press 'Append'.</source>
@@ -1547,23 +1547,23 @@ To append data to existing file press 'Append'.</source>
Для добавления данных в существующий файл нажмите 'Добавить'.</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="101"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="103"/>
<source>Replace</source>
<translation>Переписать</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="102"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="104"/>
<source>Append</source>
<translation>Добавить</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="53"/>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="103"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="55"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="105"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="107"/>
+ <location filename="../src/util/ImportDialogs/AceImportDialog.cpp" line="109"/>
<source>Destination file '%1' cannot be removed</source>
<translation>Файл '%1' не может быть удален</translation>
</message>
@@ -1687,13 +1687,18 @@ To append data to existing file press 'Append'.</source>
<translation>Создать</translation>
</message>
<message>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="70"/>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="75"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="64"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="71"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="76"/>
<source>Error</source>
<translation>Ошибка валидации</translation>
</message>
<message>
- <location filename="../src/util/CreateAnnotationDialog.cpp" line="75"/>
+ <location filename="../src/util/CreateAnnotationDialog.cpp" line="76"/>
<source>Cannot create an annotation object. Please check settings</source>
<translation>Невозможно создать аннотацию. Проверьте пожалуйста настройки</translation>
</message>
@@ -2840,23 +2845,37 @@ complement(5..15)</translation>
<context>
<name>U2::ProjectViewModel</name>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1108"/>
<source>[unloaded]</source>
- <translation>[выгружен]</translation>
+ <translation type="vanished">[выгружен]</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1110"/>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1215"/>
<source>[loading %1%]</source>
- <translation>[прочитано %1%]</translation>
+ <translation type="vanished">[прочитано %1%]</translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1108"/>
+ <source>[unloaded] </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1111"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1220"/>
+ <source>[loading] </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1113"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1222"/>
+ <source>[loading %1%] </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1142"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1146"/>
<source>Locks:</source>
<translation>Блокировки:</translation>
</message>
<message>
- <location filename="../src/util/project/ProjectViewModel.cpp" line="1145"/>
+ <location filename="../src/util/project/ProjectViewModel.cpp" line="1149"/>
<source>Project is locked</source>
<translation>Проект заблокирован</translation>
</message>
@@ -3230,42 +3249,42 @@ check connection settings</translation>
<context>
<name>U2::ToolsMenu</name>
<message>
- <location filename="../src/ToolsMenu.cpp" line="107"/>
+ <location filename="../src/ToolsMenu.cpp" line="108"/>
<source>Sanger data analysis</source>
<translation>Анализ данных секвенирования по Сэнгеру</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="117"/>
+ <location filename="../src/ToolsMenu.cpp" line="118"/>
<source>NGS data analysis</source>
<translation>Анализ данных NGS</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="144"/>
+ <location filename="../src/ToolsMenu.cpp" line="146"/>
<source>BLAST</source>
<translation>BLAST</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="158"/>
+ <location filename="../src/ToolsMenu.cpp" line="160"/>
<source>Multiple sequence alignment</source>
<translation>Множественное выравнивание</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="170"/>
+ <location filename="../src/ToolsMenu.cpp" line="172"/>
<source>Cloning</source>
<translation>Клонирование</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="178"/>
+ <location filename="../src/ToolsMenu.cpp" line="180"/>
<source>Primer</source>
<translation>Олигонуклеотиды</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="184"/>
+ <location filename="../src/ToolsMenu.cpp" line="186"/>
<source>Search for TFBS</source>
<translation>Поиск сайтов связывания транскрипционных факторов (TFBS)</translation>
</message>
<message>
- <location filename="../src/ToolsMenu.cpp" line="193"/>
+ <location filename="../src/ToolsMenu.cpp" line="195"/>
<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 15c9079..c112231 100644
--- a/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseActorCategories.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseActorCategories.h b/src/corelibs/U2Lang/src/library/BaseActorCategories.h
index e6fbc79..1964b35 100644
--- a/src/corelibs/U2Lang/src/library/BaseActorCategories.h
+++ b/src/corelibs/U2Lang/src/library/BaseActorCategories.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseAttributes.cpp b/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
index 76738fe..e17bacc 100644
--- a/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseAttributes.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseAttributes.h b/src/corelibs/U2Lang/src/library/BaseAttributes.h
index ef41e56..4fa60c8 100644
--- a/src/corelibs/U2Lang/src/library/BaseAttributes.h
+++ b/src/corelibs/U2Lang/src/library/BaseAttributes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
index 0c1a983..da6b8ac 100644
--- a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseDatasetWorker.h b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
index 676d77f..173f836 100644
--- a/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseDatasetWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
index 7303a15..3ed8c01 100644
--- a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseOneOneWorker.h b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
index 939c153..6a03cdc 100644
--- a/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseOneOneWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BasePorts.cpp b/src/corelibs/U2Lang/src/library/BasePorts.cpp
index 61c7519..9a6cf08 100644
--- a/src/corelibs/U2Lang/src/library/BasePorts.cpp
+++ b/src/corelibs/U2Lang/src/library/BasePorts.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BasePorts.h b/src/corelibs/U2Lang/src/library/BasePorts.h
index fa77e3f..c6cc92c 100644
--- a/src/corelibs/U2Lang/src/library/BasePorts.h
+++ b/src/corelibs/U2Lang/src/library/BasePorts.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseSlots.cpp b/src/corelibs/U2Lang/src/library/BaseSlots.cpp
index 6ce7e91..a32c950 100644
--- a/src/corelibs/U2Lang/src/library/BaseSlots.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseSlots.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseSlots.h b/src/corelibs/U2Lang/src/library/BaseSlots.h
index b4fdd4a..6713d64 100644
--- a/src/corelibs/U2Lang/src/library/BaseSlots.h
+++ b/src/corelibs/U2Lang/src/library/BaseSlots.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseThroughWorker.cpp b/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
index 8ac47f2..1abc92b 100644
--- a/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseThroughWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseThroughWorker.h b/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
index 38ff436..1bcab73 100644
--- a/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
+++ b/src/corelibs/U2Lang/src/library/BaseThroughWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseTypes.cpp b/src/corelibs/U2Lang/src/library/BaseTypes.cpp
index 3c38b88..1815cbf 100644
--- a/src/corelibs/U2Lang/src/library/BaseTypes.cpp
+++ b/src/corelibs/U2Lang/src/library/BaseTypes.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/BaseTypes.h b/src/corelibs/U2Lang/src/library/BaseTypes.h
index e031377..b880754 100644
--- a/src/corelibs/U2Lang/src/library/BaseTypes.h
+++ b/src/corelibs/U2Lang/src/library/BaseTypes.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/LastReadyScheduler.cpp b/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
index 89afbfe..bd90700 100644
--- a/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
+++ b/src/corelibs/U2Lang/src/library/LastReadyScheduler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/LastReadyScheduler.h b/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
index eeea506..8da5413 100644
--- a/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
+++ b/src/corelibs/U2Lang/src/library/LastReadyScheduler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/LocalDomain.cpp b/src/corelibs/U2Lang/src/library/LocalDomain.cpp
index f482646..0126483 100644
--- a/src/corelibs/U2Lang/src/library/LocalDomain.cpp
+++ b/src/corelibs/U2Lang/src/library/LocalDomain.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/LocalDomain.h b/src/corelibs/U2Lang/src/library/LocalDomain.h
index 357c12d..bd9bc2a 100644
--- a/src/corelibs/U2Lang/src/library/LocalDomain.h
+++ b/src/corelibs/U2Lang/src/library/LocalDomain.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ActorContext.cpp b/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
index 7ef0fd6..6f45205 100644
--- a/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ActorContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ActorContext.h b/src/corelibs/U2Lang/src/library/script/ActorContext.h
index ff4f385..463c3dc 100644
--- a/src/corelibs/U2Lang/src/library/script/ActorContext.h
+++ b/src/corelibs/U2Lang/src/library/script/ActorContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
index 669b080..fd46df1 100644
--- a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
+++ b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/DbiClassPrototype.h b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
index 531467a..f0c9f91 100644
--- a/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
+++ b/src/corelibs/U2Lang/src/library/script/DbiClassPrototype.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
index ac794b4..f7d5517 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
index d432514..5b8ac96 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
+++ b/src/corelibs/U2Lang/src/library/script/ScriptEngineUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
index 385d9d9..30bf3b7 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
+++ b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/ScriptLibrary.h b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
index 19f6fc0..eacfae7 100644
--- a/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
+++ b/src/corelibs/U2Lang/src/library/script/ScriptLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/SequencePrototype.cpp b/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
index 2b3a357..12f8440 100644
--- a/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
+++ b/src/corelibs/U2Lang/src/library/script/SequencePrototype.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/library/script/SequencePrototype.h b/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
index e0ab8e7..b79e322 100644
--- a/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
+++ b/src/corelibs/U2Lang/src/library/script/SequencePrototype.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
index 66e0522..ff4b7b9 100644
--- a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
index 5464f3a..a75022a 100644
--- a/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
+++ b/src/corelibs/U2Lang/src/model/ActorPrototypeRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Aliasing.cpp b/src/corelibs/U2Lang/src/model/Aliasing.cpp
index b6bce80..9b17d86 100644
--- a/src/corelibs/U2Lang/src/model/Aliasing.cpp
+++ b/src/corelibs/U2Lang/src/model/Aliasing.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Aliasing.h b/src/corelibs/U2Lang/src/model/Aliasing.h
index 2630368..68ea60f 100644
--- a/src/corelibs/U2Lang/src/model/Aliasing.h
+++ b/src/corelibs/U2Lang/src/model/Aliasing.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Attribute.cpp b/src/corelibs/U2Lang/src/model/Attribute.cpp
index 2eda7ea..1e90451 100644
--- a/src/corelibs/U2Lang/src/model/Attribute.cpp
+++ b/src/corelibs/U2Lang/src/model/Attribute.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Attribute.h b/src/corelibs/U2Lang/src/model/Attribute.h
index 7ee6d8f..df55a69 100644
--- a/src/corelibs/U2Lang/src/model/Attribute.h
+++ b/src/corelibs/U2Lang/src/model/Attribute.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/AttributeRelation.cpp b/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
index 8864515..6179438 100644
--- a/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
+++ b/src/corelibs/U2Lang/src/model/AttributeRelation.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/AttributeRelation.h b/src/corelibs/U2Lang/src/model/AttributeRelation.h
index 7901357..7fe9f82 100644
--- a/src/corelibs/U2Lang/src/model/AttributeRelation.h
+++ b/src/corelibs/U2Lang/src/model/AttributeRelation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Configuration.cpp b/src/corelibs/U2Lang/src/model/Configuration.cpp
index 4c3200e..5fcf590 100644
--- a/src/corelibs/U2Lang/src/model/Configuration.cpp
+++ b/src/corelibs/U2Lang/src/model/Configuration.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Configuration.h b/src/corelibs/U2Lang/src/model/Configuration.h
index 9544bf7..c3f0c09 100644
--- a/src/corelibs/U2Lang/src/model/Configuration.h
+++ b/src/corelibs/U2Lang/src/model/Configuration.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ConfigurationEditor.cpp b/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
index 865b3e7..6b56c38 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
+++ b/src/corelibs/U2Lang/src/model/ConfigurationEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ConfigurationEditor.h b/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
index 33ad851..4195f62 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
+++ b/src/corelibs/U2Lang/src/model/ConfigurationEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ConfigurationValidator.h b/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
index 86bc616..404603c 100644
--- a/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
+++ b/src/corelibs/U2Lang/src/model/ConfigurationValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Datatype.cpp b/src/corelibs/U2Lang/src/model/Datatype.cpp
index d3fee2a..ca35177 100644
--- a/src/corelibs/U2Lang/src/model/Datatype.cpp
+++ b/src/corelibs/U2Lang/src/model/Datatype.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Datatype.h b/src/corelibs/U2Lang/src/model/Datatype.h
index 938f416..4531b89 100644
--- a/src/corelibs/U2Lang/src/model/Datatype.h
+++ b/src/corelibs/U2Lang/src/model/Datatype.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/DbiDataHandler.cpp b/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
index fed2608..563d315 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
+++ b/src/corelibs/U2Lang/src/model/DbiDataHandler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/DbiDataHandler.h b/src/corelibs/U2Lang/src/model/DbiDataHandler.h
index 0d05816..8d2df7a 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataHandler.h
+++ b/src/corelibs/U2Lang/src/model/DbiDataHandler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/DbiDataStorage.cpp b/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
index c95ae75..e84415b 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
+++ b/src/corelibs/U2Lang/src/model/DbiDataStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -168,10 +168,10 @@ SharedDbiDataHandler DbiDataStorage::putAlignment(const MAlignment &al) {
return handler;
}
-SharedDbiDataHandler DbiDataStorage::putAnnotationTable(const QList<SharedAnnotationData> &anns) {
+SharedDbiDataHandler DbiDataStorage::putAnnotationTable(const QList<SharedAnnotationData> &anns, const QString annTableName) {
SAFE_POINT(NULL != dbiHandle, "Invalid DBI handle!", SharedDbiDataHandler());
- AnnotationTableObject obj("Annotations", dbiHandle->getDbiRef());
+ AnnotationTableObject obj(annTableName, dbiHandle->getDbiRef());
U2OpStatusImpl os;
obj.addAnnotations(anns);
SAFE_POINT_OP(os, SharedDbiDataHandler());
diff --git a/src/corelibs/U2Lang/src/model/DbiDataStorage.h b/src/corelibs/U2Lang/src/model/DbiDataStorage.h
index 3562deb..e8de633 100644
--- a/src/corelibs/U2Lang/src/model/DbiDataStorage.h
+++ b/src/corelibs/U2Lang/src/model/DbiDataStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -50,7 +50,7 @@ public:
virtual U2Object *getObject(const SharedDbiDataHandler &handler, const U2DataType &type);
virtual SharedDbiDataHandler putSequence(const DNASequence &sequence);
virtual SharedDbiDataHandler putAlignment(const MAlignment &al);
- virtual SharedDbiDataHandler putAnnotationTable(const QList<SharedAnnotationData> &anns);
+ virtual SharedDbiDataHandler putAnnotationTable(const QList<SharedAnnotationData> &anns, const QString annTableName = "Annotations");
virtual SharedDbiDataHandler putAnnotationTable(AnnotationTableObject *annTable);
// returns QVariant with QVariantList inside, which have SharedDbiDataHandler in each QVariant
diff --git a/src/corelibs/U2Lang/src/model/Descriptor.cpp b/src/corelibs/U2Lang/src/model/Descriptor.cpp
index a837b93..0782b08 100644
--- a/src/corelibs/U2Lang/src/model/Descriptor.cpp
+++ b/src/corelibs/U2Lang/src/model/Descriptor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Descriptor.h b/src/corelibs/U2Lang/src/model/Descriptor.h
index 30a53d4..b64e540 100644
--- a/src/corelibs/U2Lang/src/model/Descriptor.h
+++ b/src/corelibs/U2Lang/src/model/Descriptor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ExternalToolCfg.cpp b/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
index aacf93f..6b78b17 100644
--- a/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
+++ b/src/corelibs/U2Lang/src/model/ExternalToolCfg.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ExternalToolCfg.h b/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
index 89a9b00..4d355bd 100644
--- a/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
+++ b/src/corelibs/U2Lang/src/model/ExternalToolCfg.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/GrouperOutSlot.cpp b/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
index b7073a6..596bfad 100644
--- a/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
+++ b/src/corelibs/U2Lang/src/model/GrouperOutSlot.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/GrouperOutSlot.h b/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
index 0a20a4a..5a21e6d 100644
--- a/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
+++ b/src/corelibs/U2Lang/src/model/GrouperOutSlot.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
index d9f9c21..1c6b6b8 100644
--- a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/GrouperSlotAttribute.h b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
index 682770b..3fc0876 100644
--- a/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
+++ b/src/corelibs/U2Lang/src/model/GrouperSlotAttribute.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
index 10b7f99..aac7d52 100644
--- a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
+++ b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IncludedProtoFactory.h b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
index 933e6c1..c0712ad 100644
--- a/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
+++ b/src/corelibs/U2Lang/src/model/IncludedProtoFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBus.cpp b/src/corelibs/U2Lang/src/model/IntegralBus.cpp
index e41b7f6..1c7d61f 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBus.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBus.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBus.h b/src/corelibs/U2Lang/src/model/IntegralBus.h
index 9741929..417db71 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBus.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBus.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBusModel.cpp b/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
index cdfc9c7..89bd5ea 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBusModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBusModel.h b/src/corelibs/U2Lang/src/model/IntegralBusModel.h
index ad58280..25d5f6f 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusModel.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBusModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBusType.cpp b/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
index 7044cf1..e59340a 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
+++ b/src/corelibs/U2Lang/src/model/IntegralBusType.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/IntegralBusType.h b/src/corelibs/U2Lang/src/model/IntegralBusType.h
index 48db3e1..c792f21 100644
--- a/src/corelibs/U2Lang/src/model/IntegralBusType.h
+++ b/src/corelibs/U2Lang/src/model/IntegralBusType.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Marker.cpp b/src/corelibs/U2Lang/src/model/Marker.cpp
index fba7b8c..f9d0c5d 100644
--- a/src/corelibs/U2Lang/src/model/Marker.cpp
+++ b/src/corelibs/U2Lang/src/model/Marker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Marker.h b/src/corelibs/U2Lang/src/model/Marker.h
index 2bddf71..ae38b4a 100644
--- a/src/corelibs/U2Lang/src/model/Marker.h
+++ b/src/corelibs/U2Lang/src/model/Marker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/MarkerAttribute.cpp b/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
index 8e63db1..6e5845f 100644
--- a/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/MarkerAttribute.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/MarkerAttribute.h b/src/corelibs/U2Lang/src/model/MarkerAttribute.h
index 443a3fb..e5fcbc2 100644
--- a/src/corelibs/U2Lang/src/model/MarkerAttribute.h
+++ b/src/corelibs/U2Lang/src/model/MarkerAttribute.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/MessageMetadata.cpp b/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
index 71e2d19..7e115b7 100644
--- a/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
+++ b/src/corelibs/U2Lang/src/model/MessageMetadata.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/MessageMetadata.h b/src/corelibs/U2Lang/src/model/MessageMetadata.h
index bd46b4a..0017980 100644
--- a/src/corelibs/U2Lang/src/model/MessageMetadata.h
+++ b/src/corelibs/U2Lang/src/model/MessageMetadata.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Peer.h b/src/corelibs/U2Lang/src/model/Peer.h
index 5dc7dfa..3834bb5 100644
--- a/src/corelibs/U2Lang/src/model/Peer.h
+++ b/src/corelibs/U2Lang/src/model/Peer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Port.cpp b/src/corelibs/U2Lang/src/model/Port.cpp
index bcb34b2..8de0099 100644
--- a/src/corelibs/U2Lang/src/model/Port.cpp
+++ b/src/corelibs/U2Lang/src/model/Port.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Port.h b/src/corelibs/U2Lang/src/model/Port.h
index b992355..527b6ed 100644
--- a/src/corelibs/U2Lang/src/model/Port.h
+++ b/src/corelibs/U2Lang/src/model/Port.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/PortRelation.h b/src/corelibs/U2Lang/src/model/PortRelation.h
index b942126..345d1b4 100644
--- a/src/corelibs/U2Lang/src/model/PortRelation.h
+++ b/src/corelibs/U2Lang/src/model/PortRelation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QDConstraint.cpp b/src/corelibs/U2Lang/src/model/QDConstraint.cpp
index 2293122..faaad31 100644
--- a/src/corelibs/U2Lang/src/model/QDConstraint.cpp
+++ b/src/corelibs/U2Lang/src/model/QDConstraint.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QDConstraint.h b/src/corelibs/U2Lang/src/model/QDConstraint.h
index 4775737..75ef747 100644
--- a/src/corelibs/U2Lang/src/model/QDConstraint.h
+++ b/src/corelibs/U2Lang/src/model/QDConstraint.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QDScheme.cpp b/src/corelibs/U2Lang/src/model/QDScheme.cpp
index f45550a..df0daa6 100644
--- a/src/corelibs/U2Lang/src/model/QDScheme.cpp
+++ b/src/corelibs/U2Lang/src/model/QDScheme.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QDScheme.h b/src/corelibs/U2Lang/src/model/QDScheme.h
index b217207..02869f2 100644
--- a/src/corelibs/U2Lang/src/model/QDScheme.h
+++ b/src/corelibs/U2Lang/src/model/QDScheme.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
index 361afb2..dc94765 100644
--- a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/QueryDesignerRegistry.h b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
index 9cb7fcb..8cbb4ba 100644
--- a/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
+++ b/src/corelibs/U2Lang/src/model/QueryDesignerRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
index 1d90db5..8fd0779 100644
--- a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
+++ b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
index 5597439..56c4861 100644
--- a/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
+++ b/src/corelibs/U2Lang/src/model/ReadDbObjActorPrototype.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/RunFileSystem.cpp b/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
index d13bcf3..69b9639 100644
--- a/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
+++ b/src/corelibs/U2Lang/src/model/RunFileSystem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/RunFileSystem.h b/src/corelibs/U2Lang/src/model/RunFileSystem.h
index ff29cf8..0e2b0d7 100644
--- a/src/corelibs/U2Lang/src/model/RunFileSystem.h
+++ b/src/corelibs/U2Lang/src/model/RunFileSystem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Schema.cpp b/src/corelibs/U2Lang/src/model/Schema.cpp
index fd6443a..47ad81e 100644
--- a/src/corelibs/U2Lang/src/model/Schema.cpp
+++ b/src/corelibs/U2Lang/src/model/Schema.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/Schema.h b/src/corelibs/U2Lang/src/model/Schema.h
index 071b1e7..08a8c53 100644
--- a/src/corelibs/U2Lang/src/model/Schema.h
+++ b/src/corelibs/U2Lang/src/model/Schema.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
index 55cec67..062b1a6 100644
--- a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
+++ b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/SchemaActorsRegistry.h b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
index cd081d7..3b92a0c 100644
--- a/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
+++ b/src/corelibs/U2Lang/src/model/SchemaActorsRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/SchemaConfig.h b/src/corelibs/U2Lang/src/model/SchemaConfig.h
index b2498c8..72ef8a3 100644
--- a/src/corelibs/U2Lang/src/model/SchemaConfig.h
+++ b/src/corelibs/U2Lang/src/model/SchemaConfig.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowContext.cpp b/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
index d036dca..ce93854 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowContext.h b/src/corelibs/U2Lang/src/model/WorkflowContext.h
index 3f23639..9dd142c 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowContext.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowEnv.cpp b/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
index 1248c4d..dc103bb 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowEnv.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowEnv.h b/src/corelibs/U2Lang/src/model/WorkflowEnv.h
index cc98797..7637c03 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowEnv.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowEnv.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowManager.h b/src/corelibs/U2Lang/src/model/WorkflowManager.h
index f366f92..7725aa6 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowManager.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
index dbd37fc..fde92df 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowScriptEngine.h b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
index cbbbe1e..c15b491 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowScriptEngine.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowTransport.cpp b/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
index 7452d9c..9b4a12a 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
+++ b/src/corelibs/U2Lang/src/model/WorkflowTransport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/WorkflowTransport.h b/src/corelibs/U2Lang/src/model/WorkflowTransport.h
index 0bd229d..d79a16e 100644
--- a/src/corelibs/U2Lang/src/model/WorkflowTransport.h
+++ b/src/corelibs/U2Lang/src/model/WorkflowTransport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/Actor.cpp b/src/corelibs/U2Lang/src/model/actor/Actor.cpp
index 2708814..d603e3f 100644
--- a/src/corelibs/U2Lang/src/model/actor/Actor.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/Actor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/Actor.h b/src/corelibs/U2Lang/src/model/actor/Actor.h
index 14c5bb5..80b79a2 100644
--- a/src/corelibs/U2Lang/src/model/actor/Actor.h
+++ b/src/corelibs/U2Lang/src/model/actor/Actor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
index 94bae65..1bffb55 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
index 9ccdb71..114281c 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorConfigurationEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorDocument.h b/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
index 4df0538..f8f7c90 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
index 9e2b0ba..e5d359e 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorPrototype.h b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
index 98347ce..5a0f278 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorPrototype.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
index 619b95c..72748f9 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
index 115b788..9a182c7 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorScriptValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorValidator.cpp b/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
index ccb3cfb..d872667 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
+++ b/src/corelibs/U2Lang/src/model/actor/ActorValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/actor/ActorValidator.h b/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
index 48334fc..41b156b 100644
--- a/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
+++ b/src/corelibs/U2Lang/src/model/actor/ActorValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
index d88743d..f2ec93a 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/Dataset.h b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
index 4da6dbe..4fdbc2a 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/Dataset.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
index ba43337..f0e3d63 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
index 77c0814..06d85f9 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/DbFolderScanner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
index 7216980..87e685c 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
index a4bf947..53f31e9 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/SharedDbUrlUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
index 798314a..67b8478 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
index cf34a31..147d7a8 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLAttribute.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
index f5c72ca..6d12b71 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/url_attribute/URLContainer.h b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
index 34cc9a9..51c3ba2 100644
--- a/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
+++ b/src/corelibs/U2Lang/src/model/url_attribute/URLContainer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
index 008a216..73bf4c1 100644
--- a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
index 0ab5c3e..44779ca 100644
--- a/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
+++ b/src/corelibs/U2Lang/src/model/wizard/ElementSelectorWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/IdMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
index 637d1d9..9d28d3e 100644
--- a/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/IdMapping.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/IdMapping.h b/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
index c6b9352..af94ef0 100644
--- a/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/IdMapping.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/PortMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
index 49341a5..87c2f02 100644
--- a/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/PortMapping.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/PortMapping.h b/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
index 25d7108..a1f8670 100644
--- a/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/PortMapping.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
index 6e49bed..8f5a9d8 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/SelectorValue.h b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
index 03f593d..a79f41d 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
+++ b/src/corelibs/U2Lang/src/model/wizard/SelectorValue.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
index fc90d3a..667448b 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/SlotMapping.h b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
index 1760900..0f89f86 100644
--- a/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
+++ b/src/corelibs/U2Lang/src/model/wizard/SlotMapping.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/Variable.cpp b/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
index a55a19f..eb09d61 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/Variable.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/Variable.h b/src/corelibs/U2Lang/src/model/wizard/Variable.h
index e667745..e6d2aed 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Variable.h
+++ b/src/corelibs/U2Lang/src/model/wizard/Variable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/Wizard.cpp b/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
index f06e240..b786e31 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/Wizard.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/Wizard.h b/src/corelibs/U2Lang/src/model/wizard/Wizard.h
index 979f1e1..8851bce 100644
--- a/src/corelibs/U2Lang/src/model/wizard/Wizard.h
+++ b/src/corelibs/U2Lang/src/model/wizard/Wizard.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/WizardPage.cpp b/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
index 70cea60..3a07af8 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardPage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/WizardPage.h b/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
index 5e915db..05d0887 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardPage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
index 08e73ef..1ad1640 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/WizardWidget.h b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
index 5e4c106..af2e0b9 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h b/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
index d4ca8c5..d0c1dc2 100644
--- a/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
+++ b/src/corelibs/U2Lang/src/model/wizard/WizardWidgetVisitor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/run/WorkflowMonitor.cpp b/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
index bde97c4..f217c40 100644
--- a/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
+++ b/src/corelibs/U2Lang/src/run/WorkflowMonitor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/run/WorkflowMonitor.h b/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
index 73b384f..a684d5c 100644
--- a/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
+++ b/src/corelibs/U2Lang/src/run/WorkflowMonitor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/AttributeInfo.cpp b/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
index ad68d1a..156e8de 100644
--- a/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
+++ b/src/corelibs/U2Lang/src/support/AttributeInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/AttributeInfo.h b/src/corelibs/U2Lang/src/support/AttributeInfo.h
index aa094b6..1a4cf9d 100644
--- a/src/corelibs/U2Lang/src/support/AttributeInfo.h
+++ b/src/corelibs/U2Lang/src/support/AttributeInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
index e2c4aef..592990d 100644
--- a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
index 60e389c..0285a69 100644
--- a/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BaseBreakpointHitCounter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BaseNGSWorker.cpp b/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
index 3d24e99..81d2be6 100644
--- a/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
+++ b/src/corelibs/U2Lang/src/support/BaseNGSWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BaseNGSWorker.h b/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
index f8312f0..0b42fe4 100644
--- a/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
+++ b/src/corelibs/U2Lang/src/support/BaseNGSWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
index 68e6a2e..e5c4e7e 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointConditionChecker.h b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
index d8156df..9f6cc8b 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointConditionChecker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
index e3aa999..92071f1 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
index 7ae0cfa..4f06f67 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointEqualHitCounter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
index 38541d6..99f30ba 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
index a255ee1..35490f1 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointGreaterOrEqualHitCounter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
index fed8f0a..f700751 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
+++ b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
index afe69b5..2fcbc3d 100644
--- a/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
+++ b/src/corelibs/U2Lang/src/support/BreakpointMultipleHitCounter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/CoreLibConstants.cpp b/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
index 399c71f..fc9bb48 100644
--- a/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
+++ b/src/corelibs/U2Lang/src/support/CoreLibConstants.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/CoreLibConstants.h b/src/corelibs/U2Lang/src/support/CoreLibConstants.h
index ae91944..d3d389c 100644
--- a/src/corelibs/U2Lang/src/support/CoreLibConstants.h
+++ b/src/corelibs/U2Lang/src/support/CoreLibConstants.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/DatasetFetcher.cpp b/src/corelibs/U2Lang/src/support/DatasetFetcher.cpp
index cce014c..fd57426 100644
--- a/src/corelibs/U2Lang/src/support/DatasetFetcher.cpp
+++ b/src/corelibs/U2Lang/src/support/DatasetFetcher.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/DatasetFetcher.h b/src/corelibs/U2Lang/src/support/DatasetFetcher.h
index c44af00..69ef929 100644
--- a/src/corelibs/U2Lang/src/support/DatasetFetcher.h
+++ b/src/corelibs/U2Lang/src/support/DatasetFetcher.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
index a827bfb..17f25b9 100644
--- a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
+++ b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
index b0fc718..60f9d17 100644
--- a/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
+++ b/src/corelibs/U2Lang/src/support/ElapsedTimeUpdater.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/IntegralBusUtils.cpp b/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
index ca205c2..4ad0244 100644
--- a/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/IntegralBusUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/IntegralBusUtils.h b/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
index 967fa79..f5fe41e 100644
--- a/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
+++ b/src/corelibs/U2Lang/src/support/IntegralBusUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
index abe6059..a6cced7 100644
--- a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
+++ b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/MapDatatypeEditor.h b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
index 021b4db..e0bf714 100644
--- a/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
+++ b/src/corelibs/U2Lang/src/support/MapDatatypeEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/MarkerUtils.cpp b/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
index 8e282dd..8a4745d 100644
--- a/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/MarkerUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/MarkerUtils.h b/src/corelibs/U2Lang/src/support/MarkerUtils.h
index c023189..5e549cb 100644
--- a/src/corelibs/U2Lang/src/support/MarkerUtils.h
+++ b/src/corelibs/U2Lang/src/support/MarkerUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
index d3fc0be..06e006f 100644
--- a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
+++ b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/NoFailTaskWrapper.h b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
index a4c8f8e..ded7fb5 100644
--- a/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
+++ b/src/corelibs/U2Lang/src/support/NoFailTaskWrapper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SchemaSerializer.cpp b/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
index 5f526e3..28cb543 100644
--- a/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/SchemaSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SchemaSerializer.h b/src/corelibs/U2Lang/src/support/SchemaSerializer.h
index fb9874e..305c0c3 100644
--- a/src/corelibs/U2Lang/src/support/SchemaSerializer.h
+++ b/src/corelibs/U2Lang/src/support/SchemaSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
index 7e88e59..b8bc454 100644
--- a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
index 0a742ab..ff08a01 100644
--- a/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
+++ b/src/corelibs/U2Lang/src/support/ScriptWorkerSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
index 2a11b88..c449135 100644
--- a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
+++ b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SimpleWorkflowTask.h b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
index 206d263..339a509 100644
--- a/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
+++ b/src/corelibs/U2Lang/src/support/SimpleWorkflowTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SupportClass.cpp b/src/corelibs/U2Lang/src/support/SupportClass.cpp
index f08665c..7c19a5e 100644
--- a/src/corelibs/U2Lang/src/support/SupportClass.cpp
+++ b/src/corelibs/U2Lang/src/support/SupportClass.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SupportClass.h b/src/corelibs/U2Lang/src/support/SupportClass.h
index 2498f1e..bf1f89a 100644
--- a/src/corelibs/U2Lang/src/support/SupportClass.h
+++ b/src/corelibs/U2Lang/src/support/SupportClass.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SupportStructures.cpp b/src/corelibs/U2Lang/src/support/SupportStructures.cpp
index b59ad83..eaf84c2 100644
--- a/src/corelibs/U2Lang/src/support/SupportStructures.cpp
+++ b/src/corelibs/U2Lang/src/support/SupportStructures.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/SupportStructures.h b/src/corelibs/U2Lang/src/support/SupportStructures.h
index cf486b7..6a73a48 100644
--- a/src/corelibs/U2Lang/src/support/SupportStructures.h
+++ b/src/corelibs/U2Lang/src/support/SupportStructures.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
index 0697316..40c83ef 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowBreakpoint.h b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
index 451093f..859e0c1 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpoint.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
index c432303..cd30fa6 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
index a4f90f9..63249e0 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowBreakpointSharedInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
index c3d17f2..3f49499 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
index 74b22c8..f7a0bc4 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugMessageParser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
index 1c52d87..049fb34 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowDebugStatus.h b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
index c4695ea..1cc64bd 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowDebugStatus.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
index eb95038..ce6b96d 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowEnvImpl.h b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
index da3cc30..7ceda04 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowEnvImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
index 87db258..b5c65da 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowIOTasks.h b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
index 9548f7a..b5b4269 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowIOTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowInvestigationData.h b/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
index 0598d37..1f36a51 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowInvestigationData.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowRunTask.cpp b/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
index 0fbd079..02b1040 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowRunTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowRunTask.h b/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
index e5432e2..20ce173 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowRunTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowSettings.cpp b/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
index 8adab38..8053558 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowSettings.h b/src/corelibs/U2Lang/src/support/WorkflowSettings.h
index 94e0f45..47fc791 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowSettings.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowUtils.cpp b/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
index deba825..0b3b347 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
+++ b/src/corelibs/U2Lang/src/support/WorkflowUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/WorkflowUtils.h b/src/corelibs/U2Lang/src/support/WorkflowUtils.h
index d63f867..2af9d41 100644
--- a/src/corelibs/U2Lang/src/support/WorkflowUtils.h
+++ b/src/corelibs/U2Lang/src/support/WorkflowUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
index 7846204..da3104f 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/ScriptContext.h b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
index 913ed33..34257f0 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
index 13916b1..6024f6e 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
index e4cff93..9399c48 100644
--- a/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
+++ b/src/corelibs/U2Lang/src/support/external_script/ScriptableScheduler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
index b52ba47..43f2aed 100644
--- a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
+++ b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
index 1f82b7f..a85b358 100644
--- a/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
+++ b/src/corelibs/U2Lang/src/support/external_script/WorkflowRunSerializedSchemeTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Constants.cpp b/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
index 257f043..37854a9 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Constants.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Constants.h b/src/corelibs/U2Lang/src/support/serialize/Constants.h
index a5b6084..07bf802 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Constants.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Constants.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
index bfbc8ed..033d4b5 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
index cc40ffa..b7343b8 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRSchemaSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
index 0a02931..ceedf47 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
index f15a836..b203299 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRVisualSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
index ae1c156..fd14d44 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
index 3db868c..7b58467 100644
--- a/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/HRWizardSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/OldUWL.cpp b/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
index 997b6a5..5894904 100644
--- a/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/OldUWL.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/OldUWL.h b/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
index adaae42..a87c53a 100644
--- a/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
+++ b/src/corelibs/U2Lang/src/support/serialize/OldUWL.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
index cde2f42..5b5456d 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Tokenizer.h b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
index 62dfa32..bec1de9 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Tokenizer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Utils.cpp b/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
index d016c71..fd97c26 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
+++ b/src/corelibs/U2Lang/src/support/serialize/Utils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/support/serialize/Utils.h b/src/corelibs/U2Lang/src/support/serialize/Utils.h
index 0294347..e2407da 100644
--- a/src/corelibs/U2Lang/src/support/serialize/Utils.h
+++ b/src/corelibs/U2Lang/src/support/serialize/Utils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
index a8bfc84..d5da004 100644
--- a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
+++ b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
index ff2a044..d94995e 100644
--- a/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
+++ b/src/corelibs/U2Lang/src/tasks/ReadDocumentTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
index a5c18cf..151ec88 100644
--- a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
+++ b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
index 26219fa..6c454e0 100644
--- a/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
+++ b/src/corelibs/U2Lang/src/tasks/SchemaEstimationTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
index 4954cd5..80aa608 100644
--- a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
+++ b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
index b14625d..737b1cb 100644
--- a/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
+++ b/src/corelibs/U2Lang/src/tasks/WorkflowTasksRegistry.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/AppContextImpl.cpp b/src/corelibs/U2Private/src/AppContextImpl.cpp
index 5a28d6c..c81f1ec 100644
--- a/src/corelibs/U2Private/src/AppContextImpl.cpp
+++ b/src/corelibs/U2Private/src/AppContextImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/AppContextImpl.h b/src/corelibs/U2Private/src/AppContextImpl.h
index b2ba5af..5f7e0bf 100644
--- a/src/corelibs/U2Private/src/AppContextImpl.h
+++ b/src/corelibs/U2Private/src/AppContextImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/AppSettingsImpl.cpp b/src/corelibs/U2Private/src/AppSettingsImpl.cpp
index 2c5335c..f672be8 100644
--- a/src/corelibs/U2Private/src/AppSettingsImpl.cpp
+++ b/src/corelibs/U2Private/src/AppSettingsImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/AppSettingsImpl.h b/src/corelibs/U2Private/src/AppSettingsImpl.h
index 92a248d..931492a 100644
--- a/src/corelibs/U2Private/src/AppSettingsImpl.h
+++ b/src/corelibs/U2Private/src/AppSettingsImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/ConsoleLogDriver.cpp b/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
index cb86b54..83764d7 100644
--- a/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
+++ b/src/corelibs/U2Private/src/ConsoleLogDriver.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/ConsoleLogDriver.h b/src/corelibs/U2Private/src/ConsoleLogDriver.h
index 1a4a19c..82f29b3 100644
--- a/src/corelibs/U2Private/src/ConsoleLogDriver.h
+++ b/src/corelibs/U2Private/src/ConsoleLogDriver.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/CredentialsAskerCli.cpp b/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
index 38714f7..5cbf266 100644
--- a/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
+++ b/src/corelibs/U2Private/src/CredentialsAskerCli.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/CredentialsAskerCli.h b/src/corelibs/U2Private/src/CredentialsAskerCli.h
index 04d88c7..cd418b7 100644
--- a/src/corelibs/U2Private/src/CredentialsAskerCli.h
+++ b/src/corelibs/U2Private/src/CredentialsAskerCli.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
index 3cefff7..a04629a 100644
--- a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/DocumentFormatRegistryImpl.h b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
index e246663..4b4c52a 100644
--- a/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
+++ b/src/corelibs/U2Private/src/DocumentFormatRegistryImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
index 8dca50e..df40b27 100644
--- a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/IOAdapterRegistryImpl.h b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
index a96e0dd..6985143 100644
--- a/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
+++ b/src/corelibs/U2Private/src/IOAdapterRegistryImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/LogSettings.cpp b/src/corelibs/U2Private/src/LogSettings.cpp
index 842fda8..ed59b16 100644
--- a/src/corelibs/U2Private/src/LogSettings.cpp
+++ b/src/corelibs/U2Private/src/LogSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/LogSettings.h b/src/corelibs/U2Private/src/LogSettings.h
index 13d9ba7..5a5b446 100644
--- a/src/corelibs/U2Private/src/LogSettings.h
+++ b/src/corelibs/U2Private/src/LogSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/PluginDescriptor.cpp b/src/corelibs/U2Private/src/PluginDescriptor.cpp
index 5522344..696f924 100644
--- a/src/corelibs/U2Private/src/PluginDescriptor.cpp
+++ b/src/corelibs/U2Private/src/PluginDescriptor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -24,7 +24,8 @@
#include <U2Core/L10n.h>
#include <U2Core/GAutoDeleteList.h>
-#include <QtXml>
+#include <QtCore/QDir>
+#include <QtXml/QDomDocument>
namespace U2 {
diff --git a/src/corelibs/U2Private/src/PluginDescriptor.h b/src/corelibs/U2Private/src/PluginDescriptor.h
index 822d1e2..2c2842e 100644
--- a/src/corelibs/U2Private/src/PluginDescriptor.h
+++ b/src/corelibs/U2Private/src/PluginDescriptor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/PluginSupportImpl.cpp b/src/corelibs/U2Private/src/PluginSupportImpl.cpp
index 795ff08..84f56fd 100644
--- a/src/corelibs/U2Private/src/PluginSupportImpl.cpp
+++ b/src/corelibs/U2Private/src/PluginSupportImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/PluginSupportImpl.h b/src/corelibs/U2Private/src/PluginSupportImpl.h
index 7e91a79..aceb3e1 100644
--- a/src/corelibs/U2Private/src/PluginSupportImpl.h
+++ b/src/corelibs/U2Private/src/PluginSupportImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/ServiceRegistryImpl.cpp b/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
index 9f6e585..a2cd8b9 100644
--- a/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
+++ b/src/corelibs/U2Private/src/ServiceRegistryImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/ServiceRegistryImpl.h b/src/corelibs/U2Private/src/ServiceRegistryImpl.h
index 985b312..56673bc 100644
--- a/src/corelibs/U2Private/src/ServiceRegistryImpl.h
+++ b/src/corelibs/U2Private/src/ServiceRegistryImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/SettingsImpl.cpp b/src/corelibs/U2Private/src/SettingsImpl.cpp
index 56d9f92..34df501 100644
--- a/src/corelibs/U2Private/src/SettingsImpl.cpp
+++ b/src/corelibs/U2Private/src/SettingsImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/SettingsImpl.h b/src/corelibs/U2Private/src/SettingsImpl.h
index d5dd4fa..3288bf4 100644
--- a/src/corelibs/U2Private/src/SettingsImpl.h
+++ b/src/corelibs/U2Private/src/SettingsImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/SleepPreventerMac.cpp b/src/corelibs/U2Private/src/SleepPreventerMac.cpp
index ea925b0..7e42b10 100644
--- a/src/corelibs/U2Private/src/SleepPreventerMac.cpp
+++ b/src/corelibs/U2Private/src/SleepPreventerMac.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/SleepPreventerMac.h b/src/corelibs/U2Private/src/SleepPreventerMac.h
index 1d53d96..2b6f0bf 100644
--- a/src/corelibs/U2Private/src/SleepPreventerMac.h
+++ b/src/corelibs/U2Private/src/SleepPreventerMac.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/TaskSchedulerImpl.cpp b/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
index 31c18df..559bbbc 100644
--- a/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
+++ b/src/corelibs/U2Private/src/TaskSchedulerImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/TaskSchedulerImpl.h b/src/corelibs/U2Private/src/TaskSchedulerImpl.h
index f0cfbf4..d295abf 100644
--- a/src/corelibs/U2Private/src/TaskSchedulerImpl.h
+++ b/src/corelibs/U2Private/src/TaskSchedulerImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandler.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
index 9b06725..68b96a5 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandler.h b/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
index 0e20a4b..c3d2ba5 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
index 8e380ed..704fd73 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.cpp
@@ -1,135 +1,135 @@
-/**
- * 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(ENV_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
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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(ENV_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 83d894f..19a45e9 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerArgsHelper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
index 831e3d8..d2e05ac 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
index 29d6563..acaaa5b 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivate.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
index f9d4e7a..e55660b 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
index 90dd9ef..be9c458 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateMac.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
index f301266..3478af2 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
index d0e2e81..7a8f8fc 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateUnixNotMac.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
index f2fef27..4f4b10e 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
index a8759de..24387f2 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashHandlerPrivateWin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
index fa3e997..3498fce 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/CrashLogCache.h b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
index 5d56060..b3cef1b 100644
--- a/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
+++ b/src/corelibs/U2Private/src/crash_handler/CrashLogCache.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/StackWalker.cpp b/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
index d177ab8..e1ae883 100644
--- a/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
+++ b/src/corelibs/U2Private/src/crash_handler/StackWalker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/src/crash_handler/StackWalker.h b/src/corelibs/U2Private/src/crash_handler/StackWalker.h
index c3de9f7..0cfaf62 100644
--- a/src/corelibs/U2Private/src/crash_handler/StackWalker.h
+++ b/src/corelibs/U2Private/src/crash_handler/StackWalker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Private/transl/english.ts b/src/corelibs/U2Private/transl/english.ts
index afb9bcf..0eef5d1 100644
--- a/src/corelibs/U2Private/transl/english.ts
+++ b/src/corelibs/U2Private/transl/english.ts
@@ -40,47 +40,47 @@
<context>
<name>U2::AddPluginTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="419"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="408"/>
<source>Add plugin task: %1</source>
<translation>Add plugin task: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="434"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="423"/>
<source>Plugin is already loaded: %1</source>
<translation>Plugin is already loaded: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="442"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="431"/>
<source>Plugin %1 depends on %2 which is not loaded</source>
<translation>Plugin %1 depends on %2 which is not loaded</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="446"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="435"/>
<source>Plugin %1 depends on %2 which is available, but the version is too old</source>
<translation>Plugin %1 depends on %2 which is available, but the version is too old</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="457"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="446"/>
<source>Plugin loading error: %1, Error string %2</source>
<translation>Plugin loading error: %1, Error string %2</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="462"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="451"/>
<source>Settings is NULL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="490"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="481"/>
<source>Plugin loading error: %1. Verification failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="513"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="504"/>
<source>Plugin initialization routine was not found: %1</source>
<translation>Plugin initialization routine was not found: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="519"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="510"/>
<source>Plugin initialization failed: %1</source>
<translation>Plugin initialization failed: %1</translation>
</message>
@@ -212,7 +212,7 @@ By default, loglevel="ERROR".</translation>
<context>
<name>U2::LoadAllPluginsTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="83"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="82"/>
<source>Loading start up plugins</source>
<translation>Loading start up plugins</translation>
</message>
@@ -221,12 +221,12 @@ By default, loglevel="ERROR".</translation>
<translation type="vanished">Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="115"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="114"/>
<source>File not found: %1</source>
<translation>File not found: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="120"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="119"/>
<source>Invalid file format: %1</source>
<translation>Invalid file format: %1</translation>
</message>
@@ -257,47 +257,47 @@ By default, loglevel="ERROR".</translation>
<context>
<name>U2::PluginDescriptorHelper</name>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="109"/>
- <location filename="../src/PluginDescriptor.cpp" line="115"/>
- <location filename="../src/PluginDescriptor.cpp" line="121"/>
- <location filename="../src/PluginDescriptor.cpp" line="127"/>
+ <location filename="../src/PluginDescriptor.cpp" line="110"/>
+ <location filename="../src/PluginDescriptor.cpp" line="116"/>
+ <location filename="../src/PluginDescriptor.cpp" line="122"/>
+ <location filename="../src/PluginDescriptor.cpp" line="128"/>
<source>Required attribute not found %1</source>
<translation>Required attribute not found %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="138"/>
- <location filename="../src/PluginDescriptor.cpp" line="149"/>
- <location filename="../src/PluginDescriptor.cpp" line="155"/>
+ <location filename="../src/PluginDescriptor.cpp" line="139"/>
+ <location filename="../src/PluginDescriptor.cpp" line="150"/>
+ <location filename="../src/PluginDescriptor.cpp" line="156"/>
<source>Required element not found %1</source>
<translation>Required element not found %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="162"/>
+ <location filename="../src/PluginDescriptor.cpp" line="163"/>
<source>Not valid value: '%1', plugin: %2</source>
<translation>Not valid value: '%1', plugin: %2</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="170"/>
+ <location filename="../src/PluginDescriptor.cpp" line="171"/>
<source>Platform arch is unknown: %1</source>
<translation>Platform arch is unknown: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="177"/>
+ <location filename="../src/PluginDescriptor.cpp" line="178"/>
<source>Platform bits is unknown: %1</source>
<translation>Platform bits is unknown: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="196"/>
+ <location filename="../src/PluginDescriptor.cpp" line="197"/>
<source>Invalid depends token: %1</source>
<translation>Invalid depends token: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="256"/>
+ <location filename="../src/PluginDescriptor.cpp" line="257"/>
<source>Plugin circular dependency detected: %1 <-> %2</source>
<translation>Plugin circular dependency detected: %1 <-> %2</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="340"/>
+ <location filename="../src/PluginDescriptor.cpp" line="341"/>
<source>Can't satisfy dependencies for %1 !</source>
<translation>Can't satisfy dependencies for %1 !</translation>
</message>
@@ -463,7 +463,7 @@ By default, loglevel="ERROR".</translation>
<context>
<name>U2::VerifyPluginTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="548"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="539"/>
<source>Verify plugin task: %1</source>
<translation>Verify plugin task: %1</translation>
</message>
diff --git a/src/corelibs/U2Private/transl/russian.ts b/src/corelibs/U2Private/transl/russian.ts
index 1fa7262..d1913cf 100644
--- a/src/corelibs/U2Private/transl/russian.ts
+++ b/src/corelibs/U2Private/transl/russian.ts
@@ -39,47 +39,47 @@
<context>
<name>U2::AddPluginTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="419"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="408"/>
<source>Add plugin task: %1</source>
<translation>Загрузка внешнего модуля: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="434"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="423"/>
<source>Plugin is already loaded: %1</source>
<translation>Модуль уже загружен: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="442"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="431"/>
<source>Plugin %1 depends on %2 which is not loaded</source>
<translation>Модуль %1 зависит от модуля %2, который не был загружен</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="446"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="435"/>
<source>Plugin %1 depends on %2 which is available, but the version is too old</source>
<translation>Модуль %1 зависит от модуля %2, который доступен, но версия которого устарела</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="457"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="446"/>
<source>Plugin loading error: %1, Error string %2</source>
<translation>Ошибка загрузки модуля: %1, строка %2</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="462"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="451"/>
<source>Settings is NULL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="490"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="481"/>
<source>Plugin loading error: %1. Verification failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="513"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="504"/>
<source>Plugin initialization routine was not found: %1</source>
<translation>Не найдена входная функция библиотеки модуля: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="519"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="510"/>
<source>Plugin initialization failed: %1</source>
<translation>Ошибка инициализации модуля: %1</translation>
</message>
@@ -211,7 +211,7 @@ By default, loglevel="ERROR".</source>
<context>
<name>U2::LoadAllPluginsTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="83"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="82"/>
<source>Loading start up plugins</source>
<translation>Загрузка подключаемых модулей</translation>
</message>
@@ -220,12 +220,12 @@ By default, loglevel="ERROR".</source>
<translation type="vanished">Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="115"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="114"/>
<source>File not found: %1</source>
<translation>Не найден внешний модуль: %1</translation>
</message>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="120"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="119"/>
<source>Invalid file format: %1</source>
<translation>Некорректный файл библиотеки: %1</translation>
</message>
@@ -256,47 +256,47 @@ By default, loglevel="ERROR".</source>
<context>
<name>U2::PluginDescriptorHelper</name>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="109"/>
- <location filename="../src/PluginDescriptor.cpp" line="115"/>
- <location filename="../src/PluginDescriptor.cpp" line="121"/>
- <location filename="../src/PluginDescriptor.cpp" line="127"/>
+ <location filename="../src/PluginDescriptor.cpp" line="110"/>
+ <location filename="../src/PluginDescriptor.cpp" line="116"/>
+ <location filename="../src/PluginDescriptor.cpp" line="122"/>
+ <location filename="../src/PluginDescriptor.cpp" line="128"/>
<source>Required attribute not found %1</source>
<translation>Required attribute not found %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="138"/>
- <location filename="../src/PluginDescriptor.cpp" line="149"/>
- <location filename="../src/PluginDescriptor.cpp" line="155"/>
+ <location filename="../src/PluginDescriptor.cpp" line="139"/>
+ <location filename="../src/PluginDescriptor.cpp" line="150"/>
+ <location filename="../src/PluginDescriptor.cpp" line="156"/>
<source>Required element not found %1</source>
<translation>Required element not found %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="162"/>
+ <location filename="../src/PluginDescriptor.cpp" line="163"/>
<source>Not valid value: '%1', plugin: %2</source>
<translation>Not valid value: '%1', plugin: %2</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="170"/>
+ <location filename="../src/PluginDescriptor.cpp" line="171"/>
<source>Platform arch is unknown: %1</source>
<translation>Platform arch is unknown: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="177"/>
+ <location filename="../src/PluginDescriptor.cpp" line="178"/>
<source>Platform bits is unknown: %1</source>
<translation>Platform bits is unknown: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="196"/>
+ <location filename="../src/PluginDescriptor.cpp" line="197"/>
<source>Invalid depends token: %1</source>
<translation>Invalid depends token: %1</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="256"/>
+ <location filename="../src/PluginDescriptor.cpp" line="257"/>
<source>Plugin circular dependency detected: %1 <-> %2</source>
<translation>Обнаружен модуль циркулярной зависимости: %1 <-> %2</translation>
</message>
<message>
- <location filename="../src/PluginDescriptor.cpp" line="340"/>
+ <location filename="../src/PluginDescriptor.cpp" line="341"/>
<source>Can't satisfy dependencies for %1 !</source>
<translation>Can't satisfy dependencies for %1 !</translation>
</message>
@@ -462,7 +462,7 @@ By default, loglevel="ERROR".</source>
<context>
<name>U2::VerifyPluginTask</name>
<message>
- <location filename="../src/PluginSupportImpl.cpp" line="548"/>
+ <location filename="../src/PluginSupportImpl.cpp" line="539"/>
<source>Verify plugin task: %1</source>
<translation>Задача верификации модуля: %1</translation>
</message>
diff --git a/src/corelibs/U2Script/src/CommonDbi.cpp b/src/corelibs/U2Script/src/CommonDbi.cpp
index 0ab39a0..458eea1 100644
--- a/src/corelibs/U2Script/src/CommonDbi.cpp
+++ b/src/corelibs/U2Script/src/CommonDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/CommonDbi.h b/src/corelibs/U2Script/src/CommonDbi.h
index 55a8e1d..fccd4f9 100644
--- a/src/corelibs/U2Script/src/CommonDbi.h
+++ b/src/corelibs/U2Script/src/CommonDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/FormatDetection.cpp b/src/corelibs/U2Script/src/FormatDetection.cpp
index b0edfb2..2e2b5cb 100644
--- a/src/corelibs/U2Script/src/FormatDetection.cpp
+++ b/src/corelibs/U2Script/src/FormatDetection.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/FormatDetection.h b/src/corelibs/U2Script/src/FormatDetection.h
index 6f02056..d591740 100644
--- a/src/corelibs/U2Script/src/FormatDetection.h
+++ b/src/corelibs/U2Script/src/FormatDetection.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/SchemeHandle.cpp b/src/corelibs/U2Script/src/SchemeHandle.cpp
index 7d9b4c3..aff8251 100644
--- a/src/corelibs/U2Script/src/SchemeHandle.cpp
+++ b/src/corelibs/U2Script/src/SchemeHandle.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/SchemeHandle.h b/src/corelibs/U2Script/src/SchemeHandle.h
index 7d62055..efbbdca 100644
--- a/src/corelibs/U2Script/src/SchemeHandle.h
+++ b/src/corelibs/U2Script/src/SchemeHandle.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/SchemeWrapper.cpp b/src/corelibs/U2Script/src/SchemeWrapper.cpp
index 0b1a4a3..2ec6a27 100644
--- a/src/corelibs/U2Script/src/SchemeWrapper.cpp
+++ b/src/corelibs/U2Script/src/SchemeWrapper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/SchemeWrapper.h b/src/corelibs/U2Script/src/SchemeWrapper.h
index 1d5893d..e77793b 100644
--- a/src/corelibs/U2Script/src/SchemeWrapper.h
+++ b/src/corelibs/U2Script/src/SchemeWrapper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/TextConversionUtils.cpp b/src/corelibs/U2Script/src/TextConversionUtils.cpp
index 7118353..eab8fa6 100644
--- a/src/corelibs/U2Script/src/TextConversionUtils.cpp
+++ b/src/corelibs/U2Script/src/TextConversionUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/TextConversionUtils.h b/src/corelibs/U2Script/src/TextConversionUtils.h
index c0e782c..1e8b416 100644
--- a/src/corelibs/U2Script/src/TextConversionUtils.h
+++ b/src/corelibs/U2Script/src/TextConversionUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/U2Script.cpp b/src/corelibs/U2Script/src/U2Script.cpp
index 71ccd22..4266bb7 100644
--- a/src/corelibs/U2Script/src/U2Script.cpp
+++ b/src/corelibs/U2Script/src/U2Script.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/U2Script.h b/src/corelibs/U2Script/src/U2Script.h
index b3659e5..4e903f0 100644
--- a/src/corelibs/U2Script/src/U2Script.h
+++ b/src/corelibs/U2Script/src/U2Script.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/UgeneContextWrapper.cpp b/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
index 4d49781..0b71acc 100644
--- a/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
+++ b/src/corelibs/U2Script/src/UgeneContextWrapper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/UgeneContextWrapper.h b/src/corelibs/U2Script/src/UgeneContextWrapper.h
index fa3bc6a..aeff9cf 100644
--- a/src/corelibs/U2Script/src/UgeneContextWrapper.h
+++ b/src/corelibs/U2Script/src/UgeneContextWrapper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/WorkflowElementFacade.cpp b/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
index 6c198d8..5c151da 100644
--- a/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
+++ b/src/corelibs/U2Script/src/WorkflowElementFacade.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/WorkflowElementFacade.h b/src/corelibs/U2Script/src/WorkflowElementFacade.h
index 39e04ad..0f4276c 100644
--- a/src/corelibs/U2Script/src/WorkflowElementFacade.h
+++ b/src/corelibs/U2Script/src/WorkflowElementFacade.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/globals.cpp b/src/corelibs/U2Script/src/globals.cpp
index 0357724..a60568b 100644
--- a/src/corelibs/U2Script/src/globals.cpp
+++ b/src/corelibs/U2Script/src/globals.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/globals.h b/src/corelibs/U2Script/src/globals.h
index 942e9fa..1b1e8c7 100644
--- a/src/corelibs/U2Script/src/globals.h
+++ b/src/corelibs/U2Script/src/globals.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/ActorWrap.cpp b/src/corelibs/U2Script/src/js/ActorWrap.cpp
index 8878eb5..5708903 100644
--- a/src/corelibs/U2Script/src/js/ActorWrap.cpp
+++ b/src/corelibs/U2Script/src/js/ActorWrap.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/ActorWrap.h b/src/corelibs/U2Script/src/js/ActorWrap.h
index 9f83b97..c3e2764 100644
--- a/src/corelibs/U2Script/src/js/ActorWrap.h
+++ b/src/corelibs/U2Script/src/js/ActorWrap.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/DebugStatusWrap.cpp b/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
index 2f277cb..37f1730 100644
--- a/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
+++ b/src/corelibs/U2Script/src/js/DebugStatusWrap.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/DebugStatusWrap.h b/src/corelibs/U2Script/src/js/DebugStatusWrap.h
index e423999..97bf344 100644
--- a/src/corelibs/U2Script/src/js/DebugStatusWrap.h
+++ b/src/corelibs/U2Script/src/js/DebugStatusWrap.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/JsContext.cpp b/src/corelibs/U2Script/src/js/JsContext.cpp
index 42e3d05..43c0a66 100644
--- a/src/corelibs/U2Script/src/js/JsContext.cpp
+++ b/src/corelibs/U2Script/src/js/JsContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/JsContext.h b/src/corelibs/U2Script/src/js/JsContext.h
index 61d05d3..a831e90 100644
--- a/src/corelibs/U2Script/src/js/JsContext.h
+++ b/src/corelibs/U2Script/src/js/JsContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/JsScheduler.cpp b/src/corelibs/U2Script/src/js/JsScheduler.cpp
index 9a99359..020f42f 100644
--- a/src/corelibs/U2Script/src/js/JsScheduler.cpp
+++ b/src/corelibs/U2Script/src/js/JsScheduler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/JsScheduler.h b/src/corelibs/U2Script/src/js/JsScheduler.h
index fc1f65a..c17234c 100644
--- a/src/corelibs/U2Script/src/js/JsScheduler.h
+++ b/src/corelibs/U2Script/src/js/JsScheduler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/NodeApiUtils.cpp b/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
index 761b0d1..f049b3a 100644
--- a/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
+++ b/src/corelibs/U2Script/src/js/NodeApiUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Script/src/js/NodeApiUtils.h b/src/corelibs/U2Script/src/js/NodeApiUtils.h
index 5413d54..596cc13 100644
--- a/src/corelibs/U2Script/src/js/NodeApiUtils.h
+++ b/src/corelibs/U2Script/src/js/NodeApiUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/GTest.cpp b/src/corelibs/U2Test/src/GTest.cpp
index 9f17959..8a0f70c 100644
--- a/src/corelibs/U2Test/src/GTest.cpp
+++ b/src/corelibs/U2Test/src/GTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/GTest.h b/src/corelibs/U2Test/src/GTest.h
index 8dfa358..9aa90cc 100644
--- a/src/corelibs/U2Test/src/GTest.h
+++ b/src/corelibs/U2Test/src/GTest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/GTestFrameworkComponents.cpp b/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
index 7b2e085..59b91df 100644
--- a/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
+++ b/src/corelibs/U2Test/src/GTestFrameworkComponents.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/GTestFrameworkComponents.h b/src/corelibs/U2Test/src/GTestFrameworkComponents.h
index 30f0f60..730e01b 100644
--- a/src/corelibs/U2Test/src/GTestFrameworkComponents.h
+++ b/src/corelibs/U2Test/src/GTestFrameworkComponents.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/TestRunnerTask.cpp b/src/corelibs/U2Test/src/TestRunnerTask.cpp
index 5be7366..eb7e42a 100644
--- a/src/corelibs/U2Test/src/TestRunnerTask.cpp
+++ b/src/corelibs/U2Test/src/TestRunnerTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/TestRunnerTask.h b/src/corelibs/U2Test/src/TestRunnerTask.h
index 0e05e85..174a93b 100644
--- a/src/corelibs/U2Test/src/TestRunnerTask.h
+++ b/src/corelibs/U2Test/src/TestRunnerTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
index 6da2f94..bce99b3 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestLauncher.h b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
index 4cac912..5f15f81 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestLauncher.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestService.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
index 9719e86..aad8fb1 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestService.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestService.h b/src/corelibs/U2Test/src/gui_tests/GUITestService.h
index a8fac34..736bd19 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestService.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestService.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
index a66f2c0..bb52712 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
index c3ef785..012d20b 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestTeamcityLogger.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestThread.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
index c4c758d..187457e 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestThread.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestThread.h b/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
index fae6c20..e039a7b 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestThread.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
index 506c0ec..1b8905c 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/gui_tests/GUITestWindow.h b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
index 16c9e10..640dbbd 100644
--- a/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
+++ b/src/corelibs/U2Test/src/gui_tests/GUITestWindow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
index 0f12372..885de6f 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/xmltest/XMLTestFormat.h b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
index 118f70d..c487380 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
index bd96200..f1302d6 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2Test/src/xmltest/XMLTestUtils.h b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
index 56d302c..d9d46cc 100644
--- a/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
+++ b/src/corelibs/U2Test/src/xmltest/XMLTestUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/CMakeLists.txt b/src/corelibs/U2View/CMakeLists.txt
index afa2b0a..488be64 100644
--- a/src/corelibs/U2View/CMakeLists.txt
+++ b/src/corelibs/U2View/CMakeLists.txt
@@ -20,5 +20,5 @@ add_library(U2View SHARED ${HDRS} ${SRCS})
target_link_libraries(U2View
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
- U2Core U2Algorithm U2Formats U2Remote U2Lang U2Gui)
+ U2Core U2Algorithm U2Formats U2Lang U2Gui)
diff --git a/src/corelibs/U2View/src/LicenseDialog.cpp b/src/corelibs/U2View/src/LicenseDialog.cpp
index fac9c5d..2e12890 100644
--- a/src/corelibs/U2View/src/LicenseDialog.cpp
+++ b/src/corelibs/U2View/src/LicenseDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/LicenseDialog.h b/src/corelibs/U2View/src/LicenseDialog.h
index bff9324..0fc7f14 100644
--- a/src/corelibs/U2View/src/LicenseDialog.h
+++ b/src/corelibs/U2View/src/LicenseDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/UndoRedoFramework.cpp b/src/corelibs/U2View/src/UndoRedoFramework.cpp
index d33c802..a585751 100644
--- a/src/corelibs/U2View/src/UndoRedoFramework.cpp
+++ b/src/corelibs/U2View/src/UndoRedoFramework.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/UndoRedoFramework.h b/src/corelibs/U2View/src/UndoRedoFramework.h
index 6cc3c59..d60c163 100644
--- a/src/corelibs/U2View/src/UndoRedoFramework.h
+++ b/src/corelibs/U2View/src/UndoRedoFramework.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/WebWindow.cpp b/src/corelibs/U2View/src/WebWindow.cpp
index 8dcfae5..5ed098b 100644
--- a/src/corelibs/U2View/src/WebWindow.cpp
+++ b/src/corelibs/U2View/src/WebWindow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/WebWindow.h b/src/corelibs/U2View/src/WebWindow.h
index 0b1b475..65ff7a5 100644
--- a/src/corelibs/U2View/src/WebWindow.h
+++ b/src/corelibs/U2View/src/WebWindow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
index d5f4b8f..f217195 100644
--- a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
index d83c3a6..3b029ab 100644
--- a/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/AddReadsToDocumentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
index 9a25bc3..bc7cc56 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
index 9fc4b06..4581253 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyAnnotationsArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
index b551658..1c5e821 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -163,7 +163,6 @@ QWidget * AssemblyBrowser::createWidget() {
const QString objectName = "assembly_browser_" + getName();
ui->setObjectName(objectName);
-
U2OpStatusImpl os;
if(model->hasReads(os)) {
updateOverviewTypeActions();
@@ -173,6 +172,7 @@ QWidget * AssemblyBrowser::createWidget() {
ui->installEventFilter(this);
ui->setAcceptDrops(true);
}
+
return ui;
}
@@ -254,6 +254,9 @@ QString AssemblyBrowser::tryAddObject(GObject * obj) {
notificationStack->addNotification(message, Warning_Not);
}
if(setRef) {
+ if(model->isDbLocked(100)){
+ return tr("Internal error: database is busy");
+ }
model->setReference(seqObj);
U2Assembly assembly = model->getAssembly();
@@ -308,61 +311,60 @@ bool AssemblyBrowser::isAssemblyObjectLocked(bool showDialog) const {
return isLocked;
}
-void AssemblyBrowser::buildStaticToolbar(QToolBar* tb) {
+void AssemblyBrowser::buildStaticToolbar(QToolBar* staticToolBar) {
U2OpStatusImpl os;
if(model->hasReads(os)) {
- tb->addAction(zoomInAction);
- tb->addAction(zoomOutAction);
+ staticToolBar->addAction(zoomInAction);
+ staticToolBar->addAction(zoomOutAction);
U2OpStatusImpl st;
- posSelector = new PositionSelector(tb, 1, model->getModelLength(st));
+ posSelector = new PositionSelector(staticToolBar, 1, model->getModelLength(st));
if(!st.hasError()) {
connect(posSelector, SIGNAL(si_positionChanged(int)), SLOT(sl_onPosChangeRequest(int)));
- tb->addSeparator();
- tb->addWidget(posSelector);
+ staticToolBar->addSeparator();
+ staticToolBar->addWidget(posSelector);
posSelector->getPosEdit()->setMinimumWidth(160); // For big numbers we need bigger text box
}
- tb->addSeparator();
+ staticToolBar->addSeparator();
updateZoomingActions();
// commented because do not know if log scale is needed
- /*QToolButton * overviewScaleTypeToolButton = new QToolButton(tb);
+ /*QToolButton * overviewScaleTypeToolButton = new QToolButton(staticToolBar);
QMenu * scaleTypeMenu = new QMenu(tr("Scale type"), ui);
foreach(QAction * a, overviewScaleTypeActions) {
scaleTypeMenu->addAction(a);
}
overviewScaleTypeToolButton->setDefaultAction(scaleTypeMenu->menuAction());
overviewScaleTypeToolButton->setPopupMode(QToolButton::InstantPopup);
- tb->addWidget(overviewScaleTypeToolButton);*/
-
- tb->addAction(showCoordsOnRulerAction);
- tb->addAction(showCoverageOnRulerAction);
- tb->addAction(readHintEnabledAction);
- tb->addSeparator();
- tb->addAction(setReferenceAction);
- tb->addAction(extractAssemblyRegionAction);
- tb->addAction(saveScreenShotAction);
+ staticToolBar->addWidget(overviewScaleTypeToolButton);*/
+
+ staticToolBar->addAction(showCoordsOnRulerAction);
+ staticToolBar->addAction(showCoverageOnRulerAction);
+ staticToolBar->addAction(readHintEnabledAction);
+ staticToolBar->addSeparator();
+ staticToolBar->addAction(setReferenceAction);
+ staticToolBar->addAction(extractAssemblyRegionAction);
+ staticToolBar->addAction(saveScreenShotAction);
}
- GObjectView::buildStaticToolbar(tb);
+ GObjectView::buildStaticToolbar(staticToolBar);
}
void AssemblyBrowser::sl_onPosChangeRequest(int pos) {
setXOffsetInAssembly(normalizeXoffset(pos - 1));
ui->getReadsArea()->setFocus();
}
-
-void AssemblyBrowser::buildStaticMenu(QMenu* m) {
+void AssemblyBrowser::buildStaticMenu(QMenu* staticMenu) {
U2OpStatusImpl os;
if(model->hasReads(os)) {
- m->addAction(zoomInAction);
- m->addAction(zoomOutAction);
- m->addAction(saveScreenShotAction);
- m->addAction(exportToSamAction);
- m->addAction(extractAssemblyRegionAction);
- m->addAction(setReferenceAction);
+ staticMenu->addAction(zoomInAction);
+ staticMenu->addAction(zoomOutAction);
+ staticMenu->addAction(saveScreenShotAction);
+ staticMenu->addAction(exportToSamAction);
+ staticMenu->addAction(extractAssemblyRegionAction);
+ staticMenu->addAction(setReferenceAction);
}
- GObjectView::buildStaticMenu(m);
- GUIUtils::disableEmptySubmenus(m);
+ GObjectView::buildStaticMenu(staticMenu);
+ GUIUtils::disableEmptySubmenus(staticMenu);
}
void AssemblyBrowser::setGlobalCoverageInfo(CoverageInfo newInfo) {
@@ -372,12 +374,15 @@ void AssemblyBrowser::setGlobalCoverageInfo(CoverageInfo newInfo) {
if(newInfo.coverageInfo.size() <= coveredRegionsManager.getSize()) {
return;
}
+ if(newInfo.isEmpty()){ //wait when coverage will be calculated
+ return;
+ }
// prefer model's coverage stat
if(model->hasCachedCoverageStat()) {
U2OpStatus2Log status;
U2AssemblyCoverageStat coverageStat = model->getCoverageStat(status);
- if(!status.isCoR() && coverageStat.coverage->size() > newInfo.coverageInfo.size()) {
- newInfo.coverageInfo = U2AssemblyUtils::coverageStatToVector(coverageStat);
+ if(!status.isCoR() && coverageStat.size() > newInfo.coverageInfo.size()) {
+ newInfo.coverageInfo = coverageStat;
newInfo.updateStats();
}
}
@@ -408,15 +413,19 @@ bool AssemblyBrowser::isInLocalCoverageCache(qint64 position) {
return localCoverageCache.region.contains(position);
}
-qint64 AssemblyBrowser::getCoverageAtPos(qint64 pos) {
+qint32 AssemblyBrowser::getCoverageAtPos(qint64 pos) {
if(isInLocalCoverageCache(pos)) {
return localCoverageCache.coverageInfo.at(pos - localCoverageCache.region.startPos);
} else {
+ if (model->isDbLocked()){
+ return -1;
+ }
+
U2OpStatus2Log status;
U2AssemblyCoverageStat coverageStat;
- coverageStat.coverage->resize(1);
+ coverageStat.resize(1);
model->calculateCoverageStat(U2Region(pos, 1), coverageStat, status);
- return coverageStat.coverage->first().maxValue;
+ return coverageStat.first();
}
}
@@ -1080,7 +1089,7 @@ void AssemblyBrowser::sl_setReference() {
void AssemblyBrowser::sl_extractAssemblyRegion() {
GUrl url(U2DbiUtils::ref2Url(model->getDbiConnection().dbi->getDbiRef()));
U2Region visibleRegion = getVisibleBasesRegion();
- QString extractedFragmentFilename = url.dirPath() + "/" + url.baseFileName() + "_" + QString::number(visibleRegion.startPos + 1)
+ QString extractedFragmentFilename = url.dirPath() + "/" + url.baseFileName() + "_" + QString::number(visibleRegion.startPos + 1)
+ "_" + QString::number(visibleRegion.endPos()) + "." + url.completeFileSuffix();
U2OpStatusImpl os;
ExtractAssemblyRegionTaskSettings ts(extractedFragmentFilename, model->getModelLength(os), gobject);
@@ -1118,7 +1127,8 @@ void AssemblyBrowser::sl_onReferenceLoaded() {
//==============================================================================
AssemblyBrowserUi::AssemblyBrowserUi(AssemblyBrowser * browser_) : browser(browser_), zoomableOverview(0),
-referenceArea(0), coverageGraph(0), ruler(0), readsArea(0), annotationsArea(0), nothingToVisualize(true) {
+referenceArea(0), coverageGraph(0), ruler(0), readsArea(0), annotationsArea(0), nothingToVisualize(true)
+{
U2OpStatusImpl os;
if(browser->getModel()->hasReads(os)) { // has mapped reads -> show rich visualization
setMinimumSize(300, 200);
@@ -1192,7 +1202,7 @@ referenceArea(0), coverageGraph(0), ruler(0), readsArea(0), annotationsArea(0),
else {
QVBoxLayout * mainLayout = new QVBoxLayout();
QString msg = tr("Assembly has no mapped reads. Nothing to visualize.");
- QLabel * infoLabel = new QLabel(QString("<table align=\"center\"><tr><td>%1</td></tr></table>").arg(msg));
+ QLabel * infoLabel = new QLabel(QString("<table align=\"center\"><tr><td>%1</td></tr></table>").arg(msg), this);
infoLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
mainLayout->addWidget(infoLabel);
setLayout(mainLayout);
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
index 5ce2bce..a9309f3 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -67,7 +67,7 @@ public:
void setLocalCoverageCache(CoverageInfo coverage);
// Methods used to optimize getting coverage at any point inside this region:
bool isInLocalCoverageCache(qint64 position);
- qint64 getCoverageAtPos(qint64 pos);
+ qint32 getCoverageAtPos(qint64 pos);
// Methods used to draw coverage for cached part of visible region:
bool intersectsLocalCoverageCache(U2Region region);
bool isInLocalCoverageCache(U2Region region);
@@ -137,7 +137,7 @@ public slots:
void sl_zoomOut(const QPoint & pos = QPoint());
void sl_zoomToReads();
void sl_coveredRegionClicked(const QString link);
- void sl_extractAssemblyRegion();
+ void sl_extractAssemblyRegion();
signals:
void si_offsetsChanged();
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
index 977801c..c00aafe 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
index 5d6c7b2..318ab1b 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
index 07ed7cb..fb26e26 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
index 32dabde..6d87c67 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
index 51bc0d2..75ee999 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserState.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
index 5ebb507..b01b272 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
index 1fb552d..fd19e51 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyBrowserTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
index ff7da50..9351acc 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
index 5758b02..67730ba 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCellRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
index 106c2ce..b13c2b4 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
index 834d997..a9c7962 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
index 026bc7b..a23bbaf 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
index c97f90e..a8ad6d2 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyConsensusTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
index 90f85ed..3b37a38 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -80,8 +80,8 @@ void AssemblyCoverageGraph::drawAll() {
void AssemblyCoverageGraph::drawGraph(QPainter & p, const CoverageInfo &ci, int alpha) {
int cellWidth = browser->getCellWidth();
int visibleBases = browser->basesVisible();
- const QVector<qint64> & coverageInfo = ci.coverageInfo;
- qint64 maxCoverage = ci.maxCoverage;
+ const U2AssemblyCoverageStat & coverageInfo = ci.coverageInfo;
+ qint32 maxCoverage = ci.maxCoverage;
SAFE_POINT(visibleBases == coverageInfo.size(), "in AssemblyCoverageGraph::drawGraph: incorrect coverageInfo size",)
CHECK(maxCoverage > 0,);
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
index dcf32b7..becb6d4 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyCoverageGraph.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
index ba097fe..29e1eaf 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -71,6 +71,8 @@ AssemblyInfoWidget::AssemblyInfoWidget(AssemblyBrowser *browser, QWidget *p)
mainLayout->setSpacing(0);
setLayout(mainLayout);
+
+
U2OpStatus2Log st;
QSharedPointer<AssemblyModel> model = browser->getModel();
@@ -89,24 +91,27 @@ AssemblyInfoWidget::AssemblyInfoWidget(AssemblyBrowser *browser, QWidget *p)
QWidget * infoGroup = new ShowHideSubgroupWidget("INFO", tr("Assembly Information"), asmWidget, true);
mainLayout->addWidget(infoGroup);
- QByteArray md5 = model->getReferenceMd5(st);
- QByteArray species = model->getReferenceSpecies(st);
- QString uri = model->getReferenceUri(st);
-
- if( !(md5+species+uri).isEmpty() ) {QWidget * refWidget = new QWidget(this);
- QFormLayout * layout = buildFormLayout(refWidget);
- if(!md5.isEmpty()) {
- layout->addRow(buildLabel(tr("MD5"), refWidget), buildLineEdit(QString(md5), refWidget));
+ if(!browser->getModel()->isDbLocked()){
+ QByteArray md5 = model->getReferenceMd5(st);
+ QByteArray species = model->getReferenceSpecies(st);
+ QString uri = model->getReferenceUri(st);
+
+ if( !(md5+species+uri).isEmpty() ) {
+ QWidget * refWidget = new QWidget(this);
+ QFormLayout * layout = buildFormLayout(refWidget);
+ if(!md5.isEmpty()) {
+ layout->addRow(buildLabel(tr("MD5"), refWidget), buildLineEdit(QString(md5), refWidget));
+ }
+ if(!species.isEmpty()) {
+ layout->addRow(buildLabel(tr("Species"), refWidget), buildLineEdit(QString(species), refWidget));
+ }
+ if(!uri.isEmpty()) {
+ layout->addRow(buildLabel(tr("URI"), refWidget), buildLineEdit(uri, refWidget));
+ }
+
+ QWidget * refGroup = new ShowHideSubgroupWidget("REFERENCE", tr("Reference Information"), refWidget, false);
+ mainLayout->addWidget(refGroup);
}
- if(!species.isEmpty()) {
- layout->addRow(buildLabel(tr("Species"), refWidget), buildLineEdit(QString(species), refWidget));
- }
- if(!uri.isEmpty()) {
- layout->addRow(buildLabel(tr("URI"), refWidget), buildLineEdit(uri, refWidget));
- }
-
- QWidget * refGroup = new ShowHideSubgroupWidget("REFERENCE", tr("Reference Information"), refWidget, false);
- mainLayout->addWidget(refGroup);
}
U2WidgetStateStorage::restoreWidgetState(savableTab);
@@ -118,7 +123,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 = "18220487";
+const QString AssemblyInfoWidgetFactory::GROUP_DOC_PAGE = "18223127";
AssemblyInfoWidgetFactory::AssemblyInfoWidgetFactory()
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
index 8ddea2e..46deb5a 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyInfoWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
index 6ac3360..2cd3a2c 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -67,9 +67,9 @@ namespace U2 {
const QByteArray AssemblyModel::COVERAGE_STAT_ATTRIBUTE_NAME(U2BaseAttributeName::coverage_statistics.toLatin1());
AssemblyModel::AssemblyModel(const DbiConnection& dbiCon_) :
-cachedModelLength(NO_VAL), cachedModelHeight(NO_VAL), assemblyDbi(0), dbiHandle(dbiCon_),
-loadingReference(false), refObj(NULL), md5Retrieved(false), cachedReadsNumber(NO_VAL), speciesRetrieved(false),
-uriRetrieved(false)
+ cachedModelLength(NO_VAL), cachedModelHeight(NO_VAL), assemblyDbi(NULL), dbiHandle(dbiCon_),
+ loadingReference(false), refObj(NULL), md5Retrieved(false), cachedReadsNumber(NO_VAL), speciesRetrieved(false),
+ uriRetrieved(false)
{
Project * prj = AppContext::getProject();
if (prj != NULL) {
@@ -117,12 +117,12 @@ U2DbiIterator<U2AssemblyRead>* AssemblyModel::getReads(const U2Region & r, U2OpS
return assemblyDbi->getReads(assembly.id, r, os);
}
-void AssemblyModel::calculateCoverageStat(const U2Region & r, U2AssemblyCoverageStat & stat, U2OpStatus & os) {
- return assemblyDbi->calculateCoverage(assembly.id, r, stat, os);
+void AssemblyModel::calculateCoverageStat(const U2Region & r, U2AssemblyCoverageStat& coverageStat, U2OpStatus & os) {
+ return assemblyDbi->calculateCoverage(assembly.id, r, coverageStat, os);
}
bool AssemblyModel::hasCachedCoverageStat() {
- if(!cachedCoverageStat.coverage->isEmpty()) {
+ if(!cachedCoverageStat.isEmpty()) {
return true;
}
U2AttributeDbi * attributeDbi = dbiHandle.dbi->getAttributeDbi();
@@ -140,28 +140,21 @@ bool AssemblyModel::hasCachedCoverageStat() {
const U2AssemblyCoverageStat &AssemblyModel::getCoverageStat(U2OpStatus & os) {
QMutexLocker mutexLocker(&mutex);
Q_UNUSED(mutexLocker);
- if(cachedCoverageStat.coverage->isEmpty()) {
+ if(cachedCoverageStat.isEmpty()) {
U2AttributeDbi * attributeDbi = dbiHandle.dbi->getAttributeDbi();
if(NULL != attributeDbi) {
U2ByteArrayAttribute attr = U2AttributeUtils::findByteArrayAttribute(attributeDbi, assembly.id, COVERAGE_STAT_ATTRIBUTE_NAME, os);
if(!os.isCoR()) {
- /*
if(attr.hasValidId()) {
// TODO: check version
- U2AssemblyUtils::deserializeCoverageStat(attr.value, *cachedCoverageStat, os);
+ U2AssemblyUtils::deserializeCoverageStat(attr.value, cachedCoverageStat, os);
} else {
- */
qint64 length = getModelLength(os);
if(!os.isCoR()) {
- QScopedPointer<QVector<CoveragePerBaseInfo> > results(new QVector<CoveragePerBaseInfo>(length));
- cachedCoverageStat.coverage->clear();
- cachedCoverageStat.coverage->reserve(length);
- U2AssemblyUtils::calculateCoveragePerBase(getDbiConnection().dbi->getDbiRef(), getAssembly().id, U2Region(0, length), results.data(), os);
- for (int i = 0; i < results->size(); i++) {
- cachedCoverageStat.coverage->append(U2Range<int>(results->at(i).coverage, results->at(i).coverage));
- }
-
- /*
+ static const qint64 MAX_COVERAGE_CACHE_SIZE = 1000*1000;
+ int coverageCacheSize = (int)qMin(MAX_COVERAGE_CACHE_SIZE, length);
+ cachedCoverageStat.resize(coverageCacheSize);
+ calculateCoverageStat(U2Region(0, length), cachedCoverageStat, os);
if(!os.isCoR()) {
U2ByteArrayAttribute attribute;
attribute.objectId = assembly.id;
@@ -172,9 +165,8 @@ const U2AssemblyCoverageStat &AssemblyModel::getCoverageStat(U2OpStatus & os) {
attributeDbi->createByteArrayAttribute(attribute, opStatus);
LOG_OP(opStatus);
}
- */
}
- //}
+ }
}
} else {
os.setError("Attribute DBI is not supported");
@@ -680,4 +672,13 @@ U2SequenceObject* AssemblyModel::getRefObj() const {
return refObj;
}
+bool AssemblyModel::isDbLocked(int timeout){
+ QMutex* mutex = dbiHandle.dbi->getDbMutex();
+ CHECK(mutex != NULL, false);
+ if(mutex->tryLock(timeout)){
+ mutex->unlock();
+ return false;
+ }
+ return true;
+}
} // U2
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
index 377f605..a6ff6c0 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -48,7 +48,7 @@ public:
QList<U2AssemblyRead> getReadsFromAssembly(const U2Region & r, qint64 minRow, qint64 maxRow, U2OpStatus & os);
U2DbiIterator<U2AssemblyRead> * getReads(const U2Region & r, U2OpStatus & os);
- void calculateCoverageStat(const U2Region & r, U2AssemblyCoverageStat & stat, U2OpStatus & os);
+ void calculateCoverageStat(const U2Region & r, U2AssemblyCoverageStat& coverageStat, U2OpStatus & os);
const U2AssemblyCoverageStat &getCoverageStat(U2OpStatus & os);
@@ -97,6 +97,8 @@ public:
bool checkPermissions(QFile::Permission permission, bool showDialog = true) const;
void dissociateReference();
+ bool isDbLocked(int timeout = 0);
+
private:
/**
Unsets reference only for current session (e.g. when ref doc is closed),
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
index 0cd75c3..3b3730d 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220485";
+const QString AssemblyNavigationWidgetFactory::GROUP_DOC_PAGE = "18223125";
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 dd3d7f0..2f2d933 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyNavigationWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
index 8ee8fa7..cf645de 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -84,12 +84,20 @@ AssemblyReadsArea::AssemblyReadsArea(AssemblyBrowserUi * ui_, QScrollBar * hBar_
hintEnabled(AssemblyBrowserSettings::getReadHintEnabled()),
scrolling(false),
optimizeRenderOnScroll(AssemblyBrowserSettings::getOptimizeRenderOnScroll()),
- readMenu(new QMenu(this))
+ readMenu(new QMenu(this)),
+ lockTimeout(500)
{
setObjectName("assembly_reads_area");
setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
+
+ bdBusyLabel.setParent(this);
+ bdBusyLabel.setText(tr("<center><b>Assembly database is busy</b><br>Some task occupied database.<br> When the database is free all functionality of Assembly Browser will be available again.</center>"));
+ bdBusyLabel.installEventFilter(this);
+ bdBusyLabel.setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
QVBoxLayout * coveredRegionsLayout = new QVBoxLayout();
coveredRegionsLayout->addWidget(&coveredRegionsLabel);
+ coveredRegionsLayout->addWidget(&bdBusyLabel);
setLayout(coveredRegionsLayout);
initRedraw();
connectSlots();
@@ -113,14 +121,14 @@ void AssemblyReadsArea::createMenu() {
QMenu * exportMenu = readMenu->addMenu(tr("Export"));
exportMenu->menuAction()->setObjectName("Export");
- QAction *exportCoverage = exportMenu->addAction(tr("Coverage"));
- exportCoverage->setObjectName("Export coverage");
- connect(exportCoverage, SIGNAL(triggered()), browser, SLOT(sl_exportCoverage()));
+ QAction *exportCoverage = exportMenu->addAction(tr("Coverage"));
+ exportCoverage->setObjectName("Export coverage");
+ connect(exportCoverage, SIGNAL(triggered()), browser, SLOT(sl_exportCoverage()));
- QAction * exportConsensus = exportMenu->addAction("Consensus");
- connect(exportConsensus, SIGNAL(triggered()), ui->getConsensusArea(), SLOT(sl_exportConsensus()));
+ QAction * exportConsensus = exportMenu->addAction("Consensus");
+ connect(exportConsensus, SIGNAL(triggered()), ui->getConsensusArea(), SLOT(sl_exportConsensus()));
- exportMenu->addSeparator();
+ exportMenu->addSeparator();
exportReadAction = exportMenu->addAction("Current read");
connect(exportReadAction, SIGNAL(triggered()), SLOT(sl_onExportRead()));
@@ -128,8 +136,8 @@ void AssemblyReadsArea::createMenu() {
QAction * exportVisibleReads = exportMenu->addAction("Visible reads as sequences");
connect(exportVisibleReads, SIGNAL(triggered()), SLOT(sl_onExportReadsOnScreen()));
- QAction * exportAssemblyRegion = exportMenu->addAction("Assembly region");
- connect(exportAssemblyRegion, SIGNAL(triggered()), browser, SLOT(sl_extractAssemblyRegion()));
+ QAction * exportAssemblyRegion = exportMenu->addAction("Assembly region");
+ connect(exportAssemblyRegion, SIGNAL(triggered()), browser, SLOT(sl_extractAssemblyRegion()));
readMenu->addSeparator();
@@ -274,39 +282,51 @@ void AssemblyReadsArea::accumulateDelta(int delta) {
void AssemblyReadsArea::drawAll() {
GTIMER(c1, t1, "AssemblyReadsArea::drawAll");
if(!model->isEmpty()) {
- if (redraw) {
- // update cached pixmap
- redraw = false;
-
- if(browser->areReadsVisible()) {
- cachedView.fill(Qt::transparent);
- QPainter p(&cachedView);
- drawReads(p);
+ if(!model->isDbLocked(lockTimeout)){
+ lockTimeout = 500;
+ if(bdBusyLabel.isVisible()){
+ bdBusyLabel.hide();
+ redraw = true;
}
- else {
- QPainter p(this);
- p.fillRect(0, 0, width(), height(), Qt::transparent);
- showWelcomeScreen();
+ if (redraw) {
+ // update cached pixmap
+ redraw = false;
+
+ if(browser->areReadsVisible()) {
+ cachedView.fill(Qt::transparent);
+ QPainter p(&cachedView);
+ drawReads(p);
+ }
+ else {
+ QPainter p(this);
+ p.fillRect(0, 0, width(), height(), Qt::transparent);
+ showWelcomeScreen();
+ }
+
+ setupHScrollBar();
+ setupVScrollBar();
}
- setupHScrollBar();
- setupVScrollBar();
- }
+ if(browser->areReadsVisible()) {
+ QPainter p(this);
+ p.drawPixmap(0, 0, cachedView);
- if(browser->areReadsVisible()) {
- QPainter p(this);
- p.drawPixmap(0, 0, cachedView);
+ // draw all light stuff which is faster
+ // to redraw than cache into pixmap
- // draw all light stuff which is faster
- // to redraw than cache into pixmap
+ if(hintData.updateHint) {
+ hintData.updateHint = false;
+ updateHint();
+ }
- if(hintData.updateHint) {
- hintData.updateHint = false;
- updateHint();
+ drawReadsShadowing(p);
+ drawCurrentReadHighlight(p);
}
-
- drawReadsShadowing(p);
- drawCurrentReadHighlight(p);
+ }else{
+ lockTimeout = 0;
+ QPainter p(this);
+ p.fillRect(0, 0, width(), height(), Qt::transparent);
+ showDdBusyScreen();
}
}
}
@@ -356,7 +376,12 @@ void AssemblyReadsArea::showWelcomeScreen() {
coveredRegionsLabel.setAdditionalText(prefix, postfix);
coveredRegionsLabel.show();
- //p.drawText(rect(), Qt::AlignCenter, );
+}
+
+void AssemblyReadsArea::showDdBusyScreen() {
+ cachedReads.clear();
+ coveredRegionsLabel.hide();
+ bdBusyLabel.show();
}
void AssemblyReadsArea::drawReads(QPainter & p) {
@@ -364,6 +389,7 @@ void AssemblyReadsArea::drawReads(QPainter & p) {
GCOUNTER(c2, t2, "AssemblyReadsArea::drawReads");
qint64 t0 = GTimer::currentTimeMicros();
coveredRegionsLabel.hide();
+ bdBusyLabel.hide();
p.setFont(browser->getFont());
p.fillRect(rect(), backgroundColor);
@@ -798,7 +824,7 @@ void AssemblyReadsArea::keyPressEvent(QKeyEvent * e) {
}
bool AssemblyReadsArea::eventFilter(QObject *obj, QEvent *ev) {
- if(obj == &coveredRegionsLabel) {
+ if(obj == &coveredRegionsLabel || obj == &bdBusyLabel) {
if(ev->type() == QEvent::MouseMove) {
QWidget::event(ev);
}
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
index b8da53c..2e0939b 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -112,6 +112,8 @@ private:
/** Put welcome screen info on coveredRegionsLabel */
void showWelcomeScreen();
+ /** Put information screen that database is busy */
+ void showDdBusyScreen();
int calcFontPointSize() const;
@@ -157,6 +159,7 @@ private:
QScopedPointer<AssemblyCellRenderer> cellRenderer;
CoveredRegionsLabel coveredRegionsLabel;
+ QLabel bdBusyLabel;
QScrollBar * hBar;
QScrollBar * vBar;
@@ -254,6 +257,7 @@ private:
QList<QAction*> cellRendererActions;
QAction * optimizeRenderAction;
+ int lockTimeout;
};
} //ns
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
index 50cd9fe..9681080 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
index 5b55b1f..f8021e9 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReadsAreaHint.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
index 4d8cf1b..f2c1851 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
index 2b4a979..38aa7c5 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyReferenceArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
index 1c99175..c375c2b 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -108,8 +108,10 @@ void AssemblyRuler::drawCursor(QPainter & p) {
// pos + 1 because of 1-based coords
QString cursorLabel = FormatUtils::formatNumberWithSeparators(posXInAsm + 1);
if(showCoverage) {
- qint64 coverage = browser->getCoverageAtPos(posXInAsm);
- cursorLabel += " C " + FormatUtils::formatNumberWithSeparators(coverage);
+ qint32 coverage = browser->getCoverageAtPos(posXInAsm);
+ if (coverage >=0){//not have info about coverage yet
+ cursorLabel += " C " + FormatUtils::formatNumberWithSeparators(coverage);
+ }
}
int textWidth = p.fontMetrics().width(cursorLabel);
int textHeight = p.fontMetrics().height();
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
index d200a06..959c6b8 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyRuler.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
index 7d7e192..46051b6 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220486";
+const QString AssemblySettingsWidgetFactory::GROUP_DOC_PAGE = "18223126";
AssemblySettingsWidgetFactory::AssemblySettingsWidgetFactory()
diff --git a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
index 102bd15..0d27c29 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblySettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
index 58f4946..a6b4e77 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
index 59d78ba..8e8921f 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantHint.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
index 8871b04..071417e 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
index e72ed5a..04aba01 100644
--- a/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
+++ b/src/corelibs/U2View/src/ov_assembly/AssemblyVariantRow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
index 511591f..97594a7 100644
--- a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@
namespace U2 {
CalculateCoveragePerBaseOnRegionTask::CalculateCoveragePerBaseOnRegionTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId, const U2Region ®ion) :
- Task(tr("Calculate coverage per base for assembly %1 on region (%2, %3)"), TaskFlag_None),
+ Task(tr("Calculate coverage per base for assembly on region (%1, %2)").arg(region.startPos).arg(region.endPos()), TaskFlag_None),
dbiRef(dbiRef),
assemblyId(assemblyId),
region(region),
@@ -40,15 +40,6 @@ CalculateCoveragePerBaseOnRegionTask::CalculateCoveragePerBaseOnRegionTask(const
{
SAFE_POINT_EXT(dbiRef.isValid(), setError(tr("Invalid database reference")), );
SAFE_POINT_EXT(!assemblyId.isEmpty(), setError(tr("Invalid assembly ID")), );
-
- DbiConnection con(dbiRef, stateInfo);
- CHECK_OP(stateInfo, );
- U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
- SAFE_POINT_EXT(NULL != assemblyDbi, setError(tr("Assembly DBI is NULL")), );
-
- const U2Assembly assembly = assemblyDbi->getAssemblyObject(assemblyId, stateInfo);
- CHECK_OP(stateInfo, );
- setTaskName(getTaskName().arg(assembly.visualName).arg(region.startPos).arg(region.endPos()));
}
CalculateCoveragePerBaseOnRegionTask::~CalculateCoveragePerBaseOnRegionTask() {
@@ -56,7 +47,19 @@ CalculateCoveragePerBaseOnRegionTask::~CalculateCoveragePerBaseOnRegionTask() {
}
void CalculateCoveragePerBaseOnRegionTask::run() {
- U2AssemblyUtils::calculateCoveragePerBase(dbiRef, assemblyId, region, results, stateInfo);
+ DbiConnection con(dbiRef, stateInfo);
+ CHECK_OP(stateInfo, );
+ U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
+ SAFE_POINT_EXT(NULL != assemblyDbi, setError(tr("Assembly DBI is NULL")), );
+
+ results->resize(region.length);
+
+ QScopedPointer<U2DbiIterator<U2AssemblyRead> > readsIterator(assemblyDbi->getReads(assemblyId, region, stateInfo));
+ while (readsIterator->hasNext()) {
+ const U2AssemblyRead read = readsIterator->next();
+ processRead(read);
+ CHECK_OP(stateInfo, );
+ }
}
const U2Region &CalculateCoveragePerBaseOnRegionTask::getRegion() const {
@@ -69,22 +72,74 @@ QVector<CoveragePerBaseInfo> *CalculateCoveragePerBaseOnRegionTask::takeResult()
return result;
}
+void CalculateCoveragePerBaseOnRegionTask::processRead(const U2AssemblyRead &read) {
+ const qint64 startPos = qMax(read->leftmostPos, region.startPos);
+ const qint64 endPos = qMin(read->leftmostPos + read->effectiveLen, region.endPos());
+ const U2Region regionToProcess = U2Region(startPos, endPos - startPos);
+
+ // we have used effective length of the read, so insertions/deletions are already taken into account
+ // cigarVector can be longer than needed
+ QVector<U2CigarOp> cigarVector;
+ foreach (const U2CigarToken &cigar, read->cigar) {
+ cigarVector += QVector<U2CigarOp>(cigar.count, cigar.op);
+ }
+
+ if (read->leftmostPos < regionToProcess.startPos) {
+ cigarVector = cigarVector.mid(regionToProcess.startPos - read->leftmostPos);//cut unneeded cigar string
+ }
+
+ for (int positionOffset = 0, cigarOffset = 0, deletionsCount = 0, insertionsCount = 0; regionToProcess.startPos + positionOffset < regionToProcess.endPos(); positionOffset++) {
+ char currentBase = 'N';
+ CoveragePerBaseInfo &info = (*results)[regionToProcess.startPos + positionOffset - region.startPos];
+ const U2CigarOp cigarOp = nextCigarOp(cigarVector, cigarOffset, insertionsCount);
+ CHECK_OP(stateInfo, );
+
+ switch(cigarOp) {
+ case U2CigarOp_I:
+ case U2CigarOp_S:
+ // skip the insertion
+ continue;
+ case U2CigarOp_D:
+ // skip the deletion
+ deletionsCount++;
+ continue;
+ case U2CigarOp_N:
+ // skip the deletion
+ deletionsCount++;
+ continue;
+ default:
+ currentBase = read->readSequence[positionOffset - deletionsCount + insertionsCount];
+ break;
+ }
+ info.basesCount[currentBase] = info.basesCount[currentBase] + 1;
+ info.coverage++;
+ }
+}
+
+U2CigarOp CalculateCoveragePerBaseOnRegionTask::nextCigarOp(const QVector<U2CigarOp> &cigarVector, int &index, int &insertionsCount) {
+ U2CigarOp cigarOp = U2CigarOp_Invalid;
+
+ do {
+ SAFE_POINT_EXT(index < cigarVector.length(), setError(tr("Cigar string: out of bounds")), U2CigarOp_Invalid);
+ cigarOp = cigarVector[index];
+ index++;
+
+ if (U2CigarOp_I == cigarOp || U2CigarOp_S == cigarOp) {
+ insertionsCount++;
+ }
+ } while (U2CigarOp_I == cigarOp || U2CigarOp_S == cigarOp || U2CigarOp_P == cigarOp);
+
+ return cigarOp;
+}
+
CalculateCoveragePerBaseTask::CalculateCoveragePerBaseTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId) :
- Task(tr("Calculate coverage per base for assembly %1"), TaskFlags_NR_FOSE_COSC),
+ Task(tr("Calculate coverage per base for assembly"), TaskFlags_NR_FOSE_COSC),
dbiRef(dbiRef),
- assemblyId(assemblyId)
+ assemblyId(assemblyId),
+ getLengthTask(NULL)
{
SAFE_POINT_EXT(dbiRef.isValid(), setError(tr("Invalid database reference")), );
SAFE_POINT_EXT(!assemblyId.isEmpty(), setError(tr("Invalid assembly ID")), );
-
- DbiConnection con(dbiRef, stateInfo);
- CHECK_OP(stateInfo, );
- U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
- SAFE_POINT_EXT(NULL != assemblyDbi, setError(tr("Assembly DBI is NULL")), );
-
- const U2Assembly assembly = assemblyDbi->getAssemblyObject(assemblyId, stateInfo);
- CHECK_OP(stateInfo, );
- setTaskName(getTaskName().arg(assembly.visualName));
}
CalculateCoveragePerBaseTask::~CalculateCoveragePerBaseTask() {
@@ -92,34 +147,28 @@ CalculateCoveragePerBaseTask::~CalculateCoveragePerBaseTask() {
}
void CalculateCoveragePerBaseTask::prepare() {
- DbiConnection con(dbiRef, stateInfo);
- CHECK_OP(stateInfo, );
- U2AttributeDbi *attributeDbi = con.dbi->getAttributeDbi();
- SAFE_POINT_EXT(NULL != attributeDbi, setError(tr("Attribute DBI is NULL")), );
-
- const U2IntegerAttribute lengthAttribute = U2AttributeUtils::findIntegerAttribute(attributeDbi, assemblyId, U2BaseAttributeName::reference_length, stateInfo);
- CHECK_OP(stateInfo, );
- CHECK_EXT(lengthAttribute.hasValidId(), setError(tr("Can't get the assembly length: attribute is missing")), );
-
- const qint64 length = lengthAttribute.value;
- SAFE_POINT_EXT(0 < length, setError(tr("Assembly has zero length")), );
-
- qint64 tasksCount = length / MAX_REGION_LENGTH + (length % MAX_REGION_LENGTH > 0 ? 1 : 0);
- for (qint64 i = 0; i < tasksCount; i++) {
- const U2Region region(i * MAX_REGION_LENGTH, (i == tasksCount - 1 ? length % MAX_REGION_LENGTH : MAX_REGION_LENGTH));
- addSubTask(new CalculateCoveragePerBaseOnRegionTask(dbiRef, assemblyId, region));
- }
+ getLengthTask = new GetAssemblyLengthTask(dbiRef, assemblyId);
+ addSubTask(getLengthTask);
}
QList<Task *> CalculateCoveragePerBaseTask::onSubTaskFinished(Task *subTask) {
QList<Task *> res;
CHECK_OP(stateInfo, res);
- CalculateCoveragePerBaseOnRegionTask *calculateTask = qobject_cast<CalculateCoveragePerBaseOnRegionTask *>(subTask);
- SAFE_POINT_EXT(NULL != calculateTask, setError(tr("An unexpected subtask")), res);
-
- results.insert(calculateTask->getRegion().startPos, calculateTask->takeResult());
- emit si_regionIsProcessed(calculateTask->getRegion().startPos);
+ if(subTask == getLengthTask){
+ const qint64 length = getLengthTask->getAssemblyLength();
+ qint64 tasksCount = length / MAX_REGION_LENGTH + (length % MAX_REGION_LENGTH > 0 ? 1 : 0);
+ for (qint64 i = 0; i < tasksCount; i++) {
+ const U2Region region(i * MAX_REGION_LENGTH, (i == tasksCount - 1 ? length % MAX_REGION_LENGTH : MAX_REGION_LENGTH));
+ res.append(new CalculateCoveragePerBaseOnRegionTask(dbiRef, assemblyId, region));
+ }
+ }else{
+ CalculateCoveragePerBaseOnRegionTask *calculateTask = qobject_cast<CalculateCoveragePerBaseOnRegionTask *>(subTask);
+ SAFE_POINT_EXT(NULL != calculateTask, setError(tr("An unexpected subtask")), res);
+
+ results.insert(calculateTask->getRegion().startPos, calculateTask->takeResult());
+ emit si_regionIsProcessed(calculateTask->getRegion().startPos);
+ }
return res;
}
@@ -138,4 +187,17 @@ QVector<CoveragePerBaseInfo> *CalculateCoveragePerBaseTask::takeResult(qint64 st
return result;
}
+void GetAssemblyLengthTask::run(){
+ DbiConnection con(dbiRef, stateInfo);
+ CHECK_OP(stateInfo, );
+ U2AttributeDbi *attributeDbi = con.dbi->getAttributeDbi();
+ SAFE_POINT_EXT(NULL != attributeDbi, setError(tr("Attribute DBI is NULL")), );
+
+ const U2IntegerAttribute lengthAttribute = U2AttributeUtils::findIntegerAttribute(attributeDbi, assemblyId, U2BaseAttributeName::reference_length, stateInfo);
+ CHECK_OP(stateInfo, );
+ CHECK_EXT(lengthAttribute.hasValidId(), setError(tr("Can't get the assembly length: attribute is missing")), );
+
+ length = lengthAttribute.value;
+ SAFE_POINT_EXT(0 < length, setError(tr("Assembly has zero length")), );
+}
} // namespace U2
diff --git a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
index 478a2d9..c8b0029 100644
--- a/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/CalculateCoveragePerBaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,10 +25,32 @@
#include <U2Core/U2Assembly.h>
#include <U2Core/Task.h>
#include <U2Core/U2Type.h>
-#include <U2Core/U2AssemblyUtils.h>
namespace U2 {
+class CoveragePerBaseInfo {
+public:
+ CoveragePerBaseInfo() :
+ coverage(0) {}
+
+ int coverage;
+ QMap<char, int> basesCount;
+};
+class GetAssemblyLengthTask : public Task {
+ Q_OBJECT
+public:
+ GetAssemblyLengthTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId):
+ Task(tr("Get length of Assembly"), TaskFlag_None), dbiRef(dbiRef), assemblyId(assemblyId) { }
+
+ void run();
+
+ qint64 getAssemblyLength() const { return length; }
+private:
+ const U2DbiRef dbiRef;
+ const U2DataId assemblyId;
+ qint64 length;
+};
+
class CalculateCoveragePerBaseOnRegionTask : public Task {
Q_OBJECT
public:
@@ -41,6 +63,9 @@ public:
QVector<CoveragePerBaseInfo> *takeResult();
private:
+ void processRead(const U2AssemblyRead &read);
+ U2CigarOp nextCigarOp(const QVector<U2CigarOp> &cigarVector, int &index, int &insertionsCount);
+
const U2DbiRef dbiRef;
const U2DataId assemblyId;
const U2Region region;
@@ -71,6 +96,7 @@ private:
QHash<qint64, QVector<CoveragePerBaseInfo> *> results;
static const qint64 MAX_REGION_LENGTH = 100000;
+ GetAssemblyLengthTask *getLengthTask;
};
} // namespace U2
diff --git a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
index 10a9a74..66d1ee8 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,11 +19,11 @@
* MA 02110-1301, USA.
*/
-#include "AssemblyModel.h"
#include "CoverageInfo.h"
#include <U2Core/U2OpStatusUtils.h>
#include <U2Core/U2SafePoints.h>
+#include "AssemblyModel.h"
#include <algorithm>
#include <limits>
@@ -31,8 +31,8 @@
namespace U2 {
void CoverageInfo::updateStats() {
- maxCoverage = 0;
- minCoverage = std::numeric_limits<qint64>::max();
+ CHECK(!coverageInfo.isEmpty(),)
+ maxCoverage = minCoverage = coverageInfo[0];
qint64 sum = 0;
@@ -45,10 +45,13 @@ void CoverageInfo::updateStats() {
}
CalcCoverageInfoTask::CalcCoverageInfoTask(const CalcCoverageInfoTaskSettings & settings_) :
-BackgroundTask<CoverageInfo>("Calculate assembly coverage", TaskFlags_NR_FOSE_COSC), settings(settings_), calculateTask(NULL) {}
+BackgroundTask<CoverageInfo>("Calculate assembly coverage", TaskFlag_None), settings(settings_)
+{
+ tpm = Progress_Manual;
+}
+void CalcCoverageInfoTask::run() {
-void CalcCoverageInfoTask::prepare() {
U2AssemblyCoverageStat cachedCoverageStat;
{
cachedCoverageStat = settings.model->getCoverageStat(stateInfo);
@@ -67,41 +70,35 @@ void CalcCoverageInfoTask::prepare() {
}
}
double basesPerRegion = (double)settings.visibleRange.length/settings.regions;
- double coverageStatBasesPerRegion = (double)modelLength/cachedCoverageStat.coverage->size();
+ double coverageStatBasesPerRegion = (double)modelLength/cachedCoverageStat.size();
result.coverageInfo.resize(settings.regions);
result.region = settings.visibleRange;
- if(cachedCoverageStat.coverage->isEmpty() || (coverageStatBasesPerRegion > basesPerRegion)) {
- calculateTask = new CalculateCoveragePerBaseOnRegionTask(settings.model->getDbiConnection().dbi->getDbiRef(), settings.model->getAssembly().id, settings.visibleRange);
- addSubTask(calculateTask);
+ if(cachedCoverageStat.isEmpty() || (coverageStatBasesPerRegion > basesPerRegion)) {
+ U2AssemblyCoverageStat coverageStat;
+ coverageStat.resize(settings.regions);
+ {
+ settings.model->calculateCoverageStat(settings.visibleRange, coverageStat, stateInfo);
+ if(stateInfo.isCoR()) {
+ return;
+ }
+ }
+ assert(coverageStat.size() == settings.regions);
+ for(int regionIndex = 0;regionIndex < settings.regions;regionIndex++) {
+ result.coverageInfo[regionIndex] = coverageStat[regionIndex];
+ }
} else {
for(int regionIndex = 0;regionIndex < settings.regions;regionIndex++) {
int startPosition = qRound((settings.visibleRange.startPos + basesPerRegion*regionIndex)/coverageStatBasesPerRegion);
int endPosition = qRound((settings.visibleRange.startPos + basesPerRegion*(regionIndex + 1))/coverageStatBasesPerRegion);
result.coverageInfo[regionIndex] = 0;
for(int i = startPosition;i < endPosition;i++) {
- result.coverageInfo[regionIndex] = std::max(result.coverageInfo[regionIndex], (qint64)cachedCoverageStat.coverage->at(i).maxValue);
+ result.coverageInfo[regionIndex] = std::max(result.coverageInfo[regionIndex], cachedCoverageStat[i]);
}
- result.updateStats();
- }
- }
-}
-
-QList<Task*> CalcCoverageInfoTask::onSubTaskFinished(Task* subTask) {
- QList<Task*> tasks;
- CHECK(!subTask->hasError(), tasks);
- CHECK(!hasError(), tasks);
- if (subTask == calculateTask) {
- QVector<CoveragePerBaseInfo> *info = calculateTask->takeResult();
- for (int i = 0; i < info->size(); i++) {
- result.coverageInfo[i] = info->at(i).coverage;
}
-
- delete info;
- result.updateStats();
}
- return tasks;
+ result.updateStats();
}
}
diff --git a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
index ef962d7..4a8caad 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
+++ b/src/corelibs/U2View/src/ov_assembly/CoverageInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -23,7 +23,6 @@
#define __COVERAGE_INFO_H__
#include "AssemblyModel.h"
-#include "CalculateCoveragePerBaseTask.h"
#include <U2Core/BackgroundTaskRunner.h>
#include <U2Core/U2Region.h>
@@ -43,10 +42,10 @@ struct CoverageInfo {
void updateStats();
U2Region region;
- QVector<qint64> coverageInfo;
+ U2AssemblyCoverageStat coverageInfo;
double averageCoverage;
- qint64 maxCoverage;
- qint64 minCoverage;
+ qint32 maxCoverage;
+ qint32 minCoverage;
};
struct CalcCoverageInfoTaskSettings {
@@ -56,13 +55,12 @@ struct CalcCoverageInfoTaskSettings {
};
class CalcCoverageInfoTask : public BackgroundTask<CoverageInfo> {
+ Q_OBJECT
public:
CalcCoverageInfoTask(const CalcCoverageInfoTaskSettings & settings);
- void prepare();
- QList<Task*> onSubTaskFinished(Task *subTask);
+ virtual void run();
private:
CalcCoverageInfoTaskSettings settings;
- CalculateCoveragePerBaseOnRegionTask *calculateTask;
};
}
diff --git a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
index 27699a2..ca9b451 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -27,7 +27,7 @@ namespace U2 {
const int CoveredRegionsManager::DESIRED_REGION_LENGTH = 100;
-CoveredRegionsManager::CoveredRegionsManager(const U2Region & visibleRegion_, const QVector<qint64> & coverageInfo) :
+CoveredRegionsManager::CoveredRegionsManager(const U2Region & visibleRegion_, const U2AssemblyCoverageStat & coverageInfo) :
visibleRegion(visibleRegion_) {
assert(!coverageInfo.empty());
assert(!visibleRegion.isEmpty());
@@ -44,7 +44,7 @@ visibleRegion(visibleRegion_) {
step *= regionsToJoin;
}
for(int i = 0; i < regionsCount; ++i) {
- qint64 maxCoverage = 0;
+ qint32 maxCoverage = 0;
for(int j = 0; j < regionsToJoin; ++j) {
maxCoverage = qMax(maxCoverage, coverageInfo[i*regionsToJoin + j]);
}
diff --git a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
index 0af1a86..34b94ea 100644
--- a/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
+++ b/src/corelibs/U2View/src/ov_assembly/CoveredRegionsManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ struct CoveredRegion {
class CoveredRegionsManager {
public:
CoveredRegionsManager() {}
- CoveredRegionsManager(const U2Region & visibleRegion_, const QVector<qint64> & coverageInfo_);
+ CoveredRegionsManager(const U2Region & visibleRegion_, const U2AssemblyCoverageStat & coverageInfo_);
inline bool isEmpty() const {return allRegions.empty();}
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
index 4c21fa0..dd6a131 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ ExportConsensusDialog::ExportConsensusDialog(QWidget *p, const ExportConsensusTa
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220479");
+ new HelpButton(this, buttonBox, "18223119");
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 e606d42..e0a6369 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
index d188298..5bc2675 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
index 4a221e7..466973f 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
index ad2eef8..6fdd0d1 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ ExportConsensusVariationsDialog::ExportConsensusVariationsDialog(QWidget *p, con
{
setupUi(this);
setWindowTitle(tr("Export Consensus Variations"));
- new HelpButton(this, buttonBox, "18220481");
+ new HelpButton(this, buttonBox, "18223121");
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 2119adc..a7bd65b 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
index f81c1fe..e9e3646 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
index 02f4f06..7f81951 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportConsensusVariationsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
index 19ff798..435e74a 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -97,7 +97,7 @@ void ExportCoverageDialog::sl_formatChanged(const QString &format) {
void ExportCoverageDialog::initLayout() {
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
- new HelpButton(this, buttonBox, "18220482");
+ new HelpButton(this, buttonBox, "18223122");
gbAdditionalOptions->hide();
adjustSize();
}
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
index 60507a1..f04da8d 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
index f3fdb82..2944d67 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,11 +47,23 @@ const QString ExportCoverageSettings::COMPRESSED_EXTENSION = ".gz";
const QByteArray ExportCoverageTask::SEPARATOR = "\t";
const QList<char> ExportCoverageTask::EXTENDED_CHARACTERS = QList<char>() << 'W' << 'R' << 'M' << 'K' << 'Y' << 'S' << 'B' << 'V' << 'H' << 'D';
+void GetAssemblyVisibleNameTask::run(){
+ DbiConnection con(dbiRef, stateInfo);
+ CHECK_OP(stateInfo, );
+ U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
+ SAFE_POINT_EXT(NULL != assemblyDbi, setError(tr("Assembly DBI is NULL")), );
+
+ const U2Assembly assembly = assemblyDbi->getAssemblyObject(assemblyId, stateInfo);
+ CHECK_OP(stateInfo, );
+ assemblyName = assembly.visualName;
+}
+
ExportCoverageTask::ExportCoverageTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId, const ExportCoverageSettings &settings, TaskFlags flags) :
- Task(tr("Export coverage per base for %1"), flags),
+ Task(tr("Export assembly coverage per base"), flags),
dbiRef(dbiRef),
assemblyId(assemblyId),
settings(settings),
+ getAssemblyNameTask(NULL),
calculateTask(NULL),
alreadyProcessed(0)
{
@@ -59,19 +71,13 @@ ExportCoverageTask::ExportCoverageTask(const U2DbiRef &dbiRef, const U2DataId &a
SAFE_POINT_EXT(!assemblyId.isEmpty(), setError(tr("Invalid assembly ID")), );
SAFE_POINT_EXT(!settings.url.isEmpty(), setError(tr("Invalid destination url")), );
- DbiConnection con(dbiRef, stateInfo);
- CHECK_OP(stateInfo, );
- U2AssemblyDbi *assemblyDbi = con.dbi->getAssemblyDbi();
- SAFE_POINT_EXT(NULL != assemblyDbi, setError(tr("Assembly DBI is NULL")), );
-
- const U2Assembly assembly = assemblyDbi->getAssemblyObject(assemblyId, stateInfo);
- CHECK_OP(stateInfo, );
- assemblyName = assembly.visualName;
- setTaskName(getTaskName().arg(assemblyName));
alphabetChars << 'A' << 'C' << 'G' << 'T';
}
void ExportCoverageTask::prepare() {
+ getAssemblyNameTask = new GetAssemblyVisibleNameTask(dbiRef, assemblyId);
+ addSubTask(getAssemblyNameTask);
+
QDir().mkpath(QFileInfo(settings.url).absoluteDir().absolutePath());
if (settings.compress) {
IOAdapterFactory *ioAdapterFactory = IOAdapterUtils::get(BaseIOAdapters::GZIPPED_LOCAL_FILE);
@@ -93,6 +99,12 @@ void ExportCoverageTask::prepare() {
addSubTask(calculateTask);
}
+QList<Task *> ExportCoverageTask::onSubTaskFinished(Task *subTask){
+ if(subTask == getAssemblyNameTask){
+ assemblyName = getAssemblyNameTask->getAssemblyVisibleName();
+ }
+ return QList<Task *>();
+}
Task::ReportResult ExportCoverageTask::report() {
if (NULL != calculateTask) {
SAFE_POINT_EXT(!calculateTask->areThereUnprocessedResults(), setError(tr("Not all regions were processed")), ReportResult_Finished);
@@ -120,7 +132,6 @@ void ExportCoverageTask::sl_regionIsProcessed(qint64 startPos) {
}
}
}
-
void ExportCoverageTask::identifyAlphabet(QVector<CoveragePerBaseInfo>* regionCoverage) {
CHECK(alphabetChars.size() == 4, );
foreach(const CoveragePerBaseInfo &info, *regionCoverage) {
@@ -255,9 +266,13 @@ ExportCoverageBedgraphTask::ExportCoverageBedgraphTask(const U2DbiRef &dbiRef, c
GCOUNTER(c, t, "ExportCoverageBedgraphTask");
}
-QList<Task *> ExportCoverageBedgraphTask::onSubTaskFinished(Task *) {
+QList<Task *> ExportCoverageBedgraphTask::onSubTaskFinished(Task *subTask) {
CHECK_OP(stateInfo, QList<Task *>());
- writeRegion();
+ if(subTask == getAssemblyNameTask){
+ assemblyName = getAssemblyNameTask->getAssemblyVisibleName();
+ }else{
+ writeRegion();
+ }
return QList<Task *>();
}
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
index 3abae57..c209cc9 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportCoverageTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -22,7 +22,6 @@
#ifndef _U2_EXPORT_COVERAGE_TASK_H_
#define _U2_EXPORT_COVERAGE_TASK_H_
-#include <U2Core/U2AssemblyUtils.h>
#include <U2Core/GUrl.h>
#include <U2Core/IOAdapter.h>
#include <U2Core/Task.h>
@@ -64,6 +63,20 @@ public:
static const QString BEDGRAPH_EXTENSION;
static const QString COMPRESSED_EXTENSION;
};
+class GetAssemblyVisibleNameTask : public Task {
+ Q_OBJECT
+public:
+ GetAssemblyVisibleNameTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId):
+ Task(tr("Get visible name of Assembly"), TaskFlag_None), dbiRef(dbiRef), assemblyId(assemblyId) { }
+
+ void run();
+
+ const QString &getAssemblyVisibleName() const { return assemblyName; }
+private:
+ const U2DbiRef dbiRef;
+ const U2DataId assemblyId;
+ QString assemblyName;
+};
class U2VIEW_EXPORT ExportCoverageTask : public Task {
Q_OBJECT
@@ -71,6 +84,7 @@ public:
ExportCoverageTask(const U2DbiRef &dbiRef, const U2DataId &assemblyId, const ExportCoverageSettings &settings, TaskFlags flags = TaskFlags_NR_FOSE_COSC);
void prepare();
+ QList<Task *> onSubTaskFinished(Task *subTask);
ReportResult report();
const QString &getUrl() const;
@@ -89,6 +103,7 @@ protected:
const ExportCoverageSettings settings;
QString assemblyName;
+ GetAssemblyVisibleNameTask *getAssemblyNameTask;
CalculateCoveragePerBaseTask *calculateTask;
QScopedPointer<IOAdapter> ioAdapter;
qint64 alreadyProcessed;
diff --git a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
index b024e98..77d8c6f 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ namespace U2 {
ExportReadsDialog::ExportReadsDialog(QWidget * p, const QList<DocumentFormatId> & formats) : QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220477");
+ new HelpButton(this, buttonBox, "18223117");
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 2f203f9..4a240de 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExportReadsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.cpp b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.cpp
index c3d131b..1c390d1 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ ExtractAssemblyRegionDialog::ExtractAssemblyRegionDialog(QWidget * p, ExtractAss
, settings(settings) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220483");
+ new HelpButton(this, buttonBox, "18223123");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -69,7 +69,7 @@ void ExtractAssemblyRegionDialog::sl_regionChanged(const U2Region& newRegion) {
QString baseName = fi.baseName();
QString newLocation = QString::number(newRegion.startPos + 1) + "_" + QString::number(newRegion.endPos());
baseName.replace(stringToReplace, newLocation);
-
+
filePath = fi.dir().path() + "/" + baseName + "." + fi.completeSuffix();
saveController->setPath(filePath);
}
@@ -105,7 +105,7 @@ void ExtractAssemblyRegionDialog::accept() {
regionSelector->setFocus(Qt::OtherFocusReason);
return;
}
-
+
if (settings->fileUrl.isEmpty()) {
QMessageBox::critical(this, tr("Error!"), tr("Select destination file"));
filepathLineEdit->setFocus(Qt::OtherFocusReason);
diff --git a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.h b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.h
index f7c55ed..1053f30 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.cpp b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.cpp
index e3441df..9e745fc 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@
namespace U2 {
-ExtractAssemblyRegionAndOpenViewTask::ExtractAssemblyRegionAndOpenViewTask(const ExtractAssemblyRegionTaskSettings& settings)
+ExtractAssemblyRegionAndOpenViewTask::ExtractAssemblyRegionAndOpenViewTask(const ExtractAssemblyRegionTaskSettings& settings)
: Task(tr("Extract Assembly Region And Open View Task"), TaskFlags_NR_FOSE_COSC), settings(settings), extractTask(NULL) {}
void ExtractAssemblyRegionAndOpenViewTask::prepare() {
@@ -50,7 +50,7 @@ void ExtractAssemblyRegionAndOpenViewTask::prepare() {
} else {
setSubtaskProgressWeight(100);
}
-
+
extractTask = new ExtractAssemblyRegionTask(settings);
addSubTask(extractTask);
}
@@ -62,16 +62,16 @@ QList<Task*> ExtractAssemblyRegionAndOpenViewTask::onSubTaskFinished(Task *subTa
if (subTask->hasError() || subTask->isCanceled()) {
return result;
}
-
+
if (extractTask == subTask && settings.addToProject) {
Task* openTask = AppContext::getProjectLoader()->openWithProjectTask(settings.fileUrl);
CHECK(openTask != NULL, result);
result.append(openTask);
- }
+ }
return result;
}
-ExtractAssemblyRegionTask::ExtractAssemblyRegionTask(const ExtractAssemblyRegionTaskSettings& settings)
+ExtractAssemblyRegionTask::ExtractAssemblyRegionTask(const ExtractAssemblyRegionTaskSettings& settings)
: Task(tr("Extract Assembly Region Task"), TaskFlag_None), settings(settings) {
tpm = Task::Progress_Manual;
}
diff --git a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.h b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.h
index fdccfb2..7c41701 100644
--- a/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.h
+++ b/src/corelibs/U2View/src/ov_assembly/ExtractAssemblyRegionTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
index 043b4a5..35f66c2 100644
--- a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
+++ b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -202,7 +202,9 @@ void ZoomableAssemblyOverview::drawBackground(QPainter & p) {
if (!ci.coverageInfo.isEmpty()) {
switch(scaleType) {
case AssemblyBrowserSettings::Scale_Linear:
- grayCoeffD = double(ci.coverageInfo[i]) / ci.maxCoverage;
+ if(ci.maxCoverage != 0){
+ grayCoeffD = double(ci.coverageInfo[i]) / ci.maxCoverage;
+ }
columnPixels = qint64(double(ci.coverageInfo[i]) / readsPerYPixel + 0.5);
//grayCoeff = 255 - int(double(255) / ci.maxCoverage * ci.coverageInfo[i] + 0.5);
break;
diff --git a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
index 75b90a6..3c0030d 100644
--- a/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
+++ b/src/corelibs/U2View/src/ov_assembly/ZoomableAssemblyOverview.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
index 30517e0..24739a3 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.cpp
@@ -1,328 +1,328 @@
-/**
- * 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/DNASequenceObject.h>
-#include <U2Core/DocumentModel.h>
-#include <U2Core/DocumentSelection.h>
-#include <U2Core/DocumentUtils.h>
-#include <U2Core/ExternalToolRunTask.h>
-#include <U2Core/GObjectSelection.h>
-#include <U2Core/IOAdapter.h>
-#include <U2Core/IOAdapterUtils.h>
-#include <U2Core/LoadDocumentTask.h>
-#include <U2Core/MSAUtils.h>
-#include <U2Core/MsaDbiUtils.h>
-#include <U2Core/U2AlphabetUtils.h>
-#include <U2Core/U2DbiUtils.h>
-#include <U2Core/U2MsaDbi.h>
-#include <U2Core/U2SequenceUtils.h>
-
-#include <U2Gui/U2FileDialog.h>
-#include <U2Gui/ProjectView.h>
-#include <U2View/MSAEditor.h>
-
-#include <U2Algorithm/AlignmentAlgorithmsRegistry.h>
-#include <U2Algorithm/AbstractAlignmentTask.h>
-#include <U2Algorithm/BaseAlignmentAlgorithmsIds.h>
-
-#include "AlignSequencesToAlignmentTask.h"
-
-#include <QtCore/QDir>
-#include <QMessageBox>
-
-namespace U2 {
-
-const int LoadSequencesTask::maxErrorListSize = 5;
-
-/************************************************************************/
-/* SequencesExtractor */
-/************************************************************************/
-SequenceObjectsExtractor::SequenceObjectsExtractor() : extractFromMsa(false), sequencesMaxLength(0) {}
-
-void SequenceObjectsExtractor::setAlphabet(const DNAAlphabet* newAlphabet) {
- seqsAlphabet = newAlphabet;
-}
-
-void SequenceObjectsExtractor::extractSequencesFromDocuments(const QList<Document*>& documentsList) {
- foreach(Document* curDocument, documentsList) {
- extractSequencesFromDocument(curDocument);
- }
-}
-
-void SequenceObjectsExtractor::extractSequencesFromDocument(Document* doc) {
- extractSequencesFromObjects(doc->getObjects());
-}
-
-void SequenceObjectsExtractor::extractSequencesFromObjects(const QList<GObject*>& objects) {
- foreach(GObject* object, objects) {
- Document* doc = object->getDocument();
- if(doc != NULL) {
- if(!usedDocuments.contains(doc)){
- usedDocuments << doc;
- }
- }
-
- if(object->getGObjectType() == GObjectTypes::MULTIPLE_ALIGNMENT) {
- extractFromMsa = true;
- MAlignmentObject* curObj = qobject_cast<MAlignmentObject*>(object);
- SAFE_POINT(curObj != NULL, "MAlignmentObject is null",);
-
- checkAlphabet(curObj->getAlphabet(), curObj->getGObjectName());
- sequencesMaxLength = qMax(sequencesMaxLength, curObj->getLength());
-
- foreach(const MAlignmentRow& row, curObj->getMAlignment().getRows()) {
- U2EntityRef seqRef(curObj->getEntityRef().dbiRef, row.getRowDBInfo().sequenceId);
- sequenceRefs << seqRef;
- sequenceNames << row.getName();
- }
- } else if(object->getGObjectType() == GObjectTypes::SEQUENCE) {
- U2SequenceObject* dnaObj = qobject_cast<U2SequenceObject*>(object);
- SAFE_POINT(dnaObj != NULL, "U2SequenceObject is null",);
- sequencesMaxLength = qMax(sequencesMaxLength, dnaObj->getSequenceLength());
- sequenceRefs << dnaObj->getEntityRef();
- sequenceNames << dnaObj->getSequenceName();
-
- checkAlphabet(dnaObj->getAlphabet(), dnaObj->getGObjectName());
- }
- }
-}
-
-void SequenceObjectsExtractor::checkAlphabet(const DNAAlphabet* newAlphabet, const QString& objectName) {
- if(seqsAlphabet == NULL) {
- seqsAlphabet = newAlphabet;
- } else {
- const DNAAlphabet* commonAlphabet = U2AlphabetUtils::deriveCommonAlphabet(newAlphabet, seqsAlphabet);
- if(commonAlphabet == NULL) {
- errorList << objectName;
- } else {
- seqsAlphabet = commonAlphabet;
- }
- }
-}
-
-const QStringList& SequenceObjectsExtractor::getErrorList() const {
- return errorList;
-}
-
-const DNAAlphabet* SequenceObjectsExtractor::getAlphabet() const {
- return seqsAlphabet;
-}
-
-const QList<U2EntityRef>& SequenceObjectsExtractor::getSequenceRefs() const {
- return sequenceRefs;
-}
-
-const QStringList& SequenceObjectsExtractor::getSequenceNames() const {
- return sequenceNames;
-}
-qint64 SequenceObjectsExtractor::getMaxSequencesLength() const {
- return sequencesMaxLength;
-}
-
-const QList<Document*>& SequenceObjectsExtractor::getUsedDocuments() const {
- return usedDocuments;
-}
-
-/************************************************************************/
-/* LoadSequencesTask */
-/************************************************************************/
-LoadSequencesTask::LoadSequencesTask(const DNAAlphabet* msaAlphabet, const QStringList& fileWithSequencesUrls)
-: Task(tr("Load sequences task"), TaskFlag_NoRun), msaAlphabet(msaAlphabet), urls(fileWithSequencesUrls), extractor()
-{
- assert(!fileWithSequencesUrls.isEmpty());
- extractor.setAlphabet(msaAlphabet);
-}
-
-void LoadSequencesTask::prepare()
-{
- foreach( const QString& fileWithSequencesUrl, urls) {
- QList<FormatDetectionResult> detectedFormats = DocumentUtils::detectFormat(fileWithSequencesUrl);
- if (!detectedFormats.isEmpty()) {
- LoadDocumentTask* loadTask = LoadDocumentTask::getDefaultLoadDocTask(fileWithSequencesUrl);
- if(loadTask != NULL) {
- addSubTask(loadTask);
- }
- } else {
- setError("Unknown format");
- }
- }
-}
-
-QList<Task*> LoadSequencesTask::onSubTaskFinished(Task* subTask) {
- QList<Task*> subTasks;
-
- propagateSubtaskError();
- if (subTask->isCanceled() || isCanceled() || hasError() ) {
- return subTasks;
- }
-
- LoadDocumentTask* loadTask = qobject_cast<LoadDocumentTask*>(subTask);
- SAFE_POINT(loadTask != NULL, "LoadDocumentTask is null", subTasks);
-
- CHECK(loadTask->getDocument() != NULL, subTasks);
- extractor.extractSequencesFromDocument(loadTask->getDocument());
- return subTasks;
-}
-
-void LoadSequencesTask::setupError() {
- CHECK(!extractor.getErrorList().isEmpty(), );
-
- QStringList smallList = extractor.getErrorList().mid(0, maxErrorListSize);
- QString error = tr("Some sequences have wrong alphabet: ");
- error += smallList.join(", ");
- if (smallList.size() < extractor.getErrorList().size()) {
- error += tr(" and others");
- }
- setError(error);
-}
-
-Task::ReportResult LoadSequencesTask::report() {
- CHECK_OP(stateInfo, ReportResult_Finished);
-
- if(!extractor.getErrorList().isEmpty()) {
- setupError();
- }
- if(extractor.getSequenceRefs().isEmpty()) {
- QString filesSeparator(", ");
- setError(tr("There are no sequences to align in the document(s): %1").arg(urls.join(filesSeparator)));
- return ReportResult_Finished;
- }
- if(U2AlphabetUtils::deriveCommonAlphabet(extractor.getAlphabet(), msaAlphabet) == NULL) {
- setError(tr("Sequences have incompatible alphabets"));
- }
- return ReportResult_Finished;
-}
-
-const SequenceObjectsExtractor& LoadSequencesTask::getExtractor() const {
- return extractor;
-}
-
-
-
-/************************************************************************/
-/* AlignSequencesToAlignmentTask */
-/************************************************************************/
-AlignSequencesToAlignmentTask::AlignSequencesToAlignmentTask(MAlignmentObject* obj, const SequenceObjectsExtractor& extractor)
- : Task(tr("Align sequences to alignment task"), TaskFlags_NR_FOSE_COSC), maObj(obj), stateLock(NULL), docStateLock(NULL),
- sequencesMaxLength(extractor.getMaxSequencesLength()), extr(extractor)
-{
- fillSettingsByDefault();
- settings.addedSequencesRefs = extractor.getSequenceRefs();
- settings.addedSequencesNames = extractor.getSequenceNames();
- settings.maxSequenceLength = extractor.getMaxSequencesLength();
- settings.alphabet = extractor.getAlphabet()->getId();
- usedDocuments = extractor.getUsedDocuments();
- initialMAlignmentAlphabet = obj->getAlphabet();
-}
-
-void AlignSequencesToAlignmentTask::prepare()
-{
- if (maObj.isNull()) {
- stateInfo.setError(tr("Object is empty."));
- return;
- }
-
- if (maObj->isStateLocked()) {
- stateInfo.setError(tr("Object is locked for modifications."));
- return;
- }
- Document* document = maObj->getDocument();
- SAFE_POINT(NULL != document, "MSA object is NULL.", );
- docStateLock = new StateLock("Lock MSA for align sequences to alignment", StateLockFlag_LiveLock);
- document->lockState(docStateLock);
- foreach(Document* curDoc, usedDocuments) {
- curDoc->lockState(docStateLock);
- }
-
- stateLock = new StateLock("Align sequences to alignment", StateLockFlag_LiveLock);
- maObj->lockState(stateLock);
-
- AlignmentAlgorithmsRegistry* alignmentRegistry = AppContext::getAlignmentAlgorithmsRegistry();
- SAFE_POINT(NULL != alignmentRegistry, "AlignmentAlgorithmsRegistry is NULL.", );
- AlignmentAlgorithm* addAlgorithm = alignmentRegistry->getAlgorithm(settings.algorithmName);
- SAFE_POINT_EXT(NULL != addAlgorithm, setError(QString("Can not find \"%1\" algorithm").arg(settings.algorithmName)), );
- addSubTask(addAlgorithm->getFactory()->getTaskInstance(&settings));
-}
-
-void AlignSequencesToAlignmentTask::fillSettingsByDefault() {
- AlignmentAlgorithmsRegistry* alignmentRegistry = AppContext::getAlignmentAlgorithmsRegistry();
- SAFE_POINT(NULL != alignmentRegistry, "AlignmentAlgorithmsRegistry is NULL.", );
- if(alignmentRegistry->getAvailableAlgorithmIds(AddToAlignment).contains(BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_MAFFT)
- && maObj->getMAlignment().getNumRows() != 0) {
- settings.algorithmName = BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_MAFFT;
- } else {
- settings.algorithmName = BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_UGENE;
- }
- settings.addAsFragments = sequencesMaxLength < 100 && maObj->getLength() / sequencesMaxLength > 3;
- settings.msaRef = maObj->getEntityRef();
- settings.inNewWindow = false;
-}
-
-Task::ReportResult AlignSequencesToAlignmentTask::report() {
- if(stateLock != NULL) {
- maObj->unlockState(stateLock);
- delete stateLock;
- }
-
- if(docStateLock != NULL) {
- Document* document = maObj->getDocument();
- document->unlockState(docStateLock);
-
- foreach(Document* curDoc, usedDocuments) {
- curDoc->unlockState(docStateLock);
- }
-
- delete docStateLock;
- }
- MAlignmentModInfo mi;
- mi.alphabetChanged = extr.getAlphabet()->getId() != initialMAlignmentAlphabet->getId();
- mi.sequenceListChanged = true;
- if(!hasError() && !isCanceled()) {
- maObj->updateCachedMAlignment(mi);
- }
-
- return ReportResult_Finished;
-}
-
-/************************************************************************/
-/* LoadSequencesAndAlignToAlignmentTask */
-/************************************************************************/
-LoadSequencesAndAlignToAlignmentTask::LoadSequencesAndAlignToAlignmentTask(MAlignmentObject* obj, const QStringList& urls)
-: Task(tr("Load sequences and add to alignment task"), TaskFlag_NoRun), urls(urls), maObj(obj), loadSequencesTask(NULL) {
- SAFE_POINT_EXT(obj != NULL, setError("MAlignmentObject is null"), );
- loadSequencesTask = new LoadSequencesTask(obj->getAlphabet(), urls);
- loadSequencesTask->setSubtaskProgressWeight(5);
- addSubTask(loadSequencesTask);
-}
-
-QList<Task*> LoadSequencesAndAlignToAlignmentTask::onSubTaskFinished(Task* subTask) {
- QList<Task*> subTasks;
- propagateSubtaskError();
- if(subTask == loadSequencesTask && !loadSequencesTask->hasError() && !loadSequencesTask->isCanceled()) {
- AlignSequencesToAlignmentTask* alignSequencesToAlignmentTask = new AlignSequencesToAlignmentTask(maObj, loadSequencesTask->getExtractor());
- alignSequencesToAlignmentTask->setSubtaskProgressWeight(95);
- subTasks << alignSequencesToAlignmentTask;
- }
- return subTasks;
-}
-
-}
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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/DNASequenceObject.h>
+#include <U2Core/DocumentModel.h>
+#include <U2Core/DocumentSelection.h>
+#include <U2Core/DocumentUtils.h>
+#include <U2Core/ExternalToolRunTask.h>
+#include <U2Core/GObjectSelection.h>
+#include <U2Core/IOAdapter.h>
+#include <U2Core/IOAdapterUtils.h>
+#include <U2Core/LoadDocumentTask.h>
+#include <U2Core/MSAUtils.h>
+#include <U2Core/MsaDbiUtils.h>
+#include <U2Core/U2AlphabetUtils.h>
+#include <U2Core/U2DbiUtils.h>
+#include <U2Core/U2MsaDbi.h>
+#include <U2Core/U2SequenceUtils.h>
+
+#include <U2Gui/U2FileDialog.h>
+#include <U2Gui/ProjectView.h>
+#include <U2View/MSAEditor.h>
+
+#include <U2Algorithm/AlignmentAlgorithmsRegistry.h>
+#include <U2Algorithm/AbstractAlignmentTask.h>
+#include <U2Algorithm/BaseAlignmentAlgorithmsIds.h>
+
+#include "AlignSequencesToAlignmentTask.h"
+
+#include <QtCore/QDir>
+#include <QMessageBox>
+
+namespace U2 {
+
+const int LoadSequencesTask::maxErrorListSize = 5;
+
+/************************************************************************/
+/* SequencesExtractor */
+/************************************************************************/
+SequenceObjectsExtractor::SequenceObjectsExtractor() : extractFromMsa(false), sequencesMaxLength(0) {}
+
+void SequenceObjectsExtractor::setAlphabet(const DNAAlphabet* newAlphabet) {
+ seqsAlphabet = newAlphabet;
+}
+
+void SequenceObjectsExtractor::extractSequencesFromDocuments(const QList<Document*>& documentsList) {
+ foreach(Document* curDocument, documentsList) {
+ extractSequencesFromDocument(curDocument);
+ }
+}
+
+void SequenceObjectsExtractor::extractSequencesFromDocument(Document* doc) {
+ extractSequencesFromObjects(doc->getObjects());
+}
+
+void SequenceObjectsExtractor::extractSequencesFromObjects(const QList<GObject*>& objects) {
+ foreach(GObject* object, objects) {
+ Document* doc = object->getDocument();
+ if(doc != NULL) {
+ if(!usedDocuments.contains(doc)){
+ usedDocuments << doc;
+ }
+ }
+
+ if(object->getGObjectType() == GObjectTypes::MULTIPLE_ALIGNMENT) {
+ extractFromMsa = true;
+ MAlignmentObject* curObj = qobject_cast<MAlignmentObject*>(object);
+ SAFE_POINT(curObj != NULL, "MAlignmentObject is null",);
+
+ checkAlphabet(curObj->getAlphabet(), curObj->getGObjectName());
+ sequencesMaxLength = qMax(sequencesMaxLength, curObj->getLength());
+
+ foreach(const MAlignmentRow& row, curObj->getMAlignment().getRows()) {
+ U2EntityRef seqRef(curObj->getEntityRef().dbiRef, row.getRowDBInfo().sequenceId);
+ sequenceRefs << seqRef;
+ sequenceNames << row.getName();
+ }
+ } else if(object->getGObjectType() == GObjectTypes::SEQUENCE) {
+ U2SequenceObject* dnaObj = qobject_cast<U2SequenceObject*>(object);
+ SAFE_POINT(dnaObj != NULL, "U2SequenceObject is null",);
+ sequencesMaxLength = qMax(sequencesMaxLength, dnaObj->getSequenceLength());
+ sequenceRefs << dnaObj->getEntityRef();
+ sequenceNames << dnaObj->getSequenceName();
+
+ checkAlphabet(dnaObj->getAlphabet(), dnaObj->getGObjectName());
+ }
+ }
+}
+
+void SequenceObjectsExtractor::checkAlphabet(const DNAAlphabet* newAlphabet, const QString& objectName) {
+ if(seqsAlphabet == NULL) {
+ seqsAlphabet = newAlphabet;
+ } else {
+ const DNAAlphabet* commonAlphabet = U2AlphabetUtils::deriveCommonAlphabet(newAlphabet, seqsAlphabet);
+ if(commonAlphabet == NULL) {
+ errorList << objectName;
+ } else {
+ seqsAlphabet = commonAlphabet;
+ }
+ }
+}
+
+const QStringList& SequenceObjectsExtractor::getErrorList() const {
+ return errorList;
+}
+
+const DNAAlphabet* SequenceObjectsExtractor::getAlphabet() const {
+ return seqsAlphabet;
+}
+
+const QList<U2EntityRef>& SequenceObjectsExtractor::getSequenceRefs() const {
+ return sequenceRefs;
+}
+
+const QStringList& SequenceObjectsExtractor::getSequenceNames() const {
+ return sequenceNames;
+}
+qint64 SequenceObjectsExtractor::getMaxSequencesLength() const {
+ return sequencesMaxLength;
+}
+
+const QList<Document*>& SequenceObjectsExtractor::getUsedDocuments() const {
+ return usedDocuments;
+}
+
+/************************************************************************/
+/* LoadSequencesTask */
+/************************************************************************/
+LoadSequencesTask::LoadSequencesTask(const DNAAlphabet* msaAlphabet, const QStringList& fileWithSequencesUrls)
+: Task(tr("Load sequences task"), TaskFlag_NoRun), msaAlphabet(msaAlphabet), urls(fileWithSequencesUrls), extractor()
+{
+ assert(!fileWithSequencesUrls.isEmpty());
+ extractor.setAlphabet(msaAlphabet);
+}
+
+void LoadSequencesTask::prepare()
+{
+ foreach( const QString& fileWithSequencesUrl, urls) {
+ QList<FormatDetectionResult> detectedFormats = DocumentUtils::detectFormat(fileWithSequencesUrl);
+ if (!detectedFormats.isEmpty()) {
+ LoadDocumentTask* loadTask = LoadDocumentTask::getDefaultLoadDocTask(fileWithSequencesUrl);
+ if(loadTask != NULL) {
+ addSubTask(loadTask);
+ }
+ } else {
+ setError("Unknown format");
+ }
+ }
+}
+
+QList<Task*> LoadSequencesTask::onSubTaskFinished(Task* subTask) {
+ QList<Task*> subTasks;
+
+ propagateSubtaskError();
+ if (subTask->isCanceled() || isCanceled() || hasError() ) {
+ return subTasks;
+ }
+
+ LoadDocumentTask* loadTask = qobject_cast<LoadDocumentTask*>(subTask);
+ SAFE_POINT(loadTask != NULL, "LoadDocumentTask is null", subTasks);
+
+ CHECK(loadTask->getDocument() != NULL, subTasks);
+ extractor.extractSequencesFromDocument(loadTask->getDocument());
+ return subTasks;
+}
+
+void LoadSequencesTask::setupError() {
+ CHECK(!extractor.getErrorList().isEmpty(), );
+
+ QStringList smallList = extractor.getErrorList().mid(0, maxErrorListSize);
+ QString error = tr("Some sequences have wrong alphabet: ");
+ error += smallList.join(", ");
+ if (smallList.size() < extractor.getErrorList().size()) {
+ error += tr(" and others");
+ }
+ setError(error);
+}
+
+Task::ReportResult LoadSequencesTask::report() {
+ CHECK_OP(stateInfo, ReportResult_Finished);
+
+ if(!extractor.getErrorList().isEmpty()) {
+ setupError();
+ }
+ if(extractor.getSequenceRefs().isEmpty()) {
+ QString filesSeparator(", ");
+ setError(tr("There are no sequences to align in the document(s): %1").arg(urls.join(filesSeparator)));
+ return ReportResult_Finished;
+ }
+ if(U2AlphabetUtils::deriveCommonAlphabet(extractor.getAlphabet(), msaAlphabet) == NULL) {
+ setError(tr("Sequences have incompatible alphabets"));
+ }
+ return ReportResult_Finished;
+}
+
+const SequenceObjectsExtractor& LoadSequencesTask::getExtractor() const {
+ return extractor;
+}
+
+
+
+/************************************************************************/
+/* AlignSequencesToAlignmentTask */
+/************************************************************************/
+AlignSequencesToAlignmentTask::AlignSequencesToAlignmentTask(MAlignmentObject* obj, const SequenceObjectsExtractor& extractor)
+ : Task(tr("Align sequences to alignment task"), TaskFlags_NR_FOSE_COSC), maObj(obj), stateLock(NULL), docStateLock(NULL),
+ sequencesMaxLength(extractor.getMaxSequencesLength()), extr(extractor)
+{
+ fillSettingsByDefault();
+ settings.addedSequencesRefs = extractor.getSequenceRefs();
+ settings.addedSequencesNames = extractor.getSequenceNames();
+ settings.maxSequenceLength = extractor.getMaxSequencesLength();
+ settings.alphabet = extractor.getAlphabet()->getId();
+ usedDocuments = extractor.getUsedDocuments();
+ initialMAlignmentAlphabet = obj->getAlphabet();
+}
+
+void AlignSequencesToAlignmentTask::prepare()
+{
+ if (maObj.isNull()) {
+ stateInfo.setError(tr("Object is empty."));
+ return;
+ }
+
+ if (maObj->isStateLocked()) {
+ stateInfo.setError(tr("Object is locked for modifications."));
+ return;
+ }
+ Document* document = maObj->getDocument();
+ SAFE_POINT(NULL != document, "MSA object is NULL.", );
+ docStateLock = new StateLock("Lock MSA for align sequences to alignment", StateLockFlag_LiveLock);
+ document->lockState(docStateLock);
+ foreach(Document* curDoc, usedDocuments) {
+ curDoc->lockState(docStateLock);
+ }
+
+ stateLock = new StateLock("Align sequences to alignment", StateLockFlag_LiveLock);
+ maObj->lockState(stateLock);
+
+ AlignmentAlgorithmsRegistry* alignmentRegistry = AppContext::getAlignmentAlgorithmsRegistry();
+ SAFE_POINT(NULL != alignmentRegistry, "AlignmentAlgorithmsRegistry is NULL.", );
+ AlignmentAlgorithm* addAlgorithm = alignmentRegistry->getAlgorithm(settings.algorithmName);
+ SAFE_POINT_EXT(NULL != addAlgorithm, setError(QString("Can not find \"%1\" algorithm").arg(settings.algorithmName)), );
+ addSubTask(addAlgorithm->getFactory()->getTaskInstance(&settings));
+}
+
+void AlignSequencesToAlignmentTask::fillSettingsByDefault() {
+ AlignmentAlgorithmsRegistry* alignmentRegistry = AppContext::getAlignmentAlgorithmsRegistry();
+ SAFE_POINT(NULL != alignmentRegistry, "AlignmentAlgorithmsRegistry is NULL.", );
+ if(alignmentRegistry->getAvailableAlgorithmIds(AddToAlignment).contains(BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_MAFFT)
+ && maObj->getMAlignment().getNumRows() != 0) {
+ settings.algorithmName = BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_MAFFT;
+ } else {
+ settings.algorithmName = BaseAlignmentAlgorithmsIds::ALIGN_SEQUENCES_TO_ALIGNMENT_BY_UGENE;
+ }
+ settings.addAsFragments = sequencesMaxLength < 100 && maObj->getLength() / sequencesMaxLength > 3;
+ settings.msaRef = maObj->getEntityRef();
+ settings.inNewWindow = false;
+}
+
+Task::ReportResult AlignSequencesToAlignmentTask::report() {
+ if(stateLock != NULL) {
+ maObj->unlockState(stateLock);
+ delete stateLock;
+ }
+
+ if(docStateLock != NULL) {
+ Document* document = maObj->getDocument();
+ document->unlockState(docStateLock);
+
+ foreach(Document* curDoc, usedDocuments) {
+ curDoc->unlockState(docStateLock);
+ }
+
+ delete docStateLock;
+ }
+ MAlignmentModInfo mi;
+ mi.alphabetChanged = extr.getAlphabet()->getId() != initialMAlignmentAlphabet->getId();
+ mi.sequenceListChanged = true;
+ if(!hasError() && !isCanceled()) {
+ maObj->updateCachedMAlignment(mi);
+ }
+
+ return ReportResult_Finished;
+}
+
+/************************************************************************/
+/* LoadSequencesAndAlignToAlignmentTask */
+/************************************************************************/
+LoadSequencesAndAlignToAlignmentTask::LoadSequencesAndAlignToAlignmentTask(MAlignmentObject* obj, const QStringList& urls)
+: Task(tr("Load sequences and add to alignment task"), TaskFlag_NoRun), urls(urls), maObj(obj), loadSequencesTask(NULL) {
+ SAFE_POINT_EXT(obj != NULL, setError("MAlignmentObject is null"), );
+ loadSequencesTask = new LoadSequencesTask(obj->getAlphabet(), urls);
+ loadSequencesTask->setSubtaskProgressWeight(5);
+ addSubTask(loadSequencesTask);
+}
+
+QList<Task*> LoadSequencesAndAlignToAlignmentTask::onSubTaskFinished(Task* subTask) {
+ QList<Task*> subTasks;
+ propagateSubtaskError();
+ if(subTask == loadSequencesTask && !loadSequencesTask->hasError() && !loadSequencesTask->isCanceled()) {
+ AlignSequencesToAlignmentTask* alignSequencesToAlignmentTask = new AlignSequencesToAlignmentTask(maObj, loadSequencesTask->getExtractor());
+ alignSequencesToAlignmentTask->setSubtaskProgressWeight(95);
+ subTasks << alignSequencesToAlignmentTask;
+ }
+ return subTasks;
+}
+
+}
diff --git a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
index 236f275..508bffa 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
+++ b/src/corelibs/U2View/src/ov_msa/AlignSequencesToAlignment/AlignSequencesToAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
index c17b0c7..3347640 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
+++ b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/AlignmentLogo.h b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
index e536ead..761a1e5 100644
--- a/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
+++ b/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
index 5cddaf7..c2ec5ac 100644
--- a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
index db671c7..83e6ab3 100644
--- a/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Clipboard/SubalignmentToClipboardTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
index 5380ae9..ae62d0d 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -48,7 +48,7 @@ ColorSchemaDialogController::ColorSchemaDialogController(QMap<char, QColor>& col
int ColorSchemaDialogController::adjustAlphabetColors(){
setupUi(this);
- new HelpButton(this, buttonBox, "18220413");
+ new HelpButton(this, buttonBox, "18223053");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
alphabetColorsView = new QPixmap(alphabetColorsFrame->size());
@@ -178,7 +178,7 @@ void ColorSchemaDialogController::mouseReleaseEvent(QMouseEvent * event){
CreateColorSchemaDialog::CreateColorSchemaDialog(ColorSchemeData* _newSchema, QStringList _usedNames) : usedNames(_usedNames), newSchema(_newSchema) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220413");
+ new HelpButton(this, buttonBox, "18223053");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -193,7 +193,7 @@ CreateColorSchemaDialog::CreateColorSchemaDialog(ColorSchemeData* _newSchema, QS
connect(schemeName, SIGNAL(textEdited ( const QString&)), SLOT(sl_schemaNameEdited(const QString&)));
- buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Ok"));
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
QPushButton *createButton = buttonBox->button(QDialogButtonBox::Ok);
QPushButton *cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
diff --git a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
index ca17673..6b2194a 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
index 72c554a..ca11438 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -93,7 +93,7 @@ static void setSchemaColors(const ColorSchemeData& customSchema){
}
-const QString ColorSchemaSettingsPageController::helpPageId = QString("18220314");
+const QString ColorSchemaSettingsPageController::helpPageId = QString("18222954");
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 3728638..8032ae8 100644
--- a/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h
+++ b/src/corelibs/U2View/src/ov_msa/ColorSchemaSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
index e7441f2..92f54ad 100644
--- a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
index fb99a86..47c10b4 100644
--- a/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/Common/RefSeqCommonWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
index 9376ee0..8328982 100644
--- a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -48,7 +48,7 @@ namespace U2{
CreateSubalignmentDialogController::CreateSubalignmentDialogController(MAlignmentObject *_mobj, const QRect& selection, QWidget *p)
: QDialog(p), mobj(_mobj), saveController(NULL){
setupUi(this);
- new HelpButton(this, buttonBox, "18220443");
+ new HelpButton(this, buttonBox, "18223083");
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 5b3700b..6efc171 100644
--- a/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/CreateSubalignmentDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
index 5400ec8..3e0dcb4 100644
--- a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@ namespace U2 {
DeleteGapsDialog::DeleteGapsDialog(QWidget* parent, int rowNum): QDialog(parent), ui(new Ui_DeleteGapsDialog()) {
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220426");
+ new HelpButton(this, ui->buttonBox, "18223066");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Remove"));
ui->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 d58c70b..1e0ba4e 100644
--- a/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h
+++ b/src/corelibs/U2View/src/ov_msa/DeleteGapsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
index 6a39e8d..c3a114b 100644
--- a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
index 58a384a..c7cae8f 100644
--- a/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Export/MSAImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
index 78a66b1..1eac52b 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
index bfb68fb..3308f7c 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
index 38ffb8b..d87b49b 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220417";
+const QString MSAExportConsensusFactoryTab::GROUP_DOC_PAGE = "18223057";
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 60eb235..83df3e6 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportConsensus/MSAExportConsensusTabFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
index c32cad0..3b6e222 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ ExportHighligtingDialogController::ExportHighligtingDialogController(MSAEditorUI
ui(new Ui_ExportHighlightedDialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220418");
+ new HelpButton(this, ui->buttonBox, "18223058");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
index cb4b2f4..7ff575b 100644
--- a/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/ExportHighlightedDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
index dfadc77..5c0e0db 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
index 3c73266..4cec98f 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
index 9d9e5ed..8243470 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220416";
+const QString MSAGeneralTabFactory::GROUP_DOC_PAGE = "18223056";
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 cbcf538..220e60c 100644
--- a/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/General/MSAGeneralTabFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
index 0be0443..59fc71f 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -176,7 +176,7 @@ MSAHighlightingTab::MSAHighlightingTab(MSAEditor* m)
connect(exportHighlightning, SIGNAL(clicked()), SLOT(sl_exportHighlightningClicked()));
connect(thresholdSlider, SIGNAL(valueChanged(int)), SLOT(sl_highlightingParametersChanged()));
connect(thresholdMoreRb, SIGNAL(toggled(bool)), SLOT(sl_highlightingParametersChanged()));
- connect(thresholdLessRb, SIGNAL(toggled(bool)), SLOT(sl_highlightingParametersChanged()));
+ connect(thresholdLessRb, SIGNAL(toggled(bool)), SLOT(sl_highlightingParametersChanged()));
sl_updateHint();
sl_highlightingParametersChanged();
diff --git a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
index 7a20c72..987f644 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
index 587f010..d2f4085 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220418";
+const QString MSAHighlightingFactory::GROUP_DOC_PAGE = "18223058";
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 f2b09bd..30108b0 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MSAHighlightingTabFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
index 0d5520d..1f0b6ce 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
index fcb70be..ca3c3ec 100644
--- a/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
+++ b/src/corelibs/U2View/src/ov_msa/Highlighting/MsaHighlightingSavableTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
index 48121bf..28a884f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
index 3637cf6..4582987 100644
--- a/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
+++ b/src/corelibs/U2View/src/ov_msa/MSACollapsibleModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditor.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
index 496b6ef..8e1856a 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -221,7 +221,7 @@ void MSAEditor::sl_saveAlignmentAs(){
QObjectScopedPointer<ExportDocumentDialogController> dialog = new ExportDocumentDialogController(srcDoc, ui);
dialog->setAddToProjectFlag(true);
- dialog->setWindowTitle(tr("Save alignment"));
+ dialog->setWindowTitle(tr("Save Alignment"));
ExportObjectUtils::export2Document(dialog);
}
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditor.h b/src/corelibs/U2View/src/ov_msa/MSAEditor.h
index 330ce14..ddd7865 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditor.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
index 89ea352..1266060 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -429,7 +429,7 @@ void MSAEditorConsensusArea::drawHistogram(QPainter &p, int firstBase, int lastB
}
#if (QT_VERSION < 0x050000)
- // A workaround for https://local.ugene.unipro.ru/tracker/browse/UGENE-4484 (see comments)
+ // A workaround for https://local.ugene.net/tracker/browse/UGENE-4484 (see comments)
// drawRects() incorrectly processes rects with coordinates greater than 16384 on Qt4
// drawRects() should be used for perfomance reasons
// this branch should be removed after migrating to Qt5
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
index 98d3da2..5685dcc 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
index dbb639f..c821b18 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
index 4b516e5..d400551 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorConsensusCache.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
index 0ac359f..4fdd882 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorFactory.h b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
index 094b8d2..f7bd0ef 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
index 1713a63..342c449 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorNameList.h b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
index 7009652..08694f0 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorNameList.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
index 37e7498..52b45d4 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
index 628e93f..649439f 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOffsetsView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
index bf944c6..7b9f0ce 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -103,6 +103,7 @@ void MSAEditorOverviewArea::sl_show() {
graphOverview->sl_unblockRendering(true);
} else {
graphOverview->sl_blockRendering();
+ cancelRendering();
}
}
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
index 9589653..b9668ba 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorOverviewArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
index 32fadfe..285fd84 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -2922,7 +2922,7 @@ void MSAEditorSequenceArea::sl_changeSelectionColor() {
}
int MSAEditorSequenceArea::getHeight(){
- return editor->getRowHeight() * (getNumVisibleSequences(true) - 1);
+ return editor->getRowHeight() * getNumVisibleSequences(true);
}
QString MSAEditorSequenceArea::exportHighligtning(int startPos, int endPos, int startingIndex, bool keepGaps, bool dots, bool transpose) {
diff --git a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
index b71061e..087d92b 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorSequenceArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorState.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
index 56ec2cd..8efec86 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorState.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorState.h b/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
index c8781c8..0b29753 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorState.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
index 178b829..73273bb 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
index f4a371c..c25e585 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorStatusBar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
index b7fe372..2248b9e 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorTasks.h b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
index bc1a184..cee49c2 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
index 87e8627..3016e34 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
index e875652..2922143 100644
--- a/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
+++ b/src/corelibs/U2View/src/ov_msa/MSAEditorUndoFramework.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
index 64228b5..7d623fa 100644
--- a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -120,7 +120,7 @@ void SelectSubalignmentDialog::init() {
SAFE_POINT(ui->getEditor() != NULL, tr("MSA Editor is NULL"), );
setupUi(this);
- new HelpButton(this, buttonBox, "18220444");
+ new HelpButton(this, buttonBox, "18223084");
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 4b24a0b..a1990be 100644
--- a/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h
+++ b/src/corelibs/U2View/src/ov_msa/MSASelectSubalignmentDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
index 08364a3..d2c1fd6 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
index 61a5d18..b41bdbd 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorSimilarityColumn.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
index 2c611d4..6618a0e 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
index bee6679..4ccbf08 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaEditorUserModStepController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
index 4a01f3b..4c7cf8a 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
index 798b3a6..bf9359d 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaOpSavableTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h b/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
index 62b8b1e..7c142d7 100644
--- a/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
+++ b/src/corelibs/U2View/src/ov_msa/MsaUpdatedWidgetInterface.h
@@ -1,60 +1,60 @@
-/**
- * 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_MSA_UPDATED_WIDGET_INTERFACE_H_
-#define _U2_MSA_UPDATED_WIDGET_INTERFACE_H_
-
-#include <qglobal.h>
-#include <U2Core/MAlignmentObject.h>
-#include "MSAEditor.h"
-
-namespace U2 {
-
-class UpdatedWidgetSettings {
-public:
- UpdatedWidgetSettings()
- : ma(NULL), ui(NULL), autoUpdate(true) {}
- const MAlignmentObject* ma;
- MSAEditorUI* ui;
- bool autoUpdate;
-};
-
-enum DataState {
- DataIsOutdated,
- DataIsValid,
- DataIsBeingUpdated
-};
-
-class UpdatedWidgetInterface{
-public:
- virtual ~UpdatedWidgetInterface() {}
- virtual void onAlignmentChanged(const MAlignment& maBefore, const MAlignmentModInfo& modInfo) = 0;
- virtual void setSettings(const UpdatedWidgetSettings* settings) = 0;
- virtual QWidget* getWidget() = 0;
- virtual const UpdatedWidgetSettings& getSettings() const = 0;
- virtual void updateWidget() = 0;
- virtual QString getHeaderText() const = 0;
-};
-
-} //namespace
-
-
-#endif
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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_MSA_UPDATED_WIDGET_INTERFACE_H_
+#define _U2_MSA_UPDATED_WIDGET_INTERFACE_H_
+
+#include <qglobal.h>
+#include <U2Core/MAlignmentObject.h>
+#include "MSAEditor.h"
+
+namespace U2 {
+
+class UpdatedWidgetSettings {
+public:
+ UpdatedWidgetSettings()
+ : ma(NULL), ui(NULL), autoUpdate(true) {}
+ const MAlignmentObject* ma;
+ MSAEditorUI* ui;
+ bool autoUpdate;
+};
+
+enum DataState {
+ DataIsOutdated,
+ DataIsValid,
+ DataIsBeingUpdated
+};
+
+class UpdatedWidgetInterface{
+public:
+ virtual ~UpdatedWidgetInterface() {}
+ virtual void onAlignmentChanged(const MAlignment& maBefore, const MAlignmentModInfo& modInfo) = 0;
+ virtual void setSettings(const UpdatedWidgetSettings* settings) = 0;
+ virtual QWidget* getWidget() = 0;
+ virtual const UpdatedWidgetSettings& getSettings() const = 0;
+ virtual void updateWidget() = 0;
+ virtual QString getHeaderText() const = 0;
+};
+
+} //namespace
+
+
+#endif
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
index ea3db89..ac86a52 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
index 45b10bf..764b6e1 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphCalculationTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
index 66e9f32..09f44bd 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -81,6 +81,7 @@ MSAGraphOverview::MSAGraphOverview(MSAEditorUI *ui)
void MSAGraphOverview::cancelRendering() {
if (isRendering) {
graphCalculationTaskRunner.cancel();
+ lastDrawnVersion = -1;
}
}
@@ -271,9 +272,6 @@ void MSAGraphOverview::sl_blockRendering() {
}
void MSAGraphOverview::sl_unblockRendering(bool update) {
- if (!isBlocked) {
- return;
- }
isBlocked = false;
if (update && lastDrawnVersion != editor->getMSAObject()->getModificationVersion()) {
diff --git a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
index 8c83cf3..e15ff32 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAGraphOverview.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
index cc8571f..8f147b7 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
index 2346931..3598de5 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverview.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
index 1d05bd2..6f66eb9 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
index 72aa82d..8d6f4b7 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewContextMenu.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
index 7169a43..bf3f950 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
index bf6055e..c37d23a 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSAOverviewImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
index bf901ef..5e6066e 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
index 0ff0642..ed007e1 100644
--- a/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
+++ b/src/corelibs/U2View/src/ov_msa/Overview/MSASimpleOverview.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
index e50ca92..8f5cc90 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
index dae4294..f79a09b 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlign.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
index a5cf3fe..8675bcd 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220447";
+const QString PairAlignFactory::GROUP_DOC_PAGE = "18223087";
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 1d50d5f..f8536a2 100644
--- a/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/PairAlign/PairAlignFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
index 8b34682..6022244 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
index 687a20b..9001dd4 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorMultiTreeViewer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
index 0bbf22f..d47b0eb 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
index c136107..4c64fb4 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
index 6c0f862..426ecb5 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -581,7 +581,7 @@ void MSAEditorTreeViewerUI::setTreeLayout(TreeLayout newLayout) {
}
void MSAEditorTreeViewerUI::onLayoutChanged(const TreeLayout& layout) {
- if(layout == RECTANGULAR_LAYOUT && !curLayoutIsRectangular) {
+ if (layout == RECTANGULAR_LAYOUT && !curLayoutIsRectangular) {
setTransform(rectangularTransform);
}
curLayoutIsRectangular = (RECTANGULAR_LAYOUT == layout);
@@ -707,8 +707,6 @@ void MSAEditorTreeViewerUI::highlightBranches() {
}
void MSAEditorTreeViewerUI::resizeEvent(QResizeEvent *e) {
- CHECK(!(curLayoutIsRectangular && curMSATreeViewer->isSynchronized()), );
-
rectangularTransform = transform();
QGraphicsView::resizeEvent(e);
e->accept();
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
index b64510c..bf61e2a 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MSAEditorTreeViewer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
index 71a1a7c..22431a2 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.cpp
@@ -1,161 +1,161 @@
-/**
- * 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 "MsaEditorTreeTabArea.h"
-#include "../MSAEditor.h"
-#include "MSAEditorTreeManager.h"
-
-#include <U2Core/DocumentModel.h>
-#include <U2Core/U2OpStatusUtils.h>
-#include <U2Core/U2SafePoints.h>
-#include <U2Core/GObjectRelationRoles.h>
-#include <U2Core/PhyTreeObject.h>
-
-#include <QPainter>
-#include <QTabBar>
-#include <QVBoxLayout>
-
-
-namespace U2
-{
-MsaEditorTreeTab::MsaEditorTreeTab(MSAEditor* msa, QWidget* parent)
- : QTabWidget(parent), msa(msa), addTabButton(NULL){
- setObjectName("MsaEditorTreeTab");
- addTabButton = new QPushButton(QIcon(":/core/images/add_tree.png"), "", this);
- addTabButton->setToolTip(tr("Add existing tree"));
- setCornerWidget(addTabButton);
- connect(addTabButton, SIGNAL(clicked(bool)), this, SLOT(sl_addTabTriggered()));
- connect(this, SIGNAL(si_tabsCountChanged(int)), SLOT(sl_onCountChanged(int)));
-
- setTabsClosable(true);
- connect(this, SIGNAL(tabCloseRequested(int)), SLOT(sl_onTabCloseRequested(int)));
-
- tabBar()->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(tabBar(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(sl_onContextMenuRequested(const QPoint&)));
-
- closeOtherTabs = new QAction(tr("Close other tabs"), this);
- closeOtherTabs->setObjectName("Close other tabs");
- connect(closeOtherTabs, SIGNAL(triggered()), SLOT(sl_onCloseOtherTabs()));
-
- closeAllTabs = new QAction(tr("Close all tabs"), this);
- closeAllTabs->setObjectName("Close all tabs");
- connect(closeAllTabs, SIGNAL(triggered()), SLOT(sl_onCloseAllTabs()));
-
- closeTab = new QAction(tr("Close tab"), this);
- closeTab->setObjectName("Close tab");
- connect(closeTab, SIGNAL(triggered()), SLOT(sl_onCloseTab()));
-}
-void MsaEditorTreeTab::sl_onTabCloseRequested(int index) {
- deleteTree(index);
-}
-
-void MsaEditorTreeTab::sl_onContextMenuRequested(const QPoint &pos) {
- menuPos = pos;
- QMenu tabsMenu;
- tabsMenu.addAction(closeOtherTabs);
- tabsMenu.addAction(closeAllTabs);
- tabsMenu.addAction(closeTab);
- tabsMenu.exec(mapToGlobal(pos));
-}
-
-void MsaEditorTreeTab::sl_onCountChanged(int count) {
- if (count > 0) {
- closeOtherTabs->setEnabled(count > 1);
- }
-}
-
-void MsaEditorTreeTab::addTab(QWidget *page, const QString &label) {
- QTabWidget::addTab(page, label);
- emit si_tabsCountChanged(count());
-}
-
-void MsaEditorTreeTab::deleteTree(int index) {
- SAFE_POINT(-1 != index && index < count(), "Incorrect index is detected.",);
- GObjectViewWindow* win = qobject_cast<GObjectViewWindow*>(widget(index));
- const GObject* obj = win->getObjectView()->getObjects().at(0);
- Document* doc = obj->getDocument();
- GObjectReference treeRef(doc->getURLString(), "", GObjectTypes::PHYLOGENETIC_TREE);
- treeRef.objName = obj->getGObjectName();
- msa->getMSAObject()->removeObjectRelation(GObjectRelation(treeRef, ObjectRole_PhylogeneticTree));
-
- removeTab(index);
- emit si_tabsCountChanged(count());
-}
-
-void MsaEditorTreeTab::sl_addTabTriggered() {
- msa->getTreeManager()->openTreeFromFile();
- emit si_tabsCountChanged(count());
-}
-
-void MsaEditorTreeTab::addExistingTree() {
- msa->getTreeManager()->openTreeFromFile();
- emit si_tabsCountChanged(count());
-}
-
-void MsaEditorTreeTab::sl_onCloseOtherTabs() {
- int selectedTabIndex = tabBar()->tabAt(menuPos);
- for (int i = count() - 1; i >= 0; i--) {
- if (i != selectedTabIndex) {
- deleteTree(i);
- }
- }
-}
-
-void MsaEditorTreeTab::sl_onCloseAllTabs() {
- for (int tabsCount = count(); tabsCount > 0; tabsCount--) {
- deleteTree(0);
- }
-}
-
-void MsaEditorTreeTab::sl_onCloseTab() {
- int index = tabBar()->tabAt(menuPos);
- deleteTree(index);
-}
-
-MsaEditorTreeTabArea::MsaEditorTreeTabArea(MSAEditor* msa, QWidget* parent)
- : QWidget(parent), addTabButton(NULL), msa(msa), treeTabWidget(NULL), currentLayout(NULL) {
- initialize();
-}
-void MsaEditorTreeTabArea::initialize() {
- treeTabWidget = createTabWidget();
- currentLayout = new QVBoxLayout();
- currentLayout->setMargin(0);
- currentLayout->setSpacing(0);
- currentLayout->addWidget(treeTabWidget);
- setLayout(currentLayout);
-}
-MsaEditorTreeTab* MsaEditorTreeTabArea::createTabWidget() {
- MsaEditorTreeTab* widget = new MsaEditorTreeTab(msa, this);
- connect(widget, SIGNAL(si_tabsCountChanged(int)), SIGNAL(si_tabsCountChanged(int)));
- return widget;
-}
-
-void MsaEditorTreeTabArea::addTab(QWidget *page, const QString &label) {
- treeTabWidget->addTab(page, label);
-}
-void MsaEditorTreeTabArea::paintEvent(QPaintEvent *) {
- QPainter p(this);
- p.fillRect(rect(), Qt::white);
-}
-
-} //namespace
-
-
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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 "MsaEditorTreeTabArea.h"
+#include "../MSAEditor.h"
+#include "MSAEditorTreeManager.h"
+
+#include <U2Core/DocumentModel.h>
+#include <U2Core/U2OpStatusUtils.h>
+#include <U2Core/U2SafePoints.h>
+#include <U2Core/GObjectRelationRoles.h>
+#include <U2Core/PhyTreeObject.h>
+
+#include <QPainter>
+#include <QTabBar>
+#include <QVBoxLayout>
+
+
+namespace U2
+{
+MsaEditorTreeTab::MsaEditorTreeTab(MSAEditor* msa, QWidget* parent)
+ : QTabWidget(parent), msa(msa), addTabButton(NULL){
+ setObjectName("MsaEditorTreeTab");
+ addTabButton = new QPushButton(QIcon(":/core/images/add_tree.png"), "", this);
+ addTabButton->setToolTip(tr("Add existing tree"));
+ setCornerWidget(addTabButton);
+ connect(addTabButton, SIGNAL(clicked(bool)), this, SLOT(sl_addTabTriggered()));
+ connect(this, SIGNAL(si_tabsCountChanged(int)), SLOT(sl_onCountChanged(int)));
+
+ setTabsClosable(true);
+ connect(this, SIGNAL(tabCloseRequested(int)), SLOT(sl_onTabCloseRequested(int)));
+
+ tabBar()->setContextMenuPolicy(Qt::CustomContextMenu);
+ connect(tabBar(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(sl_onContextMenuRequested(const QPoint&)));
+
+ closeOtherTabs = new QAction(tr("Close other tabs"), this);
+ closeOtherTabs->setObjectName("Close other tabs");
+ connect(closeOtherTabs, SIGNAL(triggered()), SLOT(sl_onCloseOtherTabs()));
+
+ closeAllTabs = new QAction(tr("Close all tabs"), this);
+ closeAllTabs->setObjectName("Close all tabs");
+ connect(closeAllTabs, SIGNAL(triggered()), SLOT(sl_onCloseAllTabs()));
+
+ closeTab = new QAction(tr("Close tab"), this);
+ closeTab->setObjectName("Close tab");
+ connect(closeTab, SIGNAL(triggered()), SLOT(sl_onCloseTab()));
+}
+void MsaEditorTreeTab::sl_onTabCloseRequested(int index) {
+ deleteTree(index);
+}
+
+void MsaEditorTreeTab::sl_onContextMenuRequested(const QPoint &pos) {
+ menuPos = pos;
+ QMenu tabsMenu;
+ tabsMenu.addAction(closeOtherTabs);
+ tabsMenu.addAction(closeAllTabs);
+ tabsMenu.addAction(closeTab);
+ tabsMenu.exec(mapToGlobal(pos));
+}
+
+void MsaEditorTreeTab::sl_onCountChanged(int count) {
+ if (count > 0) {
+ closeOtherTabs->setEnabled(count > 1);
+ }
+}
+
+void MsaEditorTreeTab::addTab(QWidget *page, const QString &label) {
+ QTabWidget::addTab(page, label);
+ emit si_tabsCountChanged(count());
+}
+
+void MsaEditorTreeTab::deleteTree(int index) {
+ SAFE_POINT(-1 != index && index < count(), "Incorrect index is detected.",);
+ GObjectViewWindow* win = qobject_cast<GObjectViewWindow*>(widget(index));
+ const GObject* obj = win->getObjectView()->getObjects().at(0);
+ Document* doc = obj->getDocument();
+ GObjectReference treeRef(doc->getURLString(), "", GObjectTypes::PHYLOGENETIC_TREE);
+ treeRef.objName = obj->getGObjectName();
+ msa->getMSAObject()->removeObjectRelation(GObjectRelation(treeRef, ObjectRole_PhylogeneticTree));
+
+ removeTab(index);
+ emit si_tabsCountChanged(count());
+}
+
+void MsaEditorTreeTab::sl_addTabTriggered() {
+ msa->getTreeManager()->openTreeFromFile();
+ emit si_tabsCountChanged(count());
+}
+
+void MsaEditorTreeTab::addExistingTree() {
+ msa->getTreeManager()->openTreeFromFile();
+ emit si_tabsCountChanged(count());
+}
+
+void MsaEditorTreeTab::sl_onCloseOtherTabs() {
+ int selectedTabIndex = tabBar()->tabAt(menuPos);
+ for (int i = count() - 1; i >= 0; i--) {
+ if (i != selectedTabIndex) {
+ deleteTree(i);
+ }
+ }
+}
+
+void MsaEditorTreeTab::sl_onCloseAllTabs() {
+ for (int tabsCount = count(); tabsCount > 0; tabsCount--) {
+ deleteTree(0);
+ }
+}
+
+void MsaEditorTreeTab::sl_onCloseTab() {
+ int index = tabBar()->tabAt(menuPos);
+ deleteTree(index);
+}
+
+MsaEditorTreeTabArea::MsaEditorTreeTabArea(MSAEditor* msa, QWidget* parent)
+ : QWidget(parent), addTabButton(NULL), msa(msa), treeTabWidget(NULL), currentLayout(NULL) {
+ initialize();
+}
+void MsaEditorTreeTabArea::initialize() {
+ treeTabWidget = createTabWidget();
+ currentLayout = new QVBoxLayout();
+ currentLayout->setMargin(0);
+ currentLayout->setSpacing(0);
+ currentLayout->addWidget(treeTabWidget);
+ setLayout(currentLayout);
+}
+MsaEditorTreeTab* MsaEditorTreeTabArea::createTabWidget() {
+ MsaEditorTreeTab* widget = new MsaEditorTreeTab(msa, this);
+ connect(widget, SIGNAL(si_tabsCountChanged(int)), SIGNAL(si_tabsCountChanged(int)));
+ return widget;
+}
+
+void MsaEditorTreeTabArea::addTab(QWidget *page, const QString &label) {
+ treeTabWidget->addTab(page, label);
+}
+void MsaEditorTreeTabArea::paintEvent(QPaintEvent *) {
+ QPainter p(this);
+ p.fillRect(rect(), Qt::white);
+}
+
+} //namespace
+
+
diff --git a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
index e0fa97c..cfe7d07 100644
--- a/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
+++ b/src/corelibs/U2View/src/ov_msa/PhyTrees/MsaEditorTreeTabArea.h
@@ -1,94 +1,94 @@
-/**
- * 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_MSA_EDITOR_TREE_TAB_AREA_H_
-#define _U2_MSA_EDITOR_TREE_TAB_AREA_H_
-
-#include <QPushButton>
-#include <QTabWidget>
-
-#include "../MsaUpdatedWidgetInterface.h"
-
-namespace U2
-{
-
-class MAlignmentRow;
-class MSADistanceMatrix;
-class MSAEditor;
-
-class MsaEditorTreeTab : public QTabWidget {
- Q_OBJECT
-public:
- MsaEditorTreeTab(MSAEditor* msa, QWidget* parent);
-
- void addTab(QWidget *page, const QString &label);
- void deleteTree(int index);
- QWidget* getCurrentWidget() const {return currentWidget();}
- void addExistingTree();
-public slots:
- void sl_addTabTriggered();
-private slots:
- void sl_onTabCloseRequested(int index);
- void sl_onCloseOtherTabs();
- void sl_onCloseAllTabs();
- void sl_onCloseTab();
- void sl_onCountChanged(int count);
- void sl_onContextMenuRequested(const QPoint &pos);
-signals:
- void si_tabsCountChanged(int curTabsNumber);
-private:
- void processMenuAction(QAction* triggeredAction);
-
- MSAEditor* msa;
- QPushButton* addTabButton;
- QPoint menuPos;
- QAction* closeOtherTabs;
- QAction* closeAllTabs;
- QAction* closeTab;
-};
-
-class MsaEditorTreeTabArea : public QWidget{
- Q_OBJECT
-public:
- MsaEditorTreeTabArea(MSAEditor* msa, QWidget* parent);
-
- void addTab(QWidget *page, const QString &label);
- void deleteTab(QWidget *page);
-
- MsaEditorTreeTab* getCurrentTabWidget() const { return treeTabWidget; }
- QWidget* getCurrentWidget() const { return treeTabWidget->getCurrentWidget(); }
-protected:
- void paintEvent(QPaintEvent *);
- virtual MsaEditorTreeTab* createTabWidget();
- void initialize();
-
-signals:
- void si_tabsCountChanged(int curTabsNumber);
-private:
- QPushButton* addTabButton;
- MSAEditor* msa;
- MsaEditorTreeTab* treeTabWidget;
- QLayout* currentLayout;
-};
-} //namespace
-
-
-#endif
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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_MSA_EDITOR_TREE_TAB_AREA_H_
+#define _U2_MSA_EDITOR_TREE_TAB_AREA_H_
+
+#include <QPushButton>
+#include <QTabWidget>
+
+#include "../MsaUpdatedWidgetInterface.h"
+
+namespace U2
+{
+
+class MAlignmentRow;
+class MSADistanceMatrix;
+class MSAEditor;
+
+class MsaEditorTreeTab : public QTabWidget {
+ Q_OBJECT
+public:
+ MsaEditorTreeTab(MSAEditor* msa, QWidget* parent);
+
+ void addTab(QWidget *page, const QString &label);
+ void deleteTree(int index);
+ QWidget* getCurrentWidget() const {return currentWidget();}
+ void addExistingTree();
+public slots:
+ void sl_addTabTriggered();
+private slots:
+ void sl_onTabCloseRequested(int index);
+ void sl_onCloseOtherTabs();
+ void sl_onCloseAllTabs();
+ void sl_onCloseTab();
+ void sl_onCountChanged(int count);
+ void sl_onContextMenuRequested(const QPoint &pos);
+signals:
+ void si_tabsCountChanged(int curTabsNumber);
+private:
+ void processMenuAction(QAction* triggeredAction);
+
+ MSAEditor* msa;
+ QPushButton* addTabButton;
+ QPoint menuPos;
+ QAction* closeOtherTabs;
+ QAction* closeAllTabs;
+ QAction* closeTab;
+};
+
+class MsaEditorTreeTabArea : public QWidget{
+ Q_OBJECT
+public:
+ MsaEditorTreeTabArea(MSAEditor* msa, QWidget* parent);
+
+ void addTab(QWidget *page, const QString &label);
+ void deleteTab(QWidget *page);
+
+ MsaEditorTreeTab* getCurrentTabWidget() const { return treeTabWidget; }
+ QWidget* getCurrentWidget() const { return treeTabWidget->getCurrentWidget(); }
+protected:
+ void paintEvent(QPaintEvent *);
+ virtual MsaEditorTreeTab* createTabWidget();
+ void initialize();
+
+signals:
+ void si_tabsCountChanged(int curTabsNumber);
+private:
+ QPushButton* addTabButton;
+ MSAEditor* msa;
+ MsaEditorTreeTab* treeTabWidget;
+ QLayout* currentLayout;
+};
+} //namespace
+
+
+#endif
diff --git a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
index ae32ea5..8ec5e80 100644
--- a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ SaveSelectedSequenceFromMSADialogController::SaveSelectedSequenceFromMSADialogCo
ui(new Ui_SaveSelectedSequenceFromMSADialog())
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220445");
+ new HelpButton(this, ui->buttonBox, "18223085");
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Export"));
ui->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 3f5f844..3ef0ef4 100644
--- a/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h
+++ b/src/corelibs/U2View/src/ov_msa/SaveSelectedSequenceFromMSADialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
index df98ee9..441a34b 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
index 894cb56..e50abd7 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
index 09f6ea3..d8b4102 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220456";
+const QString SeqStatisticsWidgetFactory::GROUP_DOC_PAGE = "18223096";
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 7ff77f4..9257940 100644
--- a/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/SeqStatistics/SeqStatisticsWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
index ef24c2c..8d8c028 100644
--- a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
+++ b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
index 9f6a24b..aedbfb7 100644
--- a/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
+++ b/src/corelibs/U2View/src/ov_msa/SequenceSelectorWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
index 58b1967..4966c0f 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
index b9ff403..17d24c5 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
index db21e6f..3472024 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220494";
+const QString MSATreeOptionsWidgetFactory::GROUP_DOC_PAGE = "18223134";
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 = "18220494";
+const QString TreeOptionsWidgetFactory::GROUP_DOC_PAGE = "18223134";
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 = "18220494";
+const QString AddTreeWidgetFactory::GROUP_DOC_PAGE = "18223134";
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 d7d630c..2dda6b6 100644
--- a/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_msa/TreeOptions/TreeOptionsWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
index 9039678..06100b4 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateBranchesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
index 71f244b..d85095b 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
index 04d8a23..ee44c71 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateCircularBranchesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
index 2dcdf38..81f2099 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
index 5ad184f..51805c3 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateRectangularBranchesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
index 8c87f11..662c77a 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
index b32f337..3790fc7 100644
--- a/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
+++ b/src/corelibs/U2View/src/ov_phyltree/CreateUnrootedBranchesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
index a49fc01..3a714cd 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
index af9e66f..beab58d 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsBranchItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
index 4699ee5..342b30b 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
index ed2f750..2124d16 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsButtonItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
index 825b48e..2f38b83 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
index 26792d5..8eb366b 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
index 7d2b568..966a237 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
index 2a2bbaa..4943c55 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsRectangularBranchItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
index 1f6247f..9ca2e50 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
index 95ba7e2..cfa50a7 100644
--- a/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
+++ b/src/corelibs/U2View/src/ov_phyltree/GraphicsUnrootedBranchItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeSettings.h b/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
index a3c3dea..cc81d15 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
index dbdad26..12531ac 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -72,6 +72,8 @@
#include "phyltree/TextSettingsDialog.h"
#include "phyltree/TreeSettingsDialog.h"
+#include <U2View/MSAEditorTreeViewer.h>
+
namespace U2 {
@@ -1016,6 +1018,11 @@ void TreeViewerUI::paint(QPainter &painter) {
void TreeViewerUI::updateRect() {
SAFE_POINT(NULL != root, "Pointer to tree root is NULL",);
QTransform viewTransform = transform();
+ // the workaround for UGENE-3504
+ if (qobject_cast<MSAEditorTreeViewerUI*>(this) != NULL
+ && (qobject_cast<MSAEditorTreeViewerUI*>(this))->isCurTreeViewerSynchronized()) {
+ viewTransform = QTransform();
+ }
QRectF rect = root->visibleChildrenBoundingRect(viewTransform) | root->sceneBoundingRect();
rect.setLeft(rect.left() - MARGIN);
rect.setRight(rect.right() + MARGIN);
@@ -1175,7 +1182,6 @@ void TreeViewerUI::sl_unrootedLayoutTriggered() {
void TreeViewerUI::changeLayout(TreeLayout newLayout) {
root->setSelectedRecurs(false, true); // clear selection
setOptionValue(TREE_LAYOUT, newLayout);
- updateTreeSettings();
switch(newLayout) {
case RECTANGULAR_LAYOUT:
@@ -1187,9 +1193,6 @@ void TreeViewerUI::changeLayout(TreeLayout newLayout) {
scene()->addItem(root);
defaultZoom();
updateRect();
- updateTreeSettings();
- fitInView(scene()->sceneRect(), Qt::KeepAspectRatio);
- onLayoutChanged(getTreeLayout());
break;
case CIRCULAR_LAYOUT:
if(getScale() <= GraphicsRectangularBranchItem::DEFAULT_WIDTH){
@@ -1204,11 +1207,12 @@ void TreeViewerUI::changeLayout(TreeLayout newLayout) {
connect(layoutTask, SIGNAL(si_stateChanged()), SLOT(sl_layoutRecomputed()));
break;
}
- if(newLayout != RECTANGULAR_LAYOUT) {
+ if (newLayout != RECTANGULAR_LAYOUT) {
TaskScheduler* scheduler = AppContext::getTaskScheduler();
scheduler->registerTopLevelTask(layoutTask);
- onLayoutChanged(newLayout);
}
+ updateTreeSettings();
+ onLayoutChanged(newLayout);
}
void TreeViewerUI::sl_rectLayoutRecomputed() {
diff --git a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
index fe8720c..c2ab66a 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
index a6e68fa..2fd4cb2 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
index b918d05..e4d9862 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
index 91c3b31..eaceb99 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerState.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
index 1af7e20..417ce8e 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerState.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
index 9f6b9ba..011f487 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
index a2fa9bb..eebd1f5 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
index f58de57..0d9b881 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
index 9fe8e1e..feb8524 100644
--- a/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
+++ b/src/corelibs/U2View/src/ov_phyltree/TreeViewerUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
index c30da60..d046903 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
index 8e16517..6f9898e 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVAnnotationCreation.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
index 141e3bf..63e55f9 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVClipboard.h b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
index 14e9b19..7cd3b01 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVClipboard.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
index 185aa95..525676e 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -339,7 +339,7 @@ void GSequenceGraphDrawer::drawGraph(QPainter& p, const QSharedPointer<GSequence
bool rp = false, lp = false;
if(!points.useIntervals){
for (int i=0, n = points.firstPoints.size(); i < n; i++) {
- fy = calculatePointValue(nPoints, points, i);
+ fy = calculatePointValue(points, i);
rp = false;
lp = false;
if (isUnknownValue(fy)) {
@@ -377,8 +377,8 @@ void GSequenceGraphDrawer::drawGraph(QPainter& p, const QSharedPointer<GSequence
} else {
for (int i=0, n = points.firstPoints.size(); i < n; i++) {
assert(points.firstPoints.size() == points.secondPoints.size());
- fy = calculatePointValue(nPoints, points, i);
- float fy2 = calculatePointValue(nPoints, points, i);;
+ fy = calculatePointValue(points, i);
+ float fy2 = calculatePointValue(points, i);;
rp = false;
lp = false;
if (isUnknownValue(fy)) {
@@ -438,6 +438,8 @@ void GSequenceGraphDrawer::drawGraph(QPainter& p, const QSharedPointer<GSequence
} else if(!calculationTaskRunner.isIdle()) {
p.fillRect(rect, Qt::gray);
p.drawText(rect, Qt::AlignCenter, tr("Graph is rendering..."));
+ } else {
+ p.drawText(rect, Qt::AlignCenter, tr("Graph is not available. Try to change calculation settings."));
}
}
const int mLabelCoordY = 20;
@@ -645,7 +647,7 @@ bool GSequenceGraphDrawer::calculateLabelData(const QRect &rect, const PairVecto
}
float GSequenceGraphDrawer::calculateLabelValue(int nPoints, const PairVector &points, GraphLabel *label, int xcoordInRect) {
- float value = calculatePointValue(nPoints, points, xcoordInRect);
+ float value = calculatePointValue(points, xcoordInRect);
if (value == UNKNOWN_VAL) {
return 2 * globalMax;
}
@@ -665,7 +667,7 @@ float GSequenceGraphDrawer::calculateLabelValue(int nPoints, const PairVector &p
return value;
}
-float GSequenceGraphDrawer::calculatePointValue(int nPoints, const PairVector &points, int xcoordInRect) {
+float GSequenceGraphDrawer::calculatePointValue(const PairVector &points, int xcoordInRect) {
float value = UNKNOWN_VAL;
if (points.useIntervals) {
float maxValue = points.firstPoints.at(xcoordInRect);
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
index 462a8f0..1f2da08 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVGraphModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -133,7 +133,7 @@ protected:
bool calculateLabelData(const QRect& rect, const PairVector& points, GraphLabel* label);
void calculatePositionOfLabel(GraphLabel *label, int nPoints);
float calculateLabelValue(int nPoints, const PairVector &points, GraphLabel *label, int xcoordInRect);
- float calculatePointValue(int nPoints, const PairVector &points, int xcoordInRect);
+ float calculatePointValue(const PairVector &points, int xcoordInRect);
bool updateStaticLabels(const QSharedPointer<GSequenceGraphData>& graph, GraphLabel* label, const QRect& rect);
void updateMovingLabels(const QSharedPointer<GSequenceGraphData>& graph, GraphLabel* label, const QRect& rect);
void updateStaticLabels(MultiLabel& multiLabel, const QRect& rect);
diff --git a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
index a587e5a..72fde13 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
index 4c8943a..1341437 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceObjectContext.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
index fda0fe2..1a7c215 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
index 38950df..5863352 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSequenceWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
index 12ebb92..f916548 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
index 2b4184c..bb16780 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSingleSequenceWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h b/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
index 66c2d53..3d694e9 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSplitWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
index c1fc347..281887d 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
index e64a990..1ee3b5e 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVSyncViewManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVUtils.cpp b/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
index f2bf066..a23bcfb 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/ADVUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/ADVUtils.h b/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
index ccd4e85..12dda58 100644
--- a/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
+++ b/src/corelibs/U2View/src/ov_sequence/ADVUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
index bad3045..d538f6b 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -193,7 +193,7 @@ QWidget* AnnotatedDNAView::createWidget() {
mainSplitter->addWidget(codonTableView);
mainSplitter->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(mainSplitter, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(sl_onContextMenuRequested(const QPoint &)));
+ connect(mainSplitter, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(sl_onContextMenuRequested()));
scrollArea = new QScrollArea();
scrollArea->setObjectName("annotated_DNA_scrollarea");
@@ -739,7 +739,7 @@ void AnnotatedDNAView::updateMultiViewActions() {
}
}
-void AnnotatedDNAView::sl_onContextMenuRequested(const QPoint &scrollAreaPos) {
+void AnnotatedDNAView::sl_onContextMenuRequested() {
QMenu m;
m.addAction(posSelectorAction);
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
index a9bdb9b..96eaf45 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -194,7 +194,7 @@ public slots:
void sl_onPosChangeRequest(int pos);
private slots:
- void sl_onContextMenuRequested(const QPoint & pos);
+ void sl_onContextMenuRequested();
void sl_onFindPatternClicked();
void sl_onShowPosSelectorRequest();
void sl_toggleHL();
diff --git a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
index f26a115..119afd9 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
index 9128006..51fd47a 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
index bf02675..bc3aa08 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
index 46965f9..048d1ef 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewState.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
index 30f9247..8d8b723 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
index d1f79f9..d6f1108 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotatedDNAViewTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
index 16466ab..d236bc1 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
index e3616af..2c42187 100644
--- a/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
+++ b/src/corelibs/U2View/src/ov_sequence/AnnotationsTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
index 0f5d8fb..b68d2ce 100644
--- a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
index 2c9c96f..f4e0c83 100644
--- a/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
+++ b/src/corelibs/U2View/src/ov_sequence/AutoAnnotationUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
index aeea45b..91ed7e1 100644
--- a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -50,7 +50,7 @@ CreateRulerDialogController::CreateRulerDialogController(const QSet<QString>& na
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220333");
+ new HelpButton(this, buttonBox, "18222973");
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 298bc39..198f6e5 100644
--- a/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h
+++ b/src/corelibs/U2View/src/ov_sequence/CreateRulerDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/DetView.cpp b/src/corelibs/U2View/src/ov_sequence/DetView.cpp
index 13fd646..25f28e8 100644
--- a/src/corelibs/U2View/src/ov_sequence/DetView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/DetView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/DetView.h b/src/corelibs/U2View/src/ov_sequence/DetView.h
index 94994cd..90ee0fd 100644
--- a/src/corelibs/U2View/src/ov_sequence/DetView.h
+++ b/src/corelibs/U2View/src/ov_sequence/DetView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
index e5d319f..e5cd8bb 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
index fb1928e..06184d1 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
index b6b4c72..5a6faf2 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
index 08c0a57..4b8a80b 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceGraphViewWithFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
index 43a0b84..fe4d156 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceLineView.h b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
index 9bf4a53..fa69c01 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
index b9f6a75..f555fa3 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
index fe83367..945ba27 100644
--- a/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
+++ b/src/corelibs/U2View/src/ov_sequence/GSequenceLineViewAnnotated.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
index 44794ec..6f600ef 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphLabelModel.h b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
index 02a8108..ec26e9c 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
index e8dcb4e..020b79e 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220391");
+ new HelpButton(this, buttonBox, "18223031");
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 a26fd08..b505cb0 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphLabelsSelectDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphMenu.cpp b/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
index 825de9c..80d9d77 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphMenu.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphMenu.h b/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
index 7d604eb..ff8321e 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphMenu.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
index ae36f53..e286410 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220393");
+ new HelpButton(this, buttonBox, "18223033");
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 eb23905..ffcb115 100644
--- a/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/GraphSettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/Overview.cpp b/src/corelibs/U2View/src/ov_sequence/Overview.cpp
index 1f309a5..3a62073 100644
--- a/src/corelibs/U2View/src/ov_sequence/Overview.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/Overview.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/Overview.h b/src/corelibs/U2View/src/ov_sequence/Overview.h
index e21c064..c48b8f4 100644
--- a/src/corelibs/U2View/src/ov_sequence/Overview.h
+++ b/src/corelibs/U2View/src/ov_sequence/Overview.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/PanView.cpp b/src/corelibs/U2View/src/ov_sequence/PanView.cpp
index e0aeb55..6781dd8 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanView.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/PanView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/PanView.h b/src/corelibs/U2View/src/ov_sequence/PanView.h
index d1bc572..e7b93d6 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanView.h
+++ b/src/corelibs/U2View/src/ov_sequence/PanView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/PanViewRows.cpp b/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
index d5a3fc7..9d6d44f 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/PanViewRows.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/PanViewRows.h b/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
index 99b5eb4..dfaa413 100644
--- a/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
+++ b/src/corelibs/U2View/src/ov_sequence/PanViewRows.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
index bab79cc..3aa5ec0 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ SaveGraphCutoffsDialogController::SaveGraphCutoffsDialogController(GSequenceGrap
:QDialog(parent), ctx(_ctx), d(_d), gd(_gd)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220394");
+ new HelpButton(this, buttonBox, "18223034");
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 6b0d4de..841217a 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
index a0cf89f..7fbdf56 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
index 6bcdcf7..bd11112 100644
--- a/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/SaveGraphCutoffsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
index 5a61d70..06625da 100644
--- a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ SearchQualifierDialog::SearchQualifierDialog(QWidget* p, AnnotationsTreeView *tr
indexOfPrevResult(-1)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220367");
+ new HelpButton(this, ui->buttonBox, "18223007");
ui->buttonBox->button(QDialogButtonBox::Yes)->setText(tr("Select all"));
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Next"));
ui->buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
diff --git a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
index 8d1e0a3..fc96372 100644
--- a/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
+++ b/src/corelibs/U2View/src/ov_sequence/SearchQualifierDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
index b2b9cab..1a16e18 100644
--- a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
index a95fcd2..1b11d58 100644
--- a/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/WindowStepSelectorWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
index 006832e..df3e3da 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
index 0f437a8..d73047e 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
index 6af1aaf..0ea2f4d 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
index 9463057..dccd0a3 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTree.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
index 9b9feeb..87df025 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
index fb06cc4..5d1923a 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightTreeItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
index b4fa19a..4e49903 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
index 688af8b..f36f5d8 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
index e5a6c46..5257761 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220356";
+const QString AnnotHighlightWidgetFactory::GROUP_DOC_PAGE = "18222996";
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 877a879..63d59e0 100644
--- a/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/annot_highlight/AnnotHighlightWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
index 03ddcb6..b12aa44 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
index 78fd001..9cae38f 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
index cadeac7..86b0335 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
index e9765cc..302f314 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
index b6e03de..5e56bca 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220338";
+const QString FindPatternWidgetFactory::GROUP_DOC_PAGE = "18222978";
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 8382605..78d9e13 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
index 600f313..caeda9c 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
index f250600..5765f93 100644
--- a/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
+++ b/src/corelibs/U2View/src/ov_sequence/find_pattern/FindPatternWidgetSavableTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h b/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
index b8f174f..e1691b1 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/ExportImagePainter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
index ffae0e5..7566112 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
index b848990..aabbad6 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequenceExportSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
index 9cb4d2f..eaa58f8 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
index 21e438c..580a195 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SequencePainter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
index eeab059..060f8cb 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
index 3e34a11..a4dae5d 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
index 8669500..4f40a20 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
index 1b99d92..e409c59 100644
--- a/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/image_export/SingleSequenceImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
index bdbfa5b..0ef32fb 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
index 00d4d04..ca6bfae 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/CharOccurTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
index 18151ca..3b068ed 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
index d3a03dc..18bff42 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DNAStatisticsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
index 4786036..7a7f2db 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
index e01384c..7d3c438 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/DinuclOccurTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
index 0aa2036..4e69adc 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
index 9370bd9..1774ff0 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfo.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
index b9beb68..c2044cc 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220327";
+const QString SequenceInfoFactory::GROUP_DOC_PAGE = "18222967";
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 3c8425d..540a057 100644
--- a/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h
+++ b/src/corelibs/U2View/src/ov_sequence/sequence_info/SequenceInfoFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
index 2233936..3f540c9 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
index a9f4289..c34b432 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewMultiLineRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
index 13b359d..c941a8e 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
index 31a3c3a..5d0e879 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
index 99f62c0..19ebb54 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
index 4e09274..11d468c 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/DetViewSingleLineRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
index a7b8d6c..ce3f015 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
index ae5e288..e4ee211 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/PanViewRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
index f3f6f4a..72cd3ef 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
index f5cb22d..05fe5f5 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
index a0a1f8f..e434b2d 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
index 5671841..490374b 100644
--- a/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
+++ b/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
index 7363c79..e9e37b3 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_text/SimpleTextObjectView.h b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
index c82f681..1feb795 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
index 463399e..4cb32a1 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
index 4994d17..6b9ed45 100644
--- a/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
+++ b/src/corelibs/U2View/src/ov_text/SimpleTextObjectViewTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
index 58f3ad1..11f7bd6 100644
--- a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/BaseSettingsDialog.h b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
index 1f0173e..76bed7d 100644
--- a/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/BaseSettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
index fcc1a17..f45bd8b 100644
--- a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220495");
+ new HelpButton(this, buttonBox, "18223135");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
index 7a8486e..ed4c772 100644
--- a/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/BranchSettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
index 326635e..cb222b3 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -62,9 +62,9 @@ CreatePhyTreeDialogController::CreatePhyTreeDialogController(QWidget* parent, co
ui->setupUi(this);
QMap<QString, QString> helpPagesMap;
- helpPagesMap.insert("PHYLIP Neighbor Joining","18220453");
- helpPagesMap.insert("MrBayes","18220454");
- helpPagesMap.insert("PhyML Maximum Likelihood","18220452");
+ helpPagesMap.insert("PHYLIP Neighbor Joining","18223093");
+ helpPagesMap.insert("MrBayes","18223094");
+ helpPagesMap.insert("PhyML Maximum Likelihood","18223092");
new ComboboxDependentHelpButton(this, ui->buttonBox, ui->algorithmBox, helpPagesMap);
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
diff --git a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
index 42b48b9..0eaa991 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
index bfa8858..a09f021 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
index f6925ac..3777415 100644
--- a/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
+++ b/src/corelibs/U2View/src/phyltree/CreatePhyTreeWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
index 13b31d1..e674838 100644
--- a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
+++ b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
index d013407..d8fe9d8 100644
--- a/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
+++ b/src/corelibs/U2View/src/phyltree/PhyTreeDisplayOptionsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
index 26dc95d..7c50a24 100644
--- a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,7 +37,9 @@ TextSettingsDialog::TextSettingsDialog(QWidget *parent, const OptionsMap& settin
: BaseSettingsDialog(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220500");
+ new HelpButton(this, buttonBox, "18223140");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
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 6922050..e09057e 100644
--- a/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/TextSettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
index a4f7f0a..812dce3 100644
--- a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
+++ b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -23,6 +23,7 @@
#include <U2Core/global.h>
#include <U2Core/U2SafePoints.h>
#include <U2Gui/HelpButton.h>
+#include <QPushButton>
namespace U2 {
@@ -30,7 +31,9 @@ namespace U2 {
TreeSettingsDialog::TreeSettingsDialog(QWidget *parent, const OptionsMap &settings, bool isRectLayout)
: BaseSettingsDialog(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220494");
+ new HelpButton(this, buttonBox, "18223134");
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
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 936b373..74a0160 100644
--- a/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h
+++ b/src/corelibs/U2View/src/phyltree/TreeSettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
index d6172ae..43ef6ff 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -48,12 +48,12 @@ BuildIndexDialog::BuildIndexDialog(const DnaAssemblyAlgRegistry* registry, QWidg
{
setupUi(this);
QMap<QString,QString> helpPagesMap;
- helpPagesMap.insert("BWA","18220571");
- helpPagesMap.insert("BWA-MEM","18220605");
- helpPagesMap.insert("BWA-SW","18220599");
- helpPagesMap.insert("Bowtie","18220568");
- helpPagesMap.insert("Bowtie2","18220596");
- helpPagesMap.insert("UGENE Genome Aligner","18220574");
+ helpPagesMap.insert("BWA","18223211");
+ helpPagesMap.insert("BWA-MEM","18223245");
+ helpPagesMap.insert("BWA-SW","18223239");
+ helpPagesMap.insert("Bowtie","18223208");
+ helpPagesMap.insert("Bowtie2","18223236");
+ helpPagesMap.insert("UGENE Genome Aligner","18223214");
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 737ef44..e4c5941 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/BuildIndexDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
index cacde30..70110e1 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ ConvertAssemblyToSamDialog::ConvertAssemblyToSamDialog(QWidget* parent, QString
saveController(NULL)
{
ui->setupUi(this);
- new HelpButton(this, ui->buttonBox, "18220575");
+ new HelpButton(this, ui->buttonBox, "18223215");
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 aad6246..f37f29b 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/ConvertAssemblyToSamDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
index 9b0d963..b5c4a64 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -67,12 +67,12 @@ DnaAssemblyDialog::DnaAssemblyDialog(QWidget* p, const QStringList& shortReadsUr
{
setupUi(this);
QMap<QString,QString> helpPagesMap;
- helpPagesMap.insert("BWA","18220570");
- helpPagesMap.insert("BWA-MEM","18220604");
- helpPagesMap.insert("BWA-SW","18220598");
- helpPagesMap.insert("Bowtie","18220567");
- helpPagesMap.insert("Bowtie2","18220595");
- helpPagesMap.insert("UGENE Genome Aligner","18220573");
+ helpPagesMap.insert("BWA","18223210");
+ helpPagesMap.insert("BWA-MEM","18223244");
+ helpPagesMap.insert("BWA-SW","18223238");
+ helpPagesMap.insert("Bowtie","18223207");
+ helpPagesMap.insert("Bowtie2","18223235");
+ helpPagesMap.insert("UGENE Genome Aligner","18223213");
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 96fa666..41c931d 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
index d3b911b..1c72ee7 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
index 19e700e..892b0e8 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyGUIExtension.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
index 7d6d436..1789577 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,6 +30,8 @@
#include <U2Core/AddDocumentTask.h>
#include <U2Core/AppContext.h>
+#include <U2Core/AppSettings.h>
+#include <U2Core/UserApplicationsSettings.h>
#include <U2Core/BaseDocumentFormats.h>
#include <U2Core/DNASequenceObject.h>
#include <U2Core/DocumentModel.h>
@@ -37,11 +39,15 @@
#include <U2Core/GObjectSelection.h>
#include <U2Core/GUrlUtils.h>
#include <U2Core/MultiTask.h>
+#include <U2Core/L10n.h>
#include <U2Core/ProjectModel.h>
#include <U2Core/U2SafePoints.h>
+#include <U2Core/U2OpStatusUtils.h>
#include <U2Formats/ConvertAssemblyToSamTask.h>
#include <U2Formats/ConvertFileTask.h>
+#include <U2Formats/FastqFormat.h>
+#include <U2Formats/PairedFastqComparator.h>
#include <U2Gui/OpenViewTask.h>
#include <U2Gui/ToolsMenu.h>
@@ -53,6 +59,7 @@
#include "DnaAssemblyUtils.h"
#include "GenomeAssemblyDialog.h"
+
namespace U2 {
DnaAssemblySupport::DnaAssemblySupport()
@@ -260,10 +267,73 @@ QString DnaAssemblySupport::unknownText(const QList<GUrl> &unknownFormatFiles) {
}
/************************************************************************/
+/* FilterUnpairedReads */
+/************************************************************************/
+FilterUnpairedReadsTask::FilterUnpairedReadsTask(const DnaAssemblyToRefTaskSettings &settings)
+ : Task(tr("Filter unpaired reads task"), TaskFlags_FOSE_COSC),
+ settings(settings) {
+ tmpDirPath = settings.tmpDirectoryForFilteredFiles.isEmpty()
+ ? AppContext::getAppSettings()->getUserAppsSettings()->getCurrentProcessTemporaryDirPath()
+ : settings.tmpDirectoryForFilteredFiles;
+}
+
+void FilterUnpairedReadsTask::run() {
+ SAFE_POINT_EXT(settings.pairedReads,
+ setError(tr("Filtering unpaired reads is launched on not-paired data")), );
+
+ QList<ShortReadSet> upstream;
+ QList<ShortReadSet> downstream;
+ foreach (const ShortReadSet& set, settings.shortReadSets) {
+ if (set.order == ShortReadSet::UpstreamMate) {
+ upstream << set;
+ } else {
+ downstream << set;
+ }
+ }
+ SAFE_POINT_EXT(upstream.size() == downstream.size(), setError(tr("The count of upstream files is not equal to the count of downstream files")), );
+
+ for (int i = 0; i < upstream.size(); i++) {
+ QString tmpFileUpstream = getTmpFilePath(upstream[i].url);
+ CHECK_OP(stateInfo, );
+ QString tmpFileDownstream = getTmpFilePath(downstream[i].url);
+ CHECK_OP(stateInfo, );
+ compareFiles(upstream[i].url.getURLString(), downstream[i].url.getURLString(),
+ tmpFileUpstream, tmpFileDownstream);
+ CHECK_OP(stateInfo, );
+
+ filteredReads << ShortReadSet(GUrl(tmpFileUpstream), ShortReadSet::PairedEndReads, ShortReadSet::UpstreamMate);
+ filteredReads << ShortReadSet(GUrl(tmpFileDownstream), ShortReadSet::PairedEndReads, ShortReadSet::DownstreamMate);
+ }
+}
+
+QString FilterUnpairedReadsTask::getTmpFilePath(const GUrl &initialFile) {
+ QString result = GUrlUtils::prepareTmpFileLocation(tmpDirPath, initialFile.baseFileName(), "fastq", stateInfo);
+ CHECK_OP(stateInfo, QString());
+ return result;
+}
+
+void FilterUnpairedReadsTask::compareFiles(const GUrl &upstream, const GUrl &downstream,
+ const GUrl &upstreamFiltered, const GUrl &downstreamFiltered) {
+
+ PairedFastqComparator comparator(upstream.getURLString(), downstream.getURLString(),
+ upstreamFiltered.getURLString(), downstreamFiltered.getURLString(),
+ stateInfo);
+ CHECK_OP(stateInfo, );
+ comparator.compare(stateInfo);
+ CHECK_OP(stateInfo, );
+
+ if (comparator.getUnpairedCount() != 0) {
+ stateInfo.addWarning(tr("%1 pairs are complete, %2 reads without a pair were found in files %3 and %4.")
+ .arg(comparator.getPairsCount()).arg(comparator.getUnpairedCount())
+ .arg(upstream.getURLString()).arg(downstream.getURLString()));
+ }
+}
+
+/************************************************************************/
/* DnaAssemblyTaskWithConversions */
/************************************************************************/
DnaAssemblyTaskWithConversions::DnaAssemblyTaskWithConversions(const DnaAssemblyToRefTaskSettings &settings, bool viewResult, bool justBuildIndex)
- : ExternalToolSupportTask("Dna assembly task", TaskFlags_NR_FOSCOE), settings(settings), viewResult(viewResult),
+ : ExternalToolSupportTask("Dna assembly task", TaskFlags(TaskFlags_NR_FOSCOE | TaskFlag_CollectChildrenWarnings)), settings(settings), viewResult(viewResult),
justBuildIndex(justBuildIndex), conversionTasksCount(0), assemblyTask(NULL) {}
const DnaAssemblyToRefTaskSettings& DnaAssemblyTaskWithConversions::getSettings() const {
@@ -287,6 +357,10 @@ void DnaAssemblyTaskWithConversions::prepare() {
}
if (0 == conversionTasksCount) {
+ if (settings.filterUnpaired) {
+ addSubTask(new FilterUnpairedReadsTask(settings));
+ return;
+ }
assemblyTask = new DnaAssemblyMultiTask(settings, viewResult, justBuildIndex);
assemblyTask->addListeners(getListeners());
addSubTask(assemblyTask);
@@ -298,7 +372,7 @@ QList<Task*> DnaAssemblyTaskWithConversions::onSubTaskFinished(Task *subTask) {
CHECK(!subTask->hasError(), result);
CHECK(!hasError(), result);
- ConvertFileTask *convertTask = dynamic_cast<ConvertFileTask*>(subTask);
+ ConvertFileTask *convertTask = qobject_cast<ConvertFileTask*>(subTask);
if (NULL != convertTask) {
SAFE_POINT_EXT(conversionTasksCount > 0, setError("Conversions task count error"), result);
if (convertTask->getSourceURL() == settings.refSeqUrl) {
@@ -313,13 +387,34 @@ QList<Task*> DnaAssemblyTaskWithConversions::onSubTaskFinished(Task *subTask) {
conversionTasksCount--;
if (0 == conversionTasksCount) {
+ if (settings.filterUnpaired) {
+ result << new FilterUnpairedReadsTask(settings);
+ return result;
+ }
assemblyTask = new DnaAssemblyMultiTask(settings, viewResult, justBuildIndex);
result << assemblyTask;
}
}
+ FilterUnpairedReadsTask* filterTask = qobject_cast<FilterUnpairedReadsTask*>(subTask);
+ if (settings.filterUnpaired && filterTask != NULL) {
+ settings.shortReadSets = filterTask->getFilteredReadList();
+ assemblyTask = new DnaAssemblyMultiTask(settings, viewResult, justBuildIndex);
+ result << assemblyTask;
+ }
return result;
}
+Task::ReportResult DnaAssemblyTaskWithConversions::report() {
+ if (settings.filterUnpaired && settings.pairedReads) {
+ foreach (const ShortReadSet& set, settings.shortReadSets) {
+ if (!QFile::remove(set.url.getURLString())) {
+ stateInfo.addWarning(tr("Cannot remove temporary file %1").arg(set.url.getURLString()));
+ }
+ }
+ }
+ return ReportResult_Finished;
+}
+
} // U2
diff --git a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
index fb5ca13..a351fef 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/DnaAssemblyUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,6 +25,7 @@
#include <U2Algorithm/DnaAssemblyMultiTask.h>
#include <U2Core/ExternalToolRunTask.h>
+
namespace U2 {
class DnaAssemblyToRefTaskSettings;
@@ -46,6 +47,23 @@ private slots:
};
+class FilterUnpairedReadsTask : public Task {
+ Q_OBJECT
+public:
+ FilterUnpairedReadsTask(const DnaAssemblyToRefTaskSettings &settings);
+ void run();
+ const QList<ShortReadSet>& getFilteredReadList() const { return filteredReads; }
+
+private:
+ QString getTmpFilePath(const GUrl& initialFile);
+ void compareFiles(const GUrl& upstream, const GUrl& downstream,
+ const GUrl& upstreamFiltered, const GUrl& downstreamFiltered);
+
+ DnaAssemblyToRefTaskSettings settings;
+ QList<ShortReadSet> filteredReads;
+ QString tmpDirPath;
+};
+
class U2VIEW_EXPORT DnaAssemblyTaskWithConversions : public ExternalToolSupportTask {
Q_OBJECT
public:
@@ -54,6 +72,7 @@ public:
void prepare();
QList<Task*> onSubTaskFinished(Task *subTask);
const DnaAssemblyToRefTaskSettings& getSettings() const;
+ ReportResult report();
private:
DnaAssemblyToRefTaskSettings settings;
diff --git a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
index c901602..d365f62 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
+++ b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,21 +52,18 @@
namespace U2 {
-QString GenomeAssemblyDialog::lastDirUrl;
-QStringList GenomeAssemblyDialog::lastLeftReadsUrls;
-QStringList GenomeAssemblyDialog::lastRightReadsUrls;
QString GenomeAssemblyDialog::methodName;
+QString GenomeAssemblyDialog::library;
GenomeAssemblyDialog::GenomeAssemblyDialog(QWidget* p)
: QDialog(p),
assemblyRegistry(AppContext::getGenomeAssemblyAlgRegistry()),
customGUI(NULL)
{
-
setupUi(this);
QMap<QString,QString> helpPagesMap;
- helpPagesMap.insert("SPAdes","18220606");
+ helpPagesMap.insert("SPAdes","18223246");
new ComboboxDependentHelpButton(this, buttonBox, methodNamesBox, helpPagesMap);
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -95,21 +92,12 @@ GenomeAssemblyDialog::GenomeAssemblyDialog(QWidget* p)
header1->setStretchLastSection( false );
header2->setStretchLastSection( false );
header3->setStretchLastSection( false );
-#if (QT_VERSION < 0x050000) //Qt 5
- header1->setClickable( false );
- header1->setResizeMode( 0, QHeaderView::Stretch );
- header2->setClickable( false );
- header2->setResizeMode( 0, QHeaderView::Stretch );
- header3->setClickable( false );
- header3->setResizeMode( 0, QHeaderView::Stretch );
-#else
header1->setSectionsClickable( false );
header1->setSectionResizeMode( 0, QHeaderView::Stretch );
header2->setSectionsClickable( false );
header2->setSectionResizeMode( 0, QHeaderView::Stretch );
header3->setSectionsClickable( false );
header3->setSectionResizeMode( 0, QHeaderView::Stretch );
-#endif
sl_onLibraryTypeChanged();
sl_onAlgorithmChanged(methodNamesBox->currentText());
@@ -122,16 +110,14 @@ GenomeAssemblyDialog::GenomeAssemblyDialog(QWidget* p)
connect(methodNamesBox, SIGNAL(currentIndexChanged(const QString &)), SLOT(sl_onAlgorithmChanged(const QString &)));
connect(libraryComboBox, SIGNAL(currentIndexChanged(int)), SLOT(sl_onLibraryTypeChanged()));
- if(!lastDirUrl.isEmpty()){
- resultDirNameEdit->setText(lastDirUrl);
- }
-
- if(!lastLeftReadsUrls.isEmpty()){
- addReads(lastLeftReadsUrls, leftReadsTable);
- }
+ QString defaultOutputDir = GUrlUtils::getDefaultDataPath() + "/" + methodNamesBox->currentText() + "_output";
+ resultDirNameEdit->setText(GUrlUtils::rollFileName(defaultOutputDir, QSet<QString>() << defaultOutputDir));
- if(!lastRightReadsUrls.isEmpty()){
- addReads(lastRightReadsUrls, rightReadsTable);
+ if (!library.isEmpty()) {
+ int index = libraryComboBox->findText(library);
+ if (index != -1) {
+ libraryComboBox->setCurrentIndex(index);
+ }
}
}
@@ -247,45 +233,47 @@ void GenomeAssemblyDialog::accept() {
}
if(validated){
- lastDirUrl = resultDirNameEdit->text();
+ library = libraryComboBox->currentText();
+ library = libraryComboBox->currentText();
- lastLeftReadsUrls.clear();
+ //check formats
+ QStringList reads;
int numItems = leftReadsTable->topLevelItemCount();
- for( int i = 0; i < numItems; ++i) {
- lastLeftReadsUrls.append(leftReadsTable->topLevelItem(i)->data(0, Qt::UserRole).toString());
+ for (int i = 0; i < numItems; ++i) {
+ reads.append(leftReadsTable->topLevelItem(i)->data(0, Qt::UserRole).toString());
}
- lastRightReadsUrls.clear();
numItems = rightReadsTable->topLevelItemCount();
- for( int i = 0; i < numItems; ++i) {
- lastRightReadsUrls.append(rightReadsTable->topLevelItem(i)->data(0, Qt::UserRole).toString());
+ for (int i = 0; i < numItems; ++i) {
+ reads.append(rightReadsTable->topLevelItem(i)->data(0, Qt::UserRole).toString());
}
- //check formats
- QStringList reads = lastLeftReadsUrls;
- if(GenomeAssemblyUtils::hasRightReads(libraryComboBox->currentText())){
- reads.append(lastRightReadsUrls);
- }
- GenomeAssemblyAlgorithmEnv *env= AppContext::getGenomeAssemblyAlgRegistry()->getAlgorithm(methodNamesBox->currentText());
+ GenomeAssemblyAlgorithmEnv *env = AppContext::getGenomeAssemblyAlgRegistry()->getAlgorithm(methodNamesBox->currentText());
SAFE_POINT(NULL != env, "Unknown algorithm: " + methodNamesBox->currentText(), );
QStringList formats = env->getReadsFormats();
- foreach (const QString& r, reads){
+ foreach(const QString& r, reads) {
const QString detectedFormat = FileAndDirectoryUtils::detectFormat(r);
- if(detectedFormat.isEmpty()){
+ if (detectedFormat.isEmpty()) {
QMessageBox::information(this, tr("Genome Assembly"),
- tr("Unknown file format of %1.").arg(r) );
- return ;
+ tr("Unknown file format of %1.").arg(r));
+ return;
}
- if(!formats.contains(detectedFormat)){
+ if (!formats.contains(detectedFormat)) {
QMessageBox::information(this, tr("Genome Assembly"),
- tr("File format of %1 is %2. Supported file formats of reads: %3.").arg(r).arg(detectedFormat).arg(formats.join(", ")) );
- return ;
+ tr("File format of %1 is %2. Supported file formats of reads: %3.").arg(r).arg(detectedFormat).arg(formats.join(", ")));
+ return;
+ }
+ }
+ QString outputDirUrl = resultDirNameEdit->text();
+ QDir d(outputDirUrl);
+ if (!d.exists()) {
+ if (!d.mkdir(outputDirUrl)) {
+ QMessageBox::information(this, tr("Genome Assembly"),
+ tr("Unable to create output directory for result assembly.\r\nDirectory Path: %1").arg(outputDirUrl));
}
}
-
-
QDialog::accept();
}
}
diff --git a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
index 7dd0a9a..fbc38e3 100644
--- a/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
+++ b/src/corelibs/U2View/src/util_dna_assembly/GenomeAssemblyDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -85,10 +85,7 @@ private:
const GenomeAssemblyAlgRegistry* assemblyRegistry;
GenomeAssemblyAlgorithmMainWidget* customGUI;
static QString methodName;
- static QString lastDirUrl;
- static QStringList lastLeftReadsUrls;
- static QStringList lastRightReadsUrls;
-
+ static QString library;
};
} // namespace
diff --git a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
index 77f5a04..d6d5276 100644
--- a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
+++ b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
index b391df2..3f66762 100644
--- a/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
+++ b/src/corelibs/U2View/src/util_msa_align/AlignmentAlgorithmGUIExtension.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
index bc8e5eb..1ffff88 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220546");
+ new HelpButton(this, buttonBox, "18223186");
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 b9abff9..7abbbe3 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
index 05beaa7..79e6617 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
index 4f0f9c4..dfc7eff 100644
--- a/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
+++ b/src/corelibs/U2View/src/util_sec_struct_predict/SecStructPredictUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
index 420880b..8b10a60 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -72,7 +72,7 @@ SmithWatermanDialog::SmithWatermanDialog(QWidget* w, ADVSequenceObjectContext* c
dialogConfig = _dialogConfig;
setupUi(this);
- new HelpButton(this, buttonBox, "18220553");
+ new HelpButton(this, buttonBox, "18223193");
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 cdc8e7a..6c9b343 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
index de1eb48..50091d1 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SmithWatermanDialogImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
index a8b5ac8..889097b 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
+++ b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,6 +43,7 @@ SubstMatrixDialog::SubstMatrixDialog(const SMatrix& _m, QWidget* p)
setupUi(this);
bttnClose = buttonBox->button(QDialogButtonBox::Close);
+ bttnClose->setText(tr("Close"));
setWindowTitle(tr("Scoring Matrix: %1").arg(m.getName()));
setModal(true);
diff --git a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
index f615f07..595911c 100644
--- a/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
+++ b/src/corelibs/U2View/src/util_smith_waterman/SubstMatrixDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/corelibs/U2View/transl/english.ts b/src/corelibs/U2View/transl/english.ts
index 37a2dec..6087250 100644
--- a/src/corelibs/U2View/transl/english.ts
+++ b/src/corelibs/U2View/transl/english.ts
@@ -688,7 +688,7 @@ Probably the data is too big.</translation>
<message>
<location filename="../src/ov_assembly/ExtractAssemblyRegionDialog.ui" line="22"/>
<source>Save to file</source>
- <translation type="unfinished"></translation>
+ <translation>Save to file</translation>
</message>
<message>
<location filename="../src/ov_assembly/ExtractAssemblyRegionDialog.ui" line="32"/>
@@ -1156,12 +1156,12 @@ Probably the data is too big.</translation>
<translation>Generating tree view</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1496"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1500"/>
<source>Expand</source>
<translation>Expand</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1499"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1503"/>
<source>Collapse</source>
<translation>Collapse</translation>
</message>
@@ -1234,7 +1234,7 @@ Double-click to collapse the branch</source>
Double-click to collapse the branch</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="120"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="125"/>
<source>Assembly Statistics</source>
<translation>Assembly Statistics</translation>
</message>
@@ -1244,137 +1244,137 @@ Double-click to collapse the branch</translation>
<translation>Navigation</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="166"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="175"/>
<source>Lock here</source>
<translation>Lock here</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="317"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="338"/>
<source>Shift+move mouse</source>
<translation>Shift+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="317"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="338"/>
<source>Zoom the Assembly Overview to selection</source>
<translation>Zoom the Assembly Overview to selection</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="318"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="339"/>
<source>Ctrl+wheel</source>
<translation>Ctrl+wheel</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="318"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="339"/>
<source>Zoom the Assembly Overview</source>
<translation>Zoom the Assembly Overview</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="319"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="340"/>
<source>Alt+click</source>
<translation>Alt+click</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="319"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="340"/>
<source>Zoom the Assembly Overview in 100x</source>
<translation>Zoom the Assembly Overview in 100x</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="320"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
<source>Wheel+move mouse</source>
<translation>Wheel+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="320"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
<source>Move the Assembly Overview</source>
<translation>Move the Assembly Overview</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="321"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="342"/>
<source>Wheel</source>
<translation>Wheel</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="321"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="342"/>
<source>Zoom the Reads Area</source>
<translation>Zoom the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="322"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
<source>Double-click</source>
<translation>Double-click</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="322"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
<source>Zoom in the Reads Area</source>
<translation>Zoom in the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="323"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="344"/>
<source>+/-</source>
<translation>+/-</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="323"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="344"/>
<source>Zoom in/Zoom out the Reads Area</source>
<translation>Zoom in/Zoom out the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="324"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="345"/>
<source>Click+move mouse</source>
<translation>Click+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="324"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="345"/>
<source>Move the Reads Area</source>
<translation>Move the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="325"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="346"/>
<source>Arrow</source>
<translation>Arrow</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="325"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="346"/>
<source>Move one base in the corresponding direction in the Reads Area</source>
<translation>Move one base in the corresponding direction in the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="326"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="347"/>
<source>Ctrl+arrow</source>
<translation>Ctrl+arrow</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="326"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="347"/>
<source>Move one page in the corresponding direction in the Reads Area</source>
<translation>Move one page in the corresponding direction in the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="327"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="348"/>
<source>Page up/Page down</source>
<translation>Page up/Page down</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="327"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="348"/>
<source>Move one page up/down in the Reads Area</source>
<translation>Move one page up/down in the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="328"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="349"/>
<source>Home/End</source>
<translation>Home/End</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="328"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="349"/>
<source>Move to the beginning/end of the assembly in the Reads Area</source>
<translation>Move to the beginning/end of the assembly in the Reads Area</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="329"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="350"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="329"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="350"/>
<source>Focus to the <i>Go to position</i> field on the toolbar</source>
<translation>Focus to the <i>Go to position</i> field on the toolbar</translation>
</message>
@@ -1516,6 +1516,11 @@ Double-click to collapse the branch</translation>
<source>Show names for the sequence only</source>
<translation>Show names for the sequence only</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/PanViewRows.cpp" line="95"/>
+ <source>Restriction Site</source>
+ <translation>Restriction Site</translation>
+ </message>
</context>
<context>
<name>SaveGraphCutoffsDialog</name>
@@ -2905,102 +2910,107 @@ Double-click to collapse the branch</translation>
<translation>It seems that sequence "%1", set as reference to assembly "%2", does not match it.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="290"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="258"/>
+ <source>Internal error: database is busy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="293"/>
<source>Internal error: broken variant track object</source>
<translation>Internal error: broken variant track object</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="296"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="299"/>
<source>Only sequence or variant track objects can be added to assembly browser</source>
<translation>Only sequence or variant track objects can be added to assembly browser</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="305"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="308"/>
<source>Warning</source>
<translation>Warning</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="306"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="309"/>
<source>This action requires changing the assembly object that is locked for editing</source>
<translation>This action requires changing the assembly object that is locked for editing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="647"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="656"/>
<source>Zoom in</source>
<translation>Zoom in</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="650"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="659"/>
<source>Zoom out</source>
<translation>Zoom out</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="653"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="662"/>
<source>Linear</source>
<translation>Linear</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="655"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="664"/>
<source>Logarithmic</source>
<translation>Logarithmic</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="661"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="670"/>
<source>Show coordinates on ruler</source>
<translation>Show coordinates on ruler</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="665"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="674"/>
<source>Show coverage under ruler cursor</source>
<translation>Show coverage under ruler cursor</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="669"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="678"/>
<source>Show information about read under cursor in pop-up hint</source>
<translation>Show information about read under cursor in pop-up hint</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="674"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="683"/>
<source>Export as image</source>
<translation>Export as image</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="677"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="686"/>
<source>Export assembly to SAM format</source>
<translation>Export assembly to SAM format</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="680"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="689"/>
<source>Set reference</source>
<translation>Set reference</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="684"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="693"/>
<source>Export assembly region</source>
<translation>Export assembly region</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1001"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1010"/>
<source>Open file with a sequence</source>
<translation>Open file with a sequence</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1012"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1021"/>
<source>An error occurred while setting reference to "%1" assembly. The selected file "%2" does not contain sequences.</source>
<translation>An error occurred while setting reference to "%1" assembly. The selected file "%2" does not contain sequences.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1014"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1023"/>
<source>An error occurred while setting reference to "%1" assembly. There are more than one sequence in file "%2". Please select the required sequence object in the Project View and click "Set reference" again.</source>
<translation>An error occurred while setting reference to "%1" assembly. There are more than one sequence in file "%2". Please select the required sequence object in the Project View and click "Set reference" again.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1075"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1084"/>
<source>An error occurred while setting reference to "%1". You have more than one sequence object selected in the Project View. Please select only one object and try again.</source>
<translation>An error occurred while setting reference to "%1". You have more than one sequence object selected in the Project View. Please select only one object and try again.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1074"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1083"/>
<source>Choose Reference Sequence</source>
<translation>Choose Reference Sequence</translation>
</message>
@@ -3021,7 +3031,7 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::AssemblyBrowserUi</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1194"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1204"/>
<source>Assembly has no mapped reads. Nothing to visualize.</source>
<translation>Assembly has no mapped reads. Nothing to visualize.</translation>
</message>
@@ -3129,42 +3139,42 @@ Double-click to collapse the branch</translation>
<context>
<name>U2::AssemblyInfoWidget</name>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="85"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="87"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="86"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="88"/>
<source>Length</source>
<translation>Length</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="87"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="89"/>
<source>Reads</source>
<translation>Reads</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="89"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="91"/>
<source>Assembly Information</source>
<translation>Assembly Information</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="99"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="103"/>
<source>MD5</source>
<translation>MD5</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="102"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="106"/>
<source>Species</source>
<translation>Species</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="105"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="109"/>
<source>URI</source>
<translation>URI</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="108"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="112"/>
<source>Reference Information</source>
<translation>Reference Information</translation>
</message>
@@ -3258,77 +3268,92 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::AssemblyReadsArea</name>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="105"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="94"/>
+ <source><center><b>Assembly database is busy</b><br>Some task occupied database.<br> When the database is free all functionality of Assembly Browser will be available again.</center></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="114"/>
<source>Copy read information to clipboard</source>
<translation>Copy read information to clipboard</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="109"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="118"/>
<source>Copy current position to clipboard</source>
<translation>Copy current position to clipboard</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="112"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="121"/>
<source>Export</source>
<translation>Export</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="115"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="124"/>
<source>Coverage</source>
<translation>Coverage</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="135"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="144"/>
<source>Reads highlighting</source>
<translation>Reads highlighting</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="160"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="169"/>
<source>Optimize rendering when scrolling</source>
<translation>Optimize rendering when scrolling</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="169"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="178"/>
<source>Reads shadowing</source>
<translation>Reads shadowing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="171"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="180"/>
<source>Disabled</source>
<translation>Disabled</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="173"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="182"/>
<source>Free</source>
<translation>Free</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="175"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="184"/>
<source>Centered</source>
<translation>Centered</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="183"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="192"/>
<source>Jump to locked base</source>
<translation>Jump to locked base</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="337"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="358"/>
<source><a href="%1" style="color: %2">Zoom in to see the reads</a></source>
<translation><a href="%1" style="color: %2">Zoom in to see the reads</a></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="362"/>
<source>Please wait until overview rendering is finished, or <a href="%1">zoom in to see the reads</a></source>
<translation>Please wait until overview rendering is finished, or <a href="%1">zoom in to see the reads</a></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="364"/>
<source> or choose one of the well-covered regions:<br><br></source>
<translation> or choose one of the well-covered regions:<br><br></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="930"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="953"/>
+ <source>Export visible reads as sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="954"/>
+ <source>There are no reads in the current area. Nothing to export!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="960"/>
<source>Locked to base</source>
<translation>Locked to base</translation>
</message>
@@ -3478,12 +3503,12 @@ You don't have enough rights to change file</translation>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="44"/>
<source>Cancel</source>
- <translation type="unfinished">Cancel</translation>
+ <translation>Cancel</translation>
</message>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="43"/>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="77"/>
@@ -3544,9 +3569,13 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::CalculateCoveragePerBaseOnRegionTask</name>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="35"/>
<source>Calculate coverage per base for assembly %1 on region (%2, %3)</source>
- <translation>Calculate coverage per base for assembly %1 on region (%2, %3)</translation>
+ <translation type="vanished">Calculate coverage per base for assembly %1 on region (%2, %3)</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="35"/>
+ <source>Calculate coverage per base for assembly on region (%1, %2)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="41"/>
@@ -3559,13 +3588,12 @@ You don't have enough rights to change file</translation>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="47"/>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="62"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="53"/>
<source>Assembly DBI is NULL</source>
<translation>Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="133"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="123"/>
<source>Cigar string: out of bounds</source>
<translation>Cigar string: out of bounds</translation>
</message>
@@ -3573,42 +3601,42 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::CalculateCoveragePerBaseTask</name>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="150"/>
<source>Calculate coverage per base for assembly %1</source>
- <translation>Calculate coverage per base for assembly %1</translation>
+ <translation type="vanished">Calculate coverage per base for assembly %1</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="154"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="136"/>
+ <source>Calculate coverage per base for assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="141"/>
<source>Invalid database reference</source>
<translation>Invalid database reference</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="155"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="142"/>
<source>Invalid assembly ID</source>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="160"/>
<source>Assembly DBI is NULL</source>
- <translation>Assembly DBI is NULL</translation>
+ <translation type="vanished">Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="175"/>
<source>Attribute DBI is NULL</source>
- <translation>Attribute DBI is NULL</translation>
+ <translation type="vanished">Attribute DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="179"/>
<source>Can't get the assembly length: attribute is missing</source>
- <translation>Can't get the assembly length: attribute is missing</translation>
+ <translation type="vanished">Can't get the assembly length: attribute is missing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="182"/>
<source>Assembly has zero length</source>
- <translation>Assembly has zero length</translation>
+ <translation type="vanished">Assembly has zero length</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="196"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="167"/>
<source>An unexpected subtask</source>
<translation>An unexpected subtask</translation>
</message>
@@ -3616,7 +3644,7 @@ You don't have enough rights to change file</translation>
<context>
<name>U2::CalculatePointsTask</name>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="890"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="892"/>
<source>Calculate graph points</source>
<translation>Calculate graph points</translation>
</message>
@@ -3749,9 +3777,13 @@ You don't have enough rights to change file</translation>
<translation>Nucleotide</translation>
</message>
<message>
- <location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="196"/>
<source>Ok</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Ok</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="196"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
</message>
<message>
<location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="223"/>
@@ -4395,17 +4427,17 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::ExportCoverageHistogramTask</name>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="155"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="166"/>
<source>Attribute DBI is NULL</source>
<translation>Attribute DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="159"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="170"/>
<source>Can't get the assembly length: attribute is missing</source>
<translation>Can't get the assembly length: attribute is missing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="162"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="173"/>
<source>Assembly has zero length</source>
<translation>Assembly has zero length</translation>
</message>
@@ -4413,42 +4445,45 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::ExportCoverageTask</name>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="51"/>
<source>Export coverage per base for %1</source>
- <translation>Export coverage per base for %1</translation>
+ <translation type="vanished">Export coverage per base for %1</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="62"/>
+ <source>Export assembly coverage per base</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="58"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="70"/>
<source>Invalid database reference</source>
<translation>Invalid database reference</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="59"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="71"/>
<source>Invalid assembly ID</source>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="60"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="72"/>
<source>Invalid destination url</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="65"/>
<source>Assembly DBI is NULL</source>
- <translation>Assembly DBI is NULL</translation>
+ <translation type="vanished">Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="78"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="84"/>
<source>Can't write the compressed file: IOAdapterFactory is NULL</source>
<translation>Can't write the compressed file: IOAdapterFactory is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="84"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="90"/>
<source>Can't write the file: IOAdapterFactory is NULL</source>
<translation>Can't write the file: IOAdapterFactory is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="98"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="110"/>
<source>Not all regions were processed</source>
<translation>Not all regions were processed</translation>
</message>
@@ -4659,181 +4694,208 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::FindPatternWidget</name>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="326"/>
<source>Exact</source>
<translation>Exact</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="330"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
<source>InsDel</source>
<translation>InsDel</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="329"/>
<source>Substitute</source>
<translation>Substitute</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="333"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
<source>Regular expression</source>
<translation>Regular expression</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="337"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="335"/>
<source>Should match</source>
<translation>Should match</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="414"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="412"/>
<source>Search with ambiguous bases</source>
<translation>Search with ambiguous bases</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="360"/>
<source>Both</source>
<translation>Both</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="363"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="361"/>
<source>Direct</source>
<translation>Direct</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="364"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
<source>Reverse-coml.</source>
<translation>Reverse-coml.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="370"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="368"/>
<source>Sequence</source>
<translation>Sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="371"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="369"/>
<source>Translation</source>
<translation>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="375"/>
<source>Whole sequence</source>
<translation>Whole sequence</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="378"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="376"/>
<source>Custom region</source>
<translation>Custom region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="379"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
<source>Selected region</source>
<translation>Selected region</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="437"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="435"/>
<source>Results no longer than:</source>
<translation>Results no longer than:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="705"/>
<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="719"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="707"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="714"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="722"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="729"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="735"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="745"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="754"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="758"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="769"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="783"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="791"/>
+ <source><b><font color=%1>%2</font><br></br></b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
<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="727"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="720"/>
<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="734"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="727"/>
<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="789"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="744"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="757"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="767"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="775"/>
+ <source><b><font color=%1>%2</font></b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="790"/>
<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="1469"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1450"/>
<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="1607"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1588"/>
<source>Results:</source>
<translation>Results:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="750"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="743"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="756"/>
<source>Reason: </source>
<translation>Reason: </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="734"/>
<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="753"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="747"/>
<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="759"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="753"/>
<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="764"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="760"/>
<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="770"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="766"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="774"/>
<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="771"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="778"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="768"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="776"/>
<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="784"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="782"/>
<source>Warning: invalid regexp. </source>
<translation>Warning: invalid regexp. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1124"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1105"/>
<source>Select file to open...</source>
<translation>Select file to open...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1176"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1157"/>
<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="297"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1521"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1502"/>
<source>Results: %1/%2</source>
<translation>Results: %1/%2</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="740"/>
<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="1324"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1305"/>
<source>Sequence in focus is NULL</source>
<translation>Sequence in focus is NULL</translation>
</message>
@@ -4876,6 +4938,11 @@ Please, check external tools in the settings.</translation>
<source>Graph is rendering...</source>
<translation>Graph is rendering...</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="442"/>
+ <source>Graph is not available. Try to change calculation settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::GSequenceGraphView</name>
@@ -4910,12 +4977,12 @@ Please, check external tools in the settings.</translation>
<translation>%1 [%2, %3], Window: %4, Step %5</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="623"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="625"/>
<source>[%2, max:%3, min:%4]</source>
<translation>[%2, max:%3, min:%4]</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="617"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="619"/>
<source>[%2, %3]</source>
<translation>[%2, %3]</translation>
</message>
@@ -4931,65 +4998,108 @@ Please, check external tools in the settings.</translation>
<context>
<name>U2::GenomeAssemblyDialog</name>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="71"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="68"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="72"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="69"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="199"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="202"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="185"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="188"/>
<source>Add short reads</source>
<translation>Add short reads</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="217"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="224"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="230"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="236"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="243"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="276"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="282"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="203"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="210"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="216"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="222"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="229"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="258"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="264"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="273"/>
<source>Genome Assembly</source>
<translation>Genome Assembly</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="225"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="211"/>
<source>Result assembly directory is not set!</source>
<translation>Result assembly directory is not set!</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="231"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="244"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="217"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="230"/>
<source>No reads. Please, add file(s) with short reads.</source>
<translation>No reads. Please, add file(s) with short reads.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="237"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="223"/>
<source>In the paired-end mode a number of lift and right reads must be equal.</source>
<translation>In the paired-end mode a number of lift and right reads must be equal.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="277"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="259"/>
<source>Unknown file format of %1.</source>
<translation>Unknown file format of %1.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="283"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="265"/>
<source>File format of %1 is %2. Supported file formats of reads: %3.</source>
<translation>File format of %1 is %2. Supported file formats of reads: %3.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="351"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="274"/>
+ <source>Unable to create output directory for result assembly.
+Directory Path: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="339"/>
<source>Select output directory</source>
<translation>Select output directory</translation>
</message>
</context>
<context>
+ <name>U2::GetAssemblyLengthTask</name>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="194"/>
+ <source>Attribute DBI is NULL</source>
+ <translation type="unfinished">Attribute DBI is NULL</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="198"/>
+ <source>Can't get the assembly length: attribute is missing</source>
+ <translation type="unfinished">Can't get the assembly length: attribute is missing</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="201"/>
+ <source>Assembly has zero length</source>
+ <translation type="unfinished">Assembly has zero length</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.h" line="43"/>
+ <source>Get length of Assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::GetAssemblyVisibleNameTask</name>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="54"/>
+ <source>Assembly DBI is NULL</source>
+ <translation type="unfinished">Assembly DBI is NULL</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.h" line="70"/>
+ <source>Get visible name of Assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::GraphLabel</name>
<message>
<location filename="../src/ov_sequence/GraphLabelModel.cpp" line="156"/>
@@ -5159,10 +5269,9 @@ Please, check external tools in the settings.</translation>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="128"/>
<location filename="../src/ov_msa/MSAEditor.cpp" line="224"/>
- <source>Save alignment</source>
- <translation>Save alignment</translation>
+ <source>Save Alignment</source>
+ <translation>Save Alignment</translation>
</message>
<message>
<location filename="../src/ov_msa/MSAEditor.cpp" line="132"/>
@@ -5170,6 +5279,11 @@ Please, check external tools in the settings.</translation>
<translation>Save alignment as</translation>
</message>
<message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="128"/>
+ <source>Save alignment</source>
+ <translation>Save alignment</translation>
+ </message>
+ <message>
<location filename="../src/ov_msa/MSAEditor.cpp" line="184"/>
<source>Export highlighted</source>
<translation>Export highlighted</translation>
@@ -5877,17 +5991,17 @@ All phylogenetic tree(s), opened in the same view, will be no more synchronized
<context>
<name>U2::MSAGraphOverview</name>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="103"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="104"/>
<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="108"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="109"/>
<source>Waiting...</source>
<translation>Waiting...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="117"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="118"/>
<source>Overview is rendering...</source>
<translation>Overview is rendering...</translation>
</message>
@@ -6072,77 +6186,77 @@ All phylogenetic tree(s), opened in the same view, will be no more synchronized
<translation>Set color...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="134"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="135"/>
<source>Show simple overview</source>
<translation>Show simple overview</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="141"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="142"/>
<source>Export as image</source>
<translation>Export as image</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="147"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="148"/>
<source>Display settings...</source>
<translation>Display settings...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="154"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="155"/>
<source>Calculation method...</source>
<translation>Calculation method...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="157"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="158"/>
<source>Strict</source>
<translation>Strict</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="158"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="159"/>
<source>Gaps</source>
<translation>Gaps</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="159"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="160"/>
<source>Clustal</source>
<translation>Clustal</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="160"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="161"/>
<source>Highlighting</source>
<translation>Highlighting</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="188"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="189"/>
<source>Graph type</source>
<translation>Graph type</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="192"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="193"/>
<source>Histogram</source>
<translation>Histogram</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="193"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="194"/>
<source>Line graph</source>
<translation>Line graph</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="194"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="195"/>
<source>Area graph</source>
<translation>Area graph</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="215"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="216"/>
<source>Orientation</source>
<translation>Orientation</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="219"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="220"/>
<source>Top to bottom</source>
<translation>Top to bottom</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="220"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="221"/>
<source>Bottom to top</source>
<translation>Bottom to top</translation>
</message>
@@ -6676,9 +6790,13 @@ Simple overview is unavailable.</translation>
<context>
<name>U2::SecStructDialog</name>
<message>
- <location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="65"/>
<source>OK</source>
- <translation>OK</translation>
+ <translation type="vanished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="65"/>
+ <source>Predict</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="66"/>
@@ -6995,22 +7113,40 @@ Please, load the corresponding plugins.</translation>
<context>
<name>U2::SubstMatrixDialog</name>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="47"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="46"/>
+ <source>Close</source>
+ <translation>Close</translation>
+ </message>
+ <message>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="48"/>
<source>Scoring Matrix: %1</source>
<translation>Scoring Matrix: %1</translation>
</message>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="51"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="52"/>
<source>min score:</source>
<translation>min score:</translation>
</message>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="52"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="53"/>
<source>max score:</source>
<translation>max score:</translation>
</message>
</context>
<context>
+ <name>U2::TextSettingsDialog</name>
+ <message>
+ <location filename="../src/phyltree/TextSettingsDialog.cpp" line="41"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TextSettingsDialog.cpp" line="42"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+</context>
+<context>
<name>U2::TreeOptionsWidget</name>
<message>
<location filename="../src/ov_msa/TreeOptions/TreeOptionsWidget.cpp" line="124"/>
@@ -7051,17 +7187,27 @@ Please, load the corresponding plugins.</translation>
<context>
<name>U2::TreeSettingsDialog</name>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="90"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="34"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="35"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="92"/>
<source>Default</source>
<translation>Default</translation>
</message>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="93"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="95"/>
<source>Phylogram</source>
<translation>Phylogram</translation>
</message>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="96"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="98"/>
<source>Cladogram</source>
<translation>Cladogram</translation>
</message>
@@ -7069,115 +7215,115 @@ Please, load the corresponding plugins.</translation>
<context>
<name>U2::TreeViewer</name>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="157"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="159"/>
<source>Tree Settings...</source>
<translation>Tree Settings...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="162"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="164"/>
<source>Rectangular</source>
<translation>Rectangular</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="167"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="169"/>
<source>Circular</source>
<translation>Circular</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="171"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="173"/>
<source>Unrooted</source>
<translation>Unrooted</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="176"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="178"/>
<source>Branch Settings...</source>
<translation>Branch Settings...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="178"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="180"/>
<source>Collapse</source>
<translation>Collapse</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="180"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="182"/>
<source>Reroot tree</source>
<translation>Reroot tree</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="182"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="184"/>
<source>Swap Siblings</source>
<translation>Swap Siblings</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="186"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="188"/>
<source>Show Names</source>
<translation>Show Names</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="191"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="193"/>
<source>Show Node Labels</source>
<translation>Show Node Labels</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="196"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="198"/>
<source>Show Distances</source>
<translation>Show Distances</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="202"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="204"/>
<source>Formatting...</source>
<translation>Formatting...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="206"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="208"/>
<source>Align Labels</source>
<translation>Align Labels</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="211"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="213"/>
<source>Zoom In</source>
<translation>Zoom In</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="212"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="214"/>
<source>Zoom Out</source>
<translation>Zoom Out</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="213"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="215"/>
<source>Reset Zooming</source>
<translation>Reset Zooming</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="216"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="218"/>
<source>Print Tree...</source>
<translation>Print Tree...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="219"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="221"/>
<source>Screen Capture...</source>
<translation>Screen Capture...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="221"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="223"/>
<source>Whole Tree as SVG...</source>
<translation>Whole Tree as SVG...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="249"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="312"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="251"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="314"/>
<source>Layout</source>
<translation>Layout</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="268"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="326"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="270"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="328"/>
<source>Show Labels</source>
<translation>Show Labels</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="289"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="345"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="291"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="347"/>
<source>Export Tree Image</source>
<translation>Export Tree Image</translation>
</message>
@@ -7198,7 +7344,7 @@ Please, load the corresponding plugins.</translation>
<context>
<name>U2::TreeViewerUI</name>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="471"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="473"/>
<source>Export Tree Image</source>
<translation>Export Tree Image</translation>
</message>
@@ -7282,8 +7428,8 @@ Please, load the corresponding plugins.</translation>
<translation>Background is rendering...</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="303"/>
- <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="325"/>
+ <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="305"/>
+ <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="327"/>
<source>%1 to %2 (%3 bp)</source>
<translation>%1 to %2 (%3 bp)</translation>
</message>
diff --git a/src/corelibs/U2View/transl/russian.ts b/src/corelibs/U2View/transl/russian.ts
index fd5c721..58e46ad 100644
--- a/src/corelibs/U2View/transl/russian.ts
+++ b/src/corelibs/U2View/transl/russian.ts
@@ -688,7 +688,7 @@ Probably the data is too big.</source>
<message>
<location filename="../src/ov_assembly/ExtractAssemblyRegionDialog.ui" line="22"/>
<source>Save to file</source>
- <translation type="unfinished"></translation>
+ <translation>Сохранить в файл</translation>
</message>
<message>
<location filename="../src/ov_assembly/ExtractAssemblyRegionDialog.ui" line="32"/>
@@ -809,7 +809,7 @@ Probably the data is too big.</source>
<message>
<location filename="../src/ov_msa/General/GeneralTabOptionsPanelWidget.ui" line="85"/>
<source>Sequence number:</source>
- <translation>Номер последовательности:</translation>
+ <translation>Число последовательностей:</translation>
</message>
<message>
<location filename="../src/ov_msa/General/GeneralTabOptionsPanelWidget.ui" line="117"/>
@@ -1156,12 +1156,12 @@ Probably the data is too big.</source>
<translation>Создание дерева</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1496"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1500"/>
<source>Expand</source>
<translation>Раскрыть</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1499"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="1503"/>
<source>Collapse</source>
<translation>Скрыть</translation>
</message>
@@ -1232,7 +1232,7 @@ Double-click to collapse the branch</source>
<translation>Левый щелчок мышью выделяет ветвь, двойной щелчок сворачивает ветвь</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="120"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="125"/>
<source>Assembly Statistics</source>
<translation>Статистика сборки</translation>
</message>
@@ -1242,137 +1242,137 @@ Double-click to collapse the branch</source>
<translation>Навигация</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="166"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="175"/>
<source>Lock here</source>
<translation>Заблокировать здесь</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="317"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="338"/>
<source>Shift+move mouse</source>
<translation>Shift+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="317"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="338"/>
<source>Zoom the Assembly Overview to selection</source>
<translation>Увеличить выделенное</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="318"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="339"/>
<source>Ctrl+wheel</source>
<translation>Ctrl+wheel</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="318"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="339"/>
<source>Zoom the Assembly Overview</source>
<translation>Увеличить общий вид сборки</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="319"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="340"/>
<source>Alt+click</source>
<translation>Alt+click</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="319"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="340"/>
<source>Zoom the Assembly Overview in 100x</source>
<translation>Увеличить общий вид сборки в 100 раз</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="320"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
<source>Wheel+move mouse</source>
<translation>Wheel+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="320"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
<source>Move the Assembly Overview</source>
<translation>Переместить общий вид сборки</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="321"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="342"/>
<source>Wheel</source>
<translation>Wheel</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="321"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="342"/>
<source>Zoom the Reads Area</source>
<translation>Увеличить область с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="322"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
<source>Double-click</source>
<translation>Double-click</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="322"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
<source>Zoom in the Reads Area</source>
<translation>Увеличить в область с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="323"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="344"/>
<source>+/-</source>
<translation>+/-</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="323"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="344"/>
<source>Zoom in/Zoom out the Reads Area</source>
<translation>Увеличить/уменьшить область с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="324"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="345"/>
<source>Click+move mouse</source>
<translation>Click+move mouse</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="324"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="345"/>
<source>Move the Reads Area</source>
<translation>Переместить област с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="325"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="346"/>
<source>Arrow</source>
<translation>Arrow</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="325"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="346"/>
<source>Move one base in the corresponding direction in the Reads Area</source>
<translation>Переместить один символ в указанном направлении в области с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="326"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="347"/>
<source>Ctrl+arrow</source>
<translation>Ctrl+arrow</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="326"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="347"/>
<source>Move one page in the corresponding direction in the Reads Area</source>
<translation>Переместить одну область видимости в указанном направлении в области с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="327"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="348"/>
<source>Page up/Page down</source>
<translation>Вверх/Вниз</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="327"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="348"/>
<source>Move one page up/down in the Reads Area</source>
<translation>Переместить одну область видимости в области с ридами вверх/вниз</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="328"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="349"/>
<source>Home/End</source>
<translation>В начало/в конец</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="328"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="349"/>
<source>Move to the beginning/end of the assembly in the Reads Area</source>
<translation>Переместиться в начало/в конец сборки в области с ридами</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="329"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="350"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="329"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="350"/>
<source>Focus to the <i>Go to position</i> field on the toolbar</source>
<translation>Перейти к полю <i>Переместиться в позицию</i> на панели инструментов</translation>
</message>
@@ -1514,6 +1514,11 @@ Double-click to collapse the branch</source>
<source>Show names for the sequence only</source>
<translation>Показать имена только для последовательности</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/PanViewRows.cpp" line="95"/>
+ <source>Restriction Site</source>
+ <translation>Сайт рестрикции</translation>
+ </message>
</context>
<context>
<name>SaveGraphCutoffsDialog</name>
@@ -2903,102 +2908,107 @@ Double-click to collapse the branch</source>
<translation>Последовательность "%1", установленная в качестве референсной для сборки "%2", не соответствует ей.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="290"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="258"/>
+ <source>Internal error: database is busy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="293"/>
<source>Internal error: broken variant track object</source>
<translation>Internal error: broken variant track object</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="296"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="299"/>
<source>Only sequence or variant track objects can be added to assembly browser</source>
<translation>Только последовательности или вариации могут быть добавлены в браузер сборок</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="305"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="308"/>
<source>Warning</source>
<translation>Внимание</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="306"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="309"/>
<source>This action requires changing the assembly object that is locked for editing</source>
<translation>Это действие требует изменения объекта сборки, который заблокирован для редактирования</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="647"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="656"/>
<source>Zoom in</source>
<translation>Приблизить</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="650"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="659"/>
<source>Zoom out</source>
<translation>Отдалить</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="653"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="662"/>
<source>Linear</source>
<translation>Линейная</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="655"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="664"/>
<source>Logarithmic</source>
<translation>Логарифмическая</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="661"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="670"/>
<source>Show coordinates on ruler</source>
<translation>Показывать координаты на шкале</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="665"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="674"/>
<source>Show coverage under ruler cursor</source>
<translation>Показывать покрытие под шкалой курсора</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="669"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="678"/>
<source>Show information about read under cursor in pop-up hint</source>
<translation>Показывать информацию о риде в сплывающей подсказке под курсором</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="674"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="683"/>
<source>Export as image</source>
<translation>Экспорт изображения</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="677"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="686"/>
<source>Export assembly to SAM format</source>
<translation>Экспортировать сборку в формат SAM</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="680"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="689"/>
<source>Set reference</source>
<translation>Выбрать референсную последовательность</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="684"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="693"/>
<source>Export assembly region</source>
<translation>Экспорт региона сборки</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1001"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1010"/>
<source>Open file with a sequence</source>
<translation>Открыть файл с последовательностью</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1012"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1021"/>
<source>An error occurred while setting reference to "%1" assembly. The selected file "%2" does not contain sequences.</source>
<translation>Возникла ошибка при попытке установить референсную последовтельность для сборки "%1". Выбранный файл "%2" не содержит последовательностей.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1014"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1023"/>
<source>An error occurred while setting reference to "%1" assembly. There are more than one sequence in file "%2". Please select the required sequence object in the Project View and click "Set reference" again.</source>
<translation>Возникла ошибка при попытке установить референсную последовтельность для сборки "%1". В файле "%2" содержится более одной последовательности.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1075"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1084"/>
<source>An error occurred while setting reference to "%1". You have more than one sequence object selected in the Project View. Please select only one object and try again.</source>
<translation>Возникла ошибка при попытке установить референсную последовтельность для сборки "%1". В проекте выделено более одной последовательности.</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1074"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1083"/>
<source>Choose Reference Sequence</source>
<translation>Выбрать референсную последовательность</translation>
</message>
@@ -3019,7 +3029,7 @@ Double-click to collapse the branch</source>
<context>
<name>U2::AssemblyBrowserUi</name>
<message>
- <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1194"/>
+ <location filename="../src/ov_assembly/AssemblyBrowser.cpp" line="1204"/>
<source>Assembly has no mapped reads. Nothing to visualize.</source>
<translation>Сборка не имеет ридов.</translation>
</message>
@@ -3127,42 +3137,42 @@ Double-click to collapse the branch</source>
<context>
<name>U2::AssemblyInfoWidget</name>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="85"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="87"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="86"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="88"/>
<source>Length</source>
<translation>Длина</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="87"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="89"/>
<source>Reads</source>
<translation>Риды</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="89"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="91"/>
<source>Assembly Information</source>
<translation>Информация о сборке</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="99"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="103"/>
<source>MD5</source>
<translation>MD5</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="102"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="106"/>
<source>Species</source>
<translation>Виды</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="105"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="109"/>
<source>URI</source>
<translation>Путь</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="108"/>
+ <location filename="../src/ov_assembly/AssemblyInfoWidget.cpp" line="112"/>
<source>Reference Information</source>
<translation>Информация о референсе</translation>
</message>
@@ -3256,77 +3266,92 @@ You don't have enough rights to change file</source>
<context>
<name>U2::AssemblyReadsArea</name>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="105"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="94"/>
+ <source><center><b>Assembly database is busy</b><br>Some task occupied database.<br> When the database is free all functionality of Assembly Browser will be available again.</center></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="114"/>
<source>Copy read information to clipboard</source>
<translation>Копировать информацию о риде в буфер обмена</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="109"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="118"/>
<source>Copy current position to clipboard</source>
<translation>Копировать текущую позицию в буфер обмена</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="112"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="121"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="115"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="124"/>
<source>Coverage</source>
<translation>Покрытие</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="135"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="144"/>
<source>Reads highlighting</source>
<translation>Выделение ридов</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="160"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="169"/>
<source>Optimize rendering when scrolling</source>
<translation>Оптимизировать отображение в процессе перемещения</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="169"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="178"/>
<source>Reads shadowing</source>
<translation>Центрирование ридов в позиции</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="171"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="180"/>
<source>Disabled</source>
<translation>Запрещено</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="173"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="182"/>
<source>Free</source>
<translation>Свободное перемещение</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="175"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="184"/>
<source>Centered</source>
<translation>В центре</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="183"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="192"/>
<source>Jump to locked base</source>
<translation>Вернуться к сохраненной позиции</translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="337"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="358"/>
<source><a href="%1" style="color: %2">Zoom in to see the reads</a></source>
<translation><a href="%1" style="color: %2">Увеличить для просмотра ридов</a></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="341"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="362"/>
<source>Please wait until overview rendering is finished, or <a href="%1">zoom in to see the reads</a></source>
<translation>Пожалуйста подождите пока завершится вычисление отображаемого участка, или <a href="%1">увеличьте, чтобы увидеть риды</a></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="343"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="364"/>
<source> or choose one of the well-covered regions:<br><br></source>
<translation> или выберите один из хорошо покрытых регионов:<br><br></translation>
</message>
<message>
- <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="930"/>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="953"/>
+ <source>Export visible reads as sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="954"/>
+ <source>There are no reads in the current area. Nothing to export!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/AssemblyReadsArea.cpp" line="960"/>
<source>Locked to base</source>
<translation>Сохранить позицию</translation>
</message>
@@ -3476,12 +3501,12 @@ You don't have enough rights to change file</source>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="44"/>
<source>Cancel</source>
- <translation type="unfinished">Отмена</translation>
+ <translation>Отмена</translation>
</message>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="43"/>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
<message>
<location filename="../src/phyltree/BranchSettingsDialog.cpp" line="77"/>
@@ -3542,9 +3567,13 @@ You don't have enough rights to change file</source>
<context>
<name>U2::CalculateCoveragePerBaseOnRegionTask</name>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="35"/>
<source>Calculate coverage per base for assembly %1 on region (%2, %3)</source>
- <translation>Calculate coverage per base for assembly %1 on region (%2, %3)</translation>
+ <translation type="vanished">Calculate coverage per base for assembly %1 on region (%2, %3)</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="35"/>
+ <source>Calculate coverage per base for assembly on region (%1, %2)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="41"/>
@@ -3557,13 +3586,12 @@ You don't have enough rights to change file</source>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="47"/>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="62"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="53"/>
<source>Assembly DBI is NULL</source>
<translation>Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="133"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="123"/>
<source>Cigar string: out of bounds</source>
<translation>Cigar string: out of bounds</translation>
</message>
@@ -3571,42 +3599,42 @@ You don't have enough rights to change file</source>
<context>
<name>U2::CalculateCoveragePerBaseTask</name>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="150"/>
<source>Calculate coverage per base for assembly %1</source>
- <translation>Calculate coverage per base for assembly %1</translation>
+ <translation type="vanished">Calculate coverage per base for assembly %1</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="154"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="136"/>
+ <source>Calculate coverage per base for assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="141"/>
<source>Invalid database reference</source>
<translation>Invalid database reference</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="155"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="142"/>
<source>Invalid assembly ID</source>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="160"/>
<source>Assembly DBI is NULL</source>
- <translation>Assembly DBI is NULL</translation>
+ <translation type="vanished">Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="175"/>
<source>Attribute DBI is NULL</source>
- <translation>Attribute DBI is NULL</translation>
+ <translation type="vanished">Attribute DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="179"/>
<source>Can't get the assembly length: attribute is missing</source>
- <translation>Can't get the assembly length: attribute is missing</translation>
+ <translation type="vanished">Can't get the assembly length: attribute is missing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="182"/>
<source>Assembly has zero length</source>
- <translation>Assembly has zero length</translation>
+ <translation type="vanished">Assembly has zero length</translation>
</message>
<message>
- <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="196"/>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="167"/>
<source>An unexpected subtask</source>
<translation>An unexpected subtask</translation>
</message>
@@ -3614,7 +3642,7 @@ You don't have enough rights to change file</source>
<context>
<name>U2::CalculatePointsTask</name>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="890"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="892"/>
<source>Calculate graph points</source>
<translation>Calculate graph points</translation>
</message>
@@ -3747,9 +3775,13 @@ You don't have enough rights to change file</source>
<translation>Нуклеотиды</translation>
</message>
<message>
- <location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="196"/>
<source>Ok</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">ОК</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="196"/>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
</message>
<message>
<location filename="../src/ov_msa/ColorSchemaDialogController.cpp" line="223"/>
@@ -4391,17 +4423,17 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::ExportCoverageHistogramTask</name>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="155"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="166"/>
<source>Attribute DBI is NULL</source>
<translation>Attribute DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="159"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="170"/>
<source>Can't get the assembly length: attribute is missing</source>
<translation>Can't get the assembly length: attribute is missing</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="162"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="173"/>
<source>Assembly has zero length</source>
<translation>Assembly has zero length</translation>
</message>
@@ -4409,42 +4441,45 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::ExportCoverageTask</name>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="51"/>
<source>Export coverage per base for %1</source>
- <translation>Экспорт покрытия по основанию для %1</translation>
+ <translation type="vanished">Экспорт покрытия по основанию для %1</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="62"/>
+ <source>Export assembly coverage per base</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="58"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="70"/>
<source>Invalid database reference</source>
<translation>Invalid database reference</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="59"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="71"/>
<source>Invalid assembly ID</source>
<translation>Invalid assembly ID</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="60"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="72"/>
<source>Invalid destination url</source>
<translation></translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="65"/>
<source>Assembly DBI is NULL</source>
- <translation>Assembly DBI is NULL</translation>
+ <translation type="vanished">Assembly DBI is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="78"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="84"/>
<source>Can't write the compressed file: IOAdapterFactory is NULL</source>
<translation>Can't write the compressed file: IOAdapterFactory is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="84"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="90"/>
<source>Can't write the file: IOAdapterFactory is NULL</source>
<translation>Can't write the file: IOAdapterFactory is NULL</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="98"/>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="110"/>
<source>Not all regions were processed</source>
<translation>Not all regions were processed</translation>
</message>
@@ -4651,182 +4686,209 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::FindPatternWidget</name>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="326"/>
<source>Exact</source>
<translation>Точный</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="330"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="328"/>
<source>InsDel</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="329"/>
<source>Substitute</source>
<translation>Замены</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="333"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="331"/>
<source>Regular expression</source>
<translation>Регулярные выражения</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="337"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="335"/>
<source>Should match</source>
<translation>Точное совпадение</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="414"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="412"/>
<source>Search with ambiguous bases</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="360"/>
<source>Both</source>
<translation>Оба</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="363"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="361"/>
<source>Direct</source>
<translation>Прямое</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="364"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="362"/>
<source>Reverse-coml.</source>
<translation>Обратно-компл.</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="370"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="368"/>
<source>Sequence</source>
<translation>Последовательности</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="371"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="369"/>
<source>Translation</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="375"/>
<source>Whole sequence</source>
<translation>Вся последовательность</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="378"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="376"/>
<source>Custom region</source>
<translation>Указанный регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="379"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="377"/>
<source>Selected region</source>
<translation>Выделенный регион</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="437"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="435"/>
<source>Results no longer than:</source>
<translation>Результаты не длиннее чем:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="705"/>
<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="719"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="707"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="714"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="722"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="729"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="735"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="745"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="754"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="758"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="769"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="783"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="791"/>
+ <source><b><font color=%1>%2</font><br></br></b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="712"/>
<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="727"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="720"/>
<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="734"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="727"/>
<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="789"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="744"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="757"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="767"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="775"/>
+ <source><b><font color=%1>%2</font></b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="790"/>
<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="1469"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1450"/>
<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="1607"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1588"/>
<source>Results:</source>
<translation>Результаты:</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="750"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="761"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="743"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="756"/>
<source>Reason: </source>
<translation>Причина: </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="741"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="734"/>
<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="753"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="747"/>
<source> Please input valid annotation names. </source>
<translation>Введите корректные имена аннотаций. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="759"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="753"/>
<source>Warning: annotation names are invalid. </source>
<translation>Внимание: имена аннотаций некорректны. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="764"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="760"/>
<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="770"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="777"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="766"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="774"/>
<source>Warning: there is no pattern to search. </source>
<translation>Предупреждение: нет паттернов для поиска. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="771"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="778"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="768"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="776"/>
<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="784"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="782"/>
<source>Warning: invalid regexp. </source>
<translation>Предупреждение: некорректное регулярное выражение. </translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1124"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1105"/>
<source>Select file to open...</source>
<translation>Выберите файл...</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1176"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1157"/>
<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="297"/>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1521"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1502"/>
<source>Results: %1/%2</source>
<translation>Результаты: %1/%2</translation>
</message>
<message>
- <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="748"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="740"/>
<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="1324"/>
+ <location filename="../src/ov_sequence/find_pattern/FindPatternWidget.cpp" line="1305"/>
<source>Sequence in focus is NULL</source>
<translation>Sequence in focus is NULL</translation>
</message>
@@ -4869,6 +4931,11 @@ Please, check external tools in the settings.</source>
<source>Graph is rendering...</source>
<translation>График рассчитывается...</translation>
</message>
+ <message>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="442"/>
+ <source>Graph is not available. Try to change calculation settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::GSequenceGraphView</name>
@@ -4903,12 +4970,12 @@ Please, check external tools in the settings.</source>
<translation>%1 [%2, %3], окно: %4, шаг: %5</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="623"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="625"/>
<source>[%2, max:%3, min:%4]</source>
<translation>[%2, макс:%3, мин:%4]</translation>
</message>
<message>
- <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="617"/>
+ <location filename="../src/ov_sequence/ADVGraphModel.cpp" line="619"/>
<source>[%2, %3]</source>
<translation>[%2, %3]</translation>
</message>
@@ -4924,65 +4991,108 @@ Please, check external tools in the settings.</source>
<context>
<name>U2::GenomeAssemblyDialog</name>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="71"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="68"/>
<source>Start</source>
<translation>Собрать</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="72"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="69"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="199"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="202"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="185"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="188"/>
<source>Add short reads</source>
<translation>Добавить выравниваемые последовательности</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="217"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="224"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="230"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="236"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="243"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="276"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="282"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="203"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="210"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="216"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="222"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="229"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="258"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="264"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="273"/>
<source>Genome Assembly</source>
<translation>Геномная сборка</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="225"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="211"/>
<source>Result assembly directory is not set!</source>
<translation>Директория для сохранения не указана!</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="231"/>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="244"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="217"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="230"/>
<source>No reads. Please, add file(s) with short reads.</source>
<translation>Нет ридов. Добавьте файл(ы) с короткими ридами.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="237"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="223"/>
<source>In the paired-end mode a number of lift and right reads must be equal.</source>
<translation>В paired-end моде число левых и правых ридов должно совпадать.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="277"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="259"/>
<source>Unknown file format of %1.</source>
<translation>Неизвестный формат файла %1.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="283"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="265"/>
<source>File format of %1 is %2. Supported file formats of reads: %3.</source>
<translation>Формат %1 файла %2. Поддерживаемые форматы для пидов: %3.</translation>
</message>
<message>
- <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="351"/>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="274"/>
+ <source>Unable to create output directory for result assembly.
+Directory Path: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/util_dna_assembly/GenomeAssemblyDialog.cpp" line="339"/>
<source>Select output directory</source>
<translation>Выберите выходную директорию</translation>
</message>
</context>
<context>
+ <name>U2::GetAssemblyLengthTask</name>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="194"/>
+ <source>Attribute DBI is NULL</source>
+ <translation type="unfinished">Attribute DBI is NULL</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="198"/>
+ <source>Can't get the assembly length: attribute is missing</source>
+ <translation type="unfinished">Can't get the assembly length: attribute is missing</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.cpp" line="201"/>
+ <source>Assembly has zero length</source>
+ <translation type="unfinished">Assembly has zero length</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/CalculateCoveragePerBaseTask.h" line="43"/>
+ <source>Get length of Assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::GetAssemblyVisibleNameTask</name>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.cpp" line="54"/>
+ <source>Assembly DBI is NULL</source>
+ <translation type="unfinished">Assembly DBI is NULL</translation>
+ </message>
+ <message>
+ <location filename="../src/ov_assembly/ExportCoverageTask.h" line="70"/>
+ <source>Get visible name of Assembly</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::GraphLabel</name>
<message>
<location filename="../src/ov_sequence/GraphLabelModel.cpp" line="156"/>
@@ -5133,7 +5243,6 @@ Please, check external tools in the settings.</source>
</message>
<message>
<location filename="../src/ov_msa/MSAEditor.cpp" line="128"/>
- <location filename="../src/ov_msa/MSAEditor.cpp" line="224"/>
<source>Save alignment</source>
<translation>Сохранить выравнивание</translation>
</message>
@@ -5148,6 +5257,11 @@ Please, check external tools in the settings.</source>
<translation>Экспортировать выравнивание с выделенными нуклеотидами</translation>
</message>
<message>
+ <location filename="../src/ov_msa/MSAEditor.cpp" line="224"/>
+ <source>Save Alignment</source>
+ <translation>Сохранить выравнивание</translation>
+ </message>
+ <message>
<location filename="../src/ov_msa/MSAEditor.cpp" line="433"/>
<source>Copy/Paste</source>
<translation>Копирование/Вставка</translation>
@@ -5870,17 +5984,17 @@ All phylogenetic tree(s), opened in the same view, will be no more synchronized
<context>
<name>U2::MSAGraphOverview</name>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="103"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="104"/>
<source>Multiple sequence alignment is too big. Overview is unavailable.</source>
<translation>Множественное выравнивание слишком большое. Обзорные график недоступен.</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="108"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="109"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="117"/>
+ <location filename="../src/ov_msa/Overview/MSAGraphOverview.cpp" line="118"/>
<source>Overview is rendering...</source>
<translation>Панорама рассчитывается...</translation>
</message>
@@ -6065,77 +6179,77 @@ All phylogenetic tree(s), opened in the same view, will be no more synchronized
<translation>Установить цвет...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="134"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="135"/>
<source>Show simple overview</source>
<translation>Показать простую панораму</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="141"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="142"/>
<source>Export as image</source>
<translation>Экспортировать выравнивание в изображение</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="147"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="148"/>
<source>Display settings...</source>
<translation>Показать настройки...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="154"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="155"/>
<source>Calculation method...</source>
<translation>Метод расчета...</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="157"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="158"/>
<source>Strict</source>
<translation>Точный</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="158"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="159"/>
<source>Gaps</source>
<translation>Пробелы</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="159"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="160"/>
<source>Clustal</source>
<translation>Clustal</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="160"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="161"/>
<source>Highlighting</source>
<translation>Выделение</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="188"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="189"/>
<source>Graph type</source>
<translation>Тип графика</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="192"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="193"/>
<source>Histogram</source>
<translation>Гистограмма</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="193"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="194"/>
<source>Line graph</source>
<translation>Линейный график</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="194"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="195"/>
<source>Area graph</source>
<translation>Площади</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="215"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="216"/>
<source>Orientation</source>
<translation>Ориентация</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="219"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="220"/>
<source>Top to bottom</source>
<translation>Сверху вниз</translation>
</message>
<message>
- <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="220"/>
+ <location filename="../src/ov_msa/Overview/MSAOverviewContextMenu.cpp" line="221"/>
<source>Bottom to top</source>
<translation>Снизу вверх</translation>
</message>
@@ -6669,9 +6783,13 @@ Simple overview is unavailable.</source>
<context>
<name>U2::SecStructDialog</name>
<message>
- <location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="65"/>
<source>OK</source>
- <translation>OK</translation>
+ <translation type="vanished">OK</translation>
+ </message>
+ <message>
+ <location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="65"/>
+ <source>Predict</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/util_sec_struct_predict/SecStructDialog.cpp" line="66"/>
@@ -6987,22 +7105,40 @@ Please, load the corresponding plugins.</source>
<context>
<name>U2::SubstMatrixDialog</name>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="47"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="46"/>
+ <source>Close</source>
+ <translation>Закрыть</translation>
+ </message>
+ <message>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="48"/>
<source>Scoring Matrix: %1</source>
<translation>Матрица оценок: %1</translation>
</message>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="51"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="52"/>
<source>min score:</source>
<translation>минимальная оценка:</translation>
</message>
<message>
- <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="52"/>
+ <location filename="../src/util_smith_waterman/SubstMatrixDialog.cpp" line="53"/>
<source>max score:</source>
<translation>максимальная оценка:</translation>
</message>
</context>
<context>
+ <name>U2::TextSettingsDialog</name>
+ <message>
+ <location filename="../src/phyltree/TextSettingsDialog.cpp" line="41"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TextSettingsDialog.cpp" line="42"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+</context>
+<context>
<name>U2::TreeOptionsWidget</name>
<message>
<location filename="../src/ov_msa/TreeOptions/TreeOptionsWidget.cpp" line="124"/>
@@ -7043,17 +7179,27 @@ Please, load the corresponding plugins.</source>
<context>
<name>U2::TreeSettingsDialog</name>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="90"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="34"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="35"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="92"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="93"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="95"/>
<source>Phylogram</source>
<translation>Филограмма</translation>
</message>
<message>
- <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="96"/>
+ <location filename="../src/phyltree/TreeSettingsDialog.cpp" line="98"/>
<source>Cladogram</source>
<translation>Кладограмма</translation>
</message>
@@ -7061,115 +7207,115 @@ Please, load the corresponding plugins.</source>
<context>
<name>U2::TreeViewer</name>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="157"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="159"/>
<source>Tree Settings...</source>
<translation>Настройки дерева...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="162"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="164"/>
<source>Rectangular</source>
<translation>Прямоугольное</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="167"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="169"/>
<source>Circular</source>
<translation>Круговое</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="171"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="173"/>
<source>Unrooted</source>
<translation>Неукорененное</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="176"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="178"/>
<source>Branch Settings...</source>
<translation>Настройки ветвей дерева...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="178"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="180"/>
<source>Collapse</source>
<translation>Скрыть</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="180"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="182"/>
<source>Reroot tree</source>
<translation>Изменить корни</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="182"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="184"/>
<source>Swap Siblings</source>
<translation>Поменять ветви местами</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="186"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="188"/>
<source>Show Names</source>
<translation>Показывать имена</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="191"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="193"/>
<source>Show Node Labels</source>
<translation>Показать метки узлов</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="196"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="198"/>
<source>Show Distances</source>
<translation>Показывать расстояния</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="202"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="204"/>
<source>Formatting...</source>
<translation>Форматирование...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="206"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="208"/>
<source>Align Labels</source>
<translation>Выровнять надписи</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="211"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="213"/>
<source>Zoom In</source>
<translation>Приблизить</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="212"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="214"/>
<source>Zoom Out</source>
<translation>Отдалить</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="213"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="215"/>
<source>Reset Zooming</source>
<translation>Восстановить размер по умолчанию</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="216"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="218"/>
<source>Print Tree...</source>
<translation>Печатать дерево...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="219"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="221"/>
<source>Screen Capture...</source>
<translation>Снимок экрана...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="221"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="223"/>
<source>Whole Tree as SVG...</source>
<translation>Все дерево в SVG...</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="249"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="312"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="251"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="314"/>
<source>Layout</source>
<translation>Представление дерева</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="268"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="326"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="270"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="328"/>
<source>Show Labels</source>
<translation>Показывать надписи</translation>
</message>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="289"/>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="345"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="291"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="347"/>
<source>Export Tree Image</source>
<translation>Экспортировать изображение дерева</translation>
</message>
@@ -7190,7 +7336,7 @@ Please, load the corresponding plugins.</source>
<context>
<name>U2::TreeViewerUI</name>
<message>
- <location filename="../src/ov_phyltree/TreeViewer.cpp" line="471"/>
+ <location filename="../src/ov_phyltree/TreeViewer.cpp" line="473"/>
<source>Export Tree Image</source>
<translation>Экспортировать изображение дерева</translation>
</message>
@@ -7274,8 +7420,8 @@ Please, load the corresponding plugins.</source>
<translation>Фон рассчитывается...</translation>
</message>
<message>
- <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="303"/>
- <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="325"/>
+ <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="305"/>
+ <location filename="../src/ov_assembly/ZoomableAssemblyOverview.cpp" line="327"/>
<source>%1 to %2 (%3 bp)</source>
<translation>%1 в %2 (%3 нукл.)</translation>
</message>
diff --git a/src/include/U2Formats/PairedFastqComparator.h b/src/include/U2Formats/PairedFastqComparator.h
new file mode 100644
index 0000000..c3f75f0
--- /dev/null
+++ b/src/include/U2Formats/PairedFastqComparator.h
@@ -0,0 +1 @@
+#include "../../corelibs/U2Formats/src/util/PairedFastqComparator.h"
diff --git a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
index 0f45d67..6fad409 100644
--- a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
+++ b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/libs_3rdparty/samtools/src/SamtoolsAdapter.h b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
index 84f23c4..7bf90b7 100644
--- a/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
+++ b/src/libs_3rdparty/samtools/src/SamtoolsAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/AnnotationTableObjectTest.cpp b/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
index ae1ed2f..d05fb3a 100644
--- a/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
+++ b/src/plugins/CoreTests/src/AnnotationTableObjectTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/AnnotationTableObjectTest.h b/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
index 62d4b95..8bcb3a6 100644
--- a/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
+++ b/src/plugins/CoreTests/src/AnnotationTableObjectTest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/AsnParserTests.cpp b/src/plugins/CoreTests/src/AsnParserTests.cpp
index c79a703..cfe1dad 100644
--- a/src/plugins/CoreTests/src/AsnParserTests.cpp
+++ b/src/plugins/CoreTests/src/AsnParserTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/AsnParserTests.h b/src/plugins/CoreTests/src/AsnParserTests.h
index 5f01761..a813978 100644
--- a/src/plugins/CoreTests/src/AsnParserTests.h
+++ b/src/plugins/CoreTests/src/AsnParserTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/BinaryFindOpenCLTests.cpp b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
index 14dddcf..84cb4cf 100644
--- a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
+++ b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/BinaryFindOpenCLTests.h b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
index 7b858e3..7ce1c13 100644
--- a/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
+++ b/src/plugins/CoreTests/src/BinaryFindOpenCLTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/BioStruct3DObjectTests.cpp b/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
index 42c39a9..15a835d 100644
--- a/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
+++ b/src/plugins/CoreTests/src/BioStruct3DObjectTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/BioStruct3DObjectTests.h b/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
index 56b7442..a283bed 100644
--- a/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
+++ b/src/plugins/CoreTests/src/BioStruct3DObjectTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/CMDLineTests.cpp b/src/plugins/CoreTests/src/CMDLineTests.cpp
index c55782a..742c3af 100644
--- a/src/plugins/CoreTests/src/CMDLineTests.cpp
+++ b/src/plugins/CoreTests/src/CMDLineTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/CMDLineTests.h b/src/plugins/CoreTests/src/CMDLineTests.h
index 36ddc1c..4ec8283 100644
--- a/src/plugins/CoreTests/src/CMDLineTests.h
+++ b/src/plugins/CoreTests/src/CMDLineTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/CoreTests.cpp b/src/plugins/CoreTests/src/CoreTests.cpp
index d2f7ed0..d126a80 100644
--- a/src/plugins/CoreTests/src/CoreTests.cpp
+++ b/src/plugins/CoreTests/src/CoreTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/CoreTests.h b/src/plugins/CoreTests/src/CoreTests.h
index 5e8c8a7..17a5447 100644
--- a/src/plugins/CoreTests/src/CoreTests.h
+++ b/src/plugins/CoreTests/src/CoreTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DNASequenceObjectTests.cpp b/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
index ae54ae7..6214561 100644
--- a/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
+++ b/src/plugins/CoreTests/src/DNASequenceObjectTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DNASequenceObjectTests.h b/src/plugins/CoreTests/src/DNASequenceObjectTests.h
index 1738d81..b0e7543 100644
--- a/src/plugins/CoreTests/src/DNASequenceObjectTests.h
+++ b/src/plugins/CoreTests/src/DNASequenceObjectTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DNATranslationImplTests.cpp b/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
index 2e55a10..911f841 100644
--- a/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
+++ b/src/plugins/CoreTests/src/DNATranslationImplTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DNATranslationImplTests.h b/src/plugins/CoreTests/src/DNATranslationImplTests.h
index 5559e60..5c191d5 100644
--- a/src/plugins/CoreTests/src/DNATranslationImplTests.h
+++ b/src/plugins/CoreTests/src/DNATranslationImplTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DnaAssemblyTests.cpp b/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
index a745f45..7169eae 100644
--- a/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
+++ b/src/plugins/CoreTests/src/DnaAssemblyTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DnaAssemblyTests.h b/src/plugins/CoreTests/src/DnaAssemblyTests.h
index fdd0322..d792a48 100644
--- a/src/plugins/CoreTests/src/DnaAssemblyTests.h
+++ b/src/plugins/CoreTests/src/DnaAssemblyTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DocumentModelTests.cpp b/src/plugins/CoreTests/src/DocumentModelTests.cpp
index b9d51d5..7a64506 100644
--- a/src/plugins/CoreTests/src/DocumentModelTests.cpp
+++ b/src/plugins/CoreTests/src/DocumentModelTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/DocumentModelTests.h b/src/plugins/CoreTests/src/DocumentModelTests.h
index c2cf734..10da461 100644
--- a/src/plugins/CoreTests/src/DocumentModelTests.h
+++ b/src/plugins/CoreTests/src/DocumentModelTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/EditAlignmentTests.cpp b/src/plugins/CoreTests/src/EditAlignmentTests.cpp
index 31b00de..899398e 100644
--- a/src/plugins/CoreTests/src/EditAlignmentTests.cpp
+++ b/src/plugins/CoreTests/src/EditAlignmentTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/EditAlignmentTests.h b/src/plugins/CoreTests/src/EditAlignmentTests.h
index b94070c..32029b3 100644
--- a/src/plugins/CoreTests/src/EditAlignmentTests.h
+++ b/src/plugins/CoreTests/src/EditAlignmentTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/EditSequenceTests.cpp b/src/plugins/CoreTests/src/EditSequenceTests.cpp
index 73b6d8b..4371fdf 100644
--- a/src/plugins/CoreTests/src/EditSequenceTests.cpp
+++ b/src/plugins/CoreTests/src/EditSequenceTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/EditSequenceTests.h b/src/plugins/CoreTests/src/EditSequenceTests.h
index a616bf7..d1d2d95 100644
--- a/src/plugins/CoreTests/src/EditSequenceTests.h
+++ b/src/plugins/CoreTests/src/EditSequenceTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/FindAlgorithmTests.cpp b/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
index ee438a8..e608659 100644
--- a/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
+++ b/src/plugins/CoreTests/src/FindAlgorithmTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/CoreTests/src/FindAlgorithmTests.h b/src/plugins/CoreTests/src/FindAlgorithmTests.h
index be25133..8494ab8 100644
--- a/src/plugins/CoreTests/src/FindAlgorithmTests.h
+++ b/src/plugins/CoreTests/src/FindAlgorithmTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/FormatDetectionTests.cpp b/src/plugins/CoreTests/src/FormatDetectionTests.cpp
index 172b1c1..f11773e 100644
--- a/src/plugins/CoreTests/src/FormatDetectionTests.cpp
+++ b/src/plugins/CoreTests/src/FormatDetectionTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/FormatDetectionTests.h b/src/plugins/CoreTests/src/FormatDetectionTests.h
index 1b46391..436d1ec 100644
--- a/src/plugins/CoreTests/src/FormatDetectionTests.h
+++ b/src/plugins/CoreTests/src/FormatDetectionTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/GUrlTests.cpp b/src/plugins/CoreTests/src/GUrlTests.cpp
index 87c3e89..91f5469 100644
--- a/src/plugins/CoreTests/src/GUrlTests.cpp
+++ b/src/plugins/CoreTests/src/GUrlTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/GUrlTests.h b/src/plugins/CoreTests/src/GUrlTests.h
index 161bff5..c65782e 100644
--- a/src/plugins/CoreTests/src/GUrlTests.h
+++ b/src/plugins/CoreTests/src/GUrlTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/LoadRemoteDocumentTests.cpp b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
index 70791b8..569e14a 100644
--- a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
+++ b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/LoadRemoteDocumentTests.h b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
index c67b4dc..f8275d4 100644
--- a/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
+++ b/src/plugins/CoreTests/src/LoadRemoteDocumentTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/PWMatrixTests.cpp b/src/plugins/CoreTests/src/PWMatrixTests.cpp
index 173f9b2..53fc626 100644
--- a/src/plugins/CoreTests/src/PWMatrixTests.cpp
+++ b/src/plugins/CoreTests/src/PWMatrixTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/PWMatrixTests.h b/src/plugins/CoreTests/src/PWMatrixTests.h
index caf0ef0..05c66eb 100644
--- a/src/plugins/CoreTests/src/PWMatrixTests.h
+++ b/src/plugins/CoreTests/src/PWMatrixTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/PhyTreeObjectTests.cpp b/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
index 69757d8..2fd1d39 100644
--- a/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
+++ b/src/plugins/CoreTests/src/PhyTreeObjectTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/PhyTreeObjectTests.h b/src/plugins/CoreTests/src/PhyTreeObjectTests.h
index c6ae88f..a4b8c61 100644
--- a/src/plugins/CoreTests/src/PhyTreeObjectTests.h
+++ b/src/plugins/CoreTests/src/PhyTreeObjectTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SMatrixTests.cpp b/src/plugins/CoreTests/src/SMatrixTests.cpp
index 46a30ba..e54e8be 100644
--- a/src/plugins/CoreTests/src/SMatrixTests.cpp
+++ b/src/plugins/CoreTests/src/SMatrixTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SMatrixTests.h b/src/plugins/CoreTests/src/SMatrixTests.h
index bc9c042..3473df2 100644
--- a/src/plugins/CoreTests/src/SMatrixTests.h
+++ b/src/plugins/CoreTests/src/SMatrixTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SecStructPredictTests.cpp b/src/plugins/CoreTests/src/SecStructPredictTests.cpp
index 9deaa16..9e77220 100644
--- a/src/plugins/CoreTests/src/SecStructPredictTests.cpp
+++ b/src/plugins/CoreTests/src/SecStructPredictTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SecStructPredictTests.h b/src/plugins/CoreTests/src/SecStructPredictTests.h
index 21a902f..be3e51b 100644
--- a/src/plugins/CoreTests/src/SecStructPredictTests.h
+++ b/src/plugins/CoreTests/src/SecStructPredictTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SequenceWalkerTests.cpp b/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
index 5727bd4..3434712 100644
--- a/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
+++ b/src/plugins/CoreTests/src/SequenceWalkerTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/SequenceWalkerTests.h b/src/plugins/CoreTests/src/SequenceWalkerTests.h
index 7ebfd6a..b570b68 100644
--- a/src/plugins/CoreTests/src/SequenceWalkerTests.h
+++ b/src/plugins/CoreTests/src/SequenceWalkerTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/TaskTests.cpp b/src/plugins/CoreTests/src/TaskTests.cpp
index 96c6636..2f7be10 100644
--- a/src/plugins/CoreTests/src/TaskTests.cpp
+++ b/src/plugins/CoreTests/src/TaskTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/TaskTests.h b/src/plugins/CoreTests/src/TaskTests.h
index 909b795..7eb04a6 100644
--- a/src/plugins/CoreTests/src/TaskTests.h
+++ b/src/plugins/CoreTests/src/TaskTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/TextObjectTests.cpp b/src/plugins/CoreTests/src/TextObjectTests.cpp
index b9cd51e..a6102c2 100644
--- a/src/plugins/CoreTests/src/TextObjectTests.cpp
+++ b/src/plugins/CoreTests/src/TextObjectTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/TextObjectTests.h b/src/plugins/CoreTests/src/TextObjectTests.h
index 0693595..91295aa 100644
--- a/src/plugins/CoreTests/src/TextObjectTests.h
+++ b/src/plugins/CoreTests/src/TextObjectTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/UtilTestActions.cpp b/src/plugins/CoreTests/src/UtilTestActions.cpp
index 4e7a622..2851286 100644
--- a/src/plugins/CoreTests/src/UtilTestActions.cpp
+++ b/src/plugins/CoreTests/src/UtilTestActions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/CoreTests/src/UtilTestActions.h b/src/plugins/CoreTests/src/UtilTestActions.h
index 2a82b3a..86f7816 100644
--- a/src/plugins/CoreTests/src/UtilTestActions.h
+++ b/src/plugins/CoreTests/src/UtilTestActions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTDatabaseConfig.cpp b/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
index b961591..c001e89 100644
--- a/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
+++ b/src/plugins/GUITestBase/src/GTDatabaseConfig.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTDatabaseConfig.h b/src/plugins/GUITestBase/src/GTDatabaseConfig.h
index 51f7faa..7fd92f3 100644
--- a/src/plugins/GUITestBase/src/GTDatabaseConfig.h
+++ b/src/plugins/GUITestBase/src/GTDatabaseConfig.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAnnotationsHighlightingTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
index 7ed4e41..049a9e2 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAnnotationsHighlightingTreeView.h b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
index adfa73b..f2bbb6a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsHighlightingTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAnnotationsTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
index 6d9e064..bd28e73 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAnnotationsTreeView.h b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
index 80768ab..191fe6a 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAnnotationsTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAssemblyBrowser.cpp b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
index 766a21a..c8dd91c 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsAssemblyBrowser.h b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
index 8ff545d..6ba68fe 100644
--- a/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
+++ b/src/plugins/GUITestBase/src/GTUtilsAssemblyBrowser.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsBookmarksTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
index 764d0fb..4518c08 100644
--- a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsBookmarksTreeView.h b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
index 826dcf4..bd81c48 100644
--- a/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsBookmarksTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsDashboard.cpp b/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
index 12e18aa..9e9de2e 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsDashboard.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/GTUtilsDashboard.h b/src/plugins/GUITestBase/src/GTUtilsDashboard.h
index 4e42096..d584936 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDashboard.h
+++ b/src/plugins/GUITestBase/src/GTUtilsDashboard.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/GTUtilsDocument.cpp b/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
index 10101b3..76171d6 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsDocument.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsDocument.h b/src/plugins/GUITestBase/src/GTUtilsDocument.h
index f40cbcc..fe22df3 100644
--- a/src/plugins/GUITestBase/src/GTUtilsDocument.h
+++ b/src/plugins/GUITestBase/src/GTUtilsDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsEscClicker.cpp b/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
index 65e677c..2124b0c 100644
--- a/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsEscClicker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsEscClicker.h b/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
index 80c5662..2038499 100644
--- a/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
+++ b/src/plugins/GUITestBase/src/GTUtilsEscClicker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsExternalTools.cpp b/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
index 920745b..4407c47 100644
--- a/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsExternalTools.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsExternalTools.h b/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
index 98f31e7..d64c6a9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
+++ b/src/plugins/GUITestBase/src/GTUtilsExternalTools.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsLog.cpp b/src/plugins/GUITestBase/src/GTUtilsLog.cpp
index 8d2709f..c5009bd 100644
--- a/src/plugins/GUITestBase/src/GTUtilsLog.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsLog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsLog.h b/src/plugins/GUITestBase/src/GTUtilsLog.h
index 6c5d3ae..b22f579 100644
--- a/src/plugins/GUITestBase/src/GTUtilsLog.h
+++ b/src/plugins/GUITestBase/src/GTUtilsLog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMdi.cpp b/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
index 20cc4bc..ade48b1 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMdi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMdi.h b/src/plugins/GUITestBase/src/GTUtilsMdi.h
index eb8b087..27a4a14 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMdi.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMdi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMsaEditor.cpp b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
index 5fb7b27..d5c1b18 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMsaEditor.h b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
index d5c69b1..c32a903 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMsaEditorSequenceArea.cpp b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
index cb22454..36fdd19 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsMsaEditorSequenceArea.h b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
index 42953f7..1b3908b 100644
--- a/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
+++ b/src/plugins/GUITestBase/src/GTUtilsMsaEditorSequenceArea.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsNotifications.cpp b/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
index 035c298..7f2d7eb 100644
--- a/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsNotifications.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsNotifications.h b/src/plugins/GUITestBase/src/GTUtilsNotifications.h
index 9f0a4c9..1e114d8 100644
--- a/src/plugins/GUITestBase/src/GTUtilsNotifications.h
+++ b/src/plugins/GUITestBase/src/GTUtilsNotifications.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionPanelMSA.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
index 44c5745..328b5e0 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionPanelMSA.h b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
index da61124..7c8b06c 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelMSA.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionPanelSequenceView.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
index 6499e52..7ef4c68 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionPanelSequenceView.h b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
index 30ede7a..d709ccc 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionPanelSequenceView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionsPanel.cpp b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
index 12d746c..4b3af49 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsOptionsPanel.h b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
index 95ea2ea..d61a684 100644
--- a/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
+++ b/src/plugins/GUITestBase/src/GTUtilsOptionsPanel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPcr.cpp b/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
index bd4fd48..c9a2cb3 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPcr.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPcr.h b/src/plugins/GUITestBase/src/GTUtilsPcr.h
index b2f086c..f9d07b8 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPcr.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPcr.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPhyTree.cpp b/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
index b9281cc..c31dcbe 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPhyTree.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPhyTree.h b/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
index b90456a..ef071e0 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPhyTree.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPrimerLibrary.cpp b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
index fff3415..e34e339 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsPrimerLibrary.h b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
index ad2d790..59f13e6 100644
--- a/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
+++ b/src/plugins/GUITestBase/src/GTUtilsPrimerLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsProject.cpp b/src/plugins/GUITestBase/src/GTUtilsProject.cpp
index 04946ba..d7755d9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProject.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsProject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsProject.h b/src/plugins/GUITestBase/src/GTUtilsProject.h
index a6dc666..a8f4025 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProject.h
+++ b/src/plugins/GUITestBase/src/GTUtilsProject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsProjectTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
index aad4358..05963ee 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -314,11 +314,11 @@ QModelIndexList GTUtilsProjectTreeView::findIndecies(HI::GUITestOpStatus &os,
s = s.mid(prefix.length() + 1);
}
} else {
- const QString unload = "[unloaded]";
+ const QString unload = "[unloaded] ";
if (s.startsWith(unload)){
s = s.mid(unload.length());
}
- const QRegExp loading("^\\[loading \\d+\\%\\]");
+ const QRegExp loading("^\\[loading \\d+\\%\\] ");
if (-1 != loading.indexIn(s)) {
s = s.mid(loading.matchedLength());
}
diff --git a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
index 67e60b5..1d4eca9 100644
--- a/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsProjectTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsQueryDesigner.cpp b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
index 9577354..5d732ce 100644
--- a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsQueryDesigner.h b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
index 7ae8bdd..8e4678e 100644
--- a/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
+++ b/src/plugins/GUITestBase/src/GTUtilsQueryDesigner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsSequenceView.cpp b/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
index 35ebe81..c6d75bb 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsSequenceView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsSequenceView.h b/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
index 14b1fb8..102c444 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsSequenceView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsSharedDatabaseDocument.cpp b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
index 6122c8c..43a34a5 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsSharedDatabaseDocument.h b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
index dfac0dc..61c939f 100644
--- a/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
+++ b/src/plugins/GUITestBase/src/GTUtilsSharedDatabaseDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsStartPage.cpp b/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
index 252b070..0d45a29 100644
--- a/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsStartPage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsStartPage.h b/src/plugins/GUITestBase/src/GTUtilsStartPage.h
index f9887c8..5bc35d0 100644
--- a/src/plugins/GUITestBase/src/GTUtilsStartPage.h
+++ b/src/plugins/GUITestBase/src/GTUtilsStartPage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsTask.cpp b/src/plugins/GUITestBase/src/GTUtilsTask.cpp
index d183d22..37305d3 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTask.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsTask.h b/src/plugins/GUITestBase/src/GTUtilsTask.h
index 55f2805..2a5c5cc 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTask.h
+++ b/src/plugins/GUITestBase/src/GTUtilsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsTaskTreeView.cpp b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
index d5e5b44..d4e8597 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsTaskTreeView.h b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
index 26dffa1..1f4db04 100644
--- a/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
+++ b/src/plugins/GUITestBase/src/GTUtilsTaskTreeView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsWizard.cpp b/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
index c7c644c..6e358a7 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsWizard.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsWizard.h b/src/plugins/GUITestBase/src/GTUtilsWizard.h
index 5cee12b..73c0cfc 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWizard.h
+++ b/src/plugins/GUITestBase/src/GTUtilsWizard.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GTUtilsWorkflowDesigner.cpp b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
index 396a23d..2f1f461 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
+++ b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -760,10 +760,6 @@ QList<WorkflowProcessItem*> GTUtilsWorkflowDesigner::getWorkers(HI::GUITestOpSta
}
#define GT_METHOD_NAME "setDatasetInputFile"
-void GTUtilsWorkflowDesigner::setDatasetInputFile(HI::GUITestOpStatus &os, const QString &folderPath, const QString &fileName) {
- setDatasetInputFile(os, folderPath + "/" + fileName);
-}
-
void GTUtilsWorkflowDesigner::setDatasetInputFile(GUITestOpStatus &os, const QString &filePath, bool pastePath) {
GTGlobals::sleep(200);
QWidget* DatasetWidget = GTWidget::findWidget(os, "DatasetWidget");
@@ -787,7 +783,7 @@ void GTUtilsWorkflowDesigner::addInputFile(HI::GUITestOpStatus &os, const QStrin
click(os, elementName);
CHECK_OP(os, );
QFileInfo info(url);
- setDatasetInputFile(os, info.path(), info.fileName());
+ setDatasetInputFile(os, info.path() + "/" + info.fileName());
}
#undef GT_METHOD_NAME
diff --git a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
index 24a6bd3..fbe13b6 100644
--- a/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
+++ b/src/plugins/GUITestBase/src/GTUtilsWorkflowDesigner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -118,9 +118,8 @@ public:
static QList<WorkflowProcessItem*> getWorkers(HI::GUITestOpStatus &os);
static void createDataset(HI::GUITestOpStatus& os, QString datasetName = "");
- //sets input file with path "filePath" and name "filename" dataset
+ //sets input file with path "filePath" to the current dataset
//this method should be called after selecting worker which contains dataset on scene
- static void setDatasetInputFile(HI::GUITestOpStatus &os, const QString &folderPath, const QString &fileName);
static void setDatasetInputFile(HI::GUITestOpStatus &os, const QString &filePath, bool pastePath = false);
static void addInputFile(HI::GUITestOpStatus &os, const QString &elementName, const QString &url);
diff --git a/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp b/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
index d8dce51..9178905 100644
--- a/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
+++ b/src/plugins/GUITestBase/src/GUITestBasePlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -96,20 +96,20 @@
HI::GUITest *test = new X(); \
test->setLabel(LABEL); \
guiTestBase->registerTest(test); \
- }
+ }
#define REGISTER_TEST_WITH_TIMEOUT(X, TIMEOUT) \
if (guiTestBase) { \
HI::GUITest *test = new X(); \
test->setTimeout(TIMEOUT); \
guiTestBase->registerTest(test); \
- }
+ }
#define REGISTER_TEST_IGNORED_BY(X, BY, MESSAGE, reason) \
if (guiTestBase) { \
HI::GUITest *test = new X(); \
test->setIgnored(BY, MESSAGE); \
test->setReason(reason); \
guiTestBase->registerTest(test); \
- }
+ }
#define REGISTER_TEST_IGNORED(X, MESSAGE) REGISTER_TEST_IGNORED_BY(X, HI::GUITest::Ignored, MESSAGE, HI::GUITest::Bug)
#define REGISTER_TEST_IGNORED_LINUX(X, MESSAGE) REGISTER_TEST_IGNORED_BY(X, HI::GUITest::IgnoredLinux, MESSAGE, HI::GUITest::Bug)
@@ -163,9 +163,9 @@ void GUITestBasePlugin::sl_showWindow() {
void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
-//////////////////////////////////////////////////////////////////////////
-// Regression scenarios/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Regression scenarios/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_regression_scenarios::test_0057_1);
REGISTER_TEST(GUITest_regression_scenarios::test_0057_2);
REGISTER_TEST(GUITest_regression_scenarios::test_0057_3);
@@ -340,7 +340,7 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_1113_1);
REGISTER_TEST(GUITest_regression_scenarios::test_1115);
REGISTER_TEST(GUITest_regression_scenarios::test_1121);
- REGISTER_TEST_IGNORED(GUITest_regression_scenarios::test_1122, "UGENE-1122");
+ REGISTER_TEST(GUITest_regression_scenarios::test_1122);
REGISTER_TEST(GUITest_regression_scenarios::test_1123);
REGISTER_TEST(GUITest_regression_scenarios::test_1123_1);
REGISTER_TEST(GUITest_regression_scenarios::test_1124);
@@ -634,7 +634,7 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_2152);
REGISTER_TEST(GUITest_regression_scenarios::test_2156);
REGISTER_TEST(GUITest_regression_scenarios::test_2157);
- REGISTER_TEST_IGNORED(GUITest_regression_scenarios::test_2160, "UGENE-4528");
+ REGISTER_TEST(GUITest_regression_scenarios::test_2160);
REGISTER_TEST(GUITest_regression_scenarios::test_2165);
REGISTER_TEST(GUITest_regression_scenarios::test_2187);
REGISTER_TEST(GUITest_regression_scenarios::test_2188);
@@ -1016,7 +1016,7 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_3886);
REGISTER_TEST(GUITest_regression_scenarios::test_3895);
- REGISTER_TEST_IGNORED(GUITest_regression_scenarios::test_3901, "https://ugene.unipro.ru/tracker/browse/UGENE-3955");
+ REGISTER_TEST_IGNORED(GUITest_regression_scenarios::test_3901, "https://ugene.net/tracker/browse/UGENE-3955");
REGISTER_TEST(GUITest_regression_scenarios::test_3902);
REGISTER_TEST(GUITest_regression_scenarios::test_3903);
REGISTER_TEST(GUITest_regression_scenarios::test_3904);
@@ -1148,7 +1148,7 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_4524);
REGISTER_TEST(GUITest_regression_scenarios::test_4537);
REGISTER_TEST(GUITest_regression_scenarios::test_4557);
- if(QSysInfo::WordSize == 32){
+ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_regression_scenarios::test_4563);
}
REGISTER_TEST(GUITest_regression_scenarios::test_4587);
@@ -1191,6 +1191,7 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
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_4782);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_1);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_2);
REGISTER_TEST(GUITest_regression_scenarios::test_4784_3);
@@ -1247,9 +1248,9 @@ void GUITestBasePlugin::registerTests(UGUITestBase *guiTestBase) {
REGISTER_TEST(GUITest_regression_scenarios::test_5012_1);
REGISTER_TEST(GUITest_regression_scenarios::test_5012_2);
REGISTER_TEST(GUITest_regression_scenarios::test_5018);
-if(QSysInfo::WordSize == 64){
- REGISTER_TEST(GUITest_regression_scenarios::test_5027_1);
-}
+ if (QSysInfo::WordSize == 64) {
+ REGISTER_TEST(GUITest_regression_scenarios::test_5027_1);
+ }
REGISTER_TEST(GUITest_regression_scenarios::test_5027_2);
REGISTER_TEST(GUITest_regression_scenarios::test_5029);
REGISTER_TEST(GUITest_regression_scenarios::test_5039);
@@ -1260,10 +1261,10 @@ if(QSysInfo::WordSize == 64){
REGISTER_TEST(GUITest_regression_scenarios::test_5128);
REGISTER_TEST(GUITest_regression_scenarios::test_5137);
-if (QSysInfo::WordSize == 32) {
- REGISTER_TEST_WITH_TIMEOUT(GUITest_regression_scenarios::test_5138_1, 420000);
- REGISTER_TEST(GUITest_regression_scenarios::test_5138_2);
-}
+ if (QSysInfo::WordSize == 32) {
+ REGISTER_TEST_WITH_TIMEOUT(GUITest_regression_scenarios::test_5138_1, 420000);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5138_2);
+ }
REGISTER_TEST(GUITest_regression_scenarios::test_5199);
REGISTER_TEST(GUITest_regression_scenarios::test_5208);
@@ -1274,6 +1275,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_regression_scenarios::test_5268);
REGISTER_TEST(GUITest_regression_scenarios::test_5278);
REGISTER_TEST(GUITest_regression_scenarios::test_5295);
+
+ REGISTER_TEST(GUITest_regression_scenarios::test_5314);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5346);
REGISTER_TEST(GUITest_regression_scenarios::test_5352);
REGISTER_TEST(GUITest_regression_scenarios::test_5356);
REGISTER_TEST(GUITest_regression_scenarios::test_5360);
@@ -1281,11 +1285,14 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_regression_scenarios::test_5363_2);
REGISTER_TEST(GUITest_regression_scenarios::test_5367);
- REGISTER_TEST(GUITest_regression_scenarios::test_5314);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5412);
+
+ REGISTER_TEST(GUITest_regression_scenarios::test_5417);
+ REGISTER_TEST(GUITest_regression_scenarios::test_5425);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project::test_0004);
REGISTER_TEST(GUITest_common_scenarios_project::test_0005);
REGISTER_TEST(GUITest_common_scenarios_project::test_0006);
@@ -1317,25 +1324,25 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project::test_0038);
REGISTER_TEST(GUITest_common_scenarios_project::test_0038_1);
REGISTER_TEST(GUITest_common_scenarios_project::test_0039);
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0040, "UGENE-4900");
- REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0041, "UGENE-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0040, "UGENE-5042");
+ REGISTER_TEST(GUITest_common_scenarios_project::test_0041);
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-4900");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0047, "UGENE-5042");
REGISTER_TEST(GUITest_common_scenarios_project::test_0048);
- 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_IGNORED(GUITest_common_scenarios_project::test_0049, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0050, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0051, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0052, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0053, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0054, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0055, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0056, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0057, "UGENE-5042");
+ REGISTER_TEST_IGNORED(GUITest_common_scenarios_project::test_0058, "UGENE-5042");
REGISTER_TEST(GUITest_common_scenarios_project::test_0059);
REGISTER_TEST(GUITest_common_scenarios_project::test_0060);
@@ -1357,47 +1364,47 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project::test_0073);
REGISTER_TEST(GUITest_common_scenarios_project::test_0074);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/bookmarks/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/bookmarks/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_bookmarks::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_bookmarks::test_0002_1);
REGISTER_TEST(GUITest_common_scenarios_project_bookmarks::test_0002_2);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/multiple docs/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/multiple docs/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_multiple_docs::test_0001);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/anonymous project/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/anonymous project/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_anonymous_project::test_0003);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/relations/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/relations/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_relations::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_relations::test_0002);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/user locking/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/user locking/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_user_locking::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_user_locking::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_user_locking::test_0003);
REGISTER_TEST(GUITest_common_scenarios_project_user_locking::test_0005);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/document modifying/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/document modifying/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_document_modifying::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_document_modifying::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_project_document_modifying::test_0002);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/project_filtering/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/project_filtering/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_filtering::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_filtering::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_filtering::test_0003);
@@ -1413,9 +1420,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project_filtering::test_0013);
REGISTER_TEST(GUITest_common_scenarios_project_filtering::test_0014);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/Sequence view/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Sequence view/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_sequence_view::test_0002);
REGISTER_TEST(GUITest_common_scenarios_sequence_view::test_0002_1);
REGISTER_TEST(GUITest_common_scenarios_sequence_view::test_0002_2);
@@ -1494,9 +1501,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_sequence_view::test_0077);
REGISTER_TEST(GUITest_common_scenarios_sequence_view::test_0078);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/sequence edit/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/sequence edit/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_sequence_edit::test_0001);
REGISTER_TEST(GUITest_common_scenarios_sequence_edit::test_0002);
REGISTER_TEST(GUITest_common_scenarios_sequence_edit::test_0003);
@@ -1524,9 +1531,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_sequence_edit::test_0016_1);
REGISTER_TEST(GUITest_common_scenarios_sequence_edit::test_0016_2);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/remote request/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/remote request/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_remote_request::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_remote_request::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_remote_request::test_0003);
@@ -1538,9 +1545,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project_remote_request::test_0009);
REGISTER_TEST(GUITest_common_scenarios_project_remote_request::test_0010);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/toggle view/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/toggle view/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_toggle_view::test_0001);
REGISTER_TEST(GUITest_common_scenarios_toggle_view::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_toggle_view::test_0001_2);
@@ -1591,9 +1598,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_toggle_view::test_0016);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/sequence exporting/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/sequence exporting/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting::test_0003);
@@ -1607,9 +1614,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting::test_0012);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting::test_0013);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/project/sequence exporting/from project view/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/project/sequence exporting/from project view/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting_from_project_view::test_0001);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting_from_project_view::test_0002);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting_from_project_view::test_0003);
@@ -1629,9 +1636,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting_from_project_view::test_0008_1);
REGISTER_TEST(GUITest_common_scenarios_project_sequence_exporting_from_project_view::test_0008_2);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_msa_editor::test_0001_2);
@@ -1846,9 +1853,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_msa_editor::test_fake);
-/////////////////////////////////////////////////////////////////////////
-// Common align sequences to an alignment
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common align sequences to an alignment
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0001);
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0002);
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0003);
@@ -1859,18 +1866,18 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0008);
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0009);
REGISTER_TEST(GUITest_common_scenarios_align_sequences_to_msa::test_0010);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor/colors
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor/colors
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor_colors::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_colors::test_0002);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_colors::test_0003);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_colors::test_0004);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor/consensus
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor/consensus
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor_consensus::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_consensus::test_0002);
@@ -1888,9 +1895,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_msa_editor_consensus::test_0005);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_consensus::test_0006);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor/edit
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor/edit
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor_edit::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_edit::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_edit::test_0001_2);
@@ -1937,9 +1944,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_msa_editor_edit::test_0014);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_edit::test_0015);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor/replace_character
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor/replace_character
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor_replace_character::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_replace_character::test_0002);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_replace_character::test_0003);
@@ -1961,9 +1968,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_msa_editor_replace_character::test_0017);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_replace_character::test_0018);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/msa_editor/overview
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/msa_editor/overview
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0001);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0002);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0003);
@@ -1984,9 +1991,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0020);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0021);
REGISTER_TEST(GUITest_common_scenarios_msa_editor_overview::test_0022);
-//////////////////////////////////////////////////////////////////////////
-// Common scenarios/document_from_text/
-//////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ // Common scenarios/document_from_text/
+ //////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_document_from_text::test_0001);
REGISTER_TEST(GUITest_common_scenarios_document_from_text::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_document_from_text::test_0001_2);
@@ -2052,9 +2059,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_document_from_text::test_0018);
REGISTER_TEST(GUITest_common_scenarios_document_from_text::test_0019);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Annotations import
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Annotations import
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_annotations_import::test_0001);
REGISTER_TEST(GUITest_common_scenarios_annotations_import::test_0001_1);
@@ -2093,9 +2100,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_annotations_import::test_0009_2);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/annotations
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/annotations
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_annotations::test_0001);
REGISTER_TEST(GUITest_common_scenarios_annotations::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_annotations::test_0001_2);
@@ -2125,9 +2132,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_annotations::test_0012_3);
REGISTER_TEST(GUITest_common_scenarios_annotations::test_0013);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/annotations/CreateAnnotationWidget
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/annotations/CreateAnnotationWidget
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_create_annotation_widget::test_0001);
REGISTER_TEST(GUITest_common_scenarios_create_annotation_widget::test_0002);
REGISTER_TEST(GUITest_common_scenarios_create_annotation_widget::test_0003);
@@ -2172,9 +2179,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_create_annotation_widget::test_0042);
REGISTER_TEST(GUITest_common_scenarios_create_annotation_widget::test_0043);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/annotations/edit
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/annotations/edit
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_annotations_edit::test_0001);
REGISTER_TEST(GUITest_common_scenarios_annotations_edit::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_annotations_edit::test_0001_2);
@@ -2194,9 +2201,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_annotations_edit::test_0006_1);
REGISTER_TEST(GUITest_common_scenarios_annotations_edit::test_0006_2);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/annotations/qualifiers
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/annotations/qualifiers
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_annotations_qualifiers::test_0001);
REGISTER_TEST(GUITest_common_scenarios_annotations_qualifiers::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_annotations_qualifiers::test_0001_2);
@@ -2226,15 +2233,15 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_annotations_qualifiers::test_0008);
REGISTER_TEST(GUITest_common_scenarios_annotations_qualifiers::test_0009);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/smith_waterman_dialog
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/smith_waterman_dialog
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_sw_dialog::test_0001);
REGISTER_TEST(GUITest_common_scenarios_sw_dialog::test_0002);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/option_panel
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/option_panel
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_options_panel::test_0001);
REGISTER_TEST(GUITest_common_scenarios_options_panel::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_options_panel::test_0002);
@@ -2260,9 +2267,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_options_panel::test_0019);
REGISTER_TEST(GUITest_common_scenarios_options_panel::test_0020);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/option_panel
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/option_panel
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_options_panel_MSA::general_test_0001);
REGISTER_TEST(GUITest_common_scenarios_options_panel_MSA::general_test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_options_panel_MSA::general_test_0002);
@@ -2346,9 +2353,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_common_scenarios_options_panel_MSA::save_parameters_test_0005);
REGISTER_TEST(GUITest_common_scenarios_options_panel_MSA::save_parameters_test_0006);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/dp_view
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/dp_view
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_Common_scenarios_dp_view::test_0011);
REGISTER_TEST(GUITest_Common_scenarios_dp_view::test_0011_1);
REGISTER_TEST(GUITest_Common_scenarios_dp_view::test_0011_2);
@@ -2363,9 +2370,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_Common_scenarios_dp_view::test_0020);
REGISTER_TEST(GUITest_Common_scenarios_dp_view::test_0025);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/Assembly browser
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/Assembly browser
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_Assembly_browser::test_0001);
REGISTER_TEST(GUITest_Assembly_browser::test_0002);
REGISTER_TEST(GUITest_Assembly_browser::test_0010);
@@ -2399,9 +2406,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_Assembly_browser::test_0036);
REGISTER_TEST(GUITest_Assembly_browser::test_0037);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/bowtie2
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/bowtie2
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_Bowtie2::test_0001);
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_Bowtie2::test_0002);//"Restore when this tool becomes available");
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_Bowtie2::test_0003);
@@ -2409,9 +2416,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_Bowtie2::test_0005);
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_Bowtie2::test_0006);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/dna_assembly
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/dna_assembly
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_dna_assembly::test_0001);
REGISTER_TEST(GUITest_dna_assembly::test_0002);
REGISTER_TEST(GUITest_dna_assembly::test_0003);
@@ -2420,9 +2427,9 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_dna_assembly::test_0006);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/index_reuse
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/index_reuse
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_index_reuse::test_0001);
REGISTER_TEST(GUITest_index_reuse::test_0002);
REGISTER_TEST(GUITest_index_reuse::test_0003);
@@ -2434,41 +2441,41 @@ if (QSysInfo::WordSize == 32) {
REGISTER_TEST(GUITest_index_reuse::test_0009);
REGISTER_TEST(GUITest_index_reuse::test_0010);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/dna_assembly/conversions
-/////////////////////////////////////////////////////////////////////////
-REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_dna_assembly_conversions::test_0001);
-REGISTER_TEST(GUITest_dna_assembly_conversions::test_0002);
-REGISTER_TEST(GUITest_dna_assembly_conversions::test_0003);
-REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
-
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Assembling/sam
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/dna_assembly/conversions
+ /////////////////////////////////////////////////////////////////////////
+ REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_dna_assembly_conversions::test_0001);
+ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0002);
+ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0003);
+ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
+
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Assembling/sam
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_SAM::test_0002);
REGISTER_TEST(GUITest_SAM::test_0003);
REGISTER_TEST(GUITest_SAM::test_0004);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Query designer
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Query designer
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST_IGNORED_MAC(GUITest_common_scenarios_querry_designer::test_0001, "breaks testing on mac");
REGISTER_TEST_IGNORED_MAC(GUITest_common_scenarios_querry_designer::test_0001_1, "breaks testing on mac");
REGISTER_TEST_IGNORED_MAC(GUITest_common_scenarios_querry_designer::test_0001_2, "breaks testing on mac");
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Workflow designer
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Workflow designer
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0002)//,"no such scheme on windows");
- REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0002_1)//,"no such scheme on windows");
- REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0003);
+ REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0002_1)//,"no such scheme on windows");
+ REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0003);
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0005)//,"no such scheme on windows");
- REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0006);//"no such scheme on windows, https://ugene.unipro.ru/tracker/browse/UGENE-2738 on mac");
- REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0006_1);//"no such scheme on windows, https://ugene.unipro.ru/tracker/browse/UGENE-2738 on mac");
- REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0007);//"no such scheme on windows, https://ugene.unipro.ru/tracker/browse/UGENE-2738 on mac");
+ REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0006);//"no such scheme on windows, https://ugene.net/tracker/browse/UGENE-2738 on mac");
+ REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0006_1);//"no such scheme on windows, https://ugene.net/tracker/browse/UGENE-2738 on mac");
+ REGISTER_TEST_ONLY_LINUX(GUITest_common_scenarios_workflow_designer::test_0007);//"no such scheme on windows, https://ugene.net/tracker/browse/UGENE-2738 on mac");
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0009)//*,"no such scheme on windows");
- REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0010)//,"no such scheme on windows");
- REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0013);
+ REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_designer::test_0010)//,"no such scheme on windows");
+ REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0013);
REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0015);
REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0017);
//REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0018);
@@ -2477,42 +2484,42 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0060);
REGISTER_TEST(GUITest_common_scenarios_workflow_designer::test_0061);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Workflow designer/Workflow parameters validation
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Workflow designer/Workflow parameters validation
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_workflow_parameters_validation::test_0001);
REGISTER_TEST_NOT_FOR_MAC(GUITest_common_scenarios_workflow_parameters_validation::test_0002);//, "qt dialog can't be shown");
REGISTER_TEST(GUITest_common_scenarios_workflow_parameters_validation::test_0003);
REGISTER_TEST_NOT_FOR_WINDOWS(GUITest_common_scenarios_workflow_parameters_validation::test_0005);//, "Test should run not under admin user on WIN");
REGISTER_TEST(GUITest_common_scenarios_workflow_parameters_validation::test_0006);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Workflow designer/Estimating
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Workflow designer/Estimating
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_workflow_estimating::test_0001);
REGISTER_TEST(GUITest_common_scenarios_workflow_estimating::test_0002);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Workflow designer/Name filter
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Workflow designer/Name filter
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_workflow_name_filter::test_0001);
REGISTER_TEST(GUITest_common_scenarios_workflow_name_filter::test_0002);
REGISTER_TEST(GUITest_common_scenarios_workflow_name_filter::test_0003);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Workflow designer/Scripting
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Workflow designer/Scripting
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_workflow_scripting::test_0001);
REGISTER_TEST(GUITest_common_scenarios_workflow_scripting::test_0003);
REGISTER_TEST(GUITest_common_scenarios_workflow_scripting::test_0004);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/NIAID_pipelines
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/NIAID_pipelines
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_NIAID_pipelines::test_0002);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Tree viewer
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Tree viewer
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_tree_viewer::test_0001);
REGISTER_TEST(GUITest_common_scenarios_tree_viewer::test_0001_1);
REGISTER_TEST(GUITest_common_scenarios_tree_viewer::test_0001_2);
@@ -2539,14 +2546,14 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_tree_viewer::test_0028);
REGISTER_TEST(GUITest_common_scenarios_tree_viewer::test_0029);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Repeat Finder
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Repeat Finder
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_repeat_finder::test_0001);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/Undo_Redo
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/Undo_Redo
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_undo_redo::test_0001);
REGISTER_TEST(GUITest_common_scenarios_undo_redo::test_0002);
REGISTER_TEST(GUITest_common_scenarios_undo_redo::test_0003);
@@ -2570,9 +2577,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_undo_redo::test_0012);
-/////////////////////////////////////////////////////////////////////////
-// Common scenarios/shared_database
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // Common scenarios/shared_database
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_shared_database::cm_test_0001);
REGISTER_TEST(GUITest_common_scenarios_shared_database::cm_test_0002);
REGISTER_TEST(GUITest_common_scenarios_shared_database::cm_test_0003);
@@ -2637,9 +2644,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_shared_database::export_test_0008);
REGISTER_TEST(GUITest_common_scenarios_shared_database::export_test_0009);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/circular_view
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/circular_view
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_circular_view::general_avail_1);
REGISTER_TEST(GUITest_common_scenarios_circular_view::general_avail_2);
REGISTER_TEST(GUITest_common_scenarios_circular_view::general_avail_3);
@@ -2649,14 +2656,14 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_circular_view::general_avail_7);
REGISTER_TEST(GUITest_common_scenarios_circular_view::general_avail_8);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/cloning
-/////////////////////////////////////////////////////////////////////////
- REGISTER_TEST(GUITest_common_scenarios_cloning::test_0011);
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/cloning
+ /////////////////////////////////////////////////////////////////////////
+ REGISTER_TEST(GUITest_common_scenarios_cloning::test_0011);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/options_panel/sequence_view
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/options_panel/sequence_view
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_options_panel_sequence_view::test_0001);
REGISTER_TEST(GUITest_common_scenarios_options_panel_sequence_view::test_0002);
REGISTER_TEST(GUITest_common_scenarios_options_panel_sequence_view::test_0003);
@@ -2668,9 +2675,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_options_panel_sequence_view::test_0009);
REGISTER_TEST(GUITest_common_scenarios_options_panel_sequence_view::test_0010);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/workflow_designer/shared_db
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/workflow_designer/shared_db
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_shared_db_wd::read_gui_test_0001);
REGISTER_TEST(GUITest_common_scenarios_shared_db_wd::read_gui_test_0002);
REGISTER_TEST(GUITest_common_scenarios_shared_db_wd::read_gui_test_0003);
@@ -2707,9 +2714,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_shared_db_wd::test_3726);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/pcr/in_silico_pcr
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/pcr/in_silico_pcr
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_in_silico_pcr::test_0001);
REGISTER_TEST(GUITest_common_scenarios_in_silico_pcr::test_0002);
REGISTER_TEST(GUITest_common_scenarios_in_silico_pcr::test_0003);
@@ -2728,9 +2735,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_in_silico_pcr::test_0015);
REGISTER_TEST(GUITest_common_scenarios_in_silico_pcr::test_0016);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/pcr/primer_library
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/pcr/primer_library
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_primer_library::test_0001);
REGISTER_TEST(GUITest_common_scenarios_primer_library::test_0002);
REGISTER_TEST(GUITest_common_scenarios_primer_library::test_0003);
@@ -2748,9 +2755,9 @@ REGISTER_TEST(GUITest_dna_assembly_conversions::test_0004);
REGISTER_TEST(GUITest_common_scenarios_primer_library::test_0015);
REGISTER_TEST(GUITest_common_scenarios_primer_library::test_0016);
-/////////////////////////////////////////////////////////////////////////
-// common_scenarios/start_page
-/////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////
+ // common_scenarios/start_page
+ /////////////////////////////////////////////////////////////////////////
REGISTER_TEST(GUITest_common_scenarios_start_page::test_0001);
REGISTER_TEST(GUITest_common_scenarios_start_page::test_0002);
REGISTER_TEST(GUITest_common_scenarios_start_page::test_0003);
diff --git a/src/plugins/GUITestBase/src/GUITestBasePlugin.h b/src/plugins/GUITestBase/src/GUITestBasePlugin.h
index 167bd24..c7f0a63 100644
--- a/src/plugins/GUITestBase/src/GUITestBasePlugin.h
+++ b/src/plugins/GUITestBase/src/GUITestBasePlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTBaseCompleter.cpp b/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
index 2bd5d36..1009aed 100644
--- a/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
+++ b/src/plugins/GUITestBase/src/api/GTBaseCompleter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTBaseCompleter.h b/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
index b079354..d5fce62 100644
--- a/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
+++ b/src/plugins/GUITestBase/src/api/GTBaseCompleter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTGraphicsItem.cpp b/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
index 051d663..f207237 100644
--- a/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
+++ b/src/plugins/GUITestBase/src/api/GTGraphicsItem.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTGraphicsItem.h b/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
index 2d2a78a..598886a 100644
--- a/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
+++ b/src/plugins/GUITestBase/src/api/GTGraphicsItem.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTMSAEditorStatusWidget.cpp b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
index 159a6ec..f26592c 100644
--- a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
+++ b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTMSAEditorStatusWidget.h b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
index 23e6d9e..0b7f6c0 100644
--- a/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
+++ b/src/plugins/GUITestBase/src/api/GTMSAEditorStatusWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTRegionSelector.cpp b/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
index 12fd20a..662eb59 100644
--- a/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
+++ b/src/plugins/GUITestBase/src/api/GTRegionSelector.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTRegionSelector.h b/src/plugins/GUITestBase/src/api/GTRegionSelector.h
index 7399aa0..d84db07 100644
--- a/src/plugins/GUITestBase/src/api/GTRegionSelector.h
+++ b/src/plugins/GUITestBase/src/api/GTRegionSelector.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTSequenceReadingModeDialog.cpp b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
index fee5393..cdbb073 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTSequenceReadingModeDialog.h b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
index 96a56b6..9f24d3b 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTSequenceReadingModeDialogUtils.cpp b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
index 7f92128..c0445fb 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api/GTSequenceReadingModeDialogUtils.h b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
index 2cdebc1..f3c7752 100644
--- a/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
+++ b/src/plugins/GUITestBase/src/api/GTSequenceReadingModeDialogUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/qt/EscapeClicker.cpp b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
index f7b7ed2..0d0c883 100644
--- a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
+++ b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/qt/EscapeClicker.h b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
index 44643b1..17fd0f3 100644
--- a/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
+++ b/src/plugins/GUITestBase/src/runnables/qt/EscapeClicker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
index 4e660ef..e6aae83 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
index da8a17c..7c48023 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddFolderDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
index b72b951..f7c6c78 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
index b136cbf..d2269c2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AddNewDocumentDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
index 3fb736d..09ae178 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
index 030a4e7..6f58632 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AlignShortReadsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
index f8cc436..e7324c6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
index a55da74..6d4f769 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/AppSettingsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
index a571690..0a909f8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/BuildIndexDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
index 94e54a9..5773d18 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
index f3de368..f6c09eb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CommonImportOptionsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
index f211180..e9128a8 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
index e0cb0f8..439ea2a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ConvertAssemblyToSAMDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
index ddb9416..560526e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
index e9673fa..61ff6fd 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateAnnotationWidgetFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
index e441aac..58ec160 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
index f2fb1cf..cd78a1e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateDocumentFromTextDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
index b206c84..1d43095 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
index a9b5d86..036f690 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateObjectRelationDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
index e22d139..dc8dab4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
index b25bc01..f69cad0 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/CreateRulerDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
index 4cdd9d2..abb4e38 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
index 101092e..bb38f32 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/DownloadRemoteFileDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
index 56ab8ef..56ccb2f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
index 57f4dc3..c2e77bb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditAnnotationDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
index b9b626d..81177f1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
index 74b0cc1..c5cc097 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditGroupAnnotationsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
index 0d2bc3a..180cabf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
index 193a5c4..10dd679 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditQualifierDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
index 0398569..dbb9241 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
index 7534e52..41294a1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/EditSequenceDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
index f56e235..3609731 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
index b8f0b64..f9eb63a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportChromatogramFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
index 9e788b0..d2e38ec 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
index 1d80afd..4980726 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportDocumentDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
index b1b2d48..d5e55d1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
index 4828cb6..381ba65 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ExportImageDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
index b915920..83c5f99 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
index 2177ff1..885c31c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindQualifierDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
index d959c21..ecc3ffe 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
index 47d52a5..f09232f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindRepeatsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
index 39e1c77..711b779 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
index 218c785..cca308b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/FindTandemsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
index 00ff145..0b882c3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
index 15091b4..7305a4f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphLabelsSelectDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
index 638b4e7..4b238cf 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
index e7ac9da..7636a1e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/GraphSettingsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
index 5ef44b3..52e59ba 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
index eadd5a1..942018c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportBAMFileDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
index 59dbed8..2443509 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
index d2e3ec6..bdd968f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportOptionsWidgetFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
index 952d313..1d1e355 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
index 68c4aa4..a78d605 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ImportToDatabaseDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
index b2410c8..b69a773 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
index 9f6e5f2..b7cfc4b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ItemToImportEditDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
index 244bcd5..1882809 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
index c868bff..40e4de5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PositionSelectorFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
index 884b3b5..3b852c3 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
index 1272231..3ab19ac 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/PredictSecondaryStructureDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
index c22d4bb..66c1939 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
index c856f9c..ebcc410 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ProjectTreeItemSelectorDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
index 1abfcf0..388adae 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
index 3293b90..82e7e1a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectionDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
index 28fd477..65b23c5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
index 2bafefd..7dca032 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RangeSelectorFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
index 8bf086c..3123f5c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
index d8d2080..1daebf2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/RemovePartFromSequenceDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
index 2faaff8..92f5ddc 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
index 92981d8..f41da00 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/ReplaceSubsequenceDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
index 59aba3e..a2808ed 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
index cad6644..924e91a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SetSequenceOriginDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
index fa3d47d..96f1704 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
index 80b91f5..4a44923 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/SharedConnectionsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.cpp
index 63fe4a0..986a031 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2Gui/util/RenameSequenceFiller.h
index 5246309..95aca0b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.cpp
index 85f852a..1b1ed8a 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportConsensusDialogFiller.h
index 7262d1c..af27a2c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.cpp
index eaedc65..342fe4f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportCoverageDialogFiller.h
index 890657d..9cd0110 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.cpp
index 4e22d0c..d92c4d8 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExportReadsDialogFiller.h
index cacd542..313f787 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.cpp
index 832d7e0..0aded79 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -31,35 +31,35 @@ namespace U2 {
using namespace HI;
ExtractAssemblyRegionDialogFiller::ExtractAssemblyRegionDialogFiller(HI::GUITestOpStatus &os, const QString &filepath, const U2Region ®ion, const QString &format)
- : Filler(os, "ExtractAssemblyRegionDialog"), filepath(filepath), regionToExtract(region), format(format) {}
+ : Filler(os, "ExtractAssemblyRegionDialog"), filepath(filepath), regionToExtract(region), format(format) {}
#define GT_CLASS_NAME "ExtractAssemblyRegionDialogFiller"
#define GT_METHOD_NAME "commonScenario"
void ExtractAssemblyRegionDialogFiller::commonScenario() {
- QWidget *widget = QApplication::activeModalWidget();
- CHECK_SET_ERR(NULL != widget, "Active modal widget is NULL");
+ QWidget *widget = QApplication::activeModalWidget();
+ CHECK_SET_ERR(NULL != widget, "Active modal widget is NULL");
- QComboBox *docFormatCB = qobject_cast<QComboBox*>(GTWidget::findWidget(os, "documentFormatComboBox", widget));
- CHECK_SET_ERR(NULL != docFormatCB, "docFormatCB widget is NULL");
- GTComboBox::setIndexWithText(os, docFormatCB, format);
+ QComboBox *docFormatCB = qobject_cast<QComboBox*>(GTWidget::findWidget(os, "documentFormatComboBox", widget));
+ CHECK_SET_ERR(NULL != docFormatCB, "docFormatCB widget is NULL");
+ GTComboBox::setIndexWithText(os, docFormatCB, format);
- QLineEdit *startLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "start_edit_line", widget));
- CHECK_SET_ERR(NULL != startLineEdit, "startLineEdit widget is NULL");
- GTLineEdit::setText(os, startLineEdit, QString::number(regionToExtract.startPos));
+ QLineEdit *startLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "start_edit_line", widget));
+ CHECK_SET_ERR(NULL != startLineEdit, "startLineEdit widget is NULL");
+ GTLineEdit::setText(os, startLineEdit, QString::number(regionToExtract.startPos));
- QLineEdit *endLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "end_edit_line", widget));
- CHECK_SET_ERR(NULL != endLineEdit, "endLineEdit widget is NULL");
- GTLineEdit::setText(os, endLineEdit, QString::number(regionToExtract.endPos()));
+ QLineEdit *endLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "end_edit_line", widget));
+ CHECK_SET_ERR(NULL != endLineEdit, "endLineEdit widget is NULL");
+ GTLineEdit::setText(os, endLineEdit, QString::number(regionToExtract.endPos()));
- QLineEdit* filepathLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "filepathLineEdit", widget));
- CHECK_SET_ERR(NULL != filepathLineEdit, "filepathLineEdit widget is NULL");
- GTLineEdit::setText(os, filepathLineEdit, filepath);
+ QLineEdit* filepathLineEdit = qobject_cast<QLineEdit*>(GTWidget::findWidget(os, "filepathLineEdit", widget));
+ CHECK_SET_ERR(NULL != filepathLineEdit, "filepathLineEdit widget is NULL");
+ GTLineEdit::setText(os, filepathLineEdit, filepath);
- GTUtilsDialog::clickButtonBox(os, widget, QDialogButtonBox::Ok);
+ GTUtilsDialog::clickButtonBox(os, widget, QDialogButtonBox::Ok);
}
#undef GT_METHOD_NAME
#undef GT_CLASS_NAME
-}
\ No newline at end of file
+}
diff --git a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.h
index 5022455..7014be6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_assembly/ExtractAssemblyRegionDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,12 +32,12 @@ using namespace HI;
class ExtractAssemblyRegionDialogFiller : public Filler {
public:
ExtractAssemblyRegionDialogFiller(HI::GUITestOpStatus &os, const QString &filepath, const U2Region ®ion, const QString &format);
- void commonScenario();
+ void commonScenario();
private:
- QString filepath;
- U2Region regionToExtract;
- QString format;
+ QString filepath;
+ U2Region regionToExtract;
+ 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 6fac611..69566b9 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BranchSettingsDialogFiller.h
index e04bea0..31ae5de 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.cpp
index 8a6ba00..d2b776f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/BuildTreeDialogFiller.h
index b53ae97..1c2d56e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.cpp
index 5297015..70b9df2 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DeleteGapsDialogFiller.h
index a2556db..30315ba 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.cpp
index 3ea6e0b..c54354d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/DistanceMatrixDialogFiller.h
index 21d208c..ca55900 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.cpp
index 10a9814..2d63983 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExportHighlightedDialogFiller.h
index b6dca0b..7994a41 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.cpp
index 0b51538..ec350f6 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/ExtractSelectedAsMSADialogFiller.h
index 9098350..98d0ffa 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.cpp
index 81bb448..8a584b2 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h
index 633085a..8fead6e 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
@@ -2,7 +2,7 @@
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.cpp
index fe980a0..8c58a9c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h
index 8c0a6c0..02585af 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.cpp
index 15e8928..d485dd5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/corelibs/U2View/utils_smith_waterman/SmithWatermanDialogBaseFiller.h
index 65ef84d..b29fda2 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
index 06c6159..0da8e01 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
index 9ad5b1d..fd51ed1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/annotator/FindAnnotationCollocationsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.cpp
index cd1afc7..36116d3 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/biostruct3d_view/StructuralAlignmentDialogFiller.h
index 0cf52e1..30e84e3 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
index 27672a7..2ec8177 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
index 1afca8e..be9ec91 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/cap3/CAP3SupportDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.cpp
index 796a863..deee805 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportAnnotationsDialogFiller.h
index 150908a..091b6f5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.cpp
index 5f8d2bf..d8fd4fa 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportBlastResultDialogFiller.h
index fcd24e9..d391ff8 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.cpp
index 7242a74..038c484 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2MSADialogFiller.h
index b1e597a..2011dbe 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.cpp
index 9dbda46..e97d56e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportMSA2SequencesDialogFiller.h
index 1047b68..2182c76 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.cpp
index db54aea..2b16661 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSelectedSequenceFromAlignmentDialogFiller.h
index a30dd39..fd4d56c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.cpp
index 67e2d8c..67ac785 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequences2MSADialogFiller.h
index 73bf707..1d01770 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.cpp
index 890953c..3609729 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h
index 38ff248..4133ff1 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.cpp
index 7e8ea32..a4b9331 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dna_export/ImportAnnotationsToCsvFiller.h
index 7b3759c..0dcafae 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
index 6339b3e..4f85f8d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
index 2d964e0..c3bf54f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
index 52eab6a..5231866 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
index 576bd63..0b89d3d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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) {}
- void commonScenario();
+ virtual 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 97d633a..fccd01a 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
index b068b55..99a67a1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/ConstructMoleculeDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
index 2aeec28..c557455 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
index 8cca98e..6aad6a5 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/CreateFragmentDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
index d951183..da0a11e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
index 1bff24b..cfc8ad4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
index 6c0c288..75bdfac 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
index 4b451e7..ca90303 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/EditFragmentDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
index 5129e4a..1a9dcb2 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
index 118e9df..4656999 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.cpp
index 4b72044..4464fab 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h
index 149ed26..f2aae0d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.cpp
index 668e151..9b14c3b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/ClustalOSupportRunDialogFiller.h
index 766515f..b60a812 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.cpp
index 4738626..0d1273c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h
index 27a44b0..eb4c047 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.cpp
index c67a169..a4653ad 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/RemoteBLASTDialogFiller.h
index a251837..845480b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.cpp
index d5a02e7..849e272 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,6 +25,7 @@
#include <primitives/GTComboBox.h>
#include <base_dialogs/GTFileDialog.h>
#include <primitives/GTLineEdit.h>
+#include <primitives/GTSpinBox.h>
#include <primitives/GTWidget.h>
#include "SpadesGenomeAssemblyDialogFiller.h"
@@ -53,6 +54,30 @@ void SpadesGenomeAssemblyDialogFiller::commonScenario(){
GTWidget::click(os, GTWidget::findWidget(os, "addFightButton", dialog));
}
+ QComboBox *combo;
+ if (!datasetType.isEmpty()) {
+ combo = GTWidget::findExactWidget<QComboBox*>(os, "typeCombo", dialog);
+ GTComboBox::setIndexWithText(os, combo, datasetType);
+ }
+
+ if (!runningMode.isEmpty()) {
+ combo = GTWidget::findExactWidget<QComboBox*>(os, "modeCombo", dialog);
+ GTComboBox::setIndexWithText(os, combo, runningMode);
+ }
+
+ QLineEdit* lineEdit = GTWidget::findExactWidget<QLineEdit*>(os, "kmerEdit", dialog);
+ if (!kmerSizes.isEmpty()) {
+ GTLineEdit::setText(os, lineEdit, kmerSizes);
+ }
+
+ if (numThreads != 0) {
+ GTSpinBox::setValue(os, "numThreadsSpinbox", numThreads, GTGlobals::UseKeyBoard);
+ }
+
+ if (memLimit != 0) {
+ GTSpinBox::setValue(os, "memlimitSpin", memLimit, GTGlobals::UseKeyBoard);
+ }
+
GTUtilsDialog::clickButtonBox(os, dialog, QDialogButtonBox::Ok);
}
#undef GT_METHOD_NAME
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 794967b..abf6c02 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,18 +30,29 @@ using namespace HI;
class SpadesGenomeAssemblyDialogFiller: public Filler
{
public:
- SpadesGenomeAssemblyDialogFiller(HI::GUITestOpStatus &os, QString _library, QStringList _leftReads, QStringList _rightReads, QString _output):
+ SpadesGenomeAssemblyDialogFiller(HI::GUITestOpStatus &os, QString _library, QStringList _leftReads, QStringList _rightReads, QString _output, QString _datasetType = "", QString _runningMode = "",
+ QString _kmerSizes = "", int _numThreads = 0, int _memLimit = 0) :
Filler(os, "GenomeAssemblyDialog"),
library(_library),
leftReads(_leftReads),
rightReads(_rightReads),
- output(_output){}
- void commonScenario();
-private:
+ output(_output),
+ datasetType(_datasetType),
+ runningMode(_runningMode),
+ kmerSizes(_kmerSizes),
+ numThreads(_numThreads),
+ memLimit(_memLimit) {}
+ virtual void commonScenario();
+protected:
QString library;
QStringList leftReads;
QStringList rightReads;
QString output;
+ QString datasetType;
+ QString runningMode;
+ QString kmerSizes;
+ int numThreads;
+ int memLimit;
};
}
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 664af33..4c70cd7 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/external_tools/TCoffeeDailogFiller.h
index 299aa4e..22e8d68 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.cpp
index 72e5873..0aaef58 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/orf_marker/OrfDialogFiller.h
index 8eb1f3b..9fb72de 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
index f93610f..9afd916 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
index bd2fde8..8277925 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/AddPrimerDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
index 6ae7331..693184d 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
index be26283..ba82ce4 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ExportPrimersDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
index 249188b..392212f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
index 36853b9..ca3c137 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
index 972497c..7a7d49e 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
index 3264a89..5539494 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimerLibrarySelectorFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
index 6d24322..50eb8f7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
index 4d17820..4586a3c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/plugins/pcr/PrimersDetailsDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.cpp
index 5a26db7..a8a999a 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmBuildDialogFiller.h
index 26c3bfb..6497a06 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.cpp
index 8dcb574..a696f10 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/weight_matrix/PwmSearchDialogFiller.h
index fa8fbae..43be19a 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.cpp
index 01941a2..ab33216 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/AliasesDialogFiller.h
index 5a45681..4b1d55d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.cpp
index 33d37e4..0aefd1d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/ConfigurationWizardFiller.h
index cb67dc6..f5743d0 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineFiller.cpp
index b5fd76b..d8da3cd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithCommandLineToolFiller.h
index 2f43d67..7018d41 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.cpp
index b70b3bc..af0d634 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/CreateElementWithScriptDialogFiller.h
index 0e5cbfa..6ded38c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.cpp
index bc62f4b..ee05208 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DashboardsManagerDialogFiller.h
index 8f7ad9f..861112f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.cpp
index 59ab9c2..64a926b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DatasetNameEditDialogFiller.h
index c327fe4..a7c6000 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.cpp
index 8e6e32a..1c577ca 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/DefaultWizardFiller.h
index 7e4109a..0fa17cc 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.cpp
index d58d332..fc7f5fb 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/RPackageDialorFiller.h
index a668143..5ea29a0 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.cpp
index ba0d1f3..4505966 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/StartupDialogFiller.h
index 667884d..124a030 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.cpp
index ff09f23..f297905 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/WizardFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WizardFiller.h
index 0be2ac6..3fdff5b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.cpp
index 4d003bb..6d4e497 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins/workflow_designer/WorkflowMetadialogFiller.h
index 01a44aa..2b4f1db 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.cpp
index bd9b797..e989bb7 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/MAFFT/MAFFTSupportRunDialogFiller.h
index fe02fbf..68c6a21 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.cpp
index a6efffd..f75458d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/clustalw/ClustalWDialogFiller.h
index 214532e..ce83626 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.cpp
index 07c499c..ffda7a5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3PhmmerDialogFiller.h
index df5b897..f4881ca 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.cpp
index 3e49783..f9dbf2f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/hmm3/UHMM3SearchDialogFiller.h
index db7897e..c9949a6 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.cpp
index 67f5114..ed1831e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/kalign/KalignDialogFiller.h
index ee5aa9e..c4239b9 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.cpp
index 9509b31..e4bffdd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/primer3/Primer3DialogFiller.h
index 121fa61..678c0e4 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.cpp
index a5072ce..735adee 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h
index 995883f..d768819 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
index b040305..da2c585 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
index 30fdaf8..929b485 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ConvertAceToSqliteDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
index 415bd7c..c1f3421 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
index 4e2daa1..972e29f 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/CreateNewProjectWidgetFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
index 0ad25a7..0ea8f61 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
index 13312f8..b9c5e5c 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentFormatSelectorDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
index 99b404c..80572b1 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
index 1c8f6a2..b7d40ad 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/DocumentProviderSelectorDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
index 8eaa196..de49155 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/ExportProjectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
index ed3caae..9e7327b 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/ExportProjectDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
index d51c2d4..59f09ae 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/NCBISearchDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
index 88d2203..48573fb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/NCBISearchDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
index 6c98f47..74e9ede 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SaveProjectDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
index bb2d443..88c5c20 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SaveProjectDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
index fae7974..bf1f583 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
index cd57aad..1152ba7 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SelectDocumentFormatDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
index 6ae2b81..52691e6 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
index f122da4..c28a9cb 100644
--- a/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
+++ b/src/plugins/GUITestBase/src/runnables/ugene/ugeneui/SequenceReadingModeSelectorDialogFiller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/GUITestRunner.cpp b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
index 05866bb..ae66547 100644
--- a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
+++ b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/GUITestRunner.h b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
index 5cd23e8..25c5d8a 100644
--- a/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
+++ b/src/plugins/GUITestBase/src/test_runner/GUITestRunner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GUIInitialChecks.cpp b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
index 4041d42..e3666bb 100644
--- a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
+++ b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/GUIInitialChecks.h b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
index 1d5cb4a..96aeb88 100644
--- a/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
+++ b/src/plugins/GUITestBase/src/tests/GUIInitialChecks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.cpp
index e1e3c8d..f001bdf 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/Assembly_browser/GTTestsAssemblyBrowser.h
index cdef0a2..7dafbcd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/bowtie2/GTTestsBowtie2.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.cpp
index b019d5c..003963b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/bowtie2/GTTestsBowtie2.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/bowtie2/GTTestsBowtie2.h
index fecb65a..97f16b8 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/GTTestsDnaAssembly.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.cpp
index ac2830a..8592be6 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/GTTestsDnaAssembly.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsDnaAssembly.h
index f3e5f68..3901243 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/GTTestsIndexReuse.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.cpp
index 87067fc..370bac9 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/GTTestsIndexReuse.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/GTTestsIndexReuse.h
index 649e371..bf8dbeb 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.cpp
index 7364a8b..df46102 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/dna_assembly/conversions/GTTestsDnaAssemblyConversions.h
index a00f501..414700f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/sam/GTTestsSAM.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.cpp
index 7376f85..e510345 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Assembling/sam/GTTestsSAM.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Assembling/sam/GTTestsSAM.h
index a0a6c6b..f5a0848 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/NIAID_pipelines/GTTestsNiaidPipelines.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.cpp
index 9c967a4..c11eb80 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/NIAID_pipelines/GTTestsNiaidPipelines.h b/src/plugins/GUITestBase/src/tests/common_scenarios/NIAID_pipelines/GTTestsNiaidPipelines.h
index aed515f..3000a37 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Query_Designer/GTTestsQuerryDesigner.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.cpp
index e641988..16d0804 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Query_Designer/GTTestsQuerryDesigner.h b/src/plugins/GUITestBase/src/tests/common_scenarios/Query_Designer/GTTestsQuerryDesigner.h
index 2cd5618..5c7eaef 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/GTTestsAnnotations.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
index f6145bd..80b8c12 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/GTTestsAnnotations.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
index cb61530..af70704 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsAnnotations.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/GTTestsCreateAnnotationWidget.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
index ec9eabd..d43b399 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/GTTestsCreateAnnotationWidget.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
index 518b5be..233c9d0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/GTTestsCreateAnnotationWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/edit/GTTestsAnnotationsEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.cpp
index 83a499b..6365863 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/edit/GTTestsAnnotationsEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/edit/GTTestsAnnotationsEdit.h
index e57677b..85f083e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.cpp
index 7d0b829..ba1bcaa 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations/qualifiers/GTTestsAnnotationsQualifiers.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations/qualifiers/GTTestsAnnotationsQualifiers.h
index f3c2a72..8076d36 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations_import/GTTestsAnnotationsImport.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.cpp
index 1c55dd2..e12f0c1 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotations_import/GTTestsAnnotationsImport.h b/src/plugins/GUITestBase/src/tests/common_scenarios/annotations_import/GTTestsAnnotationsImport.h
index 88f4aae..e24978b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/GTTestsCvGeneral.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.cpp
index 43c2099..44af43f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/GTTestsCvGeneral.h b/src/plugins/GUITestBase/src/tests/common_scenarios/circular_view/GTTestsCvGeneral.h
index 25a8d77..d89a71c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cloning/GTTestsCloning.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
index a62e6fb..5e5b06a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cloning/GTTestsCloning.h b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
index a1b69cc..821fa4f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/cloning/GTTestsCloning.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/document_from_text/GTTestsDocumentFromText.cpp
index 3162ce4..d6bed10 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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
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 73f2d87..288a57b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dp_view/GTTestsDpView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.cpp
index bfae2c8..157c932 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dp_view/GTTestsDpView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/dp_view/GTTestsDpView.h
index 2fe791a..58d4f2b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/GTTestsMsaEditor.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/GTTestsMsaEditor.cpp
index 9cf9617..642eb76 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -4224,7 +4224,7 @@ GUI_TEST_CLASS_DEFINITION(test_0053_5){
GTGlobals::sleep(3000);
}
-/** These tests are created according to test plan: https://ugene.unipro.ru/wiki/display/PD/MSA**/
+/** These tests are created according to test plan: https://ugene.net/wiki/display/PD/MSA**/
GUI_TEST_CLASS_DEFINITION(test_0054){
// Open COI.aln
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 4e49503..c2c3df1 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/align/GTTestsAlignSequenceToMsa.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.cpp
index b51ef8a..1bcda49 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/align/GTTestsAlignSequenceToMsa.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/align/GTTestsAlignSequenceToMsa.h
index 9ae5452..309d59c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/colors/GTTestsMSAEditorColors.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.cpp
index 3d9a5cf..2126886 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/colors/GTTestsMSAEditorColors.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/colors/GTTestsMSAEditorColors.h
index 948ac72..e49d83f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.cpp
index 15816be..c4ac1ab 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/consensus/GTTestsMSAEditorConsensus.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/consensus/GTTestsMSAEditorConsensus.h
index 86d7673..1632785 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/edit/GTTestsMSAEditorEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.cpp
index f111816..273f784 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/edit/GTTestsMSAEditorEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/edit/GTTestsMSAEditorEdit.h
index 907591f..63bad9d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/overview/GTTestsMSAEditorOverview.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.cpp
index bbb277c..4ab340d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/overview/GTTestsMSAEditorOverview.h b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/overview/GTTestsMSAEditorOverview.h
index 3160c06..6830410 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/msa_editor/replace_character/GTTestsMSAEditorReplaceCharacter.cpp
index e729d44..d2b036b 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,564 +1,564 @@
-/**
- * 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 <QComboBox>
-#include <QSpinBox>
-#include <QApplication>
-#include <QCheckBox>
-#include <QTableWidget>
-
-#include "GTTestsMSAEditorReplaceCharacter.h"
-#include <drivers/GTMouseDriver.h>
-#include <drivers/GTKeyboardDriver.h>
-#include "utils/GTKeyboardUtils.h"
-#include "primitives/GTMenu.h"
-#include "GTGlobals.h"
-#include "system/GTClipboard.h"
-#include "utils/GTUtilsDialog.h"
-#include "GTUtilsNotifications.h"
-#include "GTUtilsMdi.h"
-#include "GTUtilsMsaEditor.h"
-#include "GTUtilsMsaEditorSequenceArea.h"
-#include "GTUtilsProjectTreeView.h"
-#include "primitives/PopupChooser.h"
-#include "GTUtilsTaskTreeView.h"
-
-#include <U2View/MSAEditor.h>
-#include <U2View/MSAEditorSequenceArea.h>
-
-namespace U2 {
-
-namespace GUITest_common_scenarios_msa_editor_replace_character {
-using namespace HI;
-
-GUI_TEST_CLASS_DEFINITION(test_0001){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- //3. Press Shift + R keys on the keyboard.
- //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0002){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- //3. Open the context menu in the sequence area.
- //Expected result : the menu contains an item "Edit > Replace character".The item is enabled.A hotkey Shift + R is shown nearby.
- //4. Select the item.
- //Expected result : the character is selected in the replacement mode.
- GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "replace_selected_character"));
- GTMenu::showContextMenu(os, GTWidget::findWidget(os, "msa_editor_sequence_area"));
-
- //5. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
- GTKeyboardDriver::keyClick( 'a');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
-}
-
-
-GUI_TEST_CLASS_DEFINITION(test_0003){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- //3. Open the main menu in the sequence area.
- //Expected result : the menu contains an item "Actions > Edit > Replace character".The item is enabled.A hotkey Shift + R is shown nearby.
- //4. Select the item.
- //Expected result : the character is selected in the replacement mode.
- GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Edit" << "Replace selected character", GTGlobals::UseMouse);
-
- //5. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
- GTKeyboardDriver::keyClick( 'g');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "G", QString("Incorrect selection content: expected - %1, received - %2").arg("G").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0004){
- //1. Open an alignment in the Alignment Editor.
-
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a region with more than one character.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(10, 10));
-
- //3. Open the context menu in the sequence area.
- //Expected result : the "Edit > Replace character" item is disabled.Selection is in normal mode.
- GTUtilsDialog::waitForDialog(os, new PopupChecker(os, QStringList() << MSAE_MENU_EDIT << "replace_selected_character", PopupChecker::IsDisabled));
- GTMenu::showContextMenu(os, GTWidget::findWidget(os, "msa_editor_sequence_area"));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0005){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- //3. Press Shift + R keys on the keyboard.
- //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result :
- //The original character was replaced by the new one. The alphabet of the alignment has been changed.
- //A warning notification appears : Alphabet of the character, inserted into the alignment, differs from the alignment alphabet.The alignment alphabet has been set to
- //"%1".Use "Undo", if you'd like to restore the original alignment.
- //Here "%1" is one of the values : "Standard DNA", "Extended DNA", "Standard RNA", "Extended RNA", "Standard amino acid", "Extended amino acid", "Raw".
- GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
- GTKeyboardDriver::keyClick( 'r');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "R", QString("Incorrect selection content: expected - %1, received - %2").arg("R").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0005_1){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- //3. Press Shift + R keys on the keyboard.
- //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result :
- //The original character was replaced by the new one. The alphabet of the alignment has been changed.
- //A warning notification appears : Alphabet of the character, inserted into the alignment, differs from the alignment alphabet.The alignment alphabet has been set to
- //"%1".Use "Undo", if you'd like to restore the original alignment.
- //Here "%1" is one of the values : "Standard DNA", "Extended DNA", "Standard RNA", "Extended RNA", "Standard amino acid", "Extended amino acid", "Raw".
- GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
- GTKeyboardDriver::keyClick( 'r');
- GTGlobals::sleep();
-
- //5. Click "Undo".
- //Expected state : There is NO notifications.
- GTUtilsMsaEditor::undo(os);
- GTGlobals::sleep();
-
- //6. Click "Redo".
- //Expected state : The warning notification appears again.
- GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
- GTUtilsMsaEditor::redo(os);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "R", QString("Incorrect selection content: expected - %1, received - %2").arg("R").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0006){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_amino.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 1), QPoint(9, 1));
-
- //3. Press Shift + R keys on the keyboard.
- //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result :
- //The original character was replaced by the new one. The alphabet of the alignment has been changed.
- //There is NO notifications.
- GTKeyboardDriver::keyClick( 'a');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0006_1){
- //1. Open an alignment in the Alignment Editor.
- GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_amino.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select one character.
- //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 1), QPoint(9, 1));
-
- //3. Press Shift + R keys on the keyboard.
- //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
- //Expected result :
- //The original character was replaced by the new one. The alphabet of the alignment has been changed.
- //There is NO notifications.
- GTKeyboardDriver::keyClick( 'a');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep();
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
-
- //5. Click "Undo".
- //Expected state : There is NO notifications.
- GTUtilsMsaEditor::undo(os);
- GTGlobals::sleep();
-
- //6. Click "Redo".
- //Expected state : There is NO notifications.
- GTUtilsMsaEditor::redo(os);
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0007){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a character and make active the replace mode for it.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
-
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- //3. Click another character in the alignment.
- //Expected result : the first character is no more in the replacement mode.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 8), QPoint(9, 8));
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0008){
- //1. Open an alignment.
-
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a gap after sequence character.
- GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(41, 9));
-
- //3. Replace the gap
- //Expected result : the gap is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0009){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a gap before sequence character.
- GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(43, 9));
-
- //3. Replace the gap
- //Expected result : the gap is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0010){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a gap between other gaps.
- GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(42, 9));
-
- //3. Replace the gap
- //Expected result : the gap is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0011){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a gap after the last sequence character.
- GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(603, 9));
-
- GTKeyboardDriver::keyClick( Qt::Key_Space);
- GTKeyboardDriver::keyClick( Qt::Key_Space);
- GTKeyboardDriver::keyClick( Qt::Key_Space);
- GTGlobals::sleep(500);
- GTKeyboardDriver::keyClick( Qt::Key_Up);
- GTGlobals::sleep(500);
-
- //3. Replace the gap
- //Expected result : the gap is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
- GTGlobals::sleep(1000);
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0012){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a gap before the first sequence character.
- GTUtilsMSAEditorSequenceArea::selectColumnInConsensus(os, 0);
- GTKeyboardDriver::keyClick( Qt::Key_Space);
-
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
-
- //3. Replace the gap
- //Expected result : the gap is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-GUI_TEST_CLASS_DEFINITION(test_0013){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a first character in sequence.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
-
- //3. Replace the character
- //Expected result : the character is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0014){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a last character in sequence.
- GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(603, 9));
-
- //3. Replace the character
- //Expected result : the character is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0015){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- GTUtilsMsaEditor::toggleCollapsingMode(os);
-
- //2. Enable collapsing mode
- GTUtilsMSAEditorSequenceArea::clickCollapceTriangle(os, "Mecopoda_elongata__Ishigaki__J");
-
- //3. Select a character in sequence inside of the collapsing group.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 14), QPoint(9, 14));
-
- //4. Replace the character
- //Expected result : the character is replaced in all sequences of the group.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 13), QPoint(9, 13));
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0016){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a character in sequence.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
-
- //3. Replace the character to gap by space key
- //Expected result : the character is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( Qt::Key_Space);
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "-", QString("Incorrect selection content: expected - %1, received - %2").arg("-").arg(selectionContent));
-
- //3. Select a character in sequence.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 10), QPoint(0, 10));
-
- //4. Replace the character to gap by '-' key
- //Expected result : the character is succesfully replaced.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( '-');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "-", QString("Incorrect selection content: expected - %1, received - %2").arg("-").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0017){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a first character in sequence.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
-
- //3. Press unsupported key
- //Expected result : the error notification appeared.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTUtilsNotifications::waitForNotification(os, true, "It is not possible to insert the character into the alignment.");
- GTKeyboardDriver::keyClick( ']');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
-}
-
-GUI_TEST_CLASS_DEFINITION(test_0018){
- //1. Open an alignment.
- GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
- GTUtilsTaskTreeView::waitTaskFinished(os);
-
- //2. Select a character in sequence.
- GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
-
- //3. Press 'Escape'
- //Expected result : edit character mode is ended.
- GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
-
- GTKeyboardDriver::keyClick( Qt::Key_Escape);
-
- GTKeyboardDriver::keyClick( 'c');
- GTGlobals::sleep(200);
-
- GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
- GTGlobals::sleep(200);
- const QString selectionContent = GTClipboard::text(os);
- CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
-}
-
-} // namespace
-} // namespace U2
-
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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 <QComboBox>
+#include <QSpinBox>
+#include <QApplication>
+#include <QCheckBox>
+#include <QTableWidget>
+
+#include "GTTestsMSAEditorReplaceCharacter.h"
+#include <drivers/GTMouseDriver.h>
+#include <drivers/GTKeyboardDriver.h>
+#include "utils/GTKeyboardUtils.h"
+#include "primitives/GTMenu.h"
+#include "GTGlobals.h"
+#include "system/GTClipboard.h"
+#include "utils/GTUtilsDialog.h"
+#include "GTUtilsNotifications.h"
+#include "GTUtilsMdi.h"
+#include "GTUtilsMsaEditor.h"
+#include "GTUtilsMsaEditorSequenceArea.h"
+#include "GTUtilsProjectTreeView.h"
+#include "primitives/PopupChooser.h"
+#include "GTUtilsTaskTreeView.h"
+
+#include <U2View/MSAEditor.h>
+#include <U2View/MSAEditorSequenceArea.h>
+
+namespace U2 {
+
+namespace GUITest_common_scenarios_msa_editor_replace_character {
+using namespace HI;
+
+GUI_TEST_CLASS_DEFINITION(test_0001){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ //3. Press Shift + R keys on the keyboard.
+ //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0002){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ //3. Open the context menu in the sequence area.
+ //Expected result : the menu contains an item "Edit > Replace character".The item is enabled.A hotkey Shift + R is shown nearby.
+ //4. Select the item.
+ //Expected result : the character is selected in the replacement mode.
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << MSAE_MENU_EDIT << "replace_selected_character"));
+ GTMenu::showContextMenu(os, GTWidget::findWidget(os, "msa_editor_sequence_area"));
+
+ //5. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
+ GTKeyboardDriver::keyClick( 'a');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
+}
+
+
+GUI_TEST_CLASS_DEFINITION(test_0003){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ //3. Open the main menu in the sequence area.
+ //Expected result : the menu contains an item "Actions > Edit > Replace character".The item is enabled.A hotkey Shift + R is shown nearby.
+ //4. Select the item.
+ //Expected result : the character is selected in the replacement mode.
+ GTMenu::clickMainMenuItem(os, QStringList() << "Actions" << "Edit" << "Replace selected character", GTGlobals::UseMouse);
+
+ //5. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result : the original character of the alignment was replaced with the new one(e.g 'A' was replaced with 'C').Selection is in normal mode.
+ GTKeyboardDriver::keyClick( 'g');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "G", QString("Incorrect selection content: expected - %1, received - %2").arg("G").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0004){
+ //1. Open an alignment in the Alignment Editor.
+
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a region with more than one character.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(10, 10));
+
+ //3. Open the context menu in the sequence area.
+ //Expected result : the "Edit > Replace character" item is disabled.Selection is in normal mode.
+ GTUtilsDialog::waitForDialog(os, new PopupChecker(os, QStringList() << MSAE_MENU_EDIT << "replace_selected_character", PopupChecker::IsDisabled));
+ GTMenu::showContextMenu(os, GTWidget::findWidget(os, "msa_editor_sequence_area"));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0005){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ //3. Press Shift + R keys on the keyboard.
+ //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result :
+ //The original character was replaced by the new one. The alphabet of the alignment has been changed.
+ //A warning notification appears : Alphabet of the character, inserted into the alignment, differs from the alignment alphabet.The alignment alphabet has been set to
+ //"%1".Use "Undo", if you'd like to restore the original alignment.
+ //Here "%1" is one of the values : "Standard DNA", "Extended DNA", "Standard RNA", "Extended RNA", "Standard amino acid", "Extended amino acid", "Raw".
+ GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
+ GTKeyboardDriver::keyClick( 'r');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "R", QString("Incorrect selection content: expected - %1, received - %2").arg("R").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0005_1){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ //3. Press Shift + R keys on the keyboard.
+ //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result :
+ //The original character was replaced by the new one. The alphabet of the alignment has been changed.
+ //A warning notification appears : Alphabet of the character, inserted into the alignment, differs from the alignment alphabet.The alignment alphabet has been set to
+ //"%1".Use "Undo", if you'd like to restore the original alignment.
+ //Here "%1" is one of the values : "Standard DNA", "Extended DNA", "Standard RNA", "Extended RNA", "Standard amino acid", "Extended amino acid", "Raw".
+ GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
+ GTKeyboardDriver::keyClick( 'r');
+ GTGlobals::sleep();
+
+ //5. Click "Undo".
+ //Expected state : There is NO notifications.
+ GTUtilsMsaEditor::undo(os);
+ GTGlobals::sleep();
+
+ //6. Click "Redo".
+ //Expected state : The warning notification appears again.
+ GTUtilsNotifications::waitForNotification(os, true, "from \"Standard DNA\" to \"Extended DNA\"");
+ GTUtilsMsaEditor::redo(os);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "R", QString("Incorrect selection content: expected - %1, received - %2").arg("R").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0006){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_amino.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 1), QPoint(9, 1));
+
+ //3. Press Shift + R keys on the keyboard.
+ //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result :
+ //The original character was replaced by the new one. The alphabet of the alignment has been changed.
+ //There is NO notifications.
+ GTKeyboardDriver::keyClick( 'a');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0006_1){
+ //1. Open an alignment in the Alignment Editor.
+ GTFileDialog::openFile(os, testDir + "_common_data/scenarios/_regression/4804", "standard_amino.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select one character.
+ //Expected result : the character is selected in the normal mode(i.e.borders of the character are drawn using a dashed line).
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 1), QPoint(9, 1));
+
+ //3. Press Shift + R keys on the keyboard.
+ //Expected result : the character is selected in the replacement mode(i.e.the border of the character are drawn using another color and / or bold).
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //4. Press a key on the keyboard with another character of the same alphabet(e.g C key).
+ //Expected result :
+ //The original character was replaced by the new one. The alphabet of the alignment has been changed.
+ //There is NO notifications.
+ GTKeyboardDriver::keyClick( 'a');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep();
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "A", QString("Incorrect selection content: expected - %1, received - %2").arg("A").arg(selectionContent));
+
+ //5. Click "Undo".
+ //Expected state : There is NO notifications.
+ GTUtilsMsaEditor::undo(os);
+ GTGlobals::sleep();
+
+ //6. Click "Redo".
+ //Expected state : There is NO notifications.
+ GTUtilsMsaEditor::redo(os);
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0007){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a character and make active the replace mode for it.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 9), QPoint(9, 9));
+
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ //3. Click another character in the alignment.
+ //Expected result : the first character is no more in the replacement mode.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 8), QPoint(9, 8));
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0008){
+ //1. Open an alignment.
+
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a gap after sequence character.
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(41, 9));
+
+ //3. Replace the gap
+ //Expected result : the gap is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0009){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a gap before sequence character.
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(43, 9));
+
+ //3. Replace the gap
+ //Expected result : the gap is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0010){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a gap between other gaps.
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(42, 9));
+
+ //3. Replace the gap
+ //Expected result : the gap is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0011){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a gap after the last sequence character.
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(603, 9));
+
+ GTKeyboardDriver::keyClick( Qt::Key_Space);
+ GTKeyboardDriver::keyClick( Qt::Key_Space);
+ GTKeyboardDriver::keyClick( Qt::Key_Space);
+ GTGlobals::sleep(500);
+ GTKeyboardDriver::keyClick( Qt::Key_Up);
+ GTGlobals::sleep(500);
+
+ //3. Replace the gap
+ //Expected result : the gap is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+ GTGlobals::sleep(1000);
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0012){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a gap before the first sequence character.
+ GTUtilsMSAEditorSequenceArea::selectColumnInConsensus(os, 0);
+ GTKeyboardDriver::keyClick( Qt::Key_Space);
+
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
+
+ //3. Replace the gap
+ //Expected result : the gap is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+GUI_TEST_CLASS_DEFINITION(test_0013){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a first character in sequence.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
+
+ //3. Replace the character
+ //Expected result : the character is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0014){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a last character in sequence.
+ GTUtilsMSAEditorSequenceArea::clickToPosition(os, QPoint(603, 9));
+
+ //3. Replace the character
+ //Expected result : the character is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0015){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsMsaEditor::toggleCollapsingMode(os);
+
+ //2. Enable collapsing mode
+ GTUtilsMSAEditorSequenceArea::clickCollapceTriangle(os, "Mecopoda_elongata__Ishigaki__J");
+
+ //3. Select a character in sequence inside of the collapsing group.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 14), QPoint(9, 14));
+
+ //4. Replace the character
+ //Expected result : the character is replaced in all sequences of the group.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(9, 13), QPoint(9, 13));
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "C", QString("Incorrect selection content: expected - %1, received - %2").arg("C").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0016){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a character in sequence.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
+
+ //3. Replace the character to gap by space key
+ //Expected result : the character is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( Qt::Key_Space);
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "-", QString("Incorrect selection content: expected - %1, received - %2").arg("-").arg(selectionContent));
+
+ //3. Select a character in sequence.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 10), QPoint(0, 10));
+
+ //4. Replace the character to gap by '-' key
+ //Expected result : the character is succesfully replaced.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( '-');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "-", QString("Incorrect selection content: expected - %1, received - %2").arg("-").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0017){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a first character in sequence.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
+
+ //3. Press unsupported key
+ //Expected result : the error notification appeared.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTUtilsNotifications::waitForNotification(os, true, "It is not possible to insert the character into the alignment.");
+ GTKeyboardDriver::keyClick( ']');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
+}
+
+GUI_TEST_CLASS_DEFINITION(test_0018){
+ //1. Open an alignment.
+ GTFileDialog::openFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ //2. Select a character in sequence.
+ GTUtilsMSAEditorSequenceArea::selectArea(os, QPoint(0, 9), QPoint(0, 9));
+
+ //3. Press 'Escape'
+ //Expected result : edit character mode is ended.
+ GTKeyboardDriver::keyClick( 'r', Qt::ShiftModifier);
+
+ GTKeyboardDriver::keyClick( Qt::Key_Escape);
+
+ GTKeyboardDriver::keyClick( 'c');
+ GTGlobals::sleep(200);
+
+ GTKeyboardDriver::keyClick( 'c', Qt::ControlModifier);
+ GTGlobals::sleep(200);
+ const QString selectionContent = GTClipboard::text(os);
+ CHECK_SET_ERR(selectionContent == "T", QString("Incorrect selection content: expected - %1, received - %2").arg("T").arg(selectionContent));
+}
+
+} // namespace
+} // namespace U2
+
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 544546c..141b630 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,60 +1,60 @@
-/**
- * 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
-k
- * 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 GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
-#define GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
-
-#include <U2Test/UGUITestBase.h>
-
-namespace U2 {
-
-namespace GUITest_common_scenarios_msa_editor_replace_character {
-#undef GUI_TEST_SUITE
-#define GUI_TEST_SUITE "GUITest_common_scenarios_msa_editor_replace_character"
-
-GUI_TEST_CLASS_DECLARATION(test_0001)
-GUI_TEST_CLASS_DECLARATION(test_0002)
-GUI_TEST_CLASS_DECLARATION(test_0003)
-GUI_TEST_CLASS_DECLARATION(test_0004)
-GUI_TEST_CLASS_DECLARATION(test_0005)
-GUI_TEST_CLASS_DECLARATION(test_0005_1)
-GUI_TEST_CLASS_DECLARATION(test_0006)
-GUI_TEST_CLASS_DECLARATION(test_0006_1)
-GUI_TEST_CLASS_DECLARATION(test_0007)
-GUI_TEST_CLASS_DECLARATION(test_0008)
-GUI_TEST_CLASS_DECLARATION(test_0009)
-GUI_TEST_CLASS_DECLARATION(test_0010)
-GUI_TEST_CLASS_DECLARATION(test_0011)
-GUI_TEST_CLASS_DECLARATION(test_0012)
-GUI_TEST_CLASS_DECLARATION(test_0013)
-GUI_TEST_CLASS_DECLARATION(test_0014)
-GUI_TEST_CLASS_DECLARATION(test_0015)
-GUI_TEST_CLASS_DECLARATION(test_0016)
-GUI_TEST_CLASS_DECLARATION(test_0017)
-GUI_TEST_CLASS_DECLARATION(test_0018)
-
-#undef GUI_TEST_SUITE
-} // namespace U2
-
-} //namespace
-
-#endif //GTTESTS_MSA_EDITOR_EDIT_H_
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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
+k
+ * 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 GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
+#define GTTESTS_MSA_EDITOR_REPLACE_CHARACTER_H_
+
+#include <U2Test/UGUITestBase.h>
+
+namespace U2 {
+
+namespace GUITest_common_scenarios_msa_editor_replace_character {
+#undef GUI_TEST_SUITE
+#define GUI_TEST_SUITE "GUITest_common_scenarios_msa_editor_replace_character"
+
+GUI_TEST_CLASS_DECLARATION(test_0001)
+GUI_TEST_CLASS_DECLARATION(test_0002)
+GUI_TEST_CLASS_DECLARATION(test_0003)
+GUI_TEST_CLASS_DECLARATION(test_0004)
+GUI_TEST_CLASS_DECLARATION(test_0005)
+GUI_TEST_CLASS_DECLARATION(test_0005_1)
+GUI_TEST_CLASS_DECLARATION(test_0006)
+GUI_TEST_CLASS_DECLARATION(test_0006_1)
+GUI_TEST_CLASS_DECLARATION(test_0007)
+GUI_TEST_CLASS_DECLARATION(test_0008)
+GUI_TEST_CLASS_DECLARATION(test_0009)
+GUI_TEST_CLASS_DECLARATION(test_0010)
+GUI_TEST_CLASS_DECLARATION(test_0011)
+GUI_TEST_CLASS_DECLARATION(test_0012)
+GUI_TEST_CLASS_DECLARATION(test_0013)
+GUI_TEST_CLASS_DECLARATION(test_0014)
+GUI_TEST_CLASS_DECLARATION(test_0015)
+GUI_TEST_CLASS_DECLARATION(test_0016)
+GUI_TEST_CLASS_DECLARATION(test_0017)
+GUI_TEST_CLASS_DECLARATION(test_0018)
+
+#undef GUI_TEST_SUITE
+} // namespace U2
+
+} //namespace
+
+#endif //GTTESTS_MSA_EDITOR_EDIT_H_
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 1c4edf8..099438d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/options_panel/GTTestsOptionPanel.h b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/GTTestsOptionPanel.h
index d39f1bc..1493d8c 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/options_panel/msa/GTTestsOptionPanelMSA.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/msa/GTTestsOptionPanelMSA.cpp
index 12136c0..9eb0133 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -371,19 +371,20 @@ GUI_TEST_CLASS_DEFINITION(highlighting_test_0003){
GTUtilsMSAEditorSequenceArea::deleteColorScheme(os, scheme);
GTGlobals::sleep(500);
-// UGENE not crashess
-// no color sheme is selected
- QString s = colorScheme->currentText();
- CHECK_SET_ERR(colorScheme->currentText() == "No colors", "wrong color scheme selected");
- QString a = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(0,0));
- QString t = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(0,2));
- QString g = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(2,0));
- QString c = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(4,0));
- QString gap = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(4,2));
- CHECK_SET_ERR(a == "#ffffff", QString("a has color %1").arg(a));
- CHECK_SET_ERR(t == "#ffffff", QString("t has color %1").arg(t));
- CHECK_SET_ERR(g == "#ffffff", QString("g has color %1").arg(g));
- CHECK_SET_ERR(c == "#ffffff", QString("c has color %1").arg(c));
+// UGENE not crashes
+// default color sheme is selected
+ const QString currentScheme = colorScheme->currentText();
+ CHECK_SET_ERR(currentScheme == "UGENE", QString("wrong color scheme selected: expected '%1', got '%2'").arg("UGENE").arg(currentScheme));
+
+ const QString a = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(0, 0));
+ const QString t = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(0, 2));
+ const QString g = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(2, 0));
+ const QString c = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(4, 0));
+ const QString gap = GTUtilsMSAEditorSequenceArea::getColor(os, QPoint(4, 2));
+ CHECK_SET_ERR(a == "#fcff92", QString("a has color %1").arg(a));
+ CHECK_SET_ERR(t == "#ff99b1", QString("t has color %1").arg(t));
+ CHECK_SET_ERR(g == "#4eade1", QString("g has color %1").arg(g));
+ CHECK_SET_ERR(c == "#70f970", QString("c has color %1").arg(c));
CHECK_SET_ERR(gap == "#ffffff", QString("gap has color %1").arg(gap));
}
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 53c7864..5ee6538 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.cpp
index e7daae6..92f97d1 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/options_panel/sequence_view/GTTestsOptionPanelSequenceView.h
index 377e27d..2641df0 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/GTTestsInSilicoPcr.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
index 7169bf1..e10781a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/GTTestsInSilicoPcr.h b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
index 83b1ab7..f2239d2 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsInSilicoPcr.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/GTTestsPrimerLibrary.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
index 13dfda1..941e5c0 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/GTTestsPrimerLibrary.h b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
index 4c79cb3..56d843f 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/pcr/GTTestsPrimerLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/GTTestsProject.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
index 0f41c75..f5c801a 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/GTTestsProject.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
index 455744d..72fe586 100644
--- a/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
+++ b/src/plugins/GUITestBase/src/tests/common_scenarios/project/GTTestsProject.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/anonymous_project/GTTestsProjectAnonymousProject.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.cpp
index 4d58e6b..ac94a77 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/anonymous_project/GTTestsProjectAnonymousProject.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/anonymous_project/GTTestsProjectAnonymousProject.h
index 2cff2d6..c501ce6 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/bookmarks/GTTestsBookmarks.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.cpp
index 20d1aad..bea2389 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/bookmarks/GTTestsBookmarks.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/bookmarks/GTTestsBookmarks.h
index bfa6e95..a5c1a34 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/document_modifying/GTTestsProjectDocumentModifying.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.cpp
index f2863d8..aabe33b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/document_modifying/GTTestsProjectDocumentModifying.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/document_modifying/GTTestsProjectDocumentModifying.h
index 7265b1a..028aea4 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/multiple_docs/GTTestsProjectMultipleDocs.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.cpp
index ce736d1..2c88840 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/multiple_docs/GTTestsProjectMultipleDocs.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/multiple_docs/GTTestsProjectMultipleDocs.h
index bd1ecb7..b423662 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/project_filtering/GTTestsProjectFiltering.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.cpp
index 3fd6d26..018a829 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/project_filtering/GTTestsProjectFiltering.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/project_filtering/GTTestsProjectFiltering.h
index 4f16367..cc81c8b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/relations/GTTestsProjectRelations.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.cpp
index 3b44193..eb0670f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/relations/GTTestsProjectRelations.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/relations/GTTestsProjectRelations.h
index 3334f8c..f314736 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/remote_request/GTTestsProjectRemoteRequest.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.cpp
index 94f94e8..348ff94 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/remote_request/GTTestsProjectRemoteRequest.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/remote_request/GTTestsProjectRemoteRequest.h
index 802d0f9..5f85779 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.cpp
index a373ef7..e7d7894 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/sequence_exporting/GTTestsProjectSequenceExporting.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/sequence_exporting/GTTestsProjectSequenceExporting.h
index 8850de1..5c69e51 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 a2c5cd1..788e153 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 b631a2e..a27e3ed 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/user_locking/GTTestsProjectUserLocking.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.cpp
index e086715..e629a1d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/project/user_locking/GTTestsProjectUserLocking.h b/src/plugins/GUITestBase/src/tests/common_scenarios/project/user_locking/GTTestsProjectUserLocking.h
index e31603c..f7bd733 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/GTTestsRepeatFinder.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.cpp
index 59fd67f..5b4957f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/GTTestsRepeatFinder.h b/src/plugins/GUITestBase/src/tests/common_scenarios/repeat_finder/GTTestsRepeatFinder.h
index fd70f64..1dc5763 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/sequence_edit/GTTestsSequenceEdit.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.cpp
index cf0b5fa..6a8e540 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/sequence_edit/GTTestsSequenceEdit.h b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_edit/GTTestsSequenceEdit.h
index 1cc25db..880e600 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/sequence_view/GTTestsSequenceView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.cpp
index ecf0670..3af7b7b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/sequence_view/GTTestsSequenceView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/sequence_view/GTTestsSequenceView.h
index cf09f2d..fbdce18 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/shared_database/GTTestsSharedDatabase.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.cpp
index 0f59a5c..cdfd24d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/shared_database/GTTestsSharedDatabase.h b/src/plugins/GUITestBase/src/tests/common_scenarios/shared_database/GTTestsSharedDatabase.h
index 4377223..473db13 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman_dialog/GTTestsSWDialog.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.cpp
index 95ca914..6fe6a52 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman_dialog/GTTestsSWDialog.h b/src/plugins/GUITestBase/src/tests/common_scenarios/smith_waterman_dialog/GTTestsSWDialog.h
index 86702e7..17c80aa 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/start_page/GTTestsStartPage.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.cpp
index 4f3f924..2d61ad9 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/start_page/GTTestsStartPage.h b/src/plugins/GUITestBase/src/tests/common_scenarios/start_page/GTTestsStartPage.h
index 563a429..46ca038 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/toggle_view/GTTestsToggleView.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.cpp
index ebdac30..a73eb89 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/toggle_view/GTTestsToggleView.h b/src/plugins/GUITestBase/src/tests/common_scenarios/toggle_view/GTTestsToggleView.h
index 11f48f9..de2c67a 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.cpp
index 4415f8b..9d086a6 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tree_viewer/GTTestsCommonScenariousTreeviewer.h b/src/plugins/GUITestBase/src/tests/common_scenarios/tree_viewer/GTTestsCommonScenariousTreeviewer.h
index aa2e60c..80f50e5 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/undo_redo/GTTestsUndoRedo.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.cpp
index f2ddd62..a695110 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/undo_redo/GTTestsUndoRedo.h b/src/plugins/GUITestBase/src/tests/common_scenarios/undo_redo/GTTestsUndoRedo.h
index bf625ca..6bcce2e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/GTTestsWorkflowDesigner.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/GTTestsWorkflowDesigner.cpp
index dc91971..b014ec7 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -614,10 +614,10 @@ GUI_TEST_CLASS_DEFINITION(test_0060){
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "Read Annotations A");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "/_common_data/bedtools/", "introns.bed");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "/_common_data/bedtools/introns.bed");
GTUtilsWorkflowDesigner::click(os, "Read Annotations B");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "/_common_data/bedtools/", "mutation.gff");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "/_common_data/bedtools/mutation.gff");
GTUtilsWorkflowDesigner::click(os, "Write Annotations");
GTGlobals::sleep();
@@ -674,10 +674,10 @@ GUI_TEST_CLASS_DEFINITION(test_0061) {
GTUtilsWorkflowDesigner::setParameter(os, "Output variants file", QDir().absoluteFilePath(sandBoxDir + "/test_ugene_5162.vcf"), GTUtilsWorkflowDesigner::lineEditWithFileSelector);
GTUtilsWorkflowDesigner::click(os, "Read Assembly (BAM/SAM)");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Assembly", "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Assembly/chrM.sam");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Assembly", "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Assembly/chrM.sam");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
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 f7e042a..f4b9acb 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/estimating/GTTestsWorkflowEstimating.cpp
index 37b0b33..c3f8298 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -56,11 +56,11 @@ GUI_TEST_CLASS_DEFINITION(test_0002) {
// 3. Set valid input data.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/c_elegans", "c_elegans_test.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/c_elegans/c_elegans_test.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/c_elegans", "c.elegans_chr2.fasta");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/c_elegans/c.elegans_chr2.fasta");
// 4. Click an "Estimate scheme" button on the toolbar.
// Expected state: an info message box appears: there is a time estimation for the set input data and two buttons: close and run.
GTUtilsDialog::waitForDialog( os, new MessageBoxDialogFiller( os, QMessageBox::Close,
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 736378f..8b0e4a1 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/name_filter/GTTestsWorkflowNameFilter.cpp
index e9792d2..524bb6f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -177,7 +177,7 @@ GUI_TEST_CLASS_DEFINITION( test_0003 ) {
}
}
}
- CHECK_SET_ERR(count == 15, QString("Wrong number of visible items in sample tree: %1").arg(count));
+ CHECK_SET_ERR(count == 16, QString("Wrong number of visible items in sample tree: %1").arg(count));
}
}
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 97eaadb..cee3e98 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/parameters_validation/GTTestsWorkflowParemeterValidation.cpp
index 32cc654..50c2e87 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -65,7 +65,7 @@ GUI_TEST_CLASS_DEFINITION(test_0001){
// 3. Add the file "test/_common_data/clustal/align.aln" as input
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os,"Read alignment"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/clustal/", "align.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/clustal/align.aln");
// 4. Move this file somewhere from its directory
class RenameHelper {
@@ -182,8 +182,7 @@ GUI_TEST_CLASS_DEFINITION( test_0003 ) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence" ) );
GTMouseDriver::click();
- QString dirPath = testDir + "_common_data/fasta/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "fa1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/fasta/fa1.fa" );
//4. Set some nonexistent path to a file as the "Pattern file" parameter of the "Find Substrings" worker
@@ -226,7 +225,7 @@ GUI_TEST_CLASS_DEFINITION(test_0005){
// 3. Add the file "test/_common_data/clustal/align.aln" as input
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os,"Read alignment"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/clustal/", "align.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/clustal/align.aln");
GTGlobals::sleep(2000);
QFile dir(testDir + "_common_data/scenarios/sandbox/permDir");
@@ -288,8 +287,7 @@ GUI_TEST_CLASS_DEFINITION( test_0006 ) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence" ) );
GTMouseDriver::click();
- QString dirPath = testDir + "_common_data/fasta/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "fa1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/fasta/fa1.fa" );
//4. Create an empty directory somewhere (e.g. in the "test/_tmp" directory)
QDir newDir(testDir);
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 b61708b..2556b4b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/scripting/GTTestsWorkflowScripting.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/scripting/GTTestsWorkflowScripting.cpp
index ad15eff..a126c7b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -147,8 +147,7 @@ GUI_TEST_CLASS_DEFINITION(test_0003) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os,"Read Sequence"));
GTMouseDriver::click();
- QString dirPath = dataDir + "samples/FASTA/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "human_T1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/FASTA/human_T1.fa" );
GTWidget::click( os,GTAction::button( os,"Run workflow" ) );
GTGlobals::sleep( 200 );
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 1c1ca79..c853529 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/shared_db/GTTestsSharedDbWd.cpp b/src/plugins/GUITestBase/src/tests/common_scenarios/workflow_designer/shared_db/GTTestsSharedDbWd.cpp
index c6794a1..e7cfc85 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -257,7 +257,7 @@ GUI_TEST_CLASS_DEFINITION(read_gui_test_0009) {
GTUtilsTaskTreeView::waitTaskFinished(os);
GTGlobals::sleep();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/", "Klebsislla.sort.bam.ugenedb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/Klebsislla.sort.bam.ugenedb");
QSet<GObjectType> acceptableTypes;
acceptableTypes << GObjectTypes::ASSEMBLY;
@@ -612,8 +612,9 @@ GUI_TEST_CLASS_DEFINITION(run_workflow_gui_test_0003) {
GTUtilsWorkflowDesigner::addAlgorithm(os, "Write Annotations");
GTUtilsWorkflowDesigner::setParameter(os, "Data storage", 1, GTUtilsWorkflowDesigner::comboValue);
- GTUtilsWorkflowDesigner::setParameter(os, "Database", 1, GTUtilsWorkflowDesigner::comboValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Database", "ugene_gui_test", GTUtilsWorkflowDesigner::comboValue);
GTUtilsWorkflowDesigner::setParameter(os, "Output path", "/test", GTUtilsWorkflowDesigner::textValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Merge annotation tables", true, GTUtilsWorkflowDesigner::comboValue);
GTUtilsWorkflowDesigner::setParameter(os, "Annotation object name", "run_workflow_gui_test_0003", GTUtilsWorkflowDesigner::textValue);
GTUtilsWorkflowDesigner::connect(os, GTUtilsWorkflowDesigner::getWorker(os, "Read Annotations"),
@@ -638,12 +639,12 @@ GUI_TEST_CLASS_DEFINITION(run_workflow_gui_test_0004) {
GTUtilsWorkflowDesigner::getWorker(os, "Write Plain Text"));
GTUtilsWorkflowDesigner::click(os, "Read Plain Text");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/text/", "text.txt");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/text/text.txt");
GTUtilsWorkflowDesigner::click(os, "Write Plain Text");
GTUtilsWorkflowDesigner::setParameter(os, "Data storage", 1, GTUtilsWorkflowDesigner::comboValue);
GTUtilsWorkflowDesigner::setParameter(os, "Database", 0, GTUtilsWorkflowDesigner::comboValue);
-
+
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok,
"Please fix issues listed in the error list (located under workflow)."));
@@ -661,7 +662,7 @@ GUI_TEST_CLASS_DEFINITION(run_workflow_gui_test_0005_1) {
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/", "aaa.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/aaa.fa");
GTUtilsDialog::waitForDialog(os, new AuthenticationDialogFiller(os, GTDatabaseConfig::login(), GTDatabaseConfig::password()));
GTWidget::click(os, GTAction::button(os, "Run workflow"));
@@ -676,7 +677,7 @@ GUI_TEST_CLASS_DEFINITION(run_workflow_gui_test_0005_2) {
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/", "aaa.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/aaa.fa");
GTUtilsDialog::waitForDialog(os, new AuthenticationDialogFiller(os, GTDatabaseConfig::login(), "invalid_password"));
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok,
@@ -693,7 +694,7 @@ GUI_TEST_CLASS_DEFINITION(run_workflow_gui_test_0006) {
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsWorkflowDesigner::click(os, "Read Assembly");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/", "1.bam.ugenedb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/1.bam.ugenedb");
GTUtilsDialog::waitForDialog(os, new AuthenticationDialogFiller(os, GTDatabaseConfig::login(), GTDatabaseConfig::password()));
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok,
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 6b325c6..99507c7 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GTAbstractGUIAction.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
index 98a0e4d..3b35b09 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GTAbstractGUIAction.h b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
index a25406c..fdc0fbf 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTAbstractGUIAction.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GTRandomGUIActionFactory.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
index f286aa9..bc666b3 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GTRandomGUIActionFactory.h b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
index 9a69d47..6b7e990 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GTRandomGUIActionFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GUICrazyUserTest.cpp b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
index 00973ae..609abed 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/crazy_user/GUICrazyUserTest.h b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
index 0579971..e9084ae 100644
--- a/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
+++ b/src/plugins/GUITestBase/src/tests/crazy_user/GUICrazyUserTest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1001_2000.cpp
index 649b7ff..2394ba0 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -795,7 +795,7 @@ GUI_TEST_CLASS_DEFINITION(test_1038) {
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
WorkflowProcessItem* readAsmbl = GTUtilsWorkflowDesigner::addElement(os, "Read Assembly");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam", "small.bam.sorted.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam/small.bam.sorted.bam");
WorkflowProcessItem* split = GTUtilsWorkflowDesigner::addElement(os, "Split Assembly into Sequences");
WorkflowProcessItem* writeSeq = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
@@ -1346,7 +1346,7 @@ GUI_TEST_CLASS_DEFINITION(test_1071) {
GUI_TEST_CLASS_DEFINITION(test_1078){ //Need to add the test
/* 1. File-New Project
- * 2. Open as - HannaRescued.fa(https://ugene.unipro.ru/tracker/browse/UGENE-1078) (FASTA format. Score:13 (Perfect match) - OK, As separate sequences in sequence viewer - OK)
+ * 2. Open as - HannaRescued.fa(https://ugene.net/tracker/browse/UGENE-1078) (FASTA format. Score:13 (Perfect match) - OK, As separate sequences in sequence viewer - OK)
* Bug state: Then crush and hung of the program
* Expected state: Error message with format error
* System: Ubuntu 12.04
@@ -1662,7 +1662,6 @@ GUI_TEST_CLASS_DEFINITION(test_1122){
// Expected state: Result is the same as in the step 4.
GTLogTracer l;
- GTUtilsDialog::waitForDialog(os, new ConvertAceToSqliteDialogFiller(os, sandBoxDir + "test_1122_1.ugenedb"));
GTUtilsDialog::waitForDialog(os, new DocumentProviderSelectorDialogFiller(os, DocumentProviderSelectorDialogFiller::AlignmentEditor));
GTUtilsDialog::waitForDialog(os, new CAP3SupportDialogFiller(os, QStringList() << testDir + "_common_data/scenarios/CAP3/xyz.fa"
<< testDir + "_common_data/scenarios/CAP3/xyz.qual",
@@ -1670,7 +1669,6 @@ GUI_TEST_CLASS_DEFINITION(test_1122){
GTMenu::clickMainMenuItem(os, QStringList() << "Tools" << "Sanger data analysis" << "Contig assembly with CAP3...");
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTUtilsDialog::waitForDialog(os, new ConvertAceToSqliteDialogFiller(os, sandBoxDir + "test_1122_2.ugenedb"));
GTUtilsDialog::waitForDialog(os, new DocumentProviderSelectorDialogFiller(os, DocumentProviderSelectorDialogFiller::AlignmentEditor));
GTUtilsDialog::waitForDialog(os, new CAP3SupportDialogFiller(os, QStringList() << testDir + "_common_data/scenarios/CAP3/xyz.fastq",
sandBoxDir + "test_1122_2"));
@@ -1829,7 +1827,7 @@ GUI_TEST_CLASS_DEFINITION(test_1155) {
}
GUI_TEST_CLASS_DEFINITION(test_1154) {
-// 1. Download "read.fa", "read2.fa", "reference.fa" from https://ugene.unipro.ru/tracker/browse/UGENE-1154 or use other sequences
+// 1. Download "read.fa", "read2.fa", "reference.fa" from https://ugene.net/tracker/browse/UGENE-1154 or use other sequences
// 2. Use menu { Tools -> NGS data analysis -> Map reads to reference... }
// Expected state: "Align sequences reads" dialog has appeared
// 3. Add "read.fa" and "read2.fa" to short reads list in the dialog
@@ -3483,7 +3481,7 @@ GUI_TEST_CLASS_DEFINITION(test_1319){
GTUtilsWorkflowDesigner::click(os, item);
// Expected state: bottom datasets panel is visible.
// 4) Add one input file.
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
// Expected state: the element's doc has the blue link to this file.
// 6) Right click on the link.
GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList()<<"Open document(s)"));
@@ -3521,8 +3519,8 @@ GUI_TEST_CLASS_DEFINITION(test_1319_2){
GTUtilsWorkflowDesigner::click(os, item);
// Expected state: bottom datasets panel is visible.
// 4) Add two input files.
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "murine.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/murine.gb");
// Expected state: the element's doc has the blue link to this files.
// 6) Right click on the link.
GTUtilsDialog::waitForDialog(os, new PopupChooserByText(os, QStringList()<<"Open document(s)"));
@@ -3831,7 +3829,7 @@ GUI_TEST_CLASS_DEFINITION(test_1358) {
CHECK_OP(os, );
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Genbank/", "murine.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Genbank/murine.gb");
//2. Press "Run schema"
//Expected state: UGENE doesn't crash
@@ -3854,7 +3852,7 @@ GUI_TEST_CLASS_DEFINITION(test_1360){
GTUtilsWorkflowDesigner::connect(os, read, write);
// 5) Specify any input data
GTUtilsWorkflowDesigner::click(os, "Read Alignment");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/COI.aln");
QString s = read->getProcess()->getDescription()->toPlainText();
CHECK_SET_ERR(s.contains("COI.aln"), "unexpected worker text: " + s);
@@ -5189,10 +5187,10 @@ GUI_TEST_CLASS_DEFINITION(test_1510) {
GTUtilsWorkflowDesigner::connect(os, readSeq, toBam);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/FASTA/", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/FASTA/human_T1.fa");
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "Read Sequence 1");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/FASTA/", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/FASTA/human_T1.fa");
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "Call Variants");
@@ -5939,7 +5937,7 @@ GUI_TEST_CLASS_DEFINITION( test_1594 ) {
GTUtilsWorkflowDesigner::connect(os, read, write);
// 2. Set the input annotations file: "_common_data/bed/valid_input/Treatment_tags.bed".
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data", "chr4.bed");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data/chr4.bed");
// 3. Set the correct output directory for the MACS element.
GTUtilsWorkflowDesigner::click(os, write);
GTUtilsWorkflowDesigner::setParameter(os, "Output directory", QDir().absoluteFilePath(sandBoxDir + "test_1594"), GTUtilsWorkflowDesigner::textValue);
@@ -5976,8 +5974,8 @@ GUI_TEST_CLASS_DEFINITION( test_1595 ){
// 3) Click it.
// Expected: datasets widget appears.
// 4) Add several files.
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
// 5) Select some of the added items in the list.
QWidget* datasetWidget = GTWidget::findWidget(os, "DatasetWidget");
QListWidget* items = GTWidget::findExactWidget<QListWidget*>(os, "itemsArea", datasetWidget);
@@ -7312,7 +7310,7 @@ GUI_TEST_CLASS_DEFINITION(test_1693) {
}
GUI_TEST_CLASS_DEFINITION(test_1700) {
- // 1. Open file "https://ugene.unipro.ru/tracker/secure/attachment/12864/pdb1a07.ent.gz".
+ // 1. Open file "https://ugene.net/tracker/secure/attachment/12864/pdb1a07.ent.gz".
GTFileDialog::openFile(os, testDir + "_common_data/pdb/", "pdb1a07.ent.gz");
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -7513,7 +7511,7 @@ GUI_TEST_CLASS_DEFINITION(test_1710_2){
GUI_TEST_CLASS_DEFINITION(test_1714){
// 1. Open the "external tools" configuration window using Settings/Preferences menu
-// 2. Select path for external tools package (if not set). External tools package can be downloaded from http://ugene.unipro.ru/external.html
+// 2. Select path for external tools package (if not set). External tools package can be downloaded from http://ugene.net/external.html
// 3. Deselect all Cistrome tools
// 4. Deselect python external tool
// Expected state: the python tool is deselected. UGENE doesn't hangs up (or crashes)
@@ -7658,11 +7656,11 @@ GUI_TEST_CLASS_DEFINITION(test_1733){
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.sam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.fa");
}
@@ -7756,11 +7754,11 @@ GUI_TEST_CLASS_DEFINITION(test_1738){
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam/", "Mycobacterium.sorted.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam/Mycobacterium.sorted.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/", "Mycobacterium.fna");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/Mycobacterium.fna");
GTWidget::click(os,GTAction::button(os,"Run workflow"));
GTGlobals::sleep(5000);
@@ -7855,7 +7853,7 @@ GUI_TEST_CLASS_DEFINITION(test_1763_1){
GTUtilsWorkflowDesigner::connect(os, read, write);
// 2. Set any input/output files
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
// 3. Start workflow
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -7889,15 +7887,16 @@ GUI_TEST_CLASS_DEFINITION(test_1763_2){
// Improve dashboards: If a workflow contains an element with an external tool, the log or parameters list of the tool run should be added to the dashboard.
// 1. Create Read alignment->Align with ClustalO->Write alignment workflow.
+// 2. Set COI.aln as input file
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Alignment");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/COI.aln");
+
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Alignment");
WorkflowProcessItem* align = GTUtilsWorkflowDesigner::addElement(os, "Align with ClustalO");
GTUtilsWorkflowDesigner::connect(os, read, align);
GTUtilsWorkflowDesigner::connect(os, align, write);
-// 2. Set COI.aln as input file
- GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+
// 3. Start workflow
GTUtilsWorkflowDesigner::runWorkflow(os);
// Expected state: Workflow dasboard opened and dashboard has External Tools tab
@@ -7922,7 +7921,7 @@ GUI_TEST_CLASS_DEFINITION(test_1764){
GTUtilsWorkflowDesigner::connect(os, read, write);
// 3) Set input sequence to "human_T1.fa" from "data/samples/FASTA", set output filename to "readed_fasta.fa"
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
GTUtilsWorkflowDesigner::click(os, write);
GTUtilsWorkflowDesigner::setParameter(os, "Output file", "readed_fasta.fa", GTUtilsWorkflowDesigner::textValue);
// 4) Run workflow, click on dashboard "readed_fasta.fa"
@@ -8064,7 +8063,7 @@ GUI_TEST_CLASS_DEFINITION(test_1808) {
// 3.Select any input and output file
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Annotations"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Write Annotations"));
GTMouseDriver::click();
GTUtilsWorkflowDesigner::setParameter(os, "Output file", outputFilePath, GTUtilsWorkflowDesigner::textValue);
@@ -8219,7 +8218,7 @@ GUI_TEST_CLASS_DEFINITION( test_1859 ) {
// 4) Set input file
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, annReaderName ) );
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/Genbank", "sars.gb" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/Genbank/sars.gb" );
GTLogTracer lt;
@@ -8428,11 +8427,11 @@ GUI_TEST_CLASS_DEFINITION(test_1908){
GTUtilsWorkflowDesigner::addSample(os, "Call variants with SAMtools");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.sam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.fa");
}
@@ -8496,7 +8495,7 @@ GUI_TEST_CLASS_DEFINITION( test_1919 )
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "File List"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam", "scerevisiae.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bam/scerevisiae.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "File Format Conversion"));
GTMouseDriver::click();
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 cde450e..0d8b229 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_1_1000.cpp
index 50efd7e..2730b76 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -710,7 +710,7 @@ GUI_TEST_CLASS_DEFINITION(test_0598) {
GTWidget::click(os, sequenceWidget);
- // 2. Show DNA Flexibility graph
+ // 2. Show DNA Flexibility graph
// Expected state: 'Calculate graph points' task is started
QWidget *graphAction = GTWidget::findWidget(os, "GraphMenuAction", sequenceWidget, false);
Runnable *chooser = new PopupChooser(os, QStringList() << "DNA Flexibility");
@@ -905,7 +905,7 @@ GUI_TEST_CLASS_DEFINITION(test_0659){
// 3. Set up valid output input files for scheme, and run it (for example set input file samples/GENBANK/sars.gb)
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
GTUtilsWorkflowDesigner::click(os, write);
GTUtilsWorkflowDesigner::setParameter(os, "Output file", QDir(sandBoxDir).absolutePath() + "/test_659", GTUtilsWorkflowDesigner::textValue);
GTUtilsWorkflowDesigner::setParameter(os, "Document format", "genbank", GTUtilsWorkflowDesigner::comboValue);
@@ -1431,8 +1431,8 @@ GUI_TEST_CLASS_DEFINITION(test_0774) {
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
CHECK_SET_ERR(read != NULL, "Read Sequence element not found");
// GTUtilsWorkflowDesigner::setDatasetInputFolder(os, dataDir + "samples/Genbank");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/", "murine.gb");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/murine.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
GTUtilsWorkflowDesigner::setParameter(os, "Mode", "Merge", GTUtilsWorkflowDesigner::comboValue);
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
@@ -1481,7 +1481,7 @@ GUI_TEST_CLASS_DEFINITION(test_0776) {
*/
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
WorkflowProcessItem* readWM = GTUtilsWorkflowDesigner::addElement(os, "Read Weight Matrix");
GTUtilsWorkflowDesigner::setParameter(os, "Input file(s)", QDir(dataDir).absolutePath() + "/position_weight_matrix/UniPROBE/Cell08/Alx3_3418.2.pwm", GTUtilsWorkflowDesigner::textValue);
@@ -1978,9 +1978,9 @@ GUI_TEST_CLASS_DEFINITION(test_0829) {
GTUtilsWorkflowDesigner::connect(os, readSeq, cap3);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "1.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "2.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "3.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/2.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/3.fa");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -1999,9 +1999,9 @@ GUI_TEST_CLASS_DEFINITION(test_0829) {
GTUtilsWorkflowDesigner::connect(os, readSeq, cap3);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "1.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "2.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829", "4.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/2.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/829/4.fa");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -2484,7 +2484,7 @@ GUI_TEST_CLASS_DEFINITION(test_0871) {
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
WorkflowProcessItem* amino = GTUtilsWorkflowDesigner::addElement(os, "Amino Translation");
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
@@ -2509,8 +2509,8 @@ GUI_TEST_CLASS_DEFINITION( test_0873 ){
GTUtilsWorkflowDesigner::addSample(os, "Merge sequences and shift corresponding annotations");
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "murine.gb");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/murine.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
// 3. fill all needed parameters and run schema
GTUtilsWorkflowDesigner::runWorkflow(os);
@@ -2697,7 +2697,7 @@ GUI_TEST_CLASS_DEFINITION(test_0896) {
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "File List");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie/pattern", "e_coli_1000.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie/pattern/e_coli_1000.sam");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -2783,10 +2783,10 @@ GUI_TEST_CLASS_DEFINITION(test_0908) {
//7) Add input and output readers of FASTA
GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta", "AMINO.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/AMINO.fa");
GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta", "alphabet.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/alphabet.fa");
WorkflowProcessItem* writer = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
@@ -2815,7 +2815,7 @@ GUI_TEST_CLASS_DEFINITION(test_0910) {
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta", "multy_fa.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/multy_fa.fa");
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
GTUtilsWorkflowDesigner::setParameter(os, "Accumulate objects", "False", GTUtilsWorkflowDesigner::comboValue);
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 e2ce51d..531486d 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_2001_3000.cpp
index 00f1e67..f16a03e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -753,7 +753,7 @@ GUI_TEST_CLASS_DEFINITION( test_2053 ){
WorkflowProcessItem * write = GTUtilsWorkflowDesigner::addElement(os, "Write Alignment");
GTUtilsWorkflowDesigner::connect(os, read, write);
GTUtilsWorkflowDesigner::click(os, "Read Alignment");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/COI.aln");
GTUtilsWorkflowDesigner::runWorkflow(os);
// Expected state: after scheme finish there is the hint on the dashboard -
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -781,7 +781,7 @@ GUI_TEST_CLASS_DEFINITION( test_2076 ){
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Alignment");
GTUtilsWorkflowDesigner::connect(os, read, write);
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/", "COI.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/COI.aln");
GTUtilsWorkflowDesigner::saveWorkflowAs(os, sandBoxDir + "test_2076.uwl", "test_2076");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep();
@@ -837,13 +837,11 @@ GUI_TEST_CLASS_DEFINITION( test_2077 ){
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence" ) );
GTMouseDriver::click();
- QString dirPath = dataDir + "samples/FASTA/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "human_T1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/FASTA/human_T1.fa" );
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence" ) );
GTMouseDriver::click();
- QString dirPath1 = dataDir + "samples/FASTA/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath1, "human_T1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/FASTA/human_T1.fa" );
// 5) Validate scheme
GTUtilsDialog::waitForDialog( os, new MessageBoxDialogFiller( os, QMessageBox::Ok,
@@ -1026,24 +1024,19 @@ GUI_TEST_CLASS_DEFINITION(test_2093_1) {
GTUtilsWorkflowDesigner::addAlgorithm(os, "File List");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "File List"));
GTMouseDriver::click();
- QString dirPath = dataDir + "samples/FASTA/";
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dirPath, "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep();
// 2. Select "Load schema" button on the dashboard menu line.
- GTWebView::traceAllWebElements(os, GTUtilsDashboard::getDashboard(os));
-
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Discard));
-
- GTUtilsDashboard::click(os, GTUtilsDashboard::findElement(os, "", "BUTTON", true));
-
+ GTUtilsDashboard::click(os, GTUtilsDashboard::findElement(os, "", "BUTTON"));
GTGlobals::sleep();
// Expected result: the scheme with parameters is loaded.
- WorkflowProcessItem* wdElement = GTUtilsWorkflowDesigner::getWorker(os, "File list");
+ WorkflowProcessItem* wdElement = GTUtilsWorkflowDesigner::getWorker(os, "File List");
CHECK_SET_ERR(wdElement, "Schema wasn't loaded");
}
@@ -1242,11 +1235,11 @@ GUI_TEST_CLASS_DEFINITION( test_2144 )
// "data/samples/Assembly/chrM.fa" as input to "Read Sequence" element;
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.sam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/chrM.fa");
// 4. Chose "Estimate" option in tool bar.
// "Estimate" option is available only for NGS samples (except "Extract transcript sequence").
@@ -1266,7 +1259,7 @@ GUI_TEST_CLASS_DEFINITION( test_2150 ){
// 3. Set "data/samples/CLUSTALW/ty3.aln.gz" as the input file.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os,"Read alignment"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/", "ty3.aln.gz");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/ty3.aln.gz");
GTGlobals::sleep();
// 4. Set some name to the result file.
@@ -1318,10 +1311,10 @@ GUI_TEST_CLASS_DEFINITION( test_2152 ){
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "File List"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3", "region1.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3", "region2.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3", "region3.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3", "region4.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3/region1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3/region2.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3/region3.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/cap3/region4.fa");
GTWidget::click(os,GTAction::button(os,"Run workflow"));
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -1351,7 +1344,7 @@ GUI_TEST_CLASS_DEFINITION( test_2156 ){
GUI_TEST_CLASS_DEFINITION( test_2157 )
{
-// 1. Open file "https://ugene.unipro.ru/tracker/secure/attachment/12864/pdb1a07.ent.gz".
+// 1. Open file "https://ugene.net/tracker/secure/attachment/12864/pdb1a07.ent.gz".
GTFileDialog::openFile(os, testDir + "_common_data/pdb/", "pdb1a07.ent.gz");
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -1383,9 +1376,9 @@ GUI_TEST_CLASS_DEFINITION( test_2160 )
GTGlobals::sleep( 200 );
// 6. Check that alignment has not changed
- CHECK_SET_ERR( 16 == GTUtilsMSAEditorSequenceArea::getLength( os ),
+ CHECK_SET_ERR( 15 == GTUtilsMSAEditorSequenceArea::getLength( os ),
"MSA length unexpectedly changed" );
- CHECK_SET_ERR( 4 == GTUtilsMSAEditorSequenceArea::getNameList( os ).size( ),
+ CHECK_SET_ERR( 18 == GTUtilsMSAEditorSequenceArea::getNameList( os ).size( ),
"MSA row count unexpectedly changed" );
}
@@ -1511,11 +1504,11 @@ GUI_TEST_CLASS_DEFINITION( test_2192 ){
// 3. Set valid input data.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.sorted.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.sorted.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.fa");
// 4. Start the scheme.
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -1640,11 +1633,11 @@ GUI_TEST_CLASS_DEFINITION( test_2266_1 ){
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/", "Klebsislla.sort.bam.ugenedb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/Klebsislla.sort.bam.ugenedb");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/", "Klebsislla_ref.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/ugenedb/Klebsislla_ref.fa");
GTUtilsWorkflowDesigner::click(os, "Call Variants");
GTUtilsWorkflowDesigner::setParameter(os, "Output variants file", QDir(sandBoxDir).absolutePath() + "/test_2266_1.vcf", GTUtilsWorkflowDesigner::lineEditWithFileSelector);
@@ -2422,7 +2415,7 @@ GUI_TEST_CLASS_DEFINITION( test_2364 ) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
GTGlobals::sleep(300);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
//4. Set the output file: "out.fa".
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Write Sequence"));
@@ -2482,7 +2475,7 @@ GUI_TEST_CLASS_DEFINITION(test_2374){
GTUtilsWorkflowDesigner::connect(os, read, write);
// 3. Set COI.aln as input, run scheme
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW", "COI.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/CLUSTALW/COI.aln");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
// Expected state: there is no "External Tools" page on the WD dashboards
@@ -2530,8 +2523,7 @@ GUI_TEST_CLASS_DEFINITION( test_2377 ) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, assemblyReaderName ) );
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/sam",
- "broken_without_reads.sam" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/sambroken_without_reads.sam" );
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, assemblyWriterName ) );
GTMouseDriver::click();
@@ -2562,7 +2554,7 @@ GUI_TEST_CLASS_DEFINITION( test_2378_1 ) {
GTUtilsWorkflowDesigner::addAlgorithm(os, "Read Assembly");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/sam", "scerevisiae.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/sam/scerevisiae.sam");
GTUtilsWorkflowDesigner::addAlgorithm(os, "Write Assembly");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Write Assembly"));
@@ -2807,7 +2799,7 @@ GUI_TEST_CLASS_DEFINITION(test_2402) {
//Expected state: all slots are connected
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank", "sars.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/sars.gb");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Assembly Sequences with CAP3"));
GTMouseDriver::click();
GTUtilsWorkflowDesigner::setParameter(os, "Output file", outputFilePath, GTUtilsWorkflowDesigner::textValue);
@@ -3016,8 +3008,7 @@ GUI_TEST_CLASS_DEFINITION( test_2424 ) {
// 2. Connect workers into schema, set input data and output data (for example eas.fastq from samples)
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence" ) );
GTMouseDriver::click();
- QString dirPath = dataDir + "samples/FASTA/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "human_T1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, dataDir + "samples/FASTA/human_T1.fa" );
const QString outputFilePath = workflowOutputDir.absolutePath( ) + "/test.gb";
@@ -3353,8 +3344,8 @@ GUI_TEST_CLASS_DEFINITION( test_2475 ) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read RNA-seq Short Reads"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie2", "reads_1.fq");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie2", "reads_2.fq");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie2/reads_1.fq");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bowtie2/reads_2.fq");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Find Splice Junctions with TopHat"));
GTMouseDriver::click();
@@ -3878,11 +3869,11 @@ GUI_TEST_CLASS_DEFINITION( test_2569 ){
// 3. Set valid input data.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.sorted.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.sorted.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.fa");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
// 4. Click "External Tools" on the appeared Dashboard.
@@ -4509,11 +4500,11 @@ GUI_TEST_CLASS_DEFINITION( test_2662 ){
// 3. Set valid input data.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Assembly (BAM/SAM)"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.sorted.bam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.sorted.bam");
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM", "chrM.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chrM/chrM.fa");
// 4. Start the scheme.
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -4725,14 +4716,11 @@ GUI_TEST_CLASS_DEFINITION(test_2711){
GUI_TEST_CLASS_DEFINITION(test_2713) {
// 1. Open file {data/samples/Genbank/murine.gb}
- QDir().mkpath(sandBoxDir + "test_2713");
- GTFile::copy(os, dataDir + "samples/Genbank/murine.gb", sandBoxDir + "test_2713/murine.gb");
- GTUtilsMdi::click(os, GTGlobals::Close);
- GTFileDialog::openFile(os, sandBoxDir + "test_2713", "murine.gb");
+ GTFile::copy(os, dataDir + "samples/Genbank/murine.gb", sandBoxDir + "test_2713.gb");
+ GTFileDialog::openFile(os, sandBoxDir, "test_2713.gb");
GTUtilsTaskTreeView::waitTaskFinished(os);
// 2. Open file {data/samples/FASTA/human_T1.fa}
-
GTFileDialog::openFile(os, dataDir + "samples/FASTA", "human_T1.fa");
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -4741,26 +4729,43 @@ GUI_TEST_CLASS_DEFINITION(test_2713) {
// 4. Press "OK"
// Expected state: annotations has appeared on the sequence view
GTUtilsDialog::waitForDialog(os, new CreateObjectRelationDialogFiller(os));
- GTUtilsProjectTreeView::dragAndDrop(os, GTUtilsProjectTreeView::findIndex(os, "NC_001363 features"), GTUtilsAnnotationsTreeView::getTreeWidget(os));
-// 5. Open file {data/samples/Genbank/murine.gb} with text editor, then make some identical modification (i.e. delete and type the same character) and save file
+ GTWidget::click(os, GTUtilsProjectTreeView::getTreeView(os));
+ QPoint point = GTUtilsProjectTreeView::getItemCenter(os, "NC_001363 features");
+ point.setX(point.x() + 1);
+ point.setY(point.y() + 1);
+ GTMouseDriver::moveTo(point);
+ GTMouseDriver::click();
+
+ GTMouseDriver::press();
+ GTMouseDriver::moveTo(GTWidget::getWidgetCenter(os, GTUtilsAnnotationsTreeView::getTreeWidget(os)));
+ GTMouseDriver::release();
+
+// 5. Open file {data/samples/Genbank/murine.gb} with text editor, then make some modification and save file
// Expected state: dialog about detected file modification has appeared in UGENE window
// 6. Press "Yes"
// Expected state: "human_T1" view has disappeared from the "Bookmarks" list, "murine.gb" has been reloaded.
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Yes));
- QFile murineFile(sandBoxDir + "test_2713/murine.gb");
- const bool opened = murineFile.open(QFile::Append);
- CHECK_SET_ERR(opened, "Can't open the file: " + sandBoxDir + "test_2713/murine.gb");
- murineFile.write(" ");
- murineFile.close();
+ QFile file(sandBoxDir + "/test_2713.gb");
+ bool opened = file.open(QIODevice::ReadOnly | QIODevice::Text);
+ CHECK_SET_ERR(opened, "Can't open the file: " + sandBoxDir + "test_2713.gb");
+ QByteArray fileData = file.readAll();
+ file.close();
+
+ fileData.replace("gag polyprotein", "ggg_polyprotein");
+
+ opened = file.open(QIODevice::WriteOnly);
+ CHECK_SET_ERR(opened, "Can't open the file: " + sandBoxDir + "test_2713.gb");
+ file.write(fileData);
+ file.close();
GTGlobals::sleep(5000);
// 7. Open "human_T1" sequence view
// Expected state: annotations from "murine.gb" present on the sequence view
GTUtilsProjectTreeView::doubleClickItem(os, "human_T1.fa");
- GTGlobals::sleep(5000);
+ GTGlobals::sleep(5000);
GTUtilsAnnotationsTreeView::findFirstAnnotation(os);
}
@@ -5085,7 +5090,7 @@ GUI_TEST_CLASS_DEFINITION(test_2773) {
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/cmdline/", "DNA.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/cmdline/DNA.fa" );
GTUtilsWorkflowDesigner::click(os, "translateTest");
GTUtilsWorkflowDesigner::setParameter( os, "offset", "sss", GTUtilsWorkflowDesigner::textValue);
@@ -5512,7 +5517,7 @@ GUI_TEST_CLASS_DEFINITION(test_2891) {
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "Read Tags");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data/", "chr2.bed");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data/chr2.bed");
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok));
GTWidget::click(os,GTAction::button(os, "Validate workflow"));
@@ -5534,7 +5539,7 @@ GUI_TEST_CLASS_DEFINITION(test_2891) {
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "Read Tags");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data/", "some_image.png");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/NIAID_pipelines/Chip-seq/input_data/some_image.png");
GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok));
GTWidget::click(os,GTAction::button(os, "Validate workflow"));
@@ -6074,7 +6079,7 @@ GUI_TEST_CLASS_DEFINITION(test_2951) {
//4. Set the input sequence: _common_data/fasta/abcd.fa.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read Sequence"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/", "abcd.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/abcd.fa");
//5. Set the correct output sequence.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Write Sequence"));
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 b6798ee..3dc82ee 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_3001_4000.cpp
index 7185018..e70f756 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -634,24 +634,48 @@ GUI_TEST_CLASS_DEFINITION(test_3103) {
}
GUI_TEST_CLASS_DEFINITION(test_3112) {
-// 1. Open "_common_data\scenarios\msa\big.aln".
-// Expected state: the MSA editor is shown, there is an overview.
-// 2. Click the "Overview" button on the main toolbar.
-// Expected state: the overview widget hides, the render task cancels.
-// Current state: the overview widget hides, the render task still works. If you change the msa (insert a gap somewhere), a safe point triggers.
- GTFileDialog::openFile(os, testDir + "_common_data/clustal/", "10000_sequences.aln");
+// 1. Open big alignment, e.g. "_common_data/clustal/big.aln"
+ GTFileDialog::openFile(os, testDir + "_common_data/clustal/", "big.aln");
GTUtilsTaskTreeView::waitTaskFinished(os);
- GTGlobals::sleep(20000); //in case of failing test try to increase this pause
-
QToolButton* button = qobject_cast<QToolButton*>(GTAction::button(os, "Show overview"));
CHECK_SET_ERR(button->isChecked(), "Overview button is not pressed");
- GTWidget::click(os, button);//uncheck
- GTWidget::click(os, button);//check
- GTWidget::click(os, button);//uncheck
- GTGlobals::sleep();
- CHECK_SET_ERR(0 == GTUtilsTaskTreeView::getTopLevelTasksCount(os), "There are unfinished tasks");
+// 2. Modify the alignment
+// Expected state: the task starts
+ GTUtilsMsaEditor::removeColumn(os, 5);
+ GTGlobals::sleep(500);
+ CHECK_SET_ERR(0 != GTUtilsTaskTreeView::getTopLevelTasksCount(os), "1: There are no active tasks ");
+
+// 3. Click the "Overview" button on the main toolbar
+// Expected state: the task is canceled, the overview is hidden
+ GTWidget::click(os, button);
+ GTGlobals::sleep(500); // wait for task to be canceled
+ CHECK_SET_ERR(0 == GTUtilsTaskTreeView::getTopLevelTasksCount(os), "2: There are unfinished tasks");
+
+// 4. Click the "Overview" button again and wait till overview calculation and rendering ends
+ GTWidget::click(os, button);
+ CHECK_SET_ERR(0 != GTUtilsTaskTreeView::getTopLevelTasksCount(os), "3: There are no active tasks");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+// 5. Hide the overview
+// 6. Open the overview
+// Expected state: no task starts because nothing have been changed
+ GTWidget::click(os, button);
+ GTWidget::click(os, button);
+ CHECK_SET_ERR(0 == GTUtilsTaskTreeView::getTopLevelTasksCount(os), "4: There are unfinished tasks");
+
+// 7. Hide the overview
+ GTWidget::click(os, button);
+
+// 8. Edit the alignment
+ GTUtilsMsaEditor::removeColumn(os, 5);
+
+// 9. Open the overview
+// Expected state: overview calculation task starts
+ GTWidget::click(os, button);
+ GTGlobals::sleep(500);
+ CHECK_SET_ERR(0 != GTUtilsTaskTreeView::getTopLevelTasksCount(os), "5: There are no active tasks");
}
GUI_TEST_CLASS_DEFINITION(test_3124) {
@@ -1483,7 +1507,7 @@ GUI_TEST_CLASS_DEFINITION(test_3229){
GTUtilsWorkflowDesigner::connect(os, read, write);
// 2. Set input a single file human_T1
GTUtilsWorkflowDesigner::click(os, read);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
// 3. Set the output path: ../test.fa or ./test.fa Output file
GTUtilsWorkflowDesigner::click(os, write);
GTUtilsWorkflowDesigner::setParameter(os, "Output file", "./test.fa", GTUtilsWorkflowDesigner::textValue);
@@ -1784,7 +1808,7 @@ GUI_TEST_CLASS_DEFINITION(test_3270) {
// Expected state: there are no warnings.
warning = GTUtilsOptionPanelSequenceView::getHintText(os);
- CHECK_SET_ERR(warning.isEmpty(), QString("An unexpected warning: '%1'").arg(warning));
+ CHECK_SET_ERR(!warning.contains("Warning"), QString("An unexpected warning: '%1'").arg(warning));
// 6. Click "Create annotations" button.
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -2442,8 +2466,7 @@ GUI_TEST_CLASS_DEFINITION(test_3373) {
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter( os, "Read Sequence"));
GTMouseDriver::click();
- QString dirPath = testDir + "_common_data/fasta/";
- GTUtilsWorkflowDesigner::setDatasetInputFile( os, dirPath, "seq1.fa" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile( os, testDir + "_common_data/fasta/seq1.fa" );
GTWidget::click( os, GTAction::button(os,"Run workflow"));
@@ -3773,7 +3796,7 @@ GUI_TEST_CLASS_DEFINITION(test_3589) {
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Assembly");
CHECK_SET_ERR(read != NULL, "Added workflow element is NULL");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dirPath, "chrM.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dirPath + "chrM.sam");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -5862,9 +5885,9 @@ GUI_TEST_CLASS_DEFINITION(test_3950) {
GTGlobals::sleep();
GTUtilsWorkflowDesigner::click(os, "File List");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bwa/", "nrsf-chr21.fastq");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bwa/nrsf-chr21.fastq");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bwa/", "control-chr21.fastq");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/bwa/control-chr21.fastq");
GTUtilsWorkflowDesigner::click(os, "Align reads with BWA MEM");
GTUtilsWorkflowDesigner::setParameter(os, "Reference genome", sandBoxDir + "test_3950.fa", GTUtilsWorkflowDesigner::textValue);
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 2619671..b0383a4 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_4001_5000.cpp
index 2a230a5..fe63045 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -273,7 +273,7 @@ GUI_TEST_CLASS_DEFINITION(test_4011){
GTUtilsWorkflowDesigner::addSample(os, "Align sequences with MUSCLE");
// 3. Align attached file
GTUtilsWorkflowDesigner::click(os, "Read alignment");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/regression/4011", "human_T1.aln");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/regression/4011/human_T1.aln");
GTUtilsWorkflowDesigner::runWorkflow(os);
// Current state:
// Runtime error occured(x86 version of UGENE)
@@ -994,7 +994,7 @@ GUI_TEST_CLASS_DEFINITION(test_4104) {
//2. Set file "data/samples/Genbank/murine.gb" as input.
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/", "murine.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Genbank/murine.gb");
//3. Run the workflow.
GTUtilsWorkflowDesigner::runWorkflow(os);
@@ -1188,8 +1188,7 @@ GUI_TEST_CLASS_DEFINITION(test_4117){
GTUtilsWorkflowDesigner::addSample(os, "Quality control by FastQC");
GTUtilsWorkflowDesigner::click(os, "FASTQ File List");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/sandbox/space containing dir",
- "short_sample.fastq" );
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/sandbox/space containing dir/short_sample.fastq" );
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
GTUtilsLog::check(os, l);
@@ -1697,7 +1696,7 @@ GUI_TEST_CLASS_DEFINITION(test_4164){
GTUtilsWorkflowDesigner::addSample(os, "SnpEff");
//3. Set input file which contains spaces in path
GTUtilsWorkflowDesigner::click(os, "Input Variations File");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/sandbox/space dir", "valid.vcf");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/sandbox/space dir/valid.vcf");
//4. Run workflow
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep(5000);
@@ -2002,7 +2001,7 @@ GUI_TEST_CLASS_DEFINITION(test_4266) {
WorkflowProcessItem* read = GTUtilsWorkflowDesigner::addElement(os, "Read Sequence");
CHECK_SET_ERR( read != NULL, "Failed to add an element");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/", "Gene.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/Gene.fa");
WorkflowProcessItem* write = GTUtilsWorkflowDesigner::addElement(os, "Write Sequence");
CHECK_SET_ERR( write != NULL, "Failed to add an element");
@@ -2118,7 +2117,7 @@ GUI_TEST_CLASS_DEFINITION(test_4295) {
GTLogTracer logTracer;
GTUtilsWorkflowDesigner::addElement(os, "File List");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA", "human_T1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
GTGlobals::sleep(200);
GTUtilsWorkflowDesigner::addElement(os, "Write Plain Text");
@@ -2437,7 +2436,7 @@ GUI_TEST_CLASS_DEFINITION(test_4325) {
GTUtilsWorkflowDesigner::addSample(os, "In Silico PCR");
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Genbank/", "CVU55762.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "/samples/Genbank/CVU55762.gb");
GTUtilsWorkflowDesigner::click(os, "In Silico PCR");
GTUtilsWorkflowDesigner::setParameter(os, "Primers URL", QDir(testDir).absolutePath() + "/_common_data/cmdline/pcr/primers_CVU55762.fa", GTUtilsWorkflowDesigner::textValue);
@@ -3165,8 +3164,8 @@ GUI_TEST_CLASS_DEFINITION(test_4563) {
// 4. Set "_common_data/scenarios/_regression/4563/test_ma.fa" as the input file.
GTMouseDriver::moveTo(GTUtilsWorkflowDesigner::getItemCenter(os, "Read alignment"));
GTMouseDriver::click();
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/4563", "test_ma.fa");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/4563", "test_ma_1.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/4563/test_ma.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/scenarios/_regression/4563/test_ma_1.fa");
GTLogTracer l;
// 5. Run the workflow.
GTWidget::click(os, GTAction::button(os, "Run workflow"));
@@ -3338,7 +3337,7 @@ GUI_TEST_CLASS_DEFINITION(test_4606) {
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");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/FASTA/human_T1.fa");
WorkflowProcessItem* customWorker = GTUtilsWorkflowDesigner::getWorker(os, "Element_4606");
@@ -3850,7 +3849,7 @@ GUI_TEST_CLASS_DEFINITION(test_4710){
GTUtilsWorkflowDesigner::addSample(os, "SnpEff");
GTThread::waitForMainThread();
GTUtilsWorkflowDesigner::click(os, "Input Variations File");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf", "valid.vcf");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf/valid.vcf");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep();
@@ -3899,7 +3898,7 @@ GUI_TEST_CLASS_DEFINITION(test_4710_1){
GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
GTUtilsWorkflowDesigner::addSample(os, "Align sequences with MUSCLE");
GTUtilsWorkflowDesigner::click(os, "Read alignment");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta", "PF07724_full_family.fa");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/fasta/PF07724_full_family.fa");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTGlobals::sleep();
// Expected state: Close dashboard tab button is disabled
@@ -4390,6 +4389,65 @@ GUI_TEST_CLASS_DEFINITION(test_4764_3) {
CHECK_SET_ERR(GTUtilsMsaEditor::getSequencesCount(os) == 8, "Sequence count should be 7");
}
+GUI_TEST_CLASS_DEFINITION(test_4782) {
+// 1. Open "data/samples/genbank/murine.gb".
+ GTFileDialog::openFile(os, dataDir + "samples/genbank/murine.gb");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+// 2. Open "data/samples/Genbank/sars.gb".
+ GTFileDialog::openFile(os, dataDir + "samples/genbank/sars.gb");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+// Expected state: a Sequence View for "sars.gb" is active.
+ const QString sarsMdiTitle = "sars [s] NC_004718";
+ QString activeMdiTitle = GTUtilsMdi::activeWindowTitle(os);
+ CHECK_SET_ERR(sarsMdiTitle == activeMdiTitle, QString("An incorrect MDI is active: expected '%1', got '%2'").arg(sarsMdiTitle).arg(activeMdiTitle));
+
+// 3. Click "Build dotplot" button on the toolbar.
+// 4. Click "OK" button in the opened dialog.
+ GTUtilsDialog::waitForDialog(os, new DefaultDialogFiller(os, "DotPlotDialog"));
+ GTToolbar::clickButtonByTooltipOnToolbar(os, MWTOOLBAR_ACTIVEMDI, "Build dotplot");
+
+// Expected state: a Sequence View for "sars.gb" is active, it contains a dotplot and two sequences.
+ CHECK_SET_ERR(sarsMdiTitle == activeMdiTitle, QString("An incorrect MDI is active: expected '%1', got '%2'").arg(sarsMdiTitle).arg(activeMdiTitle));
+ int sequenceWidgetsNumber = GTUtilsSequenceView::getSeqWidgetsNumber(os);
+ CHECK_SET_ERR(2 == sequenceWidgetsNumber, QString("Expected 2 sequence widgets, got %2").arg(sequenceWidgetsNumber));
+ GTWidget::findWidget(os, "dotplot widget", GTUtilsMdi::activeWindow(os));
+
+// 5. Activate the Sequence View for "murine.gb", that was opened on the file opening.
+ const QString murineMdiTitle = "murine [s] NC_001363";
+ GTUtilsMdi::activateWindow(os, murineMdiTitle);
+ GTGlobals::sleep(500);
+
+// Expected state: active view is "murine.gb" sequence view (without dotplot).
+ activeMdiTitle = GTUtilsMdi::activeWindowTitle(os);
+
+ CHECK_SET_ERR(murineMdiTitle == activeMdiTitle, QString("An incorrect MDI is active: expected '%1', got '%2'").arg(murineMdiTitle).arg(activeMdiTitle));
+ sequenceWidgetsNumber = GTUtilsSequenceView::getSeqWidgetsNumber(os);
+ CHECK_SET_ERR(1 == sequenceWidgetsNumber, QString("Expected 1 sequence widget, got %2").arg(sequenceWidgetsNumber));
+ GTGlobals::FindOptions findOptions(false);
+ QWidget *dotplotWidget = GTWidget::findWidget(os, "dotplot widget", GTUtilsMdi::activeWindow(os), findOptions);
+ CHECK_SET_ERR(NULL == dotplotWidget, "A dotplot widget unexpectedly found");
+
+// 6. Select all documents in project. Press delete.
+ GTWidget::click(os, GTUtilsProjectTreeView::getTreeView(os));
+ GTKeyboardDriver::keyClick('a', Qt::ControlModifier);
+ GTGlobals::sleep(100);
+ GTKeyboardDriver::keyClick(Qt::Key_Delete);
+
+// Expected state: UGENE doesn't crash, all views are closed, all documents are removed from the project.
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsProject::checkProject(os, GTUtilsProject::Empty);
+
+ findOptions.matchPolicy = Qt::MatchContains;
+ QWidget *sarsMdi = GTUtilsMdi::findWindow(os, sarsMdiTitle, findOptions);
+ CHECK_SET_ERR(NULL == sarsMdi, "'sars.gb' Sequence View is not closed");
+
+ QWidget *murineMdi = GTUtilsMdi::findWindow(os, murineMdiTitle, findOptions);
+ CHECK_SET_ERR(NULL == murineMdi, "'murine.gb' Sequence View is not closed");
+}
+
GUI_TEST_CLASS_DEFINITION(test_4784_1) {
QFile::copy(testDir + "_common_data/NIAID_pipelines/Call_variants/input_data/chr6/chr6.fa", sandBoxDir + "regression_test_4784_1.fa");
@@ -5334,7 +5392,7 @@ GUI_TEST_CLASS_DEFINITION(test_4966) {
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::setDatasetInputFile(os, testDir + "_common_data/clustal/big.aln");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
// Expected state:
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 47605d1..f4c92e4 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -177,6 +177,7 @@ 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_4782)
GUI_TEST_CLASS_DECLARATION(test_4764_1)
GUI_TEST_CLASS_DECLARATION(test_4764_2)
GUI_TEST_CLASS_DECLARATION(test_4764_3)
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
index 0d3cd35..b3e71e3 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -98,10 +98,13 @@
#include "runnables/ugene/corelibs/U2View/ov_msa/GenerateAlignmentProfileDialogFiller.h"
#include "runnables/ugene/corelibs/U2View/ov_msa/LicenseAgreementDialogFiller.h"
#include "runnables/ugene/plugins/dna_export/ExportSequencesDialogFiller.h"
+#include "runnables/ugene/plugins/dotplot/DotPlotDialogFiller.h"
+#include "runnables/ugene/plugins/dotplot/BuildDotPlotDialogFiller.h"
#include "runnables/ugene/plugins/enzymes/DigestSequenceDialogFiller.h"
#include "runnables/ugene/plugins/enzymes/FindEnzymesDialogFiller.h"
#include "runnables/ugene/plugins/external_tools/FormatDBDialogFiller.h"
#include "runnables/ugene/plugins/external_tools/BlastAllSupportDialogFiller.h"
+#include "runnables/ugene/plugins/external_tools/SpadesGenomeAssemblyDialogFiller.h"
#include "runnables/ugene/plugins/pcr/ImportPrimersDialogFiller.h"
#include "runnables/ugene/plugins_3rdparty/umuscle/MuscleDialogFiller.h"
#include "runnables/ugene/ugeneui/SaveProjectDialogFiller.h"
@@ -141,23 +144,23 @@ GUI_TEST_CLASS_DEFINITION(test_5012) {
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::setDatasetInputFile(os, testDir +"_common_data/bam/scerevisiae.bam1.sam");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam2.sam");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/scerevisiae.bam2.sam");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam3.sam");
+ 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::setDatasetInputFile(os, testDir +"_common_data/genbank/pBR322.gb");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "JQ040024.1.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/JQ040024.1.gb");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+ 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);
@@ -172,17 +175,17 @@ GUI_TEST_CLASS_DEFINITION(test_5012_1) {
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::setDatasetInputFile(os, testDir +"_common_data/bam/scerevisiae.bam1.sam");
GTUtilsWorkflowDesigner::click(os, "Read Sequence");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "pBR322.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/pBR322.gb");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/", "JQ040024.1.gb");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/genbank/JQ040024.1.gb");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, dataDir + "samples/Assembly/", "chrM.fa");
+ 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);
@@ -199,14 +202,14 @@ GUI_TEST_CLASS_DEFINITION(test_5012_2) {
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::setDatasetInputFile(os, testDir +"_common_data/bam/scerevisiae.bam1.sam");
GTUtilsWorkflowDesigner::createDataset(os);
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir +"_common_data/bam/", "scerevisiae.bam2.sam");
+ 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::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);
@@ -282,7 +285,7 @@ GUI_TEST_CLASS_DEFINITION(test_5027_1) {
GTUtilsWorkflowDesigner::addSample(os, "SnpEff");
GTThread::waitForMainThread();
GTUtilsWorkflowDesigner::click(os, "Input Variations File");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf", "valid.vcf");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf/valid.vcf");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -322,7 +325,7 @@ GUI_TEST_CLASS_DEFINITION(test_5027_2) {
GTUtilsWorkflowDesigner::addSample(os, "SnpEff");
GTThread::waitForMainThread();
GTUtilsWorkflowDesigner::click(os, "Input Variations File");
- GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf", "valid.vcf");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + "_common_data/vcf/valid.vcf");
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -771,6 +774,29 @@ GUI_TEST_CLASS_DEFINITION(test_5314) {
CHECK_SET_ERR(!lt.hasError(), "Log shouldn't contain errors");
}
+GUI_TEST_CLASS_DEFINITION(test_5346) {
+ // 1. Open WD
+ // 2. Create the workflow: File List - FastQC Quality Control
+ // 3. Set empty input file
+ // Expected state: there is an error "The input file is empty"
+ GTLogTracer l;
+
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+
+ QString emptyFile = sandBoxDir + "test_5346_empty";
+ GTFile::create(os, emptyFile);
+ WorkflowProcessItem* fileList = GTUtilsWorkflowDesigner::addElement(os, "File List");
+ GTUtilsWorkflowDesigner::setDatasetInputFile(os, emptyFile);
+
+ WorkflowProcessItem* fastqc = GTUtilsWorkflowDesigner::addElement(os, "FastQC Quality Control");
+ GTUtilsWorkflowDesigner::connect(os, fileList, fastqc);
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsLog::checkContainsError(os, l, QString("The input file '%1' is empty.").arg(QFileInfo(emptyFile).absoluteFilePath()));
+}
+
GUI_TEST_CLASS_DEFINITION(test_5352) {
// 1. Open WD
// 2. Open any sample (e.g. Align with MUSCLE)
@@ -849,7 +875,7 @@ GUI_TEST_CLASS_DEFINITION(test_5360) {
GTUtilsWorkflowDesigner::click(os, "Read FASTQ Files with Reads");
GTUtilsWorkflowDesigner::setDatasetInputFile(os, testDir + QString::fromLocal8Bit("_common_data/scenarios/_regression/5360/папка/риды.fastq"), true);
-
+
GTLogTracer lt;
GTUtilsWorkflowDesigner::runWorkflow(os);
GTUtilsTaskTreeView::waitTaskFinished(os);
@@ -966,6 +992,114 @@ GUI_TEST_CLASS_DEFINITION(test_5367) {
CHECK_SET_ERR(GTFile::equals(os, sandBoxDir + "/test_5367_coverage.txt", testDir + "/_common_data/bam/accepted_hits_with_gaps_coverage.txt"), "Exported coverage is wrong!");
}
+GUI_TEST_CLASS_DEFINITION(test_5412) {
+// 1. Open "/_common_data/reads/wrong_order/align_bwa_mem.uwl"
+// 2. Set input data: e_coli_mess_1.fastq nd e_coli_mess_2.fastq (the directory from step 1)
+// 3. Reference: "/_common_data/e_coli/NC_008253.fa"
+// 4. Set requiered output parameters
+// 5. Set "Filter unpaired reads" to false
+// 6. Run workflow
+// Expected state: error - BWA MEM tool exits with code 1
+// 7. Go back to the workflow and set the filter parameter back to true
+// 8. Run the workflow
+// Expected state: there is a warning about filtered reads
+
+ GTUtilsWorkflowDesigner::openWorkflowDesigner(os);
+
+ GTUtilsWorkflowDesigner::loadWorkflow(os, testDir + "/_common_data/reads/wrong_order/align_bwa_mem.uwl");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsWorkflowDesigner::addInputFile(os, "File List 1", testDir + "/_common_data/reads/wrong_order/e_coli_mess_1.fastq");
+ GTUtilsWorkflowDesigner::addInputFile(os, "File List 2", testDir + "/_common_data/reads/wrong_order/e_coli_mess_2.fastq");
+
+ GTUtilsWorkflowDesigner::click(os, "Align Reads with BWA MEM");
+ GTUtilsWorkflowDesigner::setParameter(os, "Output directory", QDir(sandBoxDir).absolutePath(), GTUtilsWorkflowDesigner::textValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Output file name", "test_5412", GTUtilsWorkflowDesigner::textValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Reference genome", testDir + "/_common_data/e_coli/NC_008253.fa", GTUtilsWorkflowDesigner::textValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Filter unpaired reads", false, GTUtilsWorkflowDesigner::comboValue);
+
+ GTLogTracer l;
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+ GTGlobals::sleep();
+
+ CHECK_SET_ERR(l.checkMessage("exited with code 1"), "No message about failed start of BWA MEM");
+
+ GTToolbar::clickButtonByTooltipOnToolbar(os, "mwtoolbar_activemdi", "Show workflow");
+
+ GTUtilsWorkflowDesigner::click(os, "Align Reads with BWA MEM");
+ GTUtilsWorkflowDesigner::setParameter(os, "Filter unpaired reads", true, GTUtilsWorkflowDesigner::comboValue);
+ GTUtilsWorkflowDesigner::setParameter(os, "Output file name", "test_5412_1", GTUtilsWorkflowDesigner::textValue);
+
+ GTUtilsWorkflowDesigner::runWorkflow(os);
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ CHECK_SET_ERR(l.checkMessage("5 pairs are complete, 6 reads without a pair were found in files"), "No message about filtered reads");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5417) {
+ // 1. Open "data/samples/Genbank/murine.gb".
+ // 2. Open "data/samples/Genbank/srs.gb".
+ // 3. Build doplot with theese files and try to save it.
+ // Expected state: warning message ox appeared
+ GTUtilsDialog::waitForDialog(os, new DotPlotFiller(os));
+ Runnable *filler2 = new BuildDotPlotFiller(os, dataDir + "samples/Genbank/sars.gb", dataDir + "samples/Genbank/murine.gb");
+ GTUtilsDialog::waitForDialog(os, filler2);
+
+ GTMenu::clickMainMenuItem(os, QStringList() << "Tools" << "Build dotplot...");
+
+ GTLogTracer lt;
+ GTUtilsDialog::waitForDialog(os, new PopupChooser(os, QStringList() << "Dotplot" << "Save/Load" << "Save"));
+ GTUtilsDialog::waitForDialog(os, new MessageBoxDialogFiller(os, QMessageBox::Ok));
+ GTMenu::showContextMenu(os, GTWidget::findWidget(os, "dotplot widget"));
+ CHECK_SET_ERR(!lt.hasError(), "There is error in the log");
+}
+
+GUI_TEST_CLASS_DEFINITION(test_5425) {
+ //1. Open de novo assembly dialog
+ //2. Fill it and run
+ //3. Open dialog again
+ //Expected state: all settings except files with reads was saved from previous run
+ class SpadesDialogSettingsChecker : public SpadesGenomeAssemblyDialogFiller {
+ public:
+ SpadesDialogSettingsChecker(HI::GUITestOpStatus &os, QString lib, QString datasetType, QString runningMode,
+ QString kmerSizes, int numThreads, int memLimit) : SpadesGenomeAssemblyDialogFiller(os, lib, QStringList(), QStringList(), "",
+ datasetType, runningMode, kmerSizes, numThreads, memLimit) {}
+ virtual void commonScenario() {
+ QWidget* dialog = QApplication::activeModalWidget();
+ CHECK_SET_ERR(dialog, "activeModalWidget is NULL");
+
+ QComboBox* combo = GTWidget::findExactWidget<QComboBox*>(os, "modeCombo", dialog);
+ CHECK_SET_ERR(combo->currentText() == runningMode, "running mode doesn't match");
+
+ combo = GTWidget::findExactWidget<QComboBox*>(os, "typeCombo", dialog);
+ CHECK_SET_ERR(combo->currentText() == datasetType, "type mode doesn't match");
+
+ QLineEdit* lineEdit = GTWidget::findExactWidget<QLineEdit*>(os, "kmerEdit", dialog);
+ CHECK_SET_ERR(lineEdit->text() == kmerSizes, "kmer doesn't match");
+
+ QSpinBox* spinbox = GTWidget::findExactWidget<QSpinBox*>(os, "memlimitSpin", dialog);
+ CHECK_SET_ERR(spinbox->text() == QString::number(memLimit), "memlimit doesn't match");
+
+ spinbox = GTWidget::findExactWidget<QSpinBox*>(os, "numThreadsSpinbox", dialog);
+ CHECK_SET_ERR(spinbox->text() == QString::number(numThreads), "threads doesn't match");
+
+ combo = GTWidget::findExactWidget<QComboBox*>(os, "libraryComboBox", dialog);
+ CHECK_SET_ERR(combo->currentText() == library, QString("library doesn't match, expected %1, actual:%2.").arg(library).arg(combo->currentText()));
+
+ GTUtilsDialog::clickButtonBox(os, dialog, QDialogButtonBox::Cancel);
+ }
+ };
+ GTUtilsDialog::waitForDialog(os, new SpadesGenomeAssemblyDialogFiller(os, "Paired-end (Interlaced)", QStringList() << testDir + "_common_data/cmdline/external-tool-support/spades/ecoli_1K_1.fq",
+ QStringList(), sandBoxDir, "Single Cell", "Error correction only", "aaaaa", 1, 228));
+ GTMenu::clickMainMenuItem(os, QStringList() << "Tools" << "NGS data analysis" << "Genome de novo assembly...");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+
+ GTUtilsDialog::waitForDialog(os, new SpadesDialogSettingsChecker(os, "Paired-end (Interlaced)", "Single Cell", "Error correction only", "aaaaa", 1, 228));
+ GTMenu::clickMainMenuItem(os, QStringList() << "Tools" << "NGS data analysis" << "Genome de novo assembly...");
+ GTUtilsTaskTreeView::waitTaskFinished(os);
+}
+
} // 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
index 1437695..9699a77 100644
--- a/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h
+++ b/src/plugins/GUITestBase/src/tests/regression_scenarios/GTTestsRegressionScenarios_5001_6000.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -59,6 +59,9 @@ GUI_TEST_CLASS_DECLARATION(test_5227)
GUI_TEST_CLASS_DECLARATION(test_5268)
GUI_TEST_CLASS_DECLARATION(test_5278)
GUI_TEST_CLASS_DECLARATION(test_5295)
+
+GUI_TEST_CLASS_DECLARATION(test_5314)
+GUI_TEST_CLASS_DECLARATION(test_5346)
GUI_TEST_CLASS_DECLARATION(test_5352)
GUI_TEST_CLASS_DECLARATION(test_5356)
GUI_TEST_CLASS_DECLARATION(test_5360)
@@ -66,7 +69,10 @@ GUI_TEST_CLASS_DECLARATION(test_5363_1)
GUI_TEST_CLASS_DECLARATION(test_5363_2)
GUI_TEST_CLASS_DECLARATION(test_5367)
-GUI_TEST_CLASS_DECLARATION(test_5314)
+GUI_TEST_CLASS_DECLARATION(test_5412)
+
+GUI_TEST_CLASS_DECLARATION(test_5417)
+GUI_TEST_CLASS_DECLARATION(test_5425)
#undef GUI_TEST_SUITE
diff --git a/src/plugins/annotator/src/AnnotatorPlugin.cpp b/src/plugins/annotator/src/AnnotatorPlugin.cpp
index bec888a..7019548 100644
--- a/src/plugins/annotator/src/AnnotatorPlugin.cpp
+++ b/src/plugins/annotator/src/AnnotatorPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/AnnotatorPlugin.h b/src/plugins/annotator/src/AnnotatorPlugin.h
index ab20940..5a5b645 100644
--- a/src/plugins/annotator/src/AnnotatorPlugin.h
+++ b/src/plugins/annotator/src/AnnotatorPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/AnnotatorTests.cpp b/src/plugins/annotator/src/AnnotatorTests.cpp
index 37e8a69..fdd0f00 100644
--- a/src/plugins/annotator/src/AnnotatorTests.cpp
+++ b/src/plugins/annotator/src/AnnotatorTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/AnnotatorTests.h b/src/plugins/annotator/src/AnnotatorTests.h
index cfbbbe4..edca60f 100644
--- a/src/plugins/annotator/src/AnnotatorTests.h
+++ b/src/plugins/annotator/src/AnnotatorTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CollocationWorker.cpp b/src/plugins/annotator/src/CollocationWorker.cpp
index 4d04f86..6f3baf3 100644
--- a/src/plugins/annotator/src/CollocationWorker.cpp
+++ b/src/plugins/annotator/src/CollocationWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CollocationWorker.h b/src/plugins/annotator/src/CollocationWorker.h
index ffb02e1..67d3047 100644
--- a/src/plugins/annotator/src/CollocationWorker.h
+++ b/src/plugins/annotator/src/CollocationWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CollocationsDialogController.cpp b/src/plugins/annotator/src/CollocationsDialogController.cpp
index 9fd8ea7..8073988 100644
--- a/src/plugins/annotator/src/CollocationsDialogController.cpp
+++ b/src/plugins/annotator/src/CollocationsDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ CollocationsDialogController::CollocationsDialogController(QStringList _names, A
task = NULL;
qSort(allNames);
setupUi(this);
- new HelpButton(this, buttonBox, "18220513");
+ new HelpButton(this, buttonBox, "18223153");
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 c11f408..998e173 100644
--- a/src/plugins/annotator/src/CollocationsDialogController.h
+++ b/src/plugins/annotator/src/CollocationsDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CollocationsSearchAlgorithm.cpp b/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
index 67ac786..452981c 100644
--- a/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
+++ b/src/plugins/annotator/src/CollocationsSearchAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CollocationsSearchAlgorithm.h b/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
index 244f28c..a50f901 100644
--- a/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
+++ b/src/plugins/annotator/src/CollocationsSearchAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CustomAutoAnnotationDialog.cpp b/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
index 1643fe7..e9af1bf 100644
--- a/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
+++ b/src/plugins/annotator/src/CustomAutoAnnotationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,7 +43,7 @@ CustomAutoAnnotationDialog::CustomAutoAnnotationDialog(ADVSequenceObjectContext*
: QDialog(ctx->getAnnotatedDNAView()->getWidget()), seqCtx(ctx)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220592");
+ new HelpButton(this, buttonBox, "18223232");
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 2c09f2e..7f0bc8f 100644
--- a/src/plugins/annotator/src/CustomAutoAnnotationDialog.h
+++ b/src/plugins/annotator/src/CustomAutoAnnotationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CustomPatternAnnotationTask.cpp b/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
index 7323f09..351fc90 100644
--- a/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
+++ b/src/plugins/annotator/src/CustomPatternAnnotationTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/CustomPatternAnnotationTask.h b/src/plugins/annotator/src/CustomPatternAnnotationTask.h
index 65f6873..ce318fd 100644
--- a/src/plugins/annotator/src/CustomPatternAnnotationTask.h
+++ b/src/plugins/annotator/src/CustomPatternAnnotationTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/GeneByGeneReportTask.cpp b/src/plugins/annotator/src/GeneByGeneReportTask.cpp
index 269f95e..c0ab8ce 100644
--- a/src/plugins/annotator/src/GeneByGeneReportTask.cpp
+++ b/src/plugins/annotator/src/GeneByGeneReportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/GeneByGeneReportTask.h b/src/plugins/annotator/src/GeneByGeneReportTask.h
index 90373fa..70e2350 100644
--- a/src/plugins/annotator/src/GeneByGeneReportTask.h
+++ b/src/plugins/annotator/src/GeneByGeneReportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/GeneByGeneReportWorker.cpp b/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
index 744f17d..0121339 100644
--- a/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
+++ b/src/plugins/annotator/src/GeneByGeneReportWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/annotator/src/GeneByGeneReportWorker.h b/src/plugins/annotator/src/GeneByGeneReportWorker.h
index d3c4974..33759e3 100644
--- a/src/plugins/annotator/src/GeneByGeneReportWorker.h
+++ b/src/plugins/annotator/src/GeneByGeneReportWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/ApiTestsPlugin.cpp b/src/plugins/api_tests/src/ApiTestsPlugin.cpp
index 97e2763..4ca2e2a 100644
--- a/src/plugins/api_tests/src/ApiTestsPlugin.cpp
+++ b/src/plugins/api_tests/src/ApiTestsPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/ApiTestsPlugin.h b/src/plugins/api_tests/src/ApiTestsPlugin.h
index 71ace7d..1707e9c 100644
--- a/src/plugins/api_tests/src/ApiTestsPlugin.h
+++ b/src/plugins/api_tests/src/ApiTestsPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/UnitTestSuite.cpp b/src/plugins/api_tests/src/UnitTestSuite.cpp
index 5be0ac7..c7f2287 100644
--- a/src/plugins/api_tests/src/UnitTestSuite.cpp
+++ b/src/plugins/api_tests/src/UnitTestSuite.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/UnitTestSuite.h b/src/plugins/api_tests/src/UnitTestSuite.h
index 9c1e174..9555c6c 100644
--- a/src/plugins/api_tests/src/UnitTestSuite.h
+++ b/src/plugins/api_tests/src/UnitTestSuite.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
index c2d8b82..62506bb 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
index 13cf31a..e792571 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationGroupUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
index 15ed502..e8ecd2a 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
index fc2e8e1..69863dc 100644
--- a/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/annotations/AnnotationUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
index 492f4db..e783901 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
index 24e75b6..d8c9faa 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentRowUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
index 4b9d16c..fea5acd 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
index 1bc42cb..c7f2f1f 100644
--- a/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/msa/MAlignmentUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
index 7d3281d..f1b59bf 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
index 3dd82f4..c6ccbbc 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/udr/RawDataUdrSchemaUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
index 2e03228..603a5e6 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
index 3df1f2c..b328e48 100644
--- a/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
+++ b/src/plugins/api_tests/src/core/datatype/udr/UdrSchemaUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/DbiTest.cpp b/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
index d927fee..989973b 100644
--- a/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
+++ b/src/plugins/api_tests/src/core/dbi/DbiTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/assembly/AssemblyDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/assembly/AssemblyDbiUnitTests.cpp
index d80b81b..95fc845 100644
--- a/src/plugins/api_tests/src/core/dbi/assembly/AssemblyDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/assembly/AssemblyDbiUnitTests.cpp
@@ -555,10 +555,10 @@ void AssemblyDbiUnitTests_calculateCoverage::Test() {
const U2DataId& id = AssemblyTestData::getAssemblyIds()->first();
const U2Region& region = U2Region(20, 1);
U2AssemblyCoverageStat c;
- c.coverage->resize(1);
+ c.resize(1);
assemblyDbi->calculateCoverage(id, region, c, os);
CHECK_NO_ERROR(os);
- int res = c.coverage->first().maxValue;
+ int res = c.first();
CHECK_TRUE(res == 1, "incorrect calculate Coverage");
}
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 a4638ac..33830cf 100644
--- a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -747,7 +747,7 @@ 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);
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 20b1057..bd587fe 100644
--- a/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/features/FeatureDbiUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
index 55bce99..91c3ed2 100644
--- a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
index 470533c..57c36de 100644
--- a/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/msa/MsaDbiUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
index 5eaaf81..2d6c169 100644
--- a/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/sequence/SequenceDbiUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
index 9605c53..6c6114e 100644
--- a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
index 22c47cb..cc6c808 100644
--- a/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
+++ b/src/plugins/api_tests/src/core/dbi/udr/UdrDbiUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 a14e274..a9b8401 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 c0f823f..97a6e53 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 3f374d0..f0f17dd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 8f4970f..ade3abc 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 8a06cb9..ad549d8 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/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 9eda6dc..55b4381 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/fastq/FastqUnitTests.cpp b/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
index 0cd0375..1151155 100644
--- a/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/fastq/FastqUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp b/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
index f129f0d..294958c 100644
--- a/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/format/genbank/LocationParserUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.cpp
index 74963ec..15db21b 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_mod_dbi/ModDbiSQLiteSpecificUnitTests.h
index 4a6e98d..fd30073 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.cpp
index 989199f..6cb4aa4 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_msa_dbi/MsaDbiSQLiteSpecificUnitTests.h
index 09bb93d..05f7991 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.cpp
index 097bc55..9c6931e 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_object_dbi/SQLiteObjectDbiUnitTests.h
index 7cf5918..99a90fd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.cpp
index 6ffd906..d023566 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h b/src/plugins/api_tests/src/core/format/sqlite_sequence_dbi/SequenceDbiSQLiteSpecificUnitTests.h
index 3cd692e..0b76236 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
index ffad247..399d100 100644
--- a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
index a9770d7..4fd7484 100644
--- a/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/BioStruct3DObjectUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
index 3823ebd..84192de 100644
--- a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
index b5564db..40939c4 100644
--- a/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/DNAChromatogramObjectUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
index b98182a..c72c8a9 100644
--- a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
index 004bb70..42e7b48 100644
--- a/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
+++ b/src/plugins/api_tests/src/core/gobjects/FeaturesTableObjectUnitTest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
index f6d94d8..51390af 100644
--- a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
index 0e5c8e6..4c1168a 100644
--- a/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/MAlignmentObjectUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
index f716bb7..2bc715c 100644
--- a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
index dcdbddf..15a0882 100644
--- a/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/PhyTreeObjectUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/TextObjectUnitTests.cpp b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
index 575a839..b52b67a 100644
--- a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/gobjects/TextObjectUnitTests.h b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
index 1ad14c6..70a188a 100644
--- a/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
+++ b/src/plugins/api_tests/src/core/gobjects/TextObjectUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
index cf8fb9e..b81b5e5 100644
--- a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
+++ b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
index 8c0af3d..295fdd0 100644
--- a/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
+++ b/src/plugins/api_tests/src/core/util/DatatypeSerializeUtilsUnitTest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
index fb4a90b..23d123a 100644
--- a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
index 330f91b..fdd6d86 100644
--- a/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MAlignmentImporterExporterUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
index 7c7ca21..8510a13 100644
--- a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MsaDbiUtilsUnitTests.h b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
index c217ea2..9380350 100644
--- a/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MsaDbiUtilsUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MsaUtilsUnitTests.cpp b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
index 46439f6..9215c2c 100644
--- a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
+++ b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/api_tests/src/core/util/MsaUtilsUnitTests.h b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
index 0935ba0..690a8ef 100644
--- a/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
+++ b/src/plugins/api_tests/src/core/util/MsaUtilsUnitTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/AnaglyphRenderer.cpp b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
index 3f2d367..e8ec561 100644
--- a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/AnaglyphRenderer.h b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
index 244be50..f911452 100644
--- a/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
+++ b/src/plugins/biostruct3d_view/src/AnaglyphRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BallAndStickGLRenderer.cpp b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
index bfc97b1..b2a1a8f 100644
--- a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BallAndStickGLRenderer.h b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
index cf287db..4e3166c 100644
--- a/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/BallAndStickGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DColorScheme.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
index 7763d6c..2d28894 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DColorScheme.h b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
index b25052e..133b428 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DColorScheme.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
index 34af57a..0af9189 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLImageExportTask.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
index 142d123..cab7845 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLRender.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
index 9cc2197..db94bfd 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLRender.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
index a746b61..d5246b4 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLRender.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLWidget.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
index 07ff2a6..65340fe 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DGLWidget.h b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
index fedc2f5..8fff5e1 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DGLWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DSplitter.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
index ea5c39b..eb47aa0 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DSplitter.h b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
index 2c73c5c..19c0eb8 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSplitter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
index 9b683ce..b98ef5e 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DSubsetEditor.h b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
index 9050906..e34c49b 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DSubsetEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DViewPlugin.cpp b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
index b93402d..2432190 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/BioStruct3DViewPlugin.h b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
index 9354891..9d72daa 100644
--- a/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
+++ b/src/plugins/biostruct3d_view/src/BioStruct3DViewPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/GLFrameManager.cpp b/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
index 0715dd4..7fa61a2 100644
--- a/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
+++ b/src/plugins/biostruct3d_view/src/GLFrameManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/GLFrameManager.h b/src/plugins/biostruct3d_view/src/GLFrameManager.h
index f7aca6e..175f3ef 100644
--- a/src/plugins/biostruct3d_view/src/GLFrameManager.h
+++ b/src/plugins/biostruct3d_view/src/GLFrameManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/GraphicUtils.cpp b/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
index c347653..901d57c 100644
--- a/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
+++ b/src/plugins/biostruct3d_view/src/GraphicUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/GraphicUtils.h b/src/plugins/biostruct3d_view/src/GraphicUtils.h
index b3eb8e5..beaf9fa 100644
--- a/src/plugins/biostruct3d_view/src/GraphicUtils.h
+++ b/src/plugins/biostruct3d_view/src/GraphicUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/MolecularSurfaceRenderer.cpp b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
index 73d62a6..122dc45 100644
--- a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/MolecularSurfaceRenderer.h b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
index d5fbc0f..72817e6 100644
--- a/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
+++ b/src/plugins/biostruct3d_view/src/MolecularSurfaceRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/SelectModelsDialog.cpp b/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
index 9116773..12a77d7 100644
--- a/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/SelectModelsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@ SelectModelsDialog::SelectModelsDialog(const QList<int> &_modelIds, const QList<
: QDialog(parent), Ui_SelectModelsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220384");
+ new HelpButton(this, buttonBox, "18223024");
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 1065b20..3b70731 100644
--- a/src/plugins/biostruct3d_view/src/SelectModelsDialog.h
+++ b/src/plugins/biostruct3d_view/src/SelectModelsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/SettingsDialog.cpp b/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
index d83a474..424492b 100644
--- a/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/SettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ BioStruct3DSettingsDialog::BioStruct3DSettingsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220381");
+ new HelpButton(this, buttonBox, "18223021");
glWidget = NULL;
initColorSchemes();
diff --git a/src/plugins/biostruct3d_view/src/SettingsDialog.h b/src/plugins/biostruct3d_view/src/SettingsDialog.h
index 348f947..2147518 100644
--- a/src/plugins/biostruct3d_view/src/SettingsDialog.h
+++ b/src/plugins/biostruct3d_view/src/SettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/StructuralAlignmentDialog.cpp b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
index 1aed531..bb7fdaf 100644
--- a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -20,6 +20,7 @@
*/
#include <QMessageBox>
+#include <QPushButton>
#include <U2Algorithm/StructuralAlignmentAlgorithm.h>
#include <U2Algorithm/StructuralAlignmentAlgorithmFactory.h>
@@ -56,7 +57,10 @@ StructuralAlignmentDialog::StructuralAlignmentDialog(const BioStruct3DObject *fi
: QDialog(parent), task(0)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220387");
+ new HelpButton(this, buttonBox, "18223027");
+ buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+ buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+
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 4931dc4..38b8adf 100644
--- a/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h
+++ b/src/plugins/biostruct3d_view/src/StructuralAlignmentDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/TubeGLRenderer.cpp b/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
index 1ad29fa..47a22a3 100644
--- a/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/TubeGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/TubeGLRenderer.h b/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
index 57d4f2c..dc8ce68 100644
--- a/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/TubeGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
index fa07c0b..753dc20 100644
--- a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/VanDerWaalsGLRenderer.h b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
index 1bd9192..5208d6b 100644
--- a/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/VanDerWaalsGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/WormsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
index b50df49..000994a 100644
--- a/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/WormsGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/WormsGLRenderer.h b/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
index 8d60be2..58f40e9 100644
--- a/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/WormsGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp
index 3f2d367..e8ec561 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/AnaglyphRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h
index 729dc28..e0c4e05 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/AnaglyphRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp
index 7343417..46bc91b 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h
index 6453ac3..c3c6136 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BallAndStickGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp
index ffcd187..647f842 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h
index b25052e..133b428 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DColorScheme.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp
index c83a6fc..2847477 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h
index 142d123..cab7845 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp
index 9cc2197..db94bfd 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h
index a746b61..d5246b4 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLRender.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp
index 3fb71cb..138e03f 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h
index c346756..771f31d 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DGLWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp
index ea5c39b..eb47aa0 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h
index 2c73c5c..19c0eb8 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSplitter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp
index 9b683ce..b98ef5e 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h
index 9050906..e34c49b 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DSubsetEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp
index b93402d..2432190 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h
index 9354891..9d72daa 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/BioStruct3DViewPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/GLFrameManager.cpp b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp
index ab717f1..13544b3 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/GLFrameManager.h b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h
index 54ce3d4..4d20c31 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/GLFrameManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/GraphicUtils.cpp b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp
index 2de0ba2..b9a2a77 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/GraphicUtils.h b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h
index 8c27860..dae2c9a 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/GraphicUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp
index a49d539..6963905 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h
index d5fbc0f..72817e6 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/MolecularSurfaceRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp
index 9116773..12a77d7 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@ SelectModelsDialog::SelectModelsDialog(const QList<int> &_modelIds, const QList<
: QDialog(parent), Ui_SelectModelsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220384");
+ new HelpButton(this, buttonBox, "18223024");
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/deprecated/SelectModelsDialog.h b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h
index 1065b20..3b70731 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/SelectModelsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/SettingsDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp
index d83a474..424492b 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ BioStruct3DSettingsDialog::BioStruct3DSettingsDialog()
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220381");
+ new HelpButton(this, buttonBox, "18223021");
glWidget = NULL;
initColorSchemes();
diff --git a/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h
index 348f947..2147518 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/SettingsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp
index 1aed531..b9beb83 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -56,7 +56,7 @@ StructuralAlignmentDialog::StructuralAlignmentDialog(const BioStruct3DObject *fi
: QDialog(parent), task(0)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220387");
+ new HelpButton(this, buttonBox, "18223027");
StructuralAlignmentAlgorithmRegistry *reg = AppContext::getStructuralAlignmentAlgorithmRegistry();
foreach (const QString &id, reg->getFactoriesIds()) {
diff --git a/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h
index 4931dc4..38b8adf 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/StructuralAlignmentDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp
index c0239f4..7db9596 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/TubeGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h
index 57d4f2c..dc8ce68 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/TubeGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp
index b34680c..6f26072 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h
index f257784..d91ec7f 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/VanDerWaalsGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp
index fa1545c..46a7ce0 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp
+++ b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/src/deprecated/WormsGLRenderer.h b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h
index 8d60be2..58f40e9 100644
--- a/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h
+++ b/src/plugins/biostruct3d_view/src/deprecated/WormsGLRenderer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/biostruct3d_view/transl/english.ts b/src/plugins/biostruct3d_view/transl/english.ts
index d97b32d..d6192fe 100644
--- a/src/plugins/biostruct3d_view/transl/english.ts
+++ b/src/plugins/biostruct3d_view/transl/english.ts
@@ -488,4 +488,17 @@ You may try to upgrade your system by updating the video card driver.</source>
<translation>Add</translation>
</message>
</context>
+<context>
+ <name>U2::StructuralAlignmentDialog</name>
+ <message>
+ <location filename="../src/StructuralAlignmentDialog.cpp" line="61"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/StructuralAlignmentDialog.cpp" line="62"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+</context>
</TS>
diff --git a/src/plugins/biostruct3d_view/transl/russian.ts b/src/plugins/biostruct3d_view/transl/russian.ts
index 6494e69..81b52e2 100644
--- a/src/plugins/biostruct3d_view/transl/russian.ts
+++ b/src/plugins/biostruct3d_view/transl/russian.ts
@@ -488,4 +488,17 @@ You may try to upgrade your system by updating the video card driver.</source>
<translation>Добавить</translation>
</message>
</context>
+<context>
+ <name>U2::StructuralAlignmentDialog</name>
+ <message>
+ <location filename="../src/StructuralAlignmentDialog.cpp" line="61"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/StructuralAlignmentDialog.cpp" line="62"/>
+ <source>OK</source>
+ <translation>ОК</translation>
+ </message>
+</context>
</TS>
diff --git a/src/plugins/browser_support/src/BrowserSupportPlugin.cpp b/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
index 02c2212..67af14a 100644
--- a/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
+++ b/src/plugins/browser_support/src/BrowserSupportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/browser_support/src/BrowserSupportPlugin.h b/src/plugins/browser_support/src/BrowserSupportPlugin.h
index 9ffc99d..8268900 100644
--- a/src/plugins/browser_support/src/BrowserSupportPlugin.h
+++ b/src/plugins/browser_support/src/BrowserSupportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/chroma_view/src/ChromaViewPlugin.cpp b/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
index e0a34e7..08caa1d 100644
--- a/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
+++ b/src/plugins/chroma_view/src/ChromaViewPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/chroma_view/src/ChromaViewPlugin.h b/src/plugins/chroma_view/src/ChromaViewPlugin.h
index bed3230..a0d54a0 100644
--- a/src/plugins/chroma_view/src/ChromaViewPlugin.h
+++ b/src/plugins/chroma_view/src/ChromaViewPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/chroma_view/src/ChromatogramView.cpp b/src/plugins/chroma_view/src/ChromatogramView.cpp
index 8e0199e..ced810e 100644
--- a/src/plugins/chroma_view/src/ChromatogramView.cpp
+++ b/src/plugins/chroma_view/src/ChromatogramView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/chroma_view/src/ChromatogramView.h b/src/plugins/chroma_view/src/ChromatogramView.h
index 9467b1e..d1888ac 100644
--- a/src/plugins/chroma_view/src/ChromatogramView.h
+++ b/src/plugins/chroma_view/src/ChromatogramView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularItems.cpp b/src/plugins/circular_view/src/CircularItems.cpp
index 476a6a2..3b2bfac 100644
--- a/src/plugins/circular_view/src/CircularItems.cpp
+++ b/src/plugins/circular_view/src/CircularItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularItems.h b/src/plugins/circular_view/src/CircularItems.h
index 3e97bce..088c79a 100644
--- a/src/plugins/circular_view/src/CircularItems.h
+++ b/src/plugins/circular_view/src/CircularItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularView.cpp b/src/plugins/circular_view/src/CircularView.cpp
index 6c9845c..2ce38b9 100644
--- a/src/plugins/circular_view/src/CircularView.cpp
+++ b/src/plugins/circular_view/src/CircularView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularView.h b/src/plugins/circular_view/src/CircularView.h
index 9593bd5..7789efd 100644
--- a/src/plugins/circular_view/src/CircularView.h
+++ b/src/plugins/circular_view/src/CircularView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewImageExportTask.cpp b/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
index ed830c9..d6a178c 100644
--- a/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
+++ b/src/plugins/circular_view/src/CircularViewImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewImageExportTask.h b/src/plugins/circular_view/src/CircularViewImageExportTask.h
index c59d75c..935f528 100644
--- a/src/plugins/circular_view/src/CircularViewImageExportTask.h
+++ b/src/plugins/circular_view/src/CircularViewImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewPlugin.cpp b/src/plugins/circular_view/src/CircularViewPlugin.cpp
index 72a86e8..43675d6 100644
--- a/src/plugins/circular_view/src/CircularViewPlugin.cpp
+++ b/src/plugins/circular_view/src/CircularViewPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewPlugin.h b/src/plugins/circular_view/src/CircularViewPlugin.h
index f8e7b85..0372ee9 100644
--- a/src/plugins/circular_view/src/CircularViewPlugin.h
+++ b/src/plugins/circular_view/src/CircularViewPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewSettingsWidget.cpp b/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
index 3c94556..a18d99f 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -102,6 +102,25 @@ void CircularViewSettingsWidget::initLayout() {
rulerFontSizeSpinBox->setValue(settings->rulerFontSize);
labelFontSizeSpinBox->setValue(settings->labelFontSize);
+ titleCheckBox->setChecked(settings->showTitle);
+ lengthCheckBox->setChecked(settings->showLength);
+ rulerLineCheckBox->setChecked(settings->showRulerLine);
+ rulerCoordsCheckBox->setChecked(settings->showRulerCoordinates);
+ boldButton->setChecked(settings->titleBold);
+
+ switch (settings->labelMode) {
+ case CircularViewSettings::Inside:
+ labelPositionComboBox->setCurrentText(tr("Inside"));
+ case CircularViewSettings::Outside:
+ labelPositionComboBox->setCurrentText(tr("Outside"));
+ case CircularViewSettings::None:
+ labelPositionComboBox->setCurrentText(tr("None"));
+ break;
+ default:
+ labelPositionComboBox->setCurrentText(tr("Inside/Outside"));
+
+ }
+
settingsWidget = new QWidget(this);
QVBoxLayout* settingsLayout = new QVBoxLayout(settingsWidget);
settingsLayout->setMargin(0);
diff --git a/src/plugins/circular_view/src/CircularViewSettingsWidget.h b/src/plugins/circular_view/src/CircularViewSettingsWidget.h
index 81ec0b0..5d85df8 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidget.h
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewSettingsWidgetFactory.cpp b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
index 257a4f3..9fe9f27 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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 = "18220372";
+const QString CircularViewSettingsWidgetFactory::GROUP_DOC_PAGE = "18223012";
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 f8b97b3..3c89409 100644
--- a/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h
+++ b/src/plugins/circular_view/src/CircularViewSettingsWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewSplitter.cpp b/src/plugins/circular_view/src/CircularViewSplitter.cpp
index c75f656..2cec7b9 100644
--- a/src/plugins/circular_view/src/CircularViewSplitter.cpp
+++ b/src/plugins/circular_view/src/CircularViewSplitter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/CircularViewSplitter.h b/src/plugins/circular_view/src/CircularViewSplitter.h
index 474d28f..22884e4 100644
--- a/src/plugins/circular_view/src/CircularViewSplitter.h
+++ b/src/plugins/circular_view/src/CircularViewSplitter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/RestrictionMapWidget.cpp b/src/plugins/circular_view/src/RestrictionMapWidget.cpp
index fe662e5..485af2f 100644
--- a/src/plugins/circular_view/src/RestrictionMapWidget.cpp
+++ b/src/plugins/circular_view/src/RestrictionMapWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/RestrictionMapWidget.h b/src/plugins/circular_view/src/RestrictionMapWidget.h
index 9508c5b..c9f7ae4 100644
--- a/src/plugins/circular_view/src/RestrictionMapWidget.h
+++ b/src/plugins/circular_view/src/RestrictionMapWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/SetSequenceOriginDialog.cpp b/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
index ddfda13..34df13a 100644
--- a/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
+++ b/src/plugins/circular_view/src/SetSequenceOriginDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/SetSequenceOriginDialog.h b/src/plugins/circular_view/src/SetSequenceOriginDialog.h
index c6950f4..0702753 100644
--- a/src/plugins/circular_view/src/SetSequenceOriginDialog.h
+++ b/src/plugins/circular_view/src/SetSequenceOriginDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/ShiftSequenceStartTask.cpp b/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
index f26c123..07764d2 100644
--- a/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
+++ b/src/plugins/circular_view/src/ShiftSequenceStartTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/src/ShiftSequenceStartTask.h b/src/plugins/circular_view/src/ShiftSequenceStartTask.h
index ff93a87..4075ec0 100644
--- a/src/plugins/circular_view/src/ShiftSequenceStartTask.h
+++ b/src/plugins/circular_view/src/ShiftSequenceStartTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/circular_view/transl/english.ts b/src/plugins/circular_view/transl/english.ts
index 1a49580..c01323b 100644
--- a/src/plugins/circular_view/transl/english.ts
+++ b/src/plugins/circular_view/transl/english.ts
@@ -264,36 +264,40 @@
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="65"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="113"/>
<source>Inside</source>
<translation>Inside</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="68"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="115"/>
<source>Outside</source>
<translation>Outside</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="71"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="120"/>
<source>Inside/Outside</source>
<translation>Inside/Outside</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="74"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="117"/>
<source>None</source>
<translation>None</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="111"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="130"/>
<source>Title</source>
<translation>Title</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="114"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="133"/>
<source>Ruler</source>
<translation>Ruler</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="117"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="136"/>
<source>Annotations</source>
<translation>Annotations</translation>
</message>
diff --git a/src/plugins/circular_view/transl/russian.ts b/src/plugins/circular_view/transl/russian.ts
index bfa1622..7f74be6 100644
--- a/src/plugins/circular_view/transl/russian.ts
+++ b/src/plugins/circular_view/transl/russian.ts
@@ -264,36 +264,40 @@
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="65"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="113"/>
<source>Inside</source>
<translation>Внутри</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="68"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="115"/>
<source>Outside</source>
<translation>Снаружи</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="71"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="120"/>
<source>Inside/Outside</source>
<translation>Внутри/Снаружи</translation>
</message>
<message>
<location filename="../src/CircularViewSettingsWidget.cpp" line="74"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="117"/>
<source>None</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="111"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="130"/>
<source>Title</source>
<translation>Название</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="114"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="133"/>
<source>Ruler</source>
<translation>Шкала</translation>
</message>
<message>
- <location filename="../src/CircularViewSettingsWidget.cpp" line="117"/>
+ <location filename="../src/CircularViewSettingsWidget.cpp" line="136"/>
<source>Annotations</source>
<translation>Аннотации</translation>
</message>
diff --git a/src/plugins/cuda_support/src/CudaSupportPlugin.cpp b/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
index 640cb8e..a04b94b 100644
--- a/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
+++ b/src/plugins/cuda_support/src/CudaSupportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cuda_support/src/CudaSupportPlugin.h b/src/plugins/cuda_support/src/CudaSupportPlugin.h
index aa8ad08..ccb0f9a 100644
--- a/src/plugins/cuda_support/src/CudaSupportPlugin.h
+++ b/src/plugins/cuda_support/src/CudaSupportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cuda_support/src/CudaSupportSettingsController.cpp b/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
index 41e0028..1ffcb4e 100644
--- a/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
+++ b/src/plugins/cuda_support/src/CudaSupportSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cuda_support/src/CudaSupportSettingsController.h b/src/plugins/cuda_support/src/CudaSupportSettingsController.h
index 293f0fe..38781e6 100644
--- a/src/plugins/cuda_support/src/CudaSupportSettingsController.h
+++ b/src/plugins/cuda_support/src/CudaSupportSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Alignment.cpp b/src/plugins/dbi_bam/src/Alignment.cpp
index d04cff4..75d82df 100644
--- a/src/plugins/dbi_bam/src/Alignment.cpp
+++ b/src/plugins/dbi_bam/src/Alignment.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Alignment.h b/src/plugins/dbi_bam/src/Alignment.h
index 03942fc..1c3f85f 100644
--- a/src/plugins/dbi_bam/src/Alignment.h
+++ b/src/plugins/dbi_bam/src/Alignment.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BAMDbiPlugin.cpp b/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
index 0e8a918..1498d38 100644
--- a/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
+++ b/src/plugins/dbi_bam/src/BAMDbiPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -132,8 +132,7 @@ BAMImporterTask::BAMImporterTask(const GUrl& url, bool _useGui, const QVariantMa
useGui(_useGui),
sam(hints.value(SAM_HINT, false).toBool()),
hints(hints),
- hintedDbiRef(hints.value(DocumentFormat::DBI_REF_HINT).value<U2DbiRef>()),
- destUrl(NULL)
+ hintedDbiRef(hints.value(DocumentFormat::DBI_REF_HINT).value<U2DbiRef>())
{
documentDescription = url.fileName();
loadInfoTask = new LoadInfoTask( url, sam );
diff --git a/src/plugins/dbi_bam/src/BAMDbiPlugin.h b/src/plugins/dbi_bam/src/BAMDbiPlugin.h
index d7787e5..6d668e4 100644
--- a/src/plugins/dbi_bam/src/BAMDbiPlugin.h
+++ b/src/plugins/dbi_bam/src/BAMDbiPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -89,7 +89,6 @@ private:
QVariantMap hints;
U2DbiRef hintedDbiRef;
U2DbiRef localDbiRef;
- GUrl destUrl;
time_t startTime;
};
diff --git a/src/plugins/dbi_bam/src/BAMFormat.cpp b/src/plugins/dbi_bam/src/BAMFormat.cpp
index 54c5cd1..fb19d1a 100644
--- a/src/plugins/dbi_bam/src/BAMFormat.cpp
+++ b/src/plugins/dbi_bam/src/BAMFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BAMFormat.h b/src/plugins/dbi_bam/src/BAMFormat.h
index 41419d4..baed800 100644
--- a/src/plugins/dbi_bam/src/BAMFormat.h
+++ b/src/plugins/dbi_bam/src/BAMFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BaiReader.cpp b/src/plugins/dbi_bam/src/BaiReader.cpp
index ed6693f..eac26b4 100644
--- a/src/plugins/dbi_bam/src/BaiReader.cpp
+++ b/src/plugins/dbi_bam/src/BaiReader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BaiReader.h b/src/plugins/dbi_bam/src/BaiReader.h
index 672bf2d..a5e7338 100644
--- a/src/plugins/dbi_bam/src/BaiReader.h
+++ b/src/plugins/dbi_bam/src/BaiReader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BaiWriter.cpp b/src/plugins/dbi_bam/src/BaiWriter.cpp
index d4666bc..a8d50f8 100644
--- a/src/plugins/dbi_bam/src/BaiWriter.cpp
+++ b/src/plugins/dbi_bam/src/BaiWriter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BaiWriter.h b/src/plugins/dbi_bam/src/BaiWriter.h
index 0966507..529bad6 100644
--- a/src/plugins/dbi_bam/src/BaiWriter.h
+++ b/src/plugins/dbi_bam/src/BaiWriter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BgzfReader.cpp b/src/plugins/dbi_bam/src/BgzfReader.cpp
index 5fec7e1..8f02856 100644
--- a/src/plugins/dbi_bam/src/BgzfReader.cpp
+++ b/src/plugins/dbi_bam/src/BgzfReader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BgzfReader.h b/src/plugins/dbi_bam/src/BgzfReader.h
index 80228ef..9a6a35b 100644
--- a/src/plugins/dbi_bam/src/BgzfReader.h
+++ b/src/plugins/dbi_bam/src/BgzfReader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BgzfWriter.cpp b/src/plugins/dbi_bam/src/BgzfWriter.cpp
index d9b2012..cb7637a 100644
--- a/src/plugins/dbi_bam/src/BgzfWriter.cpp
+++ b/src/plugins/dbi_bam/src/BgzfWriter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/BgzfWriter.h b/src/plugins/dbi_bam/src/BgzfWriter.h
index 79fd619..d730b11 100644
--- a/src/plugins/dbi_bam/src/BgzfWriter.h
+++ b/src/plugins/dbi_bam/src/BgzfWriter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/CancelledException.cpp b/src/plugins/dbi_bam/src/CancelledException.cpp
index 0b766c0..a3e29b0 100644
--- a/src/plugins/dbi_bam/src/CancelledException.cpp
+++ b/src/plugins/dbi_bam/src/CancelledException.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/CancelledException.h b/src/plugins/dbi_bam/src/CancelledException.h
index bde165b..d406606 100644
--- a/src/plugins/dbi_bam/src/CancelledException.h
+++ b/src/plugins/dbi_bam/src/CancelledException.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/ConvertToSQLiteDialog.cpp b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
index 1111277..d42992e 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ ConvertToSQLiteDialog::ConvertToSQLiteDialog(const GUrl& _sourceUrl, BAMInfo& _b
sourceUrl(_sourceUrl),
bamInfo(_bamInfo) {
ui.setupUi(this);
- new HelpButton(this, ui.buttonBox, "18220460");
+ new HelpButton(this, ui.buttonBox, "18223100");
ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Import"));
ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
index b2cec24..9ee68fa 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/ConvertToSQLiteTask.cpp b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
index c7ed996..9239ac6 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@ static void enableCoverageOnImport(U2AssemblyCoverageImportInfo &cii, int refere
cii.computeCoverage = true;
int coverageInfoSize = qMin(U2AssemblyUtils::MAX_COVERAGE_VECTOR_SIZE, referenceLength);
cii.coverageBasesPerPoint = qMax(1.0, ((double)referenceLength)/coverageInfoSize);
- cii.coverage.coverage->resize(coverageInfoSize);
+ cii.coverage.resize(coverageInfoSize);
}
namespace {
@@ -616,8 +616,7 @@ qint64 ConvertToSQLiteTask::importMappedSortedReads(BamReader *bamReader, Reader
.arg(references.size()));
U2AssemblyReadsImportInfo &importInfo = importInfos[referenceId];
- //workaround for UGENE-5366, uncomment after fixing coverage on import
- //enableCoverageOnImport(importInfo.coverageInfo, references[referenceId].getLength());
+ enableCoverageOnImport(importInfo.coverageInfo, references[referenceId].getLength());
QScopedPointer<DbiIterator> dbiIterator;
if(bamInfo.hasIndex()) {
@@ -885,7 +884,7 @@ void ConvertToSQLiteTask::updateImportInfoReadsCountAttribute(const U2AssemblyRe
void ConvertToSQLiteTask::updateImportInfoCoverageStatAttribute(const U2AssemblyReadsImportInfo &importInfo, const U2Assembly &assembly, U2AttributeDbi *attributeDbi) {
const U2AssemblyCoverageStat &coverageStat = importInfo.coverageInfo.coverage;
- CHECK(!coverageStat.coverage->isEmpty(), );
+ CHECK(!coverageStat.isEmpty(), );
U2ByteArrayAttribute attribute;
attribute.objectId = assembly.id;
diff --git a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
index c32f74f..742e59d 100644
--- a/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
+++ b/src/plugins/dbi_bam/src/ConvertToSQLiteTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Dbi.cpp b/src/plugins/dbi_bam/src/Dbi.cpp
index 47b71c6..46e1e4c 100644
--- a/src/plugins/dbi_bam/src/Dbi.cpp
+++ b/src/plugins/dbi_bam/src/Dbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Dbi.h b/src/plugins/dbi_bam/src/Dbi.h
index a545bf1..3b8267d 100644
--- a/src/plugins/dbi_bam/src/Dbi.h
+++ b/src/plugins/dbi_bam/src/Dbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Exception.cpp b/src/plugins/dbi_bam/src/Exception.cpp
index 09d927d..dd14f44 100644
--- a/src/plugins/dbi_bam/src/Exception.cpp
+++ b/src/plugins/dbi_bam/src/Exception.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Exception.h b/src/plugins/dbi_bam/src/Exception.h
index 0a01b37..a6a520e 100644
--- a/src/plugins/dbi_bam/src/Exception.h
+++ b/src/plugins/dbi_bam/src/Exception.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Header.cpp b/src/plugins/dbi_bam/src/Header.cpp
index 4b3f681..29c1f76 100644
--- a/src/plugins/dbi_bam/src/Header.cpp
+++ b/src/plugins/dbi_bam/src/Header.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Header.h b/src/plugins/dbi_bam/src/Header.h
index b610495..2a4fbed 100644
--- a/src/plugins/dbi_bam/src/Header.h
+++ b/src/plugins/dbi_bam/src/Header.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/IOException.cpp b/src/plugins/dbi_bam/src/IOException.cpp
index a856273..5854168 100644
--- a/src/plugins/dbi_bam/src/IOException.cpp
+++ b/src/plugins/dbi_bam/src/IOException.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/IOException.h b/src/plugins/dbi_bam/src/IOException.h
index 79944f9..5275fe7 100644
--- a/src/plugins/dbi_bam/src/IOException.h
+++ b/src/plugins/dbi_bam/src/IOException.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Index.cpp b/src/plugins/dbi_bam/src/Index.cpp
index 8468f5f..cb78134 100644
--- a/src/plugins/dbi_bam/src/Index.cpp
+++ b/src/plugins/dbi_bam/src/Index.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Index.h b/src/plugins/dbi_bam/src/Index.h
index 1acc06f..8a2d543 100644
--- a/src/plugins/dbi_bam/src/Index.h
+++ b/src/plugins/dbi_bam/src/Index.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/InvalidFormatException.cpp b/src/plugins/dbi_bam/src/InvalidFormatException.cpp
index 8cce84a..fc0548e 100644
--- a/src/plugins/dbi_bam/src/InvalidFormatException.cpp
+++ b/src/plugins/dbi_bam/src/InvalidFormatException.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/InvalidFormatException.h b/src/plugins/dbi_bam/src/InvalidFormatException.h
index 622c06c..8bf8909 100644
--- a/src/plugins/dbi_bam/src/InvalidFormatException.h
+++ b/src/plugins/dbi_bam/src/InvalidFormatException.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/LoadBamInfoTask.cpp b/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
index 044da6e..6b71c36 100644
--- a/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
+++ b/src/plugins/dbi_bam/src/LoadBamInfoTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dbi_bam/src/LoadBamInfoTask.h b/src/plugins/dbi_bam/src/LoadBamInfoTask.h
index f8f2f8b..6875ba9 100644
--- a/src/plugins/dbi_bam/src/LoadBamInfoTask.h
+++ b/src/plugins/dbi_bam/src/LoadBamInfoTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dbi_bam/src/PrepareToImportTask.cpp b/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
index a89d99e..6f604cc 100644
--- a/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
+++ b/src/plugins/dbi_bam/src/PrepareToImportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/PrepareToImportTask.h b/src/plugins/dbi_bam/src/PrepareToImportTask.h
index d531096..a2b6bc2 100644
--- a/src/plugins/dbi_bam/src/PrepareToImportTask.h
+++ b/src/plugins/dbi_bam/src/PrepareToImportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Reader.cpp b/src/plugins/dbi_bam/src/Reader.cpp
index 625abd1..4cbda5c 100644
--- a/src/plugins/dbi_bam/src/Reader.cpp
+++ b/src/plugins/dbi_bam/src/Reader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/Reader.h b/src/plugins/dbi_bam/src/Reader.h
index b4c0578..1bd605c 100644
--- a/src/plugins/dbi_bam/src/Reader.h
+++ b/src/plugins/dbi_bam/src/Reader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/SamReader.cpp b/src/plugins/dbi_bam/src/SamReader.cpp
index e019c03..2c37d84 100644
--- a/src/plugins/dbi_bam/src/SamReader.cpp
+++ b/src/plugins/dbi_bam/src/SamReader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/SamReader.h b/src/plugins/dbi_bam/src/SamReader.h
index 431127b..440390e 100644
--- a/src/plugins/dbi_bam/src/SamReader.h
+++ b/src/plugins/dbi_bam/src/SamReader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/SamtoolsBasedDbi.cpp b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
index 5301cf4..4f2a35c 100644
--- a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
+++ b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/SamtoolsBasedDbi.h b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
index e7e85aa..345eac0 100644
--- a/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
+++ b/src/plugins/dbi_bam/src/SamtoolsBasedDbi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/VirtualOffset.cpp b/src/plugins/dbi_bam/src/VirtualOffset.cpp
index cf0c09d..fc022d4 100644
--- a/src/plugins/dbi_bam/src/VirtualOffset.cpp
+++ b/src/plugins/dbi_bam/src/VirtualOffset.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dbi_bam/src/VirtualOffset.h b/src/plugins/dbi_bam/src/VirtualOffset.h
index f5662c0..02278b4 100644
--- a/src/plugins/dbi_bam/src/VirtualOffset.h
+++ b/src/plugins/dbi_bam/src/VirtualOffset.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/BaseContentDialog.ui b/src/plugins/dna_export/src/BaseContentDialog.ui
index f51fea0..ed1aa60 100644
--- a/src/plugins/dna_export/src/BaseContentDialog.ui
+++ b/src/plugins/dna_export/src/BaseContentDialog.ui
@@ -23,7 +23,7 @@
<item>
<widget class="QRadioButton" name="baseContentRadioButton">
<property name="text">
- <string>Base conetnt</string>
+ <string>Base content</string>
</property>
<property name="checked">
<bool>true</bool>
diff --git a/src/plugins/dna_export/src/CSVColumnConfiguration.h b/src/plugins/dna_export/src/CSVColumnConfiguration.h
index 9b463c5..5539d4e 100644
--- a/src/plugins/dna_export/src/CSVColumnConfiguration.h
+++ b/src/plugins/dna_export/src/CSVColumnConfiguration.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/CSVColumnConfigurationDialog.cpp b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
index fb68a46..e1b3bc0 100644
--- a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
+++ b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ CSVColumnConfigurationDialog::CSVColumnConfigurationDialog(QWidget* w, const Col
: QDialog(w), config(_config)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220365");
+ new HelpButton(this, buttonBox, "18223005");
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 608ccfa..ecf6223 100644
--- a/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h
+++ b/src/plugins/dna_export/src/CSVColumnConfigurationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/DNAExportPlugin.cpp b/src/plugins/dna_export/src/DNAExportPlugin.cpp
index 3861b15..f0338af 100644
--- a/src/plugins/dna_export/src/DNAExportPlugin.cpp
+++ b/src/plugins/dna_export/src/DNAExportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/DNAExportPlugin.h b/src/plugins/dna_export/src/DNAExportPlugin.h
index fa3aee7..db732dc 100644
--- a/src/plugins/dna_export/src/DNAExportPlugin.h
+++ b/src/plugins/dna_export/src/DNAExportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/DNAExportPluginTests.cpp b/src/plugins/dna_export/src/DNAExportPluginTests.cpp
index 91eb2df..aafb020 100644
--- a/src/plugins/dna_export/src/DNAExportPluginTests.cpp
+++ b/src/plugins/dna_export/src/DNAExportPluginTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/DNAExportPluginTests.h b/src/plugins/dna_export/src/DNAExportPluginTests.h
index 20a54c3..bfd9f70 100644
--- a/src/plugins/dna_export/src/DNAExportPluginTests.h
+++ b/src/plugins/dna_export/src/DNAExportPluginTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/DNASequenceGenerator.cpp b/src/plugins/dna_export/src/DNASequenceGenerator.cpp
index 151a3d3..1b7096f 100644
--- a/src/plugins/dna_export/src/DNASequenceGenerator.cpp
+++ b/src/plugins/dna_export/src/DNASequenceGenerator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dna_export/src/DNASequenceGenerator.h b/src/plugins/dna_export/src/DNASequenceGenerator.h
index 5723cf0..d348772 100644
--- a/src/plugins/dna_export/src/DNASequenceGenerator.h
+++ b/src/plugins/dna_export/src/DNASequenceGenerator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dna_export/src/DNASequenceGeneratorDialog.cpp b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
index cd7731f..2fdb257 100644
--- a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
+++ b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ DNASequenceGeneratorDialog::DNASequenceGeneratorDialog(QWidget* p)
: QDialog(p),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220593");
+ new HelpButton(this, buttonBox, "18223233");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Generate"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -167,7 +167,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, "18220593");
+ new HelpButton(this, buttonBox, "18223233");
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 8e14191..5798fbf 100644
--- a/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h
+++ b/src/plugins/dna_export/src/DNASequenceGeneratorDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dna_export/src/ExportAlignmentViewItems.cpp b/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
index 912c8bc..2b83e78 100644
--- a/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportAlignmentViewItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportAlignmentViewItems.h b/src/plugins/dna_export/src/ExportAlignmentViewItems.h
index bc56d21..475151e 100644
--- a/src/plugins/dna_export/src/ExportAlignmentViewItems.h
+++ b/src/plugins/dna_export/src/ExportAlignmentViewItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportBlastResultDialog.cpp b/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
index 04b38f6..112d80c 100644
--- a/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
+++ b/src/plugins/dna_export/src/ExportBlastResultDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ ExportBlastResultDialog::ExportBlastResultDialog(QWidget* p, const QString& defa
: QDialog(p),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220521");
+ new HelpButton(this, buttonBox, "18223161");
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 0ffd301..9f69d98 100644
--- a/src/plugins/dna_export/src/ExportBlastResultDialog.h
+++ b/src/plugins/dna_export/src/ExportBlastResultDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportChromatogramDialog.cpp b/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
index 9d4ffbc..9089591 100644
--- a/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
+++ b/src/plugins/dna_export/src/ExportChromatogramDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -45,7 +45,7 @@ ExportChromatogramDialog::ExportChromatogramDialog(QWidget* p, const GUrl& fileU
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220389");
+ new HelpButton(this, buttonBox, "18223029");
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 46e521d..49e09ed 100644
--- a/src/plugins/dna_export/src/ExportChromatogramDialog.h
+++ b/src/plugins/dna_export/src/ExportChromatogramDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportMSA2MSADialog.cpp b/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
index f814093..bd3fbe4 100644
--- a/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
+++ b/src/plugins/dna_export/src/ExportMSA2MSADialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ ExportMSA2MSADialog::ExportMSA2MSADialog(const QString& defaultFileName, const D
: QDialog(p),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220297");
+ new HelpButton(this, buttonBox, "18222937");
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 b1d4e0a..65e4e6b 100644
--- a/src/plugins/dna_export/src/ExportMSA2MSADialog.h
+++ b/src/plugins/dna_export/src/ExportMSA2MSADialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportMSA2SequencesDialog.cpp b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
index b656cec..f5decdd 100644
--- a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
+++ b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ ExportMSA2SequencesDialog::ExportMSA2SequencesDialog(QWidget* p)
: QDialog(p),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220296");
+ new HelpButton(this, buttonBox, "18222936");
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 791112d..6e2ff7b 100644
--- a/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h
+++ b/src/plugins/dna_export/src/ExportMSA2SequencesDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportProjectViewItems.cpp b/src/plugins/dna_export/src/ExportProjectViewItems.cpp
index e17cd6c..12fbad3 100644
--- a/src/plugins/dna_export/src/ExportProjectViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportProjectViewItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportProjectViewItems.h b/src/plugins/dna_export/src/ExportProjectViewItems.h
index 3ca2db3..34d4b0a 100644
--- a/src/plugins/dna_export/src/ExportProjectViewItems.h
+++ b/src/plugins/dna_export/src/ExportProjectViewItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportQualityScoresTask.cpp b/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
index fce9042..998c4c0 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
+++ b/src/plugins/dna_export/src/ExportQualityScoresTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportQualityScoresTask.h b/src/plugins/dna_export/src/ExportQualityScoresTask.h
index 0bfbb97..71d22b6 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresTask.h
+++ b/src/plugins/dna_export/src/ExportQualityScoresTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportQualityScoresWorker.cpp b/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
index 84190ce..8e884b8 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
+++ b/src/plugins/dna_export/src/ExportQualityScoresWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportQualityScoresWorker.h b/src/plugins/dna_export/src/ExportQualityScoresWorker.h
index 23e9802..692d1d0 100644
--- a/src/plugins/dna_export/src/ExportQualityScoresWorker.h
+++ b/src/plugins/dna_export/src/ExportQualityScoresWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSelectedSeqRegionsTask.cpp b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
index acf73a1..47c1bce 100644
--- a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
+++ b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSelectedSeqRegionsTask.h b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
index 7f7f3b6..a4fa4c2 100644
--- a/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
+++ b/src/plugins/dna_export/src/ExportSelectedSeqRegionsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequenceTask.cpp b/src/plugins/dna_export/src/ExportSequenceTask.cpp
index 416e7e3..71fc6a3 100644
--- a/src/plugins/dna_export/src/ExportSequenceTask.cpp
+++ b/src/plugins/dna_export/src/ExportSequenceTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequenceTask.h b/src/plugins/dna_export/src/ExportSequenceTask.h
index 377ef48..52ba81a 100644
--- a/src/plugins/dna_export/src/ExportSequenceTask.h
+++ b/src/plugins/dna_export/src/ExportSequenceTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequenceViewItems.cpp b/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
index f0c9fa1..04d9677 100644
--- a/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
+++ b/src/plugins/dna_export/src/ExportSequenceViewItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequenceViewItems.h b/src/plugins/dna_export/src/ExportSequenceViewItems.h
index d09a801..59aabeb 100644
--- a/src/plugins/dna_export/src/ExportSequenceViewItems.h
+++ b/src/plugins/dna_export/src/ExportSequenceViewItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequences2MSADialog.cpp b/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
index 1e61c03..7cea726 100644
--- a/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
+++ b/src/plugins/dna_export/src/ExportSequences2MSADialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ ExportSequences2MSADialog::ExportSequences2MSADialog(QWidget* p, const QString&
: QDialog(p),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220295");
+ new HelpButton(this, buttonBox, "18222935");
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 a7c4798..863e283 100644
--- a/src/plugins/dna_export/src/ExportSequences2MSADialog.h
+++ b/src/plugins/dna_export/src/ExportSequences2MSADialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportSequencesDialog.cpp b/src/plugins/dna_export/src/ExportSequencesDialog.cpp
index 372dcb5..c95f3b9 100644
--- a/src/plugins/dna_export/src/ExportSequencesDialog.cpp
+++ b/src/plugins/dna_export/src/ExportSequencesDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -50,7 +50,7 @@ ExportSequencesDialog::ExportSequencesDialog( bool m, bool allowComplement, bool
saveController(NULL),
defaultFileName(defaultFileName) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220294");
+ new HelpButton(this, buttonBox, "18222934");
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 958252a..a41f261 100644
--- a/src/plugins/dna_export/src/ExportSequencesDialog.h
+++ b/src/plugins/dna_export/src/ExportSequencesDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportTasks.cpp b/src/plugins/dna_export/src/ExportTasks.cpp
index 0753d3b..ff81cf0 100644
--- a/src/plugins/dna_export/src/ExportTasks.cpp
+++ b/src/plugins/dna_export/src/ExportTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportTasks.h b/src/plugins/dna_export/src/ExportTasks.h
index f49e8b6..f505245 100644
--- a/src/plugins/dna_export/src/ExportTasks.h
+++ b/src/plugins/dna_export/src/ExportTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportUtils.cpp b/src/plugins/dna_export/src/ExportUtils.cpp
index c513976..37f21e1 100644
--- a/src/plugins/dna_export/src/ExportUtils.cpp
+++ b/src/plugins/dna_export/src/ExportUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ExportUtils.h b/src/plugins/dna_export/src/ExportUtils.h
index f28dc9f..0bc63d0 100644
--- a/src/plugins/dna_export/src/ExportUtils.h
+++ b/src/plugins/dna_export/src/ExportUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/GenerateDNAWorker.cpp b/src/plugins/dna_export/src/GenerateDNAWorker.cpp
index 7a1b88c..80375f0 100644
--- a/src/plugins/dna_export/src/GenerateDNAWorker.cpp
+++ b/src/plugins/dna_export/src/GenerateDNAWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dna_export/src/GenerateDNAWorker.h b/src/plugins/dna_export/src/GenerateDNAWorker.h
index c9f797e..a09e427 100644
--- a/src/plugins/dna_export/src/GenerateDNAWorker.h
+++ b/src/plugins/dna_export/src/GenerateDNAWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/dna_export/src/GetSequenceByIdDialog.cpp b/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
index e1d9ce1..0012cfa 100644
--- a/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
+++ b/src/plugins/dna_export/src/GetSequenceByIdDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ namespace U2 {
GetSequenceByIdDialog::GetSequenceByIdDialog(QWidget *w): QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220520");
+ new HelpButton(this, buttonBox, "18223160");
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 fbc7c1a..634a4a6 100644
--- a/src/plugins/dna_export/src/GetSequenceByIdDialog.h
+++ b/src/plugins/dna_export/src/GetSequenceByIdDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportAnnotationsFromCSVDialog.cpp b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
index 935df6f..3635615 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -62,7 +62,7 @@ ImportAnnotationsFromCSVDialog::ImportAnnotationsFromCSVDialog(QWidget* w)
: QDialog (w),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220365");
+ new HelpButton(this, buttonBox, "18223005");
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 7719318..df23aee 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportAnnotationsFromCSVTask.cpp b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
index bca0526..2a5e845 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportAnnotationsFromCSVTask.h b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
index 6df792f..3187942 100644
--- a/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
+++ b/src/plugins/dna_export/src/ImportAnnotationsFromCSVTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportQualityScoresTask.cpp b/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
index aa569cf..8726a8e 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
+++ b/src/plugins/dna_export/src/ImportQualityScoresTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportQualityScoresTask.h b/src/plugins/dna_export/src/ImportQualityScoresTask.h
index 363e68e..1bf72a0 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresTask.h
+++ b/src/plugins/dna_export/src/ImportQualityScoresTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportQualityScoresWorker.cpp b/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
index 50f5b65..d853843 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
+++ b/src/plugins/dna_export/src/ImportQualityScoresWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/src/ImportQualityScoresWorker.h b/src/plugins/dna_export/src/ImportQualityScoresWorker.h
index d2b0aa2..d962bd4 100644
--- a/src/plugins/dna_export/src/ImportQualityScoresWorker.h
+++ b/src/plugins/dna_export/src/ImportQualityScoresWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_export/transl/english.ts b/src/plugins/dna_export/transl/english.ts
index 376e306..33b0e76 100644
--- a/src/plugins/dna_export/transl/english.ts
+++ b/src/plugins/dna_export/transl/english.ts
@@ -9,9 +9,13 @@
<translation>Set Base Content</translation>
</message>
<message>
- <location filename="../src/BaseContentDialog.ui" line="26"/>
<source>Base conetnt</source>
- <translation>Base conetnt</translation>
+ <translation type="vanished">Base conetnt</translation>
+ </message>
+ <message>
+ <location filename="../src/BaseContentDialog.ui" line="26"/>
+ <source>Base content</source>
+ <translation>Base content</translation>
</message>
<message>
<location filename="../src/BaseContentDialog.ui" line="55"/>
@@ -819,7 +823,7 @@
<message>
<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>
+ <translation>Sequences of the selected annotations can't be exported. At least one of the annotations is out of boundaries</translation>
</message>
<message>
<location filename="../src/ExportSequenceTask.cpp" line="585"/>
@@ -2052,7 +2056,8 @@ You can use this worker to convert .fasta and .qual pair to fastq format.</trans
<source>The sequences from selected BLAST results will be downloaded from
NCBI Genbank by their GI identifier
</source>
- <translation type="unfinished"></translation>
+ <translation>The sequences from selected BLAST results will be downloaded from
+NCBI Genbank by their GI identifier</translation>
</message>
<message>
<location filename="../src/GetSequenceByIdDialog.ui" line="48"/>
diff --git a/src/plugins/dna_export/transl/russian.ts b/src/plugins/dna_export/transl/russian.ts
index a0b676e..e14b229 100644
--- a/src/plugins/dna_export/transl/russian.ts
+++ b/src/plugins/dna_export/transl/russian.ts
@@ -9,9 +9,13 @@
<translation>Задать состав последовательности</translation>
</message>
<message>
- <location filename="../src/BaseContentDialog.ui" line="26"/>
<source>Base conetnt</source>
- <translation>Состав</translation>
+ <translation type="vanished">Состав</translation>
+ </message>
+ <message>
+ <location filename="../src/BaseContentDialog.ui" line="26"/>
+ <source>Base content</source>
+ <translation>Основной состав</translation>
</message>
<message>
<location filename="../src/BaseContentDialog.ui" line="55"/>
@@ -268,12 +272,12 @@
<message>
<location filename="../src/ExportChromatogramDialog.ui" line="56"/>
<source>Reversed</source>
- <translation>Обратный</translation>
+ <translation>Обратная</translation>
</message>
<message>
<location filename="../src/ExportChromatogramDialog.ui" line="66"/>
<source>Complemented</source>
- <translation>Комплементарный</translation>
+ <translation>Комплементарная</translation>
</message>
<message>
<location filename="../src/ExportChromatogramDialog.ui" line="75"/>
@@ -819,7 +823,7 @@
<message>
<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>
+ <translation>Последовательности выбранных аннотаций не могут быть экспортированы. Как минимум одна аннотация выходит за границы</translation>
</message>
<message>
<location filename="../src/ExportSequenceTask.cpp" line="585"/>
@@ -2051,7 +2055,7 @@ You can use this worker to convert .fasta and .qual pair to fastq format.</sourc
<source>The sequences from selected BLAST results will be downloaded from
NCBI Genbank by their GI identifier
</source>
- <translation type="unfinished"></translation>
+ <translation>Последовательности из выбранных результатов BLAST будут скачаны из базы NCBI Genbank по их идентификатору</translation>
</message>
<message>
<location filename="../src/GetSequenceByIdDialog.ui" line="48"/>
diff --git a/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp b/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
index 6b72f8a..86122ba 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ DNAFlexDialog::DNAFlexDialog(ADVSequenceObjectContext* _ctx)
: QDialog(_ctx->getAnnotatedDNAView()->getWidget())
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220514");
+ new HelpButton(this, buttonBox, "18223154");
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 9a695b3..a374161 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexDialog.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexGraph.cpp b/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
index 64ee02d..98609fd 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraph.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexGraph.h b/src/plugins/dna_flexibility/src/DNAFlexGraph.h
index 42ef8e3..975422d 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraph.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraph.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
index a77b856..25efabf 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexGraphAlgorithm.h b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
index aab1fe7..e913693 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexGraphAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexPlugin.cpp b/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
index 82288f8..2c534b8 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexPlugin.h b/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
index ee64c48..61cccb5 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexTask.cpp b/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
index bd561c3..c7fb81f 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
+++ b/src/plugins/dna_flexibility/src/DNAFlexTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/DNAFlexTask.h b/src/plugins/dna_flexibility/src/DNAFlexTask.h
index ffdab0d..70aaca1 100644
--- a/src/plugins/dna_flexibility/src/DNAFlexTask.h
+++ b/src/plugins/dna_flexibility/src/DNAFlexTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/FindHighFlexRegions.cpp b/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
index 46dd5d7..edd2586 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegions.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/FindHighFlexRegions.h b/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
index 6ebcbde..a6b6e6b 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegions.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
index ff836c3..e2a6f4e 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
index 7419340..1fe7a14 100644
--- a/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
+++ b/src/plugins/dna_flexibility/src/FindHighFlexRegionsAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/HighFlexResult.h b/src/plugins/dna_flexibility/src/HighFlexResult.h
index 3586d34..6374f29 100644
--- a/src/plugins/dna_flexibility/src/HighFlexResult.h
+++ b/src/plugins/dna_flexibility/src/HighFlexResult.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/HighFlexSettings.cpp b/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
index a896020..dd96eb9 100644
--- a/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
+++ b/src/plugins/dna_flexibility/src/HighFlexSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_flexibility/src/HighFlexSettings.h b/src/plugins/dna_flexibility/src/HighFlexSettings.h
index 15f5c54..12203d8 100644
--- a/src/plugins/dna_flexibility/src/HighFlexSettings.h
+++ b/src/plugins/dna_flexibility/src/HighFlexSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/BaseContentGraph.cpp b/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
index 294a9bb..6443518 100644
--- a/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
+++ b/src/plugins/dna_graphpack/src/BaseContentGraph.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/BaseContentGraph.h b/src/plugins/dna_graphpack/src/BaseContentGraph.h
index 802f204..c609e28 100644
--- a/src/plugins/dna_graphpack/src/BaseContentGraph.h
+++ b/src/plugins/dna_graphpack/src/BaseContentGraph.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/CumulativeSkew.cpp b/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
index b60b113..ccf741a 100644
--- a/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
+++ b/src/plugins/dna_graphpack/src/CumulativeSkew.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/CumulativeSkew.h b/src/plugins/dna_graphpack/src/CumulativeSkew.h
index d25446a..f007204 100644
--- a/src/plugins/dna_graphpack/src/CumulativeSkew.h
+++ b/src/plugins/dna_graphpack/src/CumulativeSkew.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/DNAGraphPackPlugin.cpp b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
index 1c1f3dd..a04ccd5 100644
--- a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
+++ b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/DNAGraphPackPlugin.h b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
index e4f85a8..8abb341 100644
--- a/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
+++ b/src/plugins/dna_graphpack/src/DNAGraphPackPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/DeviationGraph.cpp b/src/plugins/dna_graphpack/src/DeviationGraph.cpp
index 8b289dd..ec85e43 100644
--- a/src/plugins/dna_graphpack/src/DeviationGraph.cpp
+++ b/src/plugins/dna_graphpack/src/DeviationGraph.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/DeviationGraph.h b/src/plugins/dna_graphpack/src/DeviationGraph.h
index 3c8255b..a7a1f1c 100644
--- a/src/plugins/dna_graphpack/src/DeviationGraph.h
+++ b/src/plugins/dna_graphpack/src/DeviationGraph.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/EntropyAlgorithm.cpp b/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
index 41b407a..c74ee95 100644
--- a/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
+++ b/src/plugins/dna_graphpack/src/EntropyAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/EntropyAlgorithm.h b/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
index 5be2ccb..46e9101 100644
--- a/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
+++ b/src/plugins/dna_graphpack/src/EntropyAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/GCFramePlot.cpp b/src/plugins/dna_graphpack/src/GCFramePlot.cpp
index 0c12af0..0715774 100644
--- a/src/plugins/dna_graphpack/src/GCFramePlot.cpp
+++ b/src/plugins/dna_graphpack/src/GCFramePlot.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/GCFramePlot.h b/src/plugins/dna_graphpack/src/GCFramePlot.h
index 8ff9d7f..ce9e542 100644
--- a/src/plugins/dna_graphpack/src/GCFramePlot.h
+++ b/src/plugins/dna_graphpack/src/GCFramePlot.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
index aee6a3a..42ddf39 100644
--- a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
+++ b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_graphpack/src/KarlinSignatureDifferenceGraph.h b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
index 23b0688..f7ce2b2 100644
--- a/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
+++ b/src/plugins/dna_graphpack/src/KarlinSignatureDifferenceGraph.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatMSAProfileDialog.cpp b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
index 00b254f..34c651e 100644
--- a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
+++ b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@ DNAStatMSAProfileDialog::DNAStatMSAProfileDialog(QWidget* p, MSAEditor* _c)
ctx(_c),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220457");
+ new HelpButton(this, buttonBox, "18223097");
initSaveController();
}
diff --git a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
index 493fbf1..1722c4e 100644
--- a/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
+++ b/src/plugins/dna_stat/src/DNAStatMSAProfileDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatPlugin.cpp b/src/plugins/dna_stat/src/DNAStatPlugin.cpp
index 8a686cb..72ef8dd 100644
--- a/src/plugins/dna_stat/src/DNAStatPlugin.cpp
+++ b/src/plugins/dna_stat/src/DNAStatPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatPlugin.h b/src/plugins/dna_stat/src/DNAStatPlugin.h
index a6b598c..abc6290 100644
--- a/src/plugins/dna_stat/src/DNAStatPlugin.h
+++ b/src/plugins/dna_stat/src/DNAStatPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatProfileTask.cpp b/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
index 7be4491..afa9e08 100644
--- a/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
+++ b/src/plugins/dna_stat/src/DNAStatProfileTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatProfileTask.h b/src/plugins/dna_stat/src/DNAStatProfileTask.h
index 3174ee1..7e47307 100644
--- a/src/plugins/dna_stat/src/DNAStatProfileTask.h
+++ b/src/plugins/dna_stat/src/DNAStatProfileTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatsWindow.cpp b/src/plugins/dna_stat/src/DNAStatsWindow.cpp
index e80d77c..bc117af 100644
--- a/src/plugins/dna_stat/src/DNAStatsWindow.cpp
+++ b/src/plugins/dna_stat/src/DNAStatsWindow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DNAStatsWindow.h b/src/plugins/dna_stat/src/DNAStatsWindow.h
index b286c02..4d676fa 100644
--- a/src/plugins/dna_stat/src/DNAStatsWindow.h
+++ b/src/plugins/dna_stat/src/DNAStatsWindow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
index c96a1f4..00f4b15 100644
--- a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
+++ b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ DistanceMatrixMSAProfileDialog::DistanceMatrixMSAProfileDialog(QWidget* p, MSAEd
ctx(_c),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220458");
+ new HelpButton(this, buttonBox, "18223098");
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 9ece48a..7846151 100644
--- a/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h
+++ b/src/plugins/dna_stat/src/DistanceMatrixMSAProfileDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotClasses.cpp b/src/plugins/dotplot/src/DotPlotClasses.cpp
index 44278e4..6755132 100644
--- a/src/plugins/dotplot/src/DotPlotClasses.cpp
+++ b/src/plugins/dotplot/src/DotPlotClasses.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotClasses.h b/src/plugins/dotplot/src/DotPlotClasses.h
index 5974581..9b32e3a 100644
--- a/src/plugins/dotplot/src/DotPlotClasses.h
+++ b/src/plugins/dotplot/src/DotPlotClasses.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotDialog.cpp b/src/plugins/dotplot/src/DotPlotDialog.cpp
index 5936dcd..1a14e8c 100644
--- a/src/plugins/dotplot/src/DotPlotDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -53,7 +53,7 @@ DotPlotDialog::DotPlotDialog(QWidget *parent, AnnotatedDNAView* currentADV, int
,openSequenceTask(NULL), curURL("")
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220396");
+ new HelpButton(this, buttonBox, "18223036");
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 fa04dd7..c2b7447 100644
--- a/src/plugins/dotplot/src/DotPlotDialog.h
+++ b/src/plugins/dotplot/src/DotPlotDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotFilesDialog.cpp b/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
index efe5b1a..8b96d91 100644
--- a/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotFilesDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ DotPlotFilesDialog::DotPlotFilesDialog(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220396");
+ new HelpButton(this, buttonBox, "18223036");
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 0e8c07f..a206777 100644
--- a/src/plugins/dotplot/src/DotPlotFilesDialog.h
+++ b/src/plugins/dotplot/src/DotPlotFilesDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotFilterDialog.cpp b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
index ca50a35..bda73f7 100644
--- a/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ DotPlotFilterDialog::DotPlotFilterDialog(QWidget *parent, ADVSequenceObjectConte
,seqYItem(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220406");
+ new HelpButton(this, buttonBox, "18223046");
{
diff --git a/src/plugins/dotplot/src/DotPlotFilterDialog.h b/src/plugins/dotplot/src/DotPlotFilterDialog.h
index 8541009..cf6adfa 100644
--- a/src/plugins/dotplot/src/DotPlotFilterDialog.h
+++ b/src/plugins/dotplot/src/DotPlotFilterDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotImageExportTask.cpp b/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
index 7ff1e1c..d201cb3 100644
--- a/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
+++ b/src/plugins/dotplot/src/DotPlotImageExportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotImageExportTask.h b/src/plugins/dotplot/src/DotPlotImageExportTask.h
index c289e4f..f8a9641 100644
--- a/src/plugins/dotplot/src/DotPlotImageExportTask.h
+++ b/src/plugins/dotplot/src/DotPlotImageExportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotPlugin.cpp b/src/plugins/dotplot/src/DotPlotPlugin.cpp
index 3d87cc2..416c62f 100644
--- a/src/plugins/dotplot/src/DotPlotPlugin.cpp
+++ b/src/plugins/dotplot/src/DotPlotPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotPlugin.h b/src/plugins/dotplot/src/DotPlotPlugin.h
index d322814..dd47362 100644
--- a/src/plugins/dotplot/src/DotPlotPlugin.h
+++ b/src/plugins/dotplot/src/DotPlotPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotSplitter.cpp b/src/plugins/dotplot/src/DotPlotSplitter.cpp
index e67bcd2..950faf3 100644
--- a/src/plugins/dotplot/src/DotPlotSplitter.cpp
+++ b/src/plugins/dotplot/src/DotPlotSplitter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -290,6 +290,7 @@ void DotPlotSplitter::sl_toggleHand(){
}
void DotPlotSplitter::sl_dotPlotChanged(ADVSequenceObjectContext* sequenceX, ADVSequenceObjectContext* sequenceY, float shiftX, float shiftY, QPointF zoom) {
+ SAFE_POINT(sequenceX != NULL && sequenceY != NULL, tr("One of the sequences in dotplot is NULL"), );
checkLockButtonState();
diff --git a/src/plugins/dotplot/src/DotPlotSplitter.h b/src/plugins/dotplot/src/DotPlotSplitter.h
index 2bbb1d6..b13ff8d 100644
--- a/src/plugins/dotplot/src/DotPlotSplitter.h
+++ b/src/plugins/dotplot/src/DotPlotSplitter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotTasks.cpp b/src/plugins/dotplot/src/DotPlotTasks.cpp
index 68d4453..072effc 100644
--- a/src/plugins/dotplot/src/DotPlotTasks.cpp
+++ b/src/plugins/dotplot/src/DotPlotTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotTasks.h b/src/plugins/dotplot/src/DotPlotTasks.h
index c55fa34..02544a2 100644
--- a/src/plugins/dotplot/src/DotPlotTasks.h
+++ b/src/plugins/dotplot/src/DotPlotTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/dotplot/src/DotPlotWidget.cpp b/src/plugins/dotplot/src/DotPlotWidget.cpp
index a603acd..22d8e89 100644
--- a/src/plugins/dotplot/src/DotPlotWidget.cpp
+++ b/src/plugins/dotplot/src/DotPlotWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -132,6 +132,7 @@ void DotPlotWidget::initActionsAndSignals() {
connect(saveImageAction, SIGNAL(triggered()), SLOT(sl_showSaveImageDialog()));
saveDotPlotAction = new QAction(tr("Save"), this);
+ saveDotPlotAction->setObjectName("Save");
connect(saveDotPlotAction, SIGNAL(triggered()), SLOT(sl_showSaveFileDialog()));
loadDotPlotAction = new QAction(tr("Load"), this);
@@ -476,7 +477,7 @@ void DotPlotWidget::sl_sequenceWidgetRemoved(ADVSequenceWidget* w) {
if (dotPlotTask) {
cancelRepeatFinderTask();
} else {
- addCloseDotPlotTask();
+ emit si_removeDotPlot();
}
}
}
@@ -527,10 +528,14 @@ void DotPlotWidget::sl_showSaveImageDialog() {
exitButton->show();
}
-// save dotplot into a dotplot file, return true if successful
+// save dotplot into a dotplot file, return true if not canceled
bool DotPlotWidget::sl_showSaveFileDialog() {
-
LastUsedDirHelper lod("Dotplot");
+ if (dpDirectResultListener->dotPlotList->isEmpty() || dpRevComplResultsListener->dotPlotList->isEmpty()) {
+ QMessageBox::critical(this, tr("File saving error"), tr("Nothing to save: dotplot is empty.").arg(lod.url));
+ return true;
+ }
+
lod.url = U2FileDialog::getSaveFileName(NULL, tr("Save Dotplot"), lod.dir, tr("Dotplot files (*.dpt)"));
if (lod.url.length() <= 0) {
@@ -817,22 +822,7 @@ void DotPlotWidget::sl_showDeleteDialog() {
break;
}
- if (!deleteDotPlotFlag) {
- addCloseDotPlotTask();
- }
-}
-
-void DotPlotWidget::addCloseDotPlotTask() {
-
- deleteDotPlotFlag = true;
-
- Task *t = new Task("Closing dotplot", TaskFlags_NR_FOSCOE);
- if (!dotPlotTask) {
- dotPlotTask = t;
- }
-
- AppContext::getTaskScheduler()->registerTopLevelTask(t);
- connect(t, SIGNAL(si_stateChanged()), SLOT(sl_taskStateChanged()));
+ emit si_removeDotPlot();
}
// dotplot results updated, need to update picture
diff --git a/src/plugins/dotplot/src/DotPlotWidget.h b/src/plugins/dotplot/src/DotPlotWidget.h
index e6f4c54..fb9b52f 100644
--- a/src/plugins/dotplot/src/DotPlotWidget.h
+++ b/src/plugins/dotplot/src/DotPlotWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -235,7 +235,6 @@ private:
QString getRoundedText(QPainter& p, int num, int size) const;
bool getLineToDraw(const DotPlotResults &r, QLine *line, float ratioX, float ratioY, bool invert = false) const;
- void addCloseDotPlotTask();
void cancelRepeatFinderTask();
};
diff --git a/src/plugins/dotplot/transl/english.ts b/src/plugins/dotplot/transl/english.ts
index e3b5352..ed40f61 100644
--- a/src/plugins/dotplot/transl/english.ts
+++ b/src/plugins/dotplot/transl/english.ts
@@ -4,93 +4,93 @@
<context>
<name>DotPlotDialog</name>
<message>
- <location filename="../src/DotPlotDialog.ui" line="17"/>
+ <location filename="../src/DotPlotDialog.ui" line="20"/>
<source>DotPlot</source>
<translation>DotPlot</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="30"/>
+ <location filename="../src/DotPlotDialog.ui" line="33"/>
<source>Dotplot parameters</source>
<translation>Dotplot parameters</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="52"/>
+ <location filename="../src/DotPlotDialog.ui" line="55"/>
<source>Custom algorithm</source>
<translation>Custom algorithm</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="99"/>
+ <location filename="../src/DotPlotDialog.ui" line="102"/>
<source>X axis sequence</source>
<translation>X axis sequence</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="112"/>
+ <location filename="../src/DotPlotDialog.ui" line="115"/>
<source>Minimum repeat length</source>
<translation>Minimum repeat length</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="119"/>
+ <location filename="../src/DotPlotDialog.ui" line="122"/>
<source>Y axis sequence</source>
<translation>Y axis sequence</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="126"/>
+ <location filename="../src/DotPlotDialog.ui" line="129"/>
<source>Repeats identity</source>
<translation>Repeats identity</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="151"/>
+ <location filename="../src/DotPlotDialog.ui" line="154"/>
<source>bp</source>
<translation>bp</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="179"/>
+ <location filename="../src/DotPlotDialog.ui" line="182"/>
<source>Heuristic based selection of repeat length so the number of repeats in the sequence will not exceed 1000</source>
<translation>Heuristic based selection of repeat length so the number of repeats in the sequence will not exceed 1000</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="182"/>
+ <location filename="../src/DotPlotDialog.ui" line="185"/>
<source>1k</source>
<translation>1k</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="207"/>
+ <location filename="../src/DotPlotDialog.ui" line="210"/>
<source>%</source>
<translation>%</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="229"/>
+ <location filename="../src/DotPlotDialog.ui" line="232"/>
<source>Resets repeats identity to 100%</source>
<translation>Resets repeats identity to 100%</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="232"/>
+ <location filename="../src/DotPlotDialog.ui" line="235"/>
<source>100</source>
<translation>100</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="287"/>
+ <location filename="../src/DotPlotDialog.ui" line="290"/>
<source>Search inverted repeats</source>
<translation>Search for inverted repeats</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="294"/>
+ <location filename="../src/DotPlotDialog.ui" line="297"/>
<source>Search direct repeats</source>
<translation>Search for direct repeats</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="333"/>
- <location filename="../src/DotPlotDialog.ui" line="340"/>
+ <location filename="../src/DotPlotDialog.ui" line="336"/>
+ <location filename="../src/DotPlotDialog.ui" line="343"/>
<source>default</source>
<translation>default</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="365"/>
+ <location filename="../src/DotPlotDialog.ui" line="368"/>
<source>Click to load a sequence from the file system. The sequence will be added to the combo boxes when it is loaded to the project</source>
<translation>Click to load a sequence from the file system. The sequence will be added to the combo boxes when it is loaded to the project</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="368"/>
+ <location filename="../src/DotPlotDialog.ui" line="371"/>
<source>Load Sequence</source>
<translation>Load Sequence</translation>
</message>
@@ -447,6 +447,11 @@ Select valid file to build dotplot</source>
<source>Hand tool (<b>H</b>)</source>
<translation>Hand tool (<b>H</b>)</translation>
</message>
+ <message>
+ <location filename="../src/DotPlotSplitter.cpp" line="293"/>
+ <source>One of the sequences in dotplot is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::DotPlotViewAction</name>
@@ -595,12 +600,12 @@ Select valid file to build dotplot</source>
<translation>Save dotplot data before closing?</translation>
</message>
<message>
- <location filename="../src/DotPlotWidget.cpp" line="963"/>
+ <location filename="../src/DotPlotWidget.cpp" line="948"/>
<source>Invalid weight and height parameters!</source>
<translation>Invalid weight and height parameters!</translation>
</message>
<message>
- <location filename="../src/DotPlotWidget.cpp" line="1057"/>
+ <location filename="../src/DotPlotWidget.cpp" line="1042"/>
<source> (min length %1, identity %2%)</source>
<translation> (min length %1, identity %2%)</translation>
</message>
diff --git a/src/plugins/dotplot/transl/russian.ts b/src/plugins/dotplot/transl/russian.ts
index 4898774..a8a581e 100644
--- a/src/plugins/dotplot/transl/russian.ts
+++ b/src/plugins/dotplot/transl/russian.ts
@@ -4,93 +4,93 @@
<context>
<name>DotPlotDialog</name>
<message>
- <location filename="../src/DotPlotDialog.ui" line="17"/>
+ <location filename="../src/DotPlotDialog.ui" line="20"/>
<source>DotPlot</source>
<translation>DotPlot</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="30"/>
+ <location filename="../src/DotPlotDialog.ui" line="33"/>
<source>Dotplot parameters</source>
<translation>Dotplot параметры</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="52"/>
+ <location filename="../src/DotPlotDialog.ui" line="55"/>
<source>Custom algorithm</source>
<translation>Алгоритм по умолчанию</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="99"/>
+ <location filename="../src/DotPlotDialog.ui" line="102"/>
<source>X axis sequence</source>
<translation>Последовательность оси X</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="112"/>
+ <location filename="../src/DotPlotDialog.ui" line="115"/>
<source>Minimum repeat length</source>
<translation>Мин длина повторов</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="119"/>
+ <location filename="../src/DotPlotDialog.ui" line="122"/>
<source>Y axis sequence</source>
<translation>Последовательность оси Y</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="126"/>
+ <location filename="../src/DotPlotDialog.ui" line="129"/>
<source>Repeats identity</source>
<translation>Идентичность повторов</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="151"/>
+ <location filename="../src/DotPlotDialog.ui" line="154"/>
<source>bp</source>
<translation>нк</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="179"/>
+ <location filename="../src/DotPlotDialog.ui" line="182"/>
<source>Heuristic based selection of repeat length so the number of repeats in the sequence will not exceed 1000</source>
<translation>Эвристический подбор длины повторов, с тем чтобы кол-во повторов в последовательности не превысило 1000</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="182"/>
+ <location filename="../src/DotPlotDialog.ui" line="185"/>
<source>1k</source>
<translation>1к</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="207"/>
+ <location filename="../src/DotPlotDialog.ui" line="210"/>
<source>%</source>
<translation>%</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="229"/>
+ <location filename="../src/DotPlotDialog.ui" line="232"/>
<source>Resets repeats identity to 100%</source>
<translation>Сбросить к 100%</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="232"/>
+ <location filename="../src/DotPlotDialog.ui" line="235"/>
<source>100</source>
<translation>100</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="287"/>
+ <location filename="../src/DotPlotDialog.ui" line="290"/>
<source>Search inverted repeats</source>
<translation>Искать инвертированные повторы</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="294"/>
+ <location filename="../src/DotPlotDialog.ui" line="297"/>
<source>Search direct repeats</source>
<translation>Искать прямые повторы</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="333"/>
- <location filename="../src/DotPlotDialog.ui" line="340"/>
+ <location filename="../src/DotPlotDialog.ui" line="336"/>
+ <location filename="../src/DotPlotDialog.ui" line="343"/>
<source>default</source>
<translation>По умолчанию</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="365"/>
+ <location filename="../src/DotPlotDialog.ui" line="368"/>
<source>Click to load a sequence from the file system. The sequence will be added to the combo boxes when it is loaded to the project</source>
<translation>Нажмите, чтобы загрузить последовательности из файловой системы. Последовательности будут добавлены в комбо-боксы, когда они будут загружены в проект</translation>
</message>
<message>
- <location filename="../src/DotPlotDialog.ui" line="368"/>
+ <location filename="../src/DotPlotDialog.ui" line="371"/>
<source>Load Sequence</source>
<translation>Загрузить</translation>
</message>
@@ -447,6 +447,11 @@ Select valid file to build dotplot</source>
<source>Hand tool (<b>H</b>)</source>
<translation>Рука (<b>H</b>)</translation>
</message>
+ <message>
+ <location filename="../src/DotPlotSplitter.cpp" line="293"/>
+ <source>One of the sequences in dotplot is NULL</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>U2::DotPlotViewAction</name>
@@ -595,12 +600,12 @@ Select valid file to build dotplot</source>
<translation>Сохранить данные dotplot перед закрытием?</translation>
</message>
<message>
- <location filename="../src/DotPlotWidget.cpp" line="963"/>
+ <location filename="../src/DotPlotWidget.cpp" line="948"/>
<source>Invalid weight and height parameters!</source>
<translation>Некорректные параметры!</translation>
</message>
<message>
- <location filename="../src/DotPlotWidget.cpp" line="1057"/>
+ <location filename="../src/DotPlotWidget.cpp" line="1042"/>
<source> (min length %1, identity %2%)</source>
<translation>(мин. длина %1, идентичность %2%)</translation>
</message>
diff --git a/src/plugins/enzymes/src/CloningUtilTasks.cpp b/src/plugins/enzymes/src/CloningUtilTasks.cpp
index 1367cbe..07a03de 100644
--- a/src/plugins/enzymes/src/CloningUtilTasks.cpp
+++ b/src/plugins/enzymes/src/CloningUtilTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -297,7 +297,7 @@ void DigestSequenceTask::run()
}
}
qSort(results.begin(), results.end(), compareAnnotationsbyLength);
-
+
for (int fragmentCounter = 0; fragmentCounter < results.size(); fragmentCounter++) {
results[fragmentCounter]->name = QString("Fragment %1").arg(fragmentCounter + 1);
}
diff --git a/src/plugins/enzymes/src/CloningUtilTasks.h b/src/plugins/enzymes/src/CloningUtilTasks.h
index 8715a2f..4e8417c 100644
--- a/src/plugins/enzymes/src/CloningUtilTasks.h
+++ b/src/plugins/enzymes/src/CloningUtilTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/ConstructMoleculeDialog.cpp b/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
index 4414c94..4881184 100644
--- a/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
+++ b/src/plugins/enzymes/src/ConstructMoleculeDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ ConstructMoleculeDialog::ConstructMoleculeDialog(const QList<DNAFragment>& fragm
fragments(fragmentList),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220536");
+ new HelpButton(this, buttonBox, "18223176");
tabWidget->setCurrentIndex(0);
const QString coreLengthStr = ConstructMoleculeDialog::tr("core length");
diff --git a/src/plugins/enzymes/src/ConstructMoleculeDialog.h b/src/plugins/enzymes/src/ConstructMoleculeDialog.h
index 88f2bad..5f54579 100644
--- a/src/plugins/enzymes/src/ConstructMoleculeDialog.h
+++ b/src/plugins/enzymes/src/ConstructMoleculeDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/CreateFragmentDialog.cpp b/src/plugins/enzymes/src/CreateFragmentDialog.cpp
index 6799c9b..49d9a87 100644
--- a/src/plugins/enzymes/src/CreateFragmentDialog.cpp
+++ b/src/plugins/enzymes/src/CreateFragmentDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -49,7 +49,7 @@ CreateFragmentDialog::CreateFragmentDialog(ADVSequenceObjectContext* ctx, QWidg
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220535");
+ new HelpButton(this, buttonBox, "18223175");
tabWidget->setCurrentIndex(0);
@@ -69,7 +69,7 @@ CreateFragmentDialog::CreateFragmentDialog(U2SequenceObject* obj, const U2Region
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220535");
+ new HelpButton(this, buttonBox, "18223175");
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 44f4c1e..4824862 100644
--- a/src/plugins/enzymes/src/CreateFragmentDialog.h
+++ b/src/plugins/enzymes/src/CreateFragmentDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/DNAFragment.cpp b/src/plugins/enzymes/src/DNAFragment.cpp
index 37e73c2..7c76495 100644
--- a/src/plugins/enzymes/src/DNAFragment.cpp
+++ b/src/plugins/enzymes/src/DNAFragment.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/DNAFragment.h b/src/plugins/enzymes/src/DNAFragment.h
index 5fd4711..8b77054 100644
--- a/src/plugins/enzymes/src/DNAFragment.h
+++ b/src/plugins/enzymes/src/DNAFragment.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/DigestSequenceDialog.cpp b/src/plugins/enzymes/src/DigestSequenceDialog.cpp
index cb0f67c..bef9077 100644
--- a/src/plugins/enzymes/src/DigestSequenceDialog.cpp
+++ b/src/plugins/enzymes/src/DigestSequenceDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -58,7 +58,7 @@ DigestSequenceDialog::DigestSequenceDialog(ADVSequenceObjectContext* ctx, QWidge
: QDialog(p),seqCtx(ctx), timer(NULL), animationCounter(0)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220534");
+ new HelpButton(this, buttonBox, "18223174");
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 c2bd7fd..8ea8b41 100644
--- a/src/plugins/enzymes/src/DigestSequenceDialog.h
+++ b/src/plugins/enzymes/src/DigestSequenceDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EditFragmentDialog.cpp b/src/plugins/enzymes/src/EditFragmentDialog.cpp
index 6285e7b..64346b2 100644
--- a/src/plugins/enzymes/src/EditFragmentDialog.cpp
+++ b/src/plugins/enzymes/src/EditFragmentDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -49,7 +49,7 @@ EditFragmentDialog::EditFragmentDialog( DNAFragment& fragment, QWidget* p )
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220541");
+ new HelpButton(this, buttonBox, "18223181");
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 9ca9e2e..658a40a 100644
--- a/src/plugins/enzymes/src/EditFragmentDialog.h
+++ b/src/plugins/enzymes/src/EditFragmentDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesIO.cpp b/src/plugins/enzymes/src/EnzymesIO.cpp
index 78eb718..beb1423 100644
--- a/src/plugins/enzymes/src/EnzymesIO.cpp
+++ b/src/plugins/enzymes/src/EnzymesIO.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesIO.h b/src/plugins/enzymes/src/EnzymesIO.h
index 4a3cbb1..79ebe13 100644
--- a/src/plugins/enzymes/src/EnzymesIO.h
+++ b/src/plugins/enzymes/src/EnzymesIO.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesPlugin.cpp b/src/plugins/enzymes/src/EnzymesPlugin.cpp
index a8f6fba..9c7d2c9 100644
--- a/src/plugins/enzymes/src/EnzymesPlugin.cpp
+++ b/src/plugins/enzymes/src/EnzymesPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesPlugin.h b/src/plugins/enzymes/src/EnzymesPlugin.h
index 9140255..ce1446b 100644
--- a/src/plugins/enzymes/src/EnzymesPlugin.h
+++ b/src/plugins/enzymes/src/EnzymesPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesQuery.cpp b/src/plugins/enzymes/src/EnzymesQuery.cpp
index 04a8670..3b863d3 100644
--- a/src/plugins/enzymes/src/EnzymesQuery.cpp
+++ b/src/plugins/enzymes/src/EnzymesQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -145,7 +145,7 @@ QString EnzymesSelectorDialogHandler::getSelectedString(QDialog* dlg) {
EnzymesSelectorDialog::EnzymesSelectorDialog(EnzymesSelectorDialogHandler* parent)
: factory(parent) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220526");
+ new HelpButton(this, buttonBox, "18223166");
QVBoxLayout* vl = new QVBoxLayout();
enzSel = new EnzymesSelectorWidget();
diff --git a/src/plugins/enzymes/src/EnzymesQuery.h b/src/plugins/enzymes/src/EnzymesQuery.h
index af69c83..102a981 100644
--- a/src/plugins/enzymes/src/EnzymesQuery.h
+++ b/src/plugins/enzymes/src/EnzymesQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesTests.cpp b/src/plugins/enzymes/src/EnzymesTests.cpp
index 6dae4b8..c1dd824 100644
--- a/src/plugins/enzymes/src/EnzymesTests.cpp
+++ b/src/plugins/enzymes/src/EnzymesTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/EnzymesTests.h b/src/plugins/enzymes/src/EnzymesTests.h
index 0ba3565..29779f4 100644
--- a/src/plugins/enzymes/src/EnzymesTests.h
+++ b/src/plugins/enzymes/src/EnzymesTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/FindEnzymesAlgorithm.h b/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
index dd22c9c..22b5007 100644
--- a/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
+++ b/src/plugins/enzymes/src/FindEnzymesAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/FindEnzymesDialog.cpp b/src/plugins/enzymes/src/FindEnzymesDialog.cpp
index 0f06202..ad8e900 100644
--- a/src/plugins/enzymes/src/FindEnzymesDialog.cpp
+++ b/src/plugins/enzymes/src/FindEnzymesDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -516,7 +516,7 @@ void EnzymesSelectorWidget::sl_saveEnzymesFile()
FindEnzymesDialog::FindEnzymesDialog(ADVSequenceObjectContext* sctx)
: QDialog(sctx->getAnnotatedDNAView()->getWidget()), seqCtx(sctx) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220526");
+ new HelpButton(this, buttonBox, "18223166");
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 1584e89..893d0ca 100644
--- a/src/plugins/enzymes/src/FindEnzymesDialog.h
+++ b/src/plugins/enzymes/src/FindEnzymesDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/FindEnzymesTask.cpp b/src/plugins/enzymes/src/FindEnzymesTask.cpp
index 7236e5f..49eb053 100644
--- a/src/plugins/enzymes/src/FindEnzymesTask.cpp
+++ b/src/plugins/enzymes/src/FindEnzymesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/src/FindEnzymesTask.h b/src/plugins/enzymes/src/FindEnzymesTask.h
index 31cbd4d..87988ab 100644
--- a/src/plugins/enzymes/src/FindEnzymesTask.h
+++ b/src/plugins/enzymes/src/FindEnzymesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/enzymes/transl/english.ts b/src/plugins/enzymes/transl/english.ts
index 17402e3..956b7a6 100644
--- a/src/plugins/enzymes/transl/english.ts
+++ b/src/plugins/enzymes/transl/english.ts
@@ -14,9 +14,8 @@
<translation>Construction</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.ui" line="42"/>
<source>Available fragments:</source>
- <translation>Available fragments:</translation>
+ <translation type="vanished">Available fragments:</translation>
</message>
<message>
<location filename="../src/ConstructMoleculeDialog.ui" line="57"/>
@@ -139,6 +138,11 @@
<translation>Setting this option checked will result in ignoring overhangs while constructing new molecule.</translation>
</message>
<message>
+ <location filename="../src/ConstructMoleculeDialog.ui" line="42"/>
+ <source>Available fragments (core length - length without sticky ends):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/ConstructMoleculeDialog.ui" line="191"/>
<source>Edit</source>
<translation>Edit</translation>
@@ -595,14 +599,14 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::ConstructMoleculeDialog</name>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="86"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="89"/>
<source>No fragments are selected!
Please construct molecule from available fragments.</source>
<translation>No fragments are selected!
Please construct molecule from available fragments.</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="284"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="287"/>
<source>Set new molecule file name</source>
<translation>Set new molecule file name</translation>
</message>
@@ -611,42 +615,47 @@ p, li { white-space: pre-wrap; }
<translation type="vanished">Genbank (*.gb )</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="192"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="53"/>
+ <source>core length</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="195"/>
<source>Blunt</source>
<translation>Blunt</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="193"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="196"/>
<source>Fwd</source>
<translation>Fwd</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="194"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="197"/>
<source>Rev</source>
<translation>Rev</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="211"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="214"/>
<source>Left end</source>
<translation>Left end</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="220"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="223"/>
<source>Right end</source>
<translation>Right end</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="222"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="225"/>
<source>yes</source>
<translation>yes</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="222"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="225"/>
<source>no</source>
<translation>no</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="223"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="226"/>
<source>Make fragment reverse complement</source>
<translation>Make fragment reverse complement</translation>
</message>
@@ -1039,7 +1048,7 @@ To start ligation create a project or open an existing.</translation>
<context>
<name>U2::FindEnzymesAutoAnnotationUpdater</name>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="331"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="332"/>
<source>Restriction Sites</source>
<translation>Restriction Sites</translation>
</message>
@@ -1084,13 +1093,18 @@ To start ligation create a project or open an existing.</translation>
<translation>Find Enzymes</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="137"/>
- <location filename="../src/FindEnzymesTask.cpp" line="269"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="117"/>
+ <source>Alphabet is not nucleic.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindEnzymesTask.cpp" line="138"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="270"/>
<source>Number of results exceed %1, stopping</source>
<translation>Number of results exceed %1, stopping</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="217"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="218"/>
<source>Found %1 restriction sites</source>
<translation>Number of results exceed %1, stopping</translation>
</message>
@@ -1121,27 +1135,32 @@ To start ligation create a project or open an existing.</translation>
<context>
<name>U2::FindSingleEnzymeTask</name>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="232"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="233"/>
<source>Find enzyme '%1'</source>
<translation>Find enzyme '%1'</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="259"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="243"/>
+ <source>Alphabet is not nucleic.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindEnzymesTask.cpp" line="260"/>
<source>Find enzyme '%1' parallel</source>
<translation>Find enzyme '%1' parallel</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="286"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="287"/>
<source>No enzyme alphabet</source>
<translation>No enzyme alphabet</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="288"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="289"/>
<source>Non-nucleic enzyme alphabet: %1, enzyme: %2, skipping..</source>
<translation>Non-nucleic enzyme alphabet: %1, enzyme: %2, skipping..</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="293"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="294"/>
<source>Failed to get sequence alphabet</source>
<translation>Failed to get sequence alphabet</translation>
</message>
diff --git a/src/plugins/enzymes/transl/russian.ts b/src/plugins/enzymes/transl/russian.ts
index 15337f7..1ef8b8c 100644
--- a/src/plugins/enzymes/transl/russian.ts
+++ b/src/plugins/enzymes/transl/russian.ts
@@ -14,9 +14,8 @@
<translation>Создание молекулы</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.ui" line="42"/>
<source>Available fragments:</source>
- <translation>Доступные фрагменты:</translation>
+ <translation type="vanished">Доступные фрагменты:</translation>
</message>
<message>
<location filename="../src/ConstructMoleculeDialog.ui" line="57"/>
@@ -139,6 +138,11 @@
<translation>Включение опции позволяет не учитывать липкие концы фрагментов при создании новой молекулы.</translation>
</message>
<message>
+ <location filename="../src/ConstructMoleculeDialog.ui" line="42"/>
+ <source>Available fragments (core length - length without sticky ends):</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/ConstructMoleculeDialog.ui" line="191"/>
<source>Edit</source>
<translation>Редактировать</translation>
@@ -594,13 +598,13 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::ConstructMoleculeDialog</name>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="86"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="89"/>
<source>No fragments are selected!
Please construct molecule from available fragments.</source>
<translation>Выберите фрагменты, составляющие новую молекулу.</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="284"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="287"/>
<source>Set new molecule file name</source>
<translation>Задайте имя файла</translation>
</message>
@@ -609,42 +613,47 @@ p, li { white-space: pre-wrap; }
<translation type="vanished">Genbank (*.gb )</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="192"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="53"/>
+ <source>core length</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="195"/>
<source>Blunt</source>
<translation>"Срез"</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="193"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="196"/>
<source>Fwd</source>
<translation>Прям</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="194"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="197"/>
<source>Rev</source>
<translation>Обр</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="211"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="214"/>
<source>Left end</source>
<translation>Левый конец</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="220"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="223"/>
<source>Right end</source>
<translation>Правый конец</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="222"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="225"/>
<source>yes</source>
<translation>да</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="222"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="225"/>
<source>no</source>
<translation>нет</translation>
</message>
<message>
- <location filename="../src/ConstructMoleculeDialog.cpp" line="223"/>
+ <location filename="../src/ConstructMoleculeDialog.cpp" line="226"/>
<source>Make fragment reverse complement</source>
<translation>Сделать фрагмент обратно-комплементарным</translation>
</message>
@@ -1033,7 +1042,7 @@ To start ligation create a project or open an existing.</source>
<context>
<name>U2::FindEnzymesAutoAnnotationUpdater</name>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="331"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="332"/>
<source>Restriction Sites</source>
<translation>Сайты рестрикции</translation>
</message>
@@ -1078,13 +1087,18 @@ To start ligation create a project or open an existing.</source>
<translation>Поиск ферментов</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="137"/>
- <location filename="../src/FindEnzymesTask.cpp" line="269"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="117"/>
+ <source>Alphabet is not nucleic.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindEnzymesTask.cpp" line="138"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="270"/>
<source>Number of results exceed %1, stopping</source>
<translation>Кол-во результатов превысило %1, задача остановлена</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="217"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="218"/>
<source>Found %1 restriction sites</source>
<translation>Найдено %1 сайтов рестрикции</translation>
</message>
@@ -1115,27 +1129,32 @@ To start ligation create a project or open an existing.</source>
<context>
<name>U2::FindSingleEnzymeTask</name>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="232"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="233"/>
<source>Find enzyme '%1'</source>
<translation>Поиск энзима '%1'</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="259"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="243"/>
+ <source>Alphabet is not nucleic.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/FindEnzymesTask.cpp" line="260"/>
<source>Find enzyme '%1' parallel</source>
<translation>Параллельный поиск энзима '%1'</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="286"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="287"/>
<source>No enzyme alphabet</source>
<translation>Нет алфавита</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="288"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="289"/>
<source>Non-nucleic enzyme alphabet: %1, enzyme: %2, skipping..</source>
<translation>Ненуклеотидный алфавит: %1, энзим %2 игнорируется..</translation>
</message>
<message>
- <location filename="../src/FindEnzymesTask.cpp" line="293"/>
+ <location filename="../src/FindEnzymesTask.cpp" line="294"/>
<source>Failed to get sequence alphabet</source>
<translation>Невозможно получить алфавит последовательности</translation>
</message>
diff --git a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
index 16d4012..21dafd2 100644
--- a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
+++ b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ETSProjectViewItemsContoller.h b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
index ec4a9cd..e50f2aa 100644
--- a/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
+++ b/src/plugins/external_tool_support/src/ETSProjectViewItemsContoller.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolManager.cpp b/src/plugins/external_tool_support/src/ExternalToolManager.cpp
index d93a943..4b1fdd7 100644
--- a/src/plugins/external_tool_support/src/ExternalToolManager.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolManager.h b/src/plugins/external_tool_support/src/ExternalToolManager.h
index 7665f23..d829204 100644
--- a/src/plugins/external_tool_support/src/ExternalToolManager.h
+++ b/src/plugins/external_tool_support/src/ExternalToolManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportL10N.h b/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
index bef96dc..5286bdd 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportL10N.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportPlugin.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
index 4766282..f4b6ce0 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportPlugin.h b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
index c81e1bd..0433411 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportSettings.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
index 8e3ece4..b1852a1 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportSettings.h b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
index e08ef49..f45d6e5 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ExternalToolSupportSettingsController.cpp b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
index 4bdf75a..feb6f5d 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ AppSettingsGUIPageWidget* ExternalToolSupportSettingsPageController::createWidge
return r;
}
-const QString ExternalToolSupportSettingsPageController::helpPageId = QString("18220313");
+const QString ExternalToolSupportSettingsPageController::helpPageId = QString("18222953");
/////////////////////////////////////////////
////ExternalToolSupportSettingsPageWidget
diff --git a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
index c3e9813..403dd78 100644
--- a/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
+++ b/src/plugins/external_tool_support/src/ExternalToolSupportSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/R/RSupport.cpp b/src/plugins/external_tool_support/src/R/RSupport.cpp
index c5f2bd2..df90b24 100644
--- a/src/plugins/external_tool_support/src/R/RSupport.cpp
+++ b/src/plugins/external_tool_support/src/R/RSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/R/RSupport.h b/src/plugins/external_tool_support/src/R/RSupport.h
index 2f2b873..671f0a0 100644
--- a/src/plugins/external_tool_support/src/R/RSupport.h
+++ b/src/plugins/external_tool_support/src/R/RSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/RnaSeqCommon.cpp b/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
index 78d306e..95222df 100644
--- a/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
+++ b/src/plugins/external_tool_support/src/RnaSeqCommon.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/RnaSeqCommon.h b/src/plugins/external_tool_support/src/RnaSeqCommon.h
index 2922c1b..826aef1 100644
--- a/src/plugins/external_tool_support/src/RnaSeqCommon.h
+++ b/src/plugins/external_tool_support/src/RnaSeqCommon.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/TaskLocalStorage.cpp b/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
index 11cef2d..7596a42 100644
--- a/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
+++ b/src/plugins/external_tool_support/src/TaskLocalStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/TaskLocalStorage.h b/src/plugins/external_tool_support/src/TaskLocalStorage.h
index 4ea1722..4bbeddc 100644
--- a/src/plugins/external_tool_support/src/TaskLocalStorage.h
+++ b/src/plugins/external_tool_support/src/TaskLocalStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedToolsWorkersLibrary.cpp b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
index cc7889d..09fda03 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedToolsWorkersLibrary.h b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
index ce47389..a6edd5c 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedToolsWorkersLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsIntersectTask.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
index cc06288..520099f 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsIntersectTask.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
index 63fff93..9d0382f 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsIntersectTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsSupport.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
index dd4ae5c..1226146 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsSupport.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
index 3b370ce..a8d3967 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsSupportTask.cpp b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
index 005aa36..630941d 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bedtools/BedtoolsSupportTask.h b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
index 40bea7c..bfef380 100644
--- a/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
+++ b/src/plugins/external_tool_support/src/bedtools/BedtoolsSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BedGraphToBigWigTask.cpp b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
index f8ea68e..7d36928 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BedGraphToBigWigTask.h b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
index 0ba8d6f..13ade30 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BedGraphToBigWigWorker.cpp b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
index a7d4863..f9d0ef1 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BedGraphToBigWigWorker.h b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
index f610743..1830ff5 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BedGraphToBigWigWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BigWigSupport.cpp b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
index 367b901..9202ec0 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
+++ b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bigWigTools/BigWigSupport.h b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
index 875a7de..85434ad 100644
--- a/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
+++ b/src/plugins/external_tool_support/src/bigWigTools/BigWigSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllSupport.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
index cac75bb..0159a4c 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllSupport.h b/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
index 19450c4..84214e4 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
index de77f92..59fd53f 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllSupportRunDialog.h b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
index f0342ed..73e7bea 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllSupportTask.cpp b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
index 635b5b4..970e76f 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -87,7 +87,7 @@ void BlastAllSupportTask::prepare(){
return;
}
//Create ncbi.ini for windows or .ncbirc for unix like systems
- //See issue UGENE-791 (https://ugene.unipro.ru/tracker/browse/UGENE-791)
+ //See issue UGENE-791 (https://ugene.net/tracker/browse/UGENE-791)
#ifdef Q_OS_UNIX
QString iniNCBIFile=tmpDir.absolutePath()+QString("/.ncbirc");
#else
diff --git a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
index 629cc73..8c304b2 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllWorker.cpp b/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
index e9b29e1..e45921a 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
+++ b/src/plugins/external_tool_support/src/blast/BlastAllWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/BlastAllWorker.h b/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
index c64d35e..0efd255 100644
--- a/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
+++ b/src/plugins/external_tool_support/src/blast/BlastAllWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/FormatDBSupport.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
index bb6390f..ced128e 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/FormatDBSupport.h b/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
index fdd4630..aed6fd1 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/FormatDBSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
index 86cae35..b44147c 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@ FormatDBSupportRunDialog::FormatDBSupportRunDialog(const QString &_name, FormatD
QDialog(_parent), name(_name), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220586");
+ new HelpButton(this, buttonBox, "18223226");
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 037e988..7fd3f13 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/FormatDBSupportTask.cpp b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
index 10b9f7a..c416271 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast/FormatDBSupportTask.h b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
index 16adf66..d53dc4e 100644
--- a/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast/FormatDBSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastDBCmdDialog.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
index 6561fbc..eef0ee9 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -23,6 +23,7 @@
#include <U2Core/BaseDocumentFormats.h>
+#include <U2Core/GUrlUtils.h>
#include <U2Gui/HelpButton.h>
#include <U2Gui/LastUsedDirHelper.h>
#include <U2Gui/SaveDocumentController.h>
@@ -37,7 +38,7 @@ BlastDBCmdDialog::BlastDBCmdDialog(BlastDBCmdSupportTaskSettings &_settings, QWi
settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220588");
+ new HelpButton(this, buttonBox, "18223228");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Fetch"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -76,8 +77,15 @@ void BlastDBCmdDialog::sl_update() {
}
void BlastDBCmdDialog::initSaveController() {
+ QString domain = "blast_result";
+ QString dir = LastUsedDirHelper::getLastUsedDir(domain, GUrlUtils::getDefaultDataPath());
+ QString fileName = GUrlUtils::fixFileName(settings.query.isEmpty() ? "blast_result" : settings.query).replace('.', '_') + ".fa";
+
SaveDocumentControllerConfig config;
config.defaultFormatId = BaseDocumentFormats::FASTA;
+ config.defaultFileName = dir + "/" + fileName;
+ config.defaultDomain = domain;
+ config.rollFileName = true;
config.fileDialogButton = browseOutputButton;
config.fileNameEdit = outputPathLineEdit;
config.parentWidget = this;
@@ -85,11 +93,15 @@ void BlastDBCmdDialog::initSaveController() {
const QList<DocumentFormatId> formats = QList<DocumentFormatId>() << BaseDocumentFormats::FASTA;
+
saveController = new SaveDocumentController(config, formats, this);
}
void BlastDBCmdDialog::setQueryId( const QString& queryId ) {
queryIdEdit->setText(queryId);
+ settings.query = queryId;
+ delete saveController;
+ initSaveController();
}
}//namespace
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 e86c255..5f7056f 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastDBCmdDialog.ui b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.ui
index 94b9996..abac5a8 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.ui
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdDialog.ui
@@ -6,14 +6,20 @@
<rect>
<x>0</x>
<y>0</y>
- <width>537</width>
- <height>279</height>
+ <width>538</width>
+ <height>300</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>537</width>
- <height>279</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
<property name="maximumSize">
@@ -23,25 +29,34 @@
</size>
</property>
<property name="windowTitle">
- <string>Fetch Sequence from BLAST Database</string>
+ <string>Fetch Sequences from BLAST Database</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<item>
- <widget class="QGroupBox" name="inputData">
- <property name="title">
- <string/>
+ <widget class="QWidget" name="inputData" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>520</width>
+ <height>270</height>
+ </size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="sizeConstraint">
- <enum>QLayout::SetMinAndMaxSize</enum>
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Entery query ID:</string>
+ <string>Query ID</string>
</property>
</widget>
</item>
@@ -49,32 +64,28 @@
<widget class="QLineEdit" name="queryIdEdit"/>
</item>
<item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Select database :</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="dbSelectorWidget" native="true">
+ <widget class="QGroupBox" name="dbSelectorWidget">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="title">
+ <string>Select database</string>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
- <number>0</number>
+ <number>10</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
- <number>0</number>
+ <number>10</number>
</property>
<property name="bottomMargin">
<number>0</number>
@@ -85,7 +96,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Output path:</string>
+ <string>Output path</string>
</property>
</widget>
</item>
@@ -94,7 +105,7 @@
<item>
<widget class="QLineEdit" name="outputPathLineEdit">
<property name="readOnly">
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
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 75c5c04..6485e05 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastDBCmdSupport.h b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
index 7004182..d65d979 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastDBCmdSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
index 263a6bb..05ed643 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastDBCmdSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
index 748c516..a799de5 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastDBCmdSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastNPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
index f76340c..8f3dca1 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastNPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
index eb22297..d4df7a6 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastNPlusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
index 2c9a21c..866be41 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
index c858fc9..ae3e31e 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPPlusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPlusSupport.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
index e249065..5089bec 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -92,7 +92,7 @@ BlastPlusSupport::BlastPlusSupport(const QString& name, const QString& path) : E
description="The <i>blastp</i> tool searches a protein database \
using a protein query.";
versionRegExp=QRegExp("Protein-Protein BLAST (\\d+\\.\\d+\\.\\d+\\+?)");
-// https://ugene.unipro.ru/tracker/browse/UGENE-945
+// https://ugene.net/tracker/browse/UGENE-945
// }else if(name == GPU_BLASTP_TOOL_NAME){
// #ifdef Q_OS_WIN
// executableFileName="blastp.exe";
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 5ede788..8ce0cab 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPlusSupportCommonTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
index 567890e..82e0bd2 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -99,7 +99,7 @@ void BlastPlusSupportCommonTask::prepare(){
return;
}
//Create ncbi.ini for windows or .ncbirc for unix like systems
- //See issue UGENE-791 (https://ugene.unipro.ru/tracker/browse/UGENE-791)
+ //See issue UGENE-791 (https://ugene.net/tracker/browse/UGENE-791)
#ifdef Q_OS_UNIX
QString iniNCBIFile=tmpDir.absolutePath()+QString("/.ncbirc");
#else
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 5cc248b..8c74b84 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportCommonTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPlusSupportRunDialog.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
index 03a0afa..8d98d61 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -121,7 +121,7 @@ bool BlastPlusSupportRunDialog::checkToolPath(){
needSetToolPath=true;
toolName=ET_BLASTP;
-// https://ugene.unipro.ru/tracker/browse/UGENE-945
+// https://ugene.net/tracker/browse/UGENE-945
// }else if((programName->currentText() == "gpu-blastp") &&
// (AppContext::getExternalToolRegistry()->getByName(GPU_BLASTP_TOOL_NAME)->getPath().isEmpty())){
// needSetToolPath=true;
@@ -390,7 +390,7 @@ bool BlastPlusWithExtFileSpecifySupportRunDialog::checkToolPath(){
needSetToolPath=true;
toolName=ET_BLASTP;
-// https://ugene.unipro.ru/tracker/browse/UGENE-945
+// https://ugene.net/tracker/browse/UGENE-945
// }else if((programName->currentText() == "gpu-blastp") &&
// (AppContext::getExternalToolRegistry()->getByName(GPU_BLASTP_TOOL_NAME)->getPath().isEmpty())){
// needSetToolPath=true;
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 b4d6b79..930cbf4 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPlusWorker.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
index 9b72c2e..ce5ca93 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastPlusWorker.h b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
index f87d64e..5512bc2 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastPlusWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastXPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
index a8f93e8..19b8f8e 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/BlastXPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
index fc67988..13ca38f 100644
--- a/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/BlastXPlusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/RPSBlastSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
index 8964746..4f436b0 100644
--- a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/RPSBlastSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
index c09155d..27332c5 100644
--- a/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/RPSBlastSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/TBlastNPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
index 94e54cb..1953f15 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/TBlastNPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
index 6dee64c..57e786f 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastNPlusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/TBlastXPlusSupportTask.cpp b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
index 8606b9b..ddcf5a6 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/blast_plus/TBlastXPlusSupportTask.h b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
index 0a7983a..b8ffa1a 100644
--- a/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
+++ b/src/plugins/external_tool_support/src/blast_plus/TBlastXPlusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieSettingsWidget.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
index f431509..ce3e339 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieSettingsWidget.h b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
index f87e3dd..bf23542 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieSupport.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
index e10452d..65147ae 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieSupport.h b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
index 11f9733..02df709 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
index 3c10b29..3eda4d8 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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
diff --git a/src/plugins/external_tool_support/src/bowtie/BowtieTask.h b/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
index dd5f069..63c56af 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieWorker.cpp b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
index 27d3947..919ff89 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/BowtieWorker.h b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
index 39a0bc3..f911641 100644
--- a/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
+++ b/src/plugins/external_tool_support/src/bowtie/BowtieWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bowtie_tests/bowtieTests.cpp b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.cpp
index 284c849..cd24d02 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bowtie_tests/bowtieTests.h b/src/plugins/external_tool_support/src/bowtie/bowtie_tests/bowtieTests.h
index f811658..9b80acc 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Bowtie2SettingsWidget.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
index 9ef3404..24f608c 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Bowtie2SettingsWidget.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
index c2f5a6e..db991b2 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2SettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Bowtie2Support.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
index b466814..41ef4b0 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/Bowtie2Support.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
index 2e20489..52e6e8f 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Support.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
index f8b016b..158f820 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
index 96dba4f..6330d28 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Task.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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
diff --git a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
index c9ab98e..ce50e0e 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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.h b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
index f2cb255..c7186ba 100644
--- a/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
+++ b/src/plugins/external_tool_support/src/bowtie2/Bowtie2Worker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaMemWorker.cpp b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
index cc046a6..9c4f8b0 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaMemWorker.h b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
index 9c717c4..51078f2 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaMemWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaSettingsWidget.cpp b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
index 2c25496..ee92bc4 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaSettingsWidget.h b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
index a384d64..fafb50c 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaSupport.cpp b/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
index afcf19a..385b9bd 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaSupport.h b/src/plugins/external_tool_support/src/bwa/BwaSupport.h
index 2f487bf..1a80aaa 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaSupport.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaTask.cpp b/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
index 7345276..df4719c 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -198,7 +198,7 @@ void BwaAlignTask::prepare() {
}
QList<Task *> BwaAlignTask::onSubTaskFinished(Task *subTask) {
- QList<Task*> result;
+ QList<Task*> result;
QFileInfo resultPathFileInfo(resultPath);
QString tmpDirPath = AppContext::getAppSettings()->getUserAppsSettings()->getCurrentProcessTemporaryDirPath();
if (alignMultiTask == subTask) {
@@ -237,7 +237,7 @@ QList<Task *> BwaAlignTask::onSubTaskFinished(Task *subTask) {
}
samMultiTask = new MultiTask(tr("Saming reads with BWA Multitask"), samTasks);
result.append(samMultiTask);
- }
+ }
if (subTask == samMultiTask) {
if (settings.shortReadSets.size() == 1 || (settings.shortReadSets.size() == 2 && settings.pairedReads)) {
return result;
@@ -259,7 +259,7 @@ QList<Task *> BwaAlignTask::onSubTaskFinished(Task *subTask) {
}
mergeTask = new MergeBamTask(bamUrlstoMerge, resultPathFileInfo.dir().canonicalPath(), resultPathFileInfo.baseName() + ".bam", true);
result.append(mergeTask);
- }
+ }
if (subTask == mergeTask) {
//converting BAM -> SAM
QString bamResultPath = resultPathFileInfo.dir().canonicalPath() + "/" + resultPathFileInfo.baseName() + ".bam";
@@ -412,7 +412,7 @@ void BwaMemAlignTask::prepare() {
} else if (settings.shortReadSets.size() > 1) {
arguments.append(currentReadSet.url.getURLString());
ExternalToolRunTask* alignTask = new ExternalToolRunTask(ET_BWA, arguments, new BwaAlignTask::LogParser(), NULL);
- QString resultFilePathWithpartNumber = resultFileInfo.dir().canonicalPath() + "/" + resultFileInfo.baseName() + "_" +
+ QString resultFilePathWithpartNumber = resultFileInfo.dir().canonicalPath() + "/" + resultFileInfo.baseName() + "_" +
QString::number(resultPartsCounter) + "." + resultFileInfo.completeSuffix();
alignTask->setStandartOutputFile(resultFilePathWithpartNumber);
setListenerForTask(alignTask);
@@ -453,7 +453,7 @@ QList<Task *> BwaMemAlignTask::onSubTaskFinished(Task *subTask) {
}
mergeTask = new MergeBamTask(bamUrlstoMerge, resultFileInfo.dir().canonicalPath(), resultFileInfo.baseName() + ".bam", true);
result.append(mergeTask);
- }
+ }
if (mergeTask == subTask) {
//converting BAM -> SAM
cleanupTempDir(bamUrlstoMerge);
@@ -636,7 +636,7 @@ void BwaTask::prepare() {
setError(tr("Please, provide same number of files with downstream and upstream reads."));
return;
}
-
+
alignTask = new BwaMemAlignTask(indexFileName, settings);
alignTask->addListeners(QList <ExternalToolListener*>() << getListener(1));
}else{
diff --git a/src/plugins/external_tool_support/src/bwa/BwaTask.h b/src/plugins/external_tool_support/src/bwa/BwaTask.h
index 7a661af..43b91a3 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaTask.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaWorker.cpp b/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
index a902b88..c160056 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
+++ b/src/plugins/external_tool_support/src/bwa/BwaWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/BwaWorker.h b/src/plugins/external_tool_support/src/bwa/BwaWorker.h
index f4ac3e8..301c786 100644
--- a/src/plugins/external_tool_support/src/bwa/BwaWorker.h
+++ b/src/plugins/external_tool_support/src/bwa/BwaWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/bwa_tests/bwaTests.cpp b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.cpp
index e318ead..641a41f 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/bwa/bwa_tests/bwaTests.h b/src/plugins/external_tool_support/src/bwa/bwa_tests/bwaTests.h
index 40c56ff..ac205fd 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,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3Support.cpp b/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
index 772af36..87e40b9 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Support.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3Support.h b/src/plugins/external_tool_support/src/cap3/CAP3Support.h
index 87c549b..298527f 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Support.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Support.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3SupportDialog.cpp b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
index 6af18d9..3f33c58 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ CAP3SupportDialog::CAP3SupportDialog(CAP3SupportTaskSettings& s, QWidget* parent
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220576");
+ new HelpButton(this, buttonBox, "18223216");
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 3d36539..456288d 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3SupportTask.cpp b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
index 2ddada7..c2a25df 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -81,11 +81,7 @@ QList<Task*> CAP3SupportTask::onSubTaskFinished(Task* subTask) {
if (subTask == prepareDataForCAP3Task) {
assert(!prepareDataForCAP3Task->getPreparedPath().isEmpty());
GUrl inputUrl = prepareDataForCAP3Task->getPreparedPath();
- if (prepareDataForCAP3Task->onlyCopyInputFiles()) {
- tmpOutputUrl = inputUrl.getURLString()+ CAP3_EXT;
- } else {
- tmpOutputUrl = inputUrl.dirPath() + "/" + inputUrl.baseFileName() + CAP3_EXT;
- }
+ tmpOutputUrl = inputUrl.getURLString()+ CAP3_EXT;
QStringList arguments = settings.getArgumentsList();
arguments.prepend( inputUrl.getURLString() );
@@ -241,7 +237,7 @@ void PrepareInputForCAP3Task::prepare() {
QString outPath = outputDir + "/" + QString("%1_misc").arg(inputGUrls.first().baseFileName());
qualityFilePath = outPath + ".qual";
- if (!seqWriter.init(outPath)) {
+ if (!seqWriter.init(outPath + ".fa")) {
setError(tr("Failed to initialize sequence writer."));
return;
}
diff --git a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
index 97ec0ab..51c075f 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3SupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3Worker.cpp b/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
index 8cd4671..77ce8f4 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Worker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cap3/CAP3Worker.h b/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
index afb1cc7..a8c0998 100644
--- a/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
+++ b/src/plugins/external_tool_support/src/cap3/CAP3Worker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASReportWorker.cpp b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
index 58c4e1f..09f275b 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASReportWorker.h b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
index ba4c726..34985da 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASReportWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSettings.cpp b/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
index 39237bf..fba237e 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSettings.h b/src/plugins/external_tool_support/src/ceas/CEASSettings.h
index cabf9d3..1172db3 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSettings.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSupport.cpp b/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
index 9fd9f65..d3de0f7 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSupport.h b/src/plugins/external_tool_support/src/ceas/CEASSupport.h
index 3e2524e..de27019 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupport.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSupportTask.cpp b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
index bc63323..a30784d 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ceas/CEASSupportTask.h b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
index 5d28906..286aca5 100644
--- a/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
+++ b/src/plugins/external_tool_support/src/ceas/CEASSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOSupport.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
index e2698e6..9006d46 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOSupport.h b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
index 64a53f1..b1caeb4 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOSupportRunDialog.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
index aacd3fb..16ff7b9 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -45,7 +45,7 @@ ClustalOSupportRunDialog::ClustalOSupportRunDialog(const MAlignment& _ma, Clusta
QDialog(_parent), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220600");
+ new HelpButton(this, buttonBox, "18223240");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -79,7 +79,7 @@ ClustalOWithExtFileSpecifySupportRunDialog::ClustalOWithExtFileSpecifySupportRun
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220582");
+ new HelpButton(this, buttonBox, "18223222");
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 c3a8187..c3ad41c 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOSupportRunDialog.ui b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.ui
index 03675fa..10e93f6 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.ui
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportRunDialog.ui
@@ -31,7 +31,7 @@
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
diff --git a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
index db7e987..953d816 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOSupportTask.h b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
index ba30062..7f1a84e 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOWorker.cpp b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
index 6942d5a..017fab7 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalo/ClustalOWorker.h b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
index 62cfc3f..6bcbad2 100644
--- a/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
+++ b/src/plugins/external_tool_support/src/clustalo/ClustalOWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWSupport.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
index 13e744f..f71b253 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWSupport.h b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
index 9ec7819..d4498da 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWSupportRunDialog.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
index 55ea6b0..fa586e4 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ ClustalWSupportRunDialog::ClustalWSupportRunDialog(const MAlignment& _ma, Clusta
QDialog(_parent), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220589");
+ new HelpButton(this, buttonBox, "18223229");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -119,7 +119,7 @@ ClustalWWithExtFileSpecifySupportRunDialog::ClustalWWithExtFileSpecifySupportRun
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220589");
+ new HelpButton(this, buttonBox, "18223229");
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 7fd3c92..472e722 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWSupportRunDialog.ui b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.ui
index 6d57669..c4d7ab2 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.ui
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportRunDialog.ui
@@ -31,7 +31,7 @@
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="0">
diff --git a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
index b885e93..a43f671 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWSupportTask.h b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
index e07846f..1ad7620 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWWorker.cpp b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
index d069ae5..56615ad 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/clustalw/ClustalWWorker.h b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
index 7f87a04..bde2c6d 100644
--- a/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
+++ b/src/plugins/external_tool_support/src/clustalw/ClustalWWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOSettings.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
index eeb9763..9c2e2db 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOSettings.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
index 9240aa4..41f787c 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOSupport.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
index 666f2d4..cda59a7 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOSupport.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
index 80bc941..b285d11 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOTask.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
index 38961ff..6e97418 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOTask.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
index e74c5dc..ca90cdd 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOWorker.cpp b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
index 704c301..cbe0799 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conduct_go/ConductGOWorker.h b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
index 9ccdd59..af6c239 100644
--- a/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
+++ b/src/plugins/external_tool_support/src/conduct_go/ConductGOWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotSettings.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
index c68c02f..8f60a45 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotSettings.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
index 039cfc6..bd4ccec 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotSupport.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
index 97831f2..b75c3a0 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotSupport.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
index e5d6f1d..0008925 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotTask.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
index de894d6..2d84eb1 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotTask.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
index 6f52873..6331ffa 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotWorker.cpp b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
index ceefcf8..053f5f2 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/conservation_plot/ConservationPlotWorker.h b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
index 69492bd..c74cd0c 100644
--- a/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
+++ b/src/plugins/external_tool_support/src/conservation_plot/ConservationPlotWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffdiffSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
index 567991d..edc69a1 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffdiffSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
index bc532ad..172f46a 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffdiffWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
index cd62d73..75aa3e8 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffdiffWorker.h b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
index bdfcd3d..5680ce4 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffdiffWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSettings.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
index 5d18a20..e7f9951 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSettings.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
index 2825ed2..0227a8c 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSupport.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
index d3b61bb..618bce0 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSupport.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
index a7bd8b5..b80bb1f 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
index 5aae163..008e0f1 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
index c3bbb68..0eb7fd9 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
index 1b575e6..53423c0 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CufflinksWorker.h b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
index 91064c5..6797a74 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CufflinksWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffmergeSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
index 7925aea..c5fe4f2 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffmergeSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
index 9c78b87..d783111 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffmergeWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
index e16d1f7..60ed6b1 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/CuffmergeWorker.h b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
index cfc6f2a..4337ae2 100644
--- a/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/CuffmergeWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/GffreadSupportTask.cpp b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
index 55457a5..30be90b 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/GffreadSupportTask.h b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
index 758aa36..4e07a2d 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/GffreadWorker.cpp b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
index 671bf7d..23534d9 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cufflinks/GffreadWorker.h b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
index a6d66a5..220a7dd 100644
--- a/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
+++ b/src/plugins/external_tool_support/src/cufflinks/GffreadWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cutadapt/CutadaptSupport.cpp b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
index 8a967ff..c8e581a 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cutadapt/CutadaptSupport.h b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
index 3efd796..bd2e384 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/cutadapt/CutadaptWorker.cpp b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
index 4e9dace..79ab97e 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -121,14 +121,14 @@ void CutAdaptFastqWorkerFactory::init() {
Descriptor outName(BaseNGSWorker::OUT_NAME_ID, CutAdaptFastqWorker::tr("Output file name"),
CutAdaptFastqWorker::tr("A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention."));
- Descriptor adapters(ADAPTERS_URL, CutAdaptFastqWorker::tr("FASTA file with adapters"),
+ Descriptor adapters(ADAPTERS_URL, CutAdaptFastqWorker::tr("FASTA file with 3' adapters"),
CutAdaptFastqWorker::tr("A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. "
"The adapter itself and anything that follows is "
- "trimmed. If the adapter sequence ends with the '$ "
+ "trimmed. If the adapter sequence ends with the '$' "
"character, the adapter is anchored to the end of the "
"read and only found if it is a suffix of the read."));
- Descriptor front(FRONT_URL, CutAdaptFastqWorker::tr("FASTA file with reverse adapters"),
+ Descriptor front(FRONT_URL, CutAdaptFastqWorker::tr("FASTA file with 5' adapters"),
CutAdaptFastqWorker::tr("A FASTA file with one or multiple sequences of adapters that were ligated to the 5' end. "
"If the adapter sequence starts with the character '^', "
"the adapter is 'anchored'. An anchored adapter must "
diff --git a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
index 22033f2..f16c75f 100644
--- a/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
+++ b/src/plugins/external_tool_support/src/cutadapt/CutadaptWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/fastqc/FastqcSupport.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
index 92907e5..5525e23 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/fastqc/FastqcSupport.h b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
index 958b372..469556b 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/fastqc/FastqcTask.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
index 9ca2b27..2b60a8c 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ void FastQCParser::parseErrOutput( const QString& partOfLog ){
lastPartOfLog.first()=lastErrLine+lastPartOfLog.first();
lastErrLine=lastPartOfLog.takeLast();
foreach(const QString& buf, lastPartOfLog){
- if(buf.contains("ERROR", Qt::CaseInsensitive)){
+ if(buf.contains("ERROR", Qt::CaseInsensitive) || buf.contains("Failed to process file", Qt::CaseInsensitive)){
coreLog.error("FastQC: " + buf);
}
}
@@ -87,13 +87,18 @@ FastQCTask::FastQCTask(const FastQCSetting &settings)
void FastQCTask::prepare(){
if (settings.inputUrl.isEmpty()){
- setError("No input URL");
+ setError(tr("No input URL"));
return ;
}
+ if (QFileInfo(settings.inputUrl).size() == 0) {
+ setError(tr("The input file '%1' is empty.").arg(settings.inputUrl));
+ return;
+ }
+
const QDir outDir = QFileInfo(settings.outDir).absoluteDir();
if (!outDir.exists()) {
- setError("Directory does not exist: " + outDir.absolutePath());
+ setError(tr("Directory does not exist: %1").arg(outDir.absolutePath()));
return ;
}
@@ -110,7 +115,7 @@ void FastQCTask::run(){
const QFileInfo resFile(getResFileUrl());
if (!resFile.exists()) {
- setError("Result file does not exist: " + resFile.absoluteFilePath());
+ setError(tr("Result file does not exist: %1. See the log for details.").arg(resFile.absoluteFilePath()));
return ;
}
resultUrl = getResFileUrl();
diff --git a/src/plugins/external_tool_support/src/fastqc/FastqcTask.h b/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
index 4c92c39..9b6fb31 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/fastqc/FastqcWorker.cpp b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
index 504b4a3..ca8af34 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/fastqc/FastqcWorker.h b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
index 5b44e34..f626c01 100644
--- a/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
+++ b/src/plugins/external_tool_support/src/fastqc/FastqcWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/ConvertAlignment2StockholmTask.cpp b/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.cpp
index 18980c1..86c1cd4 100644
--- a/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/ConvertAlignment2StockholmTask.h b/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.h
index 972c89d..488cee8 100644
--- a/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/ConvertAlignment2StockholmTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildDialog.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.cpp
index fba756e..32e30b5 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -59,7 +59,7 @@ void HmmerBuildDialog::setSignalsAndSlots() {
void HmmerBuildDialog::initialize() {
setupUi(this);
- new HelpButton(this, buttonBox, "18220559");
+ new HelpButton(this, buttonBox, "18223199");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Build"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.h
index 6f7f757..5656eb6 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildFromFileTask.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.cpp
index 5fe0158..f196686 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildFromFileTask.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.h
index 162d2bb..bdcbdab 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromFileTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildFromMsaTask.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.cpp
index bc200de..fb4ae90 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildFromMsaTask.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.h
index dff57a2..57f542f 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildFromMsaTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildSettings.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.cpp
index 94bb48e..e0f5912 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildSettings.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.h
index adfe17d..c71f939 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildTask.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.cpp
index 76e8ce5..f9534dc 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildTask.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.h
index 514eb2b..22f2c1a 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildWorker.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.cpp
index ae0cc6a..4c7a36f 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerBuildWorker.h b/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.h
index 70f24f8..d2330fe 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerBuildWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerParseSearchResultsTask.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.cpp
index 1d9c84e..42709b6 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerParseSearchResultsTask.h b/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.h
index bca4820..592e912 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerParseSearchResultsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSearchDialog.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.cpp
index ca002ad..58fd211 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -53,7 +53,7 @@ HmmerSearchDialog::HmmerSearchDialog(U2SequenceObject *seqObj, QWidget *parent)
setupUi(this);
SAFE_POINT(NULL != seqObj, L10N::nullPointerError("sequence object"), );
- new HelpButton(this, buttonBox, "18220560");
+ new HelpButton(this, buttonBox, "18223200");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.h b/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.h
index 3212ee7..1d86509 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@ public:
static const QString DOM_E_MINUS_PREFIX;
static const QString HMM_FILES_DIR_ID;
static const QString ANNOTATIONS_DEFAULT_NAME;
-
+
private slots:
void sl_okButtonClicked();
void sl_useEvalTresholdsButtonChanged(bool checked);
@@ -56,7 +56,7 @@ private slots:
void sl_domESpinBoxChanged(int newVal);
void sl_queryHmmFileToolButtonClicked();
void sl_domZCheckBoxChanged(int state);
-
+
private:
void setModelValues();
void getModelValues();
diff --git a/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.cpp
index 8fbf0af..cf67baa 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSearchSettings.h b/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.h
index 117983d..f0a7a71 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSearchTask.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.cpp
index fdc933c..0fc72ca 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSearchTask.h b/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.h
index 07a003a..d776b93 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSearchWorker.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.cpp
index cd39412..0ab9278 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.cpp
@@ -1,332 +1,332 @@
-/**
- * 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/AnnotationData.h>
-#include <U2Core/AppContext.h>
-#include <U2Core/DNAAlphabet.h>
-#include <U2Core/DNASequence.h>
-#include <U2Core/DNASequenceObject.h>
-#include <U2Core/DNATranslation.h>
-#include <U2Core/FailTask.h>
-#include <U2Core/Log.h>
-#include <U2Core/MultiTask.h>
-#include <U2Core/TaskSignalMapper.h>
-#include <U2Core/U2OpStatusUtils.h>
-
-#include <U2Designer/DelegateEditors.h>
-
-#include <U2Lang/ActorPrototypeRegistry.h>
-#include <U2Lang/BaseActorCategories.h>
-#include <U2Lang/BasePorts.h>
-#include <U2Lang/BaseSlots.h>
-#include <U2Lang/BaseTypes.h>
-#include <U2Lang/CoreLibConstants.h>
-#include <U2Lang/Datatype.h>
-#include <U2Lang/IntegralBusModel.h>
-#include <U2Lang/WorkflowEnv.h>
-#include <U2Lang/WorkflowMonitor.h>
-
-#include "HmmerSearchTask.h"
-#include "HmmerSearchWorker.h"
-#include "HmmerSupport.h"
-
-namespace U2 {
-namespace LocalWorkflow {
-
-/*******************************
- * HMM3SearchWorkerFactory
- *******************************/
-static const QString HMM_URL_PORT("in-hmm3");
-
-static const QString NAME_ATTR("result-name");
-static const QString DOM_E_ATTR("e-val");
-static const QString DOM_T_ATTR("score");
-static const QString SEED_ATTR("seed");
-static const QString FILTER_BY_ATTR("filter-by");
-
-static const QString FILTER_BY_E_VALUE_STRING ("E-value");
-static const QString FILTER_BY_SCORE_STRING ("Score");
-static const QString FILTER_BY_NONE_STRING("Do not filter results");
-
-static const QString FILTER_BY_E_VALUE("evalue");
-static const QString FILTER_BY_SCORE("score");
-static const QString FILTER_BY_NONE("none");
-
-const QString HmmerSearchWorkerFactory::ACTOR("hmm3-search");
-
-void HmmerSearchWorkerFactory::init() {
- QList<PortDescriptor*> p;
- QList<Attribute*> a;
- {
- Descriptor filterByDesc(FILTER_BY_ATTR,
- HmmerSearchWorker::tr("Filter by"),
- HmmerSearchWorker::tr("Parameter to filter results by."));
- Descriptor hd(HMM_URL_PORT, HmmerSearchWorker::tr("HMMER profile"), HmmerSearchWorker::tr("HMMER profile(s) URL(s) to search with."));
- Descriptor sd(BasePorts::IN_SEQ_PORT_ID(), HmmerSearchWorker::tr("Input sequence"),
- HmmerSearchWorker::tr("An input sequence (nucleotide or protein) to search in."));
- Descriptor od(BasePorts::OUT_ANNOTATIONS_PORT_ID(), HmmerSearchWorker::tr("HMMER annotations"),
- HmmerSearchWorker::tr("Annotations marking found similar sequence regions."));
-
- QMap<Descriptor, DataTypePtr> hmmM;
- hmmM[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
- p << new PortDescriptor(hd, DataTypePtr(new MapDataType("hmm.search.hmm", hmmM)), true /*input*/, false, IntegralBusPort::BLIND_INPUT);
- QMap<Descriptor, DataTypePtr> seqM;
- seqM[BaseSlots::DNA_SEQUENCE_SLOT()] = BaseTypes::DNA_SEQUENCE_TYPE();
- p << new PortDescriptor(sd, DataTypePtr(new MapDataType("hmm.search.sequence", seqM)), true /*input*/);
- QMap<Descriptor, DataTypePtr> outM;
- outM[BaseSlots::ANNOTATION_TABLE_SLOT()] = BaseTypes::ANNOTATION_TABLE_TYPE();
- p << new PortDescriptor(od, DataTypePtr(new MapDataType("hmm.search.out", outM)), false /*input*/, true);
-
- Descriptor nd(NAME_ATTR, HmmerSearchWorker::tr("Result annotation"), HmmerSearchWorker::tr("A name of the result annotations."));
- Descriptor nsd(SEED_ATTR, HmmerSearchWorker::tr("Seed"), HmmerSearchWorker::tr("Random generator seed. 0 - means that one-time arbitrary seed will be used."));
- Descriptor ded(DOM_E_ATTR, HmmerSearchWorker::tr("Filter by high E-value"), HmmerSearchWorker::tr("Report domains with e-value less than."));
- Descriptor dtd(DOM_T_ATTR, HmmerSearchWorker::tr("Filter by low score"), HmmerSearchWorker::tr("Report domains with score greater than."));
-
- Attribute *evalue = new Attribute(ded, BaseTypes::NUM_TYPE(), false, QVariant((double)10.0));
- Attribute *score = new Attribute(dtd, BaseTypes::NUM_TYPE(), false, QVariant((double)0.0));
-
- Attribute *filterBy = new Attribute(filterByDesc, BaseTypes::STRING_TYPE(), true, FILTER_BY_NONE);
- a << new Attribute(nd, BaseTypes::STRING_TYPE(), true, QVariant("hmm_signal"));
- a << filterBy;
- a << new Attribute(nsd, BaseTypes::NUM_TYPE(), false, QVariant(42));
- a << evalue;
- a << score;
-
-
- evalue->addRelation(new VisibilityRelation(FILTER_BY_ATTR, FILTER_BY_E_VALUE));
- score->addRelation(new VisibilityRelation(FILTER_BY_ATTR, FILTER_BY_SCORE));
- }
-
- Descriptor desc(HmmerSearchWorkerFactory::ACTOR, HmmerSearchWorker::tr("HMM3 Search"),
- HmmerSearchWorker::tr("Searches each input sequence for significantly similar sequence matches to all specified HMM profiles."
- " In case several profiles were supplied, searches with all profiles one by one and outputs united set of annotations for each sequence."));
- ActorPrototype *proto = new IntegralBusActorPrototype(desc, p, a);
- QMap<QString, PropertyDelegate *> delegates;
-
- {
- QVariantMap filterByValues;
- filterByValues[FILTER_BY_E_VALUE_STRING] = FILTER_BY_E_VALUE;
- filterByValues[FILTER_BY_SCORE_STRING] = FILTER_BY_SCORE;
- filterByValues[FILTER_BY_NONE_STRING] = FILTER_BY_NONE;
- delegates[FILTER_BY_ATTR] = new ComboBoxDelegate(filterByValues);
- }
-
- {
- QVariantMap eMap;
- eMap["decimals"]= (2);
- eMap["minimum"] = (1e-99);
- eMap["maximum"] = (1e+99);
- eMap["singleStep"] = (0.1);
- delegates[DOM_E_ATTR] = new DoubleSpinBoxDelegate(eMap);
- }
- {
- QVariantMap nMap;
- nMap["maximum"] = (INT_MAX);
- nMap["minimum"] = (0);
- delegates[SEED_ATTR] = new SpinBoxDelegate(nMap);
- }
- {
- QVariantMap tMap;
- tMap["decimals"]= (2);
- tMap["minimum"] = (-1e+09);
- tMap["maximum"] = (1e+09);
- tMap["singleStep"] = (0.1);
- delegates[DOM_T_ATTR] = new DoubleSpinBoxDelegate(tMap);
- }
-
- proto->setEditor(new DelegateEditor(delegates));
- proto->setIconPath(":/external_tool_support/images/hmmer.png");
- proto->setPrompter(new HmmerSearchPrompter());
- proto->addExternalTool(HmmerSupport::SEARCH_TOOL);
- WorkflowEnv::getProtoRegistry()->registerProto(Descriptor("hmmer3", HmmerSearchWorker::tr("HMMER3 Tools"), ""), proto);
-
- DomainFactory *localDomain = WorkflowEnv::getDomainRegistry()->getById(LocalDomainFactory::ID);
- localDomain->registerEntry(new HmmerSearchWorkerFactory());
-}
-
-HmmerSearchWorkerFactory::HmmerSearchWorkerFactory()
- : DomainFactory(ACTOR)
-{
-
-}
-
-Worker * HmmerSearchWorkerFactory::createWorker(Actor *a) {
- return new HmmerSearchWorker(a);
-}
-
-/*******************************
- * HMM3SearchPrompter
- *******************************/
-HmmerSearchPrompter::HmmerSearchPrompter(Actor *p)
- : PrompterBase<HmmerSearchPrompter>(p)
-{
-
-}
-
-QString HmmerSearchPrompter::composeRichDoc() {
- Actor *hmmProducer = qobject_cast<IntegralBusPort *>(target->getPort(HMM_URL_PORT))->getProducer(HMM_URL_PORT);
- Actor *seqProducer = qobject_cast<IntegralBusPort *>(target->getPort(BasePorts::IN_SEQ_PORT_ID()))->getProducer(BasePorts::IN_SEQ_PORT_ID());
-
- QString seqName = (seqProducer ? tr("For each sequence from <u>%1</u>,").arg(seqProducer->getLabel()) : "");
- QString hmmName = (hmmProducer ? tr("using all profiles provided by <u>%1</u>,").arg(hmmProducer->getLabel()) : "");
-
- QString resultName = getHyperlink(NAME_ATTR, getRequiredParam(NAME_ATTR));
-
- QString doc = tr("%1 search HMMER signals %2. "
- "<br>Output the list of found regions annotated as <u>%4</u>.")
- .arg(seqName)
- .arg(hmmName)
- .arg(resultName);
-
- return doc;
-}
-
-/*******************************
- * HMM3SearchWorker
- *******************************/
-HmmerSearchWorker::HmmerSearchWorker(Actor *a)
- : BaseWorker(a, false),
- hmmPort(NULL),
- seqPort(NULL),
- output(NULL)
-{
-
-}
-
-void HmmerSearchWorker::init() {
- cfg = HmmerSearchSettings();
-
- hmmPort = ports.value(HMM_URL_PORT);
- seqPort = ports.value(BasePorts::IN_SEQ_PORT_ID());
- output = ports.value(BasePorts::OUT_ANNOTATIONS_PORT_ID());
- seqPort->addComplement(output);
- output->addComplement(seqPort);
-
- QString filterBy = actor->getParameter(FILTER_BY_ATTR)->getAttributeValue<QString>(context);
- if (filterBy == FILTER_BY_E_VALUE) {
- cfg.domE = actor->getParameter(DOM_E_ATTR)->getAttributeValue<double>(context);
- cfg.domT = HmmerSearchSettings::OPTION_NOT_SET;
- } else if (filterBy == FILTER_BY_SCORE) {
- cfg.domT = actor->getParameter(DOM_T_ATTR)->getAttributeValue<double>(context);
- cfg.domE = HmmerSearchSettings::OPTION_NOT_SET;
- } else {
- cfg.domE = HmmerSearchSettings::OPTION_NOT_SET;
- cfg.domT = HmmerSearchSettings::OPTION_NOT_SET;
- }
-
- cfg.seed = actor->getParameter(SEED_ATTR)->getAttributeValue<int>(context);
- resultName = actor->getParameter(NAME_ATTR)->getAttributeValue<QString>(context);
- if (resultName.isEmpty()) {
- algoLog.details(tr("Value for attribute name is empty, default name used"));
- resultName = "hmm_signal";
- }
-}
-
-bool HmmerSearchWorker::isReady() const {
- if (isDone()) {
- return false;
- }
- bool seqEnded = seqPort->isEnded();
- bool hmmEnded = hmmPort->isEnded();
- int seqHasMes = seqPort->hasMessage();
- int hmmHasMes = hmmPort->hasMessage();
- return hmmHasMes || (hmmEnded && (seqHasMes || seqEnded));
-}
-
-Task * HmmerSearchWorker::tick() {
- while (hmmPort->hasMessage()) {
- hmms << hmmPort->get().getData().toMap().value(BaseSlots::URL_SLOT().getId()).toString();
- }
- if (!hmmPort->isEnded()) { // || hmms.isEmpty() || !seqPort->hasMessage()
- return NULL;
- }
-
- if (seqPort->hasMessage()) {
- Message inputMessage = getMessageAndSetupScriptValues(seqPort);
- if (inputMessage.isEmpty() || hmms.isEmpty()) {
- output->transit();
- return NULL;
- }
- SharedDbiDataHandler seqId = inputMessage.getData().toMap().value(BaseSlots::DNA_SEQUENCE_SLOT().getId()).value<SharedDbiDataHandler>();
- QScopedPointer<U2SequenceObject> seqObj(StorageUtils::getSequenceObject(context->getDataStorage(), seqId));
- if (NULL == seqObj) {
- return NULL;
- }
-
- if (seqObj->getAlphabet()->getType() != DNAAlphabet_RAW) {
- QList<Task *> subtasks;
- HmmerSearchSettings settings = cfg;
- foreach (const QString &hmmProfileUrl, hmms) {
- settings.workingDir = monitor()->outputDir() + "hmmer_search";
- settings.hmmProfileUrl = hmmProfileUrl;
- settings.sequence = seqObj.data();
- settings.pattern.annotationName = resultName;
- settings.annotationTable = new AnnotationTableObject("Annotation table", context->getDataStorage()->getDbiRef());
- HmmerSearchTask *searchTask = new HmmerSearchTask(settings);
- settings.annotationTable->setParent(searchTask);
- searchTask->addListeners(createLogListeners());
- subtasks << searchTask;
- }
-
- Task *multiTask = new MultiTask(tr("Find HMMER signals in %1").arg(seqObj->getGObjectName()), subtasks);
- connect(new TaskSignalMapper(multiTask), SIGNAL(si_taskFinished(Task *)), SLOT(sl_taskFinished(Task *)));
- seqObj.take()->setParent(multiTask);
- return multiTask;
- }
- QString err = tr("Bad sequence supplied to input: %1").arg(seqObj->getGObjectName());
- return new FailTask(err);
- } if (seqPort->isEnded()) {
- setDone();
- output->setEnded();
- }
- return NULL;
-}
-
-void HmmerSearchWorker::sl_taskFinished(Task *task) {
- SAFE_POINT(NULL != task, "Invalid task is encountered", );
- if (task->isCanceled()) {
- return;
- }
- if (NULL != output) {
- QList<SharedAnnotationData> list;
-
- foreach(Task *sub, task->getSubtasks()) {
- HmmerSearchTask *searchTask = qobject_cast<HmmerSearchTask *>(sub);
- if (searchTask == NULL){
- continue;
- }
- list << searchTask->getAnnotations();
- }
-
- CHECK(!list.isEmpty(), );
-
- const SharedDbiDataHandler tableId = context->getDataStorage()->putAnnotationTable(list);
- output->put(Message(BaseTypes::ANNOTATION_TABLE_TYPE(), qVariantFromValue<SharedDbiDataHandler>(tableId)));
- algoLog.info(tr("Found %1 HMMER signals").arg(list.size()));
- }
-}
-
-void HmmerSearchWorker::cleanup() {
-
-}
-
-} // namespace LocalWorkflow
-} // namespace U2
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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/AnnotationData.h>
+#include <U2Core/AppContext.h>
+#include <U2Core/DNAAlphabet.h>
+#include <U2Core/DNASequence.h>
+#include <U2Core/DNASequenceObject.h>
+#include <U2Core/DNATranslation.h>
+#include <U2Core/FailTask.h>
+#include <U2Core/Log.h>
+#include <U2Core/MultiTask.h>
+#include <U2Core/TaskSignalMapper.h>
+#include <U2Core/U2OpStatusUtils.h>
+
+#include <U2Designer/DelegateEditors.h>
+
+#include <U2Lang/ActorPrototypeRegistry.h>
+#include <U2Lang/BaseActorCategories.h>
+#include <U2Lang/BasePorts.h>
+#include <U2Lang/BaseSlots.h>
+#include <U2Lang/BaseTypes.h>
+#include <U2Lang/CoreLibConstants.h>
+#include <U2Lang/Datatype.h>
+#include <U2Lang/IntegralBusModel.h>
+#include <U2Lang/WorkflowEnv.h>
+#include <U2Lang/WorkflowMonitor.h>
+
+#include "HmmerSearchTask.h"
+#include "HmmerSearchWorker.h"
+#include "HmmerSupport.h"
+
+namespace U2 {
+namespace LocalWorkflow {
+
+/*******************************
+ * HMM3SearchWorkerFactory
+ *******************************/
+static const QString HMM_URL_PORT("in-hmm3");
+
+static const QString NAME_ATTR("result-name");
+static const QString DOM_E_ATTR("e-val");
+static const QString DOM_T_ATTR("score");
+static const QString SEED_ATTR("seed");
+static const QString FILTER_BY_ATTR("filter-by");
+
+static const QString FILTER_BY_E_VALUE_STRING ("E-value");
+static const QString FILTER_BY_SCORE_STRING ("Score");
+static const QString FILTER_BY_NONE_STRING("Do not filter results");
+
+static const QString FILTER_BY_E_VALUE("evalue");
+static const QString FILTER_BY_SCORE("score");
+static const QString FILTER_BY_NONE("none");
+
+const QString HmmerSearchWorkerFactory::ACTOR("hmm3-search");
+
+void HmmerSearchWorkerFactory::init() {
+ QList<PortDescriptor*> p;
+ QList<Attribute*> a;
+ {
+ Descriptor filterByDesc(FILTER_BY_ATTR,
+ HmmerSearchWorker::tr("Filter by"),
+ HmmerSearchWorker::tr("Parameter to filter results by."));
+ Descriptor hd(HMM_URL_PORT, HmmerSearchWorker::tr("HMMER profile"), HmmerSearchWorker::tr("HMMER profile(s) URL(s) to search with."));
+ Descriptor sd(BasePorts::IN_SEQ_PORT_ID(), HmmerSearchWorker::tr("Input sequence"),
+ HmmerSearchWorker::tr("An input sequence (nucleotide or protein) to search in."));
+ Descriptor od(BasePorts::OUT_ANNOTATIONS_PORT_ID(), HmmerSearchWorker::tr("HMMER annotations"),
+ HmmerSearchWorker::tr("Annotations marking found similar sequence regions."));
+
+ QMap<Descriptor, DataTypePtr> hmmM;
+ hmmM[BaseSlots::URL_SLOT()] = BaseTypes::STRING_TYPE();
+ p << new PortDescriptor(hd, DataTypePtr(new MapDataType("hmm.search.hmm", hmmM)), true /*input*/, false, IntegralBusPort::BLIND_INPUT);
+ QMap<Descriptor, DataTypePtr> seqM;
+ seqM[BaseSlots::DNA_SEQUENCE_SLOT()] = BaseTypes::DNA_SEQUENCE_TYPE();
+ p << new PortDescriptor(sd, DataTypePtr(new MapDataType("hmm.search.sequence", seqM)), true /*input*/);
+ QMap<Descriptor, DataTypePtr> outM;
+ outM[BaseSlots::ANNOTATION_TABLE_SLOT()] = BaseTypes::ANNOTATION_TABLE_TYPE();
+ p << new PortDescriptor(od, DataTypePtr(new MapDataType("hmm.search.out", outM)), false /*input*/, true);
+
+ Descriptor nd(NAME_ATTR, HmmerSearchWorker::tr("Result annotation"), HmmerSearchWorker::tr("A name of the result annotations."));
+ Descriptor nsd(SEED_ATTR, HmmerSearchWorker::tr("Seed"), HmmerSearchWorker::tr("Random generator seed. 0 - means that one-time arbitrary seed will be used."));
+ Descriptor ded(DOM_E_ATTR, HmmerSearchWorker::tr("Filter by high E-value"), HmmerSearchWorker::tr("Report domains with e-value less than."));
+ Descriptor dtd(DOM_T_ATTR, HmmerSearchWorker::tr("Filter by low score"), HmmerSearchWorker::tr("Report domains with score greater than."));
+
+ Attribute *evalue = new Attribute(ded, BaseTypes::NUM_TYPE(), false, QVariant((double)10.0));
+ Attribute *score = new Attribute(dtd, BaseTypes::NUM_TYPE(), false, QVariant((double)0.0));
+
+ Attribute *filterBy = new Attribute(filterByDesc, BaseTypes::STRING_TYPE(), true, FILTER_BY_NONE);
+ a << new Attribute(nd, BaseTypes::STRING_TYPE(), true, QVariant("hmm_signal"));
+ a << filterBy;
+ a << new Attribute(nsd, BaseTypes::NUM_TYPE(), false, QVariant(42));
+ a << evalue;
+ a << score;
+
+
+ evalue->addRelation(new VisibilityRelation(FILTER_BY_ATTR, FILTER_BY_E_VALUE));
+ score->addRelation(new VisibilityRelation(FILTER_BY_ATTR, FILTER_BY_SCORE));
+ }
+
+ Descriptor desc(HmmerSearchWorkerFactory::ACTOR, HmmerSearchWorker::tr("HMM3 Search"),
+ HmmerSearchWorker::tr("Searches each input sequence for significantly similar sequence matches to all specified HMM profiles."
+ " In case several profiles were supplied, searches with all profiles one by one and outputs united set of annotations for each sequence."));
+ ActorPrototype *proto = new IntegralBusActorPrototype(desc, p, a);
+ QMap<QString, PropertyDelegate *> delegates;
+
+ {
+ QVariantMap filterByValues;
+ filterByValues[FILTER_BY_E_VALUE_STRING] = FILTER_BY_E_VALUE;
+ filterByValues[FILTER_BY_SCORE_STRING] = FILTER_BY_SCORE;
+ filterByValues[FILTER_BY_NONE_STRING] = FILTER_BY_NONE;
+ delegates[FILTER_BY_ATTR] = new ComboBoxDelegate(filterByValues);
+ }
+
+ {
+ QVariantMap eMap;
+ eMap["decimals"]= (2);
+ eMap["minimum"] = (1e-99);
+ eMap["maximum"] = (1e+99);
+ eMap["singleStep"] = (0.1);
+ delegates[DOM_E_ATTR] = new DoubleSpinBoxDelegate(eMap);
+ }
+ {
+ QVariantMap nMap;
+ nMap["maximum"] = (INT_MAX);
+ nMap["minimum"] = (0);
+ delegates[SEED_ATTR] = new SpinBoxDelegate(nMap);
+ }
+ {
+ QVariantMap tMap;
+ tMap["decimals"]= (2);
+ tMap["minimum"] = (-1e+09);
+ tMap["maximum"] = (1e+09);
+ tMap["singleStep"] = (0.1);
+ delegates[DOM_T_ATTR] = new DoubleSpinBoxDelegate(tMap);
+ }
+
+ proto->setEditor(new DelegateEditor(delegates));
+ proto->setIconPath(":/external_tool_support/images/hmmer.png");
+ proto->setPrompter(new HmmerSearchPrompter());
+ proto->addExternalTool(HmmerSupport::SEARCH_TOOL);
+ WorkflowEnv::getProtoRegistry()->registerProto(Descriptor("hmmer3", HmmerSearchWorker::tr("HMMER3 Tools"), ""), proto);
+
+ DomainFactory *localDomain = WorkflowEnv::getDomainRegistry()->getById(LocalDomainFactory::ID);
+ localDomain->registerEntry(new HmmerSearchWorkerFactory());
+}
+
+HmmerSearchWorkerFactory::HmmerSearchWorkerFactory()
+ : DomainFactory(ACTOR)
+{
+
+}
+
+Worker * HmmerSearchWorkerFactory::createWorker(Actor *a) {
+ return new HmmerSearchWorker(a);
+}
+
+/*******************************
+ * HMM3SearchPrompter
+ *******************************/
+HmmerSearchPrompter::HmmerSearchPrompter(Actor *p)
+ : PrompterBase<HmmerSearchPrompter>(p)
+{
+
+}
+
+QString HmmerSearchPrompter::composeRichDoc() {
+ Actor *hmmProducer = qobject_cast<IntegralBusPort *>(target->getPort(HMM_URL_PORT))->getProducer(HMM_URL_PORT);
+ Actor *seqProducer = qobject_cast<IntegralBusPort *>(target->getPort(BasePorts::IN_SEQ_PORT_ID()))->getProducer(BasePorts::IN_SEQ_PORT_ID());
+
+ QString seqName = (seqProducer ? tr("For each sequence from <u>%1</u>,").arg(seqProducer->getLabel()) : "");
+ QString hmmName = (hmmProducer ? tr("using all profiles provided by <u>%1</u>,").arg(hmmProducer->getLabel()) : "");
+
+ QString resultName = getHyperlink(NAME_ATTR, getRequiredParam(NAME_ATTR));
+
+ QString doc = tr("%1 search HMMER signals %2. "
+ "<br>Output the list of found regions annotated as <u>%4</u>.")
+ .arg(seqName)
+ .arg(hmmName)
+ .arg(resultName);
+
+ return doc;
+}
+
+/*******************************
+ * HMM3SearchWorker
+ *******************************/
+HmmerSearchWorker::HmmerSearchWorker(Actor *a)
+ : BaseWorker(a, false),
+ hmmPort(NULL),
+ seqPort(NULL),
+ output(NULL)
+{
+
+}
+
+void HmmerSearchWorker::init() {
+ cfg = HmmerSearchSettings();
+
+ hmmPort = ports.value(HMM_URL_PORT);
+ seqPort = ports.value(BasePorts::IN_SEQ_PORT_ID());
+ output = ports.value(BasePorts::OUT_ANNOTATIONS_PORT_ID());
+ seqPort->addComplement(output);
+ output->addComplement(seqPort);
+
+ QString filterBy = actor->getParameter(FILTER_BY_ATTR)->getAttributeValue<QString>(context);
+ if (filterBy == FILTER_BY_E_VALUE) {
+ cfg.domE = actor->getParameter(DOM_E_ATTR)->getAttributeValue<double>(context);
+ cfg.domT = HmmerSearchSettings::OPTION_NOT_SET;
+ } else if (filterBy == FILTER_BY_SCORE) {
+ cfg.domT = actor->getParameter(DOM_T_ATTR)->getAttributeValue<double>(context);
+ cfg.domE = HmmerSearchSettings::OPTION_NOT_SET;
+ } else {
+ cfg.domE = HmmerSearchSettings::OPTION_NOT_SET;
+ cfg.domT = HmmerSearchSettings::OPTION_NOT_SET;
+ }
+
+ cfg.seed = actor->getParameter(SEED_ATTR)->getAttributeValue<int>(context);
+ resultName = actor->getParameter(NAME_ATTR)->getAttributeValue<QString>(context);
+ if (resultName.isEmpty()) {
+ algoLog.details(tr("Value for attribute name is empty, default name used"));
+ resultName = "hmm_signal";
+ }
+}
+
+bool HmmerSearchWorker::isReady() const {
+ if (isDone()) {
+ return false;
+ }
+ bool seqEnded = seqPort->isEnded();
+ bool hmmEnded = hmmPort->isEnded();
+ int seqHasMes = seqPort->hasMessage();
+ int hmmHasMes = hmmPort->hasMessage();
+ return hmmHasMes || (hmmEnded && (seqHasMes || seqEnded));
+}
+
+Task * HmmerSearchWorker::tick() {
+ while (hmmPort->hasMessage()) {
+ hmms << hmmPort->get().getData().toMap().value(BaseSlots::URL_SLOT().getId()).toString();
+ }
+ if (!hmmPort->isEnded()) { // || hmms.isEmpty() || !seqPort->hasMessage()
+ return NULL;
+ }
+
+ if (seqPort->hasMessage()) {
+ Message inputMessage = getMessageAndSetupScriptValues(seqPort);
+ if (inputMessage.isEmpty() || hmms.isEmpty()) {
+ output->transit();
+ return NULL;
+ }
+ SharedDbiDataHandler seqId = inputMessage.getData().toMap().value(BaseSlots::DNA_SEQUENCE_SLOT().getId()).value<SharedDbiDataHandler>();
+ QScopedPointer<U2SequenceObject> seqObj(StorageUtils::getSequenceObject(context->getDataStorage(), seqId));
+ if (NULL == seqObj) {
+ return NULL;
+ }
+
+ if (seqObj->getAlphabet()->getType() != DNAAlphabet_RAW) {
+ QList<Task *> subtasks;
+ HmmerSearchSettings settings = cfg;
+ foreach (const QString &hmmProfileUrl, hmms) {
+ settings.workingDir = monitor()->outputDir() + "hmmer_search";
+ settings.hmmProfileUrl = hmmProfileUrl;
+ settings.sequence = seqObj.data();
+ settings.pattern.annotationName = resultName;
+ settings.annotationTable = new AnnotationTableObject("Annotation table", context->getDataStorage()->getDbiRef());
+ HmmerSearchTask *searchTask = new HmmerSearchTask(settings);
+ settings.annotationTable->setParent(searchTask);
+ searchTask->addListeners(createLogListeners());
+ subtasks << searchTask;
+ }
+
+ Task *multiTask = new MultiTask(tr("Find HMMER signals in %1").arg(seqObj->getGObjectName()), subtasks);
+ connect(new TaskSignalMapper(multiTask), SIGNAL(si_taskFinished(Task *)), SLOT(sl_taskFinished(Task *)));
+ seqObj.take()->setParent(multiTask);
+ return multiTask;
+ }
+ QString err = tr("Bad sequence supplied to input: %1").arg(seqObj->getGObjectName());
+ return new FailTask(err);
+ } if (seqPort->isEnded()) {
+ setDone();
+ output->setEnded();
+ }
+ return NULL;
+}
+
+void HmmerSearchWorker::sl_taskFinished(Task *task) {
+ SAFE_POINT(NULL != task, "Invalid task is encountered", );
+ if (task->isCanceled()) {
+ return;
+ }
+ if (NULL != output) {
+ QList<SharedAnnotationData> list;
+
+ foreach(Task *sub, task->getSubtasks()) {
+ HmmerSearchTask *searchTask = qobject_cast<HmmerSearchTask *>(sub);
+ if (searchTask == NULL){
+ continue;
+ }
+ list << searchTask->getAnnotations();
+ }
+
+ CHECK(!list.isEmpty(), );
+
+ const SharedDbiDataHandler tableId = context->getDataStorage()->putAnnotationTable(list);
+ output->put(Message(BaseTypes::ANNOTATION_TABLE_TYPE(), qVariantFromValue<SharedDbiDataHandler>(tableId)));
+ algoLog.info(tr("Found %1 HMMER signals").arg(list.size()));
+ }
+}
+
+void HmmerSearchWorker::cleanup() {
+
+}
+
+} // namespace LocalWorkflow
+} // namespace U2
diff --git a/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.h b/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.h
index fda32b3..4613146 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSearchWorker.h
@@ -1,77 +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_HMMER_SEARCH_WORKER_H_
-#define _U2_HMMER_SEARCH_WORKER_H_
-
-#include <U2Lang/LocalDomain.h>
-#include <U2Lang/WorkflowUtils.h>
-
-#include "HmmerSearchSettings.h"
-
-namespace U2 {
-
-namespace LocalWorkflow {
-
-class HmmerSearchPrompter : public PrompterBase<HmmerSearchPrompter> {
- Q_OBJECT
-public:
- HmmerSearchPrompter(Actor *p = NULL);
-
-protected:
- QString composeRichDoc();
-};
-
-class HmmerSearchWorker : public BaseWorker {
- Q_OBJECT
-public:
- HmmerSearchWorker(Actor *a);
-
- void init();
- bool isReady() const;
- Task * tick();
- void cleanup();
-
-private slots:
- void sl_taskFinished(Task *task);
-
-protected:
- IntegralBus *hmmPort;
- IntegralBus *seqPort;
- IntegralBus *output;
- QString resultName;
- HmmerSearchSettings cfg;
- QStringList hmms;
-};
-
-class HmmerSearchWorkerFactory : public DomainFactory {
-public:
- static const QString ACTOR;
-
- static void init();
- HmmerSearchWorkerFactory();
- Worker * createWorker(Actor *a);
-};
-
-} // namespace LocalWorkflow
-} // namespace U2
-
-#endif //_U2_HMMER_SEARCH_WORKER_H_
+/**
+ * UGENE - Integrated Bioinformatics Tools.
+ * Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
+ * http://ugene.net
+ *
+ * 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_HMMER_SEARCH_WORKER_H_
+#define _U2_HMMER_SEARCH_WORKER_H_
+
+#include <U2Lang/LocalDomain.h>
+#include <U2Lang/WorkflowUtils.h>
+
+#include "HmmerSearchSettings.h"
+
+namespace U2 {
+
+namespace LocalWorkflow {
+
+class HmmerSearchPrompter : public PrompterBase<HmmerSearchPrompter> {
+ Q_OBJECT
+public:
+ HmmerSearchPrompter(Actor *p = NULL);
+
+protected:
+ QString composeRichDoc();
+};
+
+class HmmerSearchWorker : public BaseWorker {
+ Q_OBJECT
+public:
+ HmmerSearchWorker(Actor *a);
+
+ void init();
+ bool isReady() const;
+ Task * tick();
+ void cleanup();
+
+private slots:
+ void sl_taskFinished(Task *task);
+
+protected:
+ IntegralBus *hmmPort;
+ IntegralBus *seqPort;
+ IntegralBus *output;
+ QString resultName;
+ HmmerSearchSettings cfg;
+ QStringList hmms;
+};
+
+class HmmerSearchWorkerFactory : public DomainFactory {
+public:
+ static const QString ACTOR;
+
+ static void init();
+ HmmerSearchWorkerFactory();
+ Worker * createWorker(Actor *a);
+};
+
+} // namespace LocalWorkflow
+} // namespace U2
+
+#endif //_U2_HMMER_SEARCH_WORKER_H_
diff --git a/src/plugins/external_tool_support/src/hmmer/HmmerSupport.cpp b/src/plugins/external_tool_support/src/hmmer/HmmerSupport.cpp
index e842304..4b1ada2 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSupport.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/HmmerSupport.h b/src/plugins/external_tool_support/src/hmmer/HmmerSupport.h
index f8e9fc0..ba97686 100644
--- a/src/plugins/external_tool_support/src/hmmer/HmmerSupport.h
+++ b/src/plugins/external_tool_support/src/hmmer/HmmerSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/PhmmerSearchDialog.cpp b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.cpp
index 706d1df..20533c9 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ PhmmerSearchDialog::PhmmerSearchDialog(U2SequenceObject *seqObj, QWidget *parent
assert(NULL != seqObj);
setupUi(this);
- new HelpButton(this, buttonBox, "18220561");
+ new HelpButton(this, buttonBox, "18223201");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Search"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.h b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.h
index e0b3784..4d8aada 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.h
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ class PhmmerSearchDialog : public QDialog, public Ui_PhmmerSearchDialog {
Q_OBJECT
public:
PhmmerSearchDialog(U2SequenceObject *seqObj, QWidget *parent = NULL);
-
+
private slots:
void accept();
void sl_queryToolButtonClicked();
@@ -51,7 +51,7 @@ private slots:
void sl_domZCheckBoxChanged(int state);
void sl_maxCheckBoxChanged(int state);
void sl_domESpinBoxChanged(int newVal);
-
+
private:
void setModelValues();
void getModelValues();
diff --git a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.cpp b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.cpp
index 08f2269..c975a04 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/PhmmerSearchSettings.h b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.h
index 8961a94..2c1b125 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.h
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/PhmmerSearchTask.cpp b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.cpp
index 790e485..20176ff 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.cpp
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/hmmer/PhmmerSearchTask.h b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.h
index 29e969e..e8a165f 100644
--- a/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.h
+++ b/src/plugins/external_tool_support/src/hmmer/PhmmerSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/java/JavaSupport.cpp b/src/plugins/external_tool_support/src/java/JavaSupport.cpp
index bb070cc..b82a75e 100644
--- a/src/plugins/external_tool_support/src/java/JavaSupport.cpp
+++ b/src/plugins/external_tool_support/src/java/JavaSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/java/JavaSupport.h b/src/plugins/external_tool_support/src/java/JavaSupport.h
index be191d6..df954e7 100644
--- a/src/plugins/external_tool_support/src/java/JavaSupport.h
+++ b/src/plugins/external_tool_support/src/java/JavaSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSSettings.cpp b/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
index 5b5918f..c1cf7eb 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSSettings.h b/src/plugins/external_tool_support/src/macs/MACSSettings.h
index 2a7d004..e375ec5 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSettings.h
+++ b/src/plugins/external_tool_support/src/macs/MACSSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSSupport.cpp b/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
index cc12bc8..d3e42e5 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSSupport.h b/src/plugins/external_tool_support/src/macs/MACSSupport.h
index 4f08d13..2fee90a 100644
--- a/src/plugins/external_tool_support/src/macs/MACSSupport.h
+++ b/src/plugins/external_tool_support/src/macs/MACSSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSTask.cpp b/src/plugins/external_tool_support/src/macs/MACSTask.cpp
index 52d96e3..6fd9055 100644
--- a/src/plugins/external_tool_support/src/macs/MACSTask.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSTask.h b/src/plugins/external_tool_support/src/macs/MACSTask.h
index 042e79f..b2ec3e5 100644
--- a/src/plugins/external_tool_support/src/macs/MACSTask.h
+++ b/src/plugins/external_tool_support/src/macs/MACSTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSWorker.cpp b/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
index 0f32fa3..a4d7ebd 100644
--- a/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
+++ b/src/plugins/external_tool_support/src/macs/MACSWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/macs/MACSWorker.h b/src/plugins/external_tool_support/src/macs/MACSWorker.h
index bdc9570..a521bf3 100644
--- a/src/plugins/external_tool_support/src/macs/MACSWorker.h
+++ b/src/plugins/external_tool_support/src/macs/MACSWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTSupport.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
index 0df88f2..8ecb1fd 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTSupport.h b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
index 969b40e..76097fa 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTSupportRunDialog.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
index 3126558..0412b03 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ MAFFTSupportRunDialog::MAFFTSupportRunDialog(MAFFTSupportTaskSettings& _settings
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220590");
+ new HelpButton(this, buttonBox, "18223230");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -71,7 +71,7 @@ MAFFTWithExtFileSpecifySupportRunDialog::MAFFTWithExtFileSpecifySupportRunDialog
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220590");
+ new HelpButton(this, buttonBox, "18223230");
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 80be9d2..69a9a77 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTSupportRunDialog.ui b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.ui
index e8a36a1..4ccba6c 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.ui
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportRunDialog.ui
@@ -25,7 +25,7 @@
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
diff --git a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
index 3b9c30f..75543da 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTSupportTask.h b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
index a216d14..a328e5b 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTWorker.cpp b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
index 17890b1..70fe098 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MAFFTWorker.h b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
index a399535..01d48e4 100644
--- a/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
+++ b/src/plugins/external_tool_support/src/mafft/MAFFTWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MafftAddToAlignmentTask.cpp b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
index f924a06..e6b049e 100644
--- a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
+++ b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mafft/MafftAddToAlignmentTask.h b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
index 90c5966..39ca555 100644
--- a/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
+++ b/src/plugins/external_tool_support/src/mafft/MafftAddToAlignmentTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesDialogWidget.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
index d8bfdfa..a01c2c1 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesDialogWidget.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
index 020ed73..3f9b6fe 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesDialogWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesSupport.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
index 20b2c15..f48b3f0 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesSupport.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
index 6cba6c9..f0353f7 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesTask.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
index d3b9863..7f63657 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesTask.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
index 3df3052..50553c1 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesTests.cpp b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
index 7ac54db..f7d5a3f 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/mrbayes/MrBayesTests.h b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
index a54c2a7..723daf6 100644
--- a/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
+++ b/src/plugins/external_tool_support/src/mrbayes/MrBayesTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Gene2PeakFormatLoader.cpp b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
index 9d71705..30d3387 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Gene2PeakFormatLoader.h b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
index 6dc82ec..416e460 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Gene2PeakFormatLoader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneFormatLoader.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
index 77e72b3..83b3c06 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneFormatLoader.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
index 6fef806..865b591 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneFormatLoader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneSettings.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
index 20bf2a8..527e6e1 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneSettings.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
index 0e673d5..72b1ce7 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneSupport.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
index 000b0a8..cf06885 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneSupport.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
index 6b5aa6b..262571f 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneTask.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
index 2df603a..8ba9375 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneTask.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
index 2580f16..3563e05 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneWorker.cpp b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
index fd1e41d..c15241a 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/Peak2GeneWorker.h b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
index 886e3f1..b721c91 100644
--- a/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
+++ b/src/plugins/external_tool_support/src/peak2gene/Peak2GeneWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/TabulatedFormatReader.cpp b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
index 07aa842..3ab4640 100644
--- a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
+++ b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/peak2gene/TabulatedFormatReader.h b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
index 507e4de..8736e89 100644
--- a/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
+++ b/src/plugins/external_tool_support/src/peak2gene/TabulatedFormatReader.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perl/PerlSupport.cpp b/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
index 483800f..552737e 100644
--- a/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
+++ b/src/plugins/external_tool_support/src/perl/PerlSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perl/PerlSupport.h b/src/plugins/external_tool_support/src/perl/PerlSupport.h
index e25d233..9dec39e 100644
--- a/src/plugins/external_tool_support/src/perl/PerlSupport.h
+++ b/src/plugins/external_tool_support/src/perl/PerlSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLDialog.ui b/src/plugins/external_tool_support/src/phyml/PhyMLDialog.ui
index dcf7be9..a7b953e 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLDialog.ui
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLDialog.ui
@@ -579,5 +579,21 @@ Uncheck to get the maximum likelihood estimate.</string>
</hint>
</hints>
</connection>
+ <connection>
+ <sender>bootstrapCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>fastMethodCombo</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>88</x>
+ <y>85</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>385</x>
+ <y>55</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
index 153269f..7c31720 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -68,6 +68,7 @@ PhyMlWidget::PhyMlWidget(const MAlignment &ma, QWidget *parent) :
CreatePhyTreeWidget(parent)
{
setupUi(this);
+
fillComboBoxes(ma);
createWidgetsControllers();
diff --git a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
index fb32590..c62c7b7 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLDialogWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLSupport.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
index a0712f0..a8b5543 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLSupport.h b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
index 7067f7a..445853b 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLTask.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
index e198258..ef9d752 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLTask.h b/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
index 48b20f4..930884c 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLTests.cpp b/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
index e1139ab..4ad424d 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/phyml/PhyMLTests.h b/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
index a26c254..cc004b3 100644
--- a/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
+++ b/src/plugins/external_tool_support/src/phyml/PhyMLTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/python/PythonSupport.cpp b/src/plugins/external_tool_support/src/python/PythonSupport.cpp
index 30778e7..56d815c 100644
--- a/src/plugins/external_tool_support/src/python/PythonSupport.cpp
+++ b/src/plugins/external_tool_support/src/python/PythonSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/python/PythonSupport.h b/src/plugins/external_tool_support/src/python/PythonSupport.h
index 28784af..6b88634 100644
--- a/src/plugins/external_tool_support/src/python/PythonSupport.h
+++ b/src/plugins/external_tool_support/src/python/PythonSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/BcfToolsSupport.cpp b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
index 6b19aa8..adad9bd 100644
--- a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/BcfToolsSupport.h b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
index 90d03bf..5a724af 100644
--- a/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/BcfToolsSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/SamToolsExtToolSupport.cpp b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
index 22e98a5..1f17d1e 100644
--- a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/SamToolsExtToolSupport.h b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
index d76cfd1..524093f 100644
--- a/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/SamToolsExtToolSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/TabixSupport.cpp b/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
index ee0d8ae..21a5704 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/TabixSupport.h b/src/plugins/external_tool_support/src/samtools/TabixSupport.h
index cf1819d..47a0cce 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupport.h
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/TabixSupportTask.cpp b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
index 0114b0e..ae20e12 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/samtools/TabixSupportTask.h b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
index 21175f1..7ae7135 100644
--- a/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
+++ b/src/plugins/external_tool_support/src/samtools/TabixSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosSettings.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
index a244159..f6ce585 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosSettings.h b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
index 7d40828..c860d19 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosSupport.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
index 6e1180c..0f1ccc1 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosSupport.h b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
index 07ff660..bbef578 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosTask.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
index 7313423..0436d22 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosTask.h b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
index f902a41..fe972cc 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosWorker.cpp b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
index a05b1f4..2112719 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/seqpos/SeqPosWorker.h b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
index 1620cb1..4342c0d 100644
--- a/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
+++ b/src/plugins/external_tool_support/src/seqpos/SeqPosWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/snpeff/SnpEffSupport.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
index d2e347a..539a755 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/snpeff/SnpEffSupport.h b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
index 9af464f..9ffcd65 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ class SnpEffSupport : public ExternalTool {
Q_OBJECT
public:
SnpEffSupport(const QString& name, const QString& path = "");
-
+
const QStringList getToolRunnerAdditionalOptions();
};
diff --git a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
index 6ebc1ba..d0cb3c5 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/snpeff/SnpEffTask.h b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
index 0f00b12..a6c6858 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/snpeff/SnpEffWorker.cpp b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
index 4111906..d33cbde 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/snpeff/SnpEffWorker.h b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
index 14c59b4..3b4a2c3 100644
--- a/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
+++ b/src/plugins/external_tool_support/src/snpeff/SnpEffWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesSettingsWidget.cpp b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
index f59a063..2e06e52 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -26,6 +26,8 @@
#include <U2Core/AppResources.h>
#include <U2Core/L10n.h>
+#include <U2Gui/U2WidgetStateStorage.h>
+
#include "SpadesSettingsWidget.h"
#include "SpadesTask.h"
@@ -33,14 +35,16 @@
namespace U2 {
// SpadesSettingsWidget
-SpadesSettingsWidget::SpadesSettingsWidget(QWidget *parent):
- GenomeAssemblyAlgorithmMainWidget(parent)
+SpadesSettingsWidget::SpadesSettingsWidget(QWidget *parent)
+ :GenomeAssemblyAlgorithmMainWidget(parent), U2SavableWidget(this)
{
setupUi(this);
layout()->setContentsMargins(0,0,0,0);
numThreadsSpinbox->setMaximum(AppContext::getAppSettings()->getAppResourcePool()->getIdealThreadCount());
numThreadsSpinbox->setValue(AppContext::getAppSettings()->getAppResourcePool()->getIdealThreadCount());
+
+ U2WidgetStateStorage::restoreWidgetState(*this);
}
QMap<QString,QVariant> SpadesSettingsWidget::getGenomeAssemblyCustomSettings() {
@@ -52,6 +56,9 @@ QMap<QString,QVariant> SpadesSettingsWidget::getGenomeAssemblyCustomSettings() {
settings.insert(SpadesTask::OPTION_THREADS, numThreadsSpinbox->value());
settings.insert(SpadesTask::OPTION_MEMLIMIT, memlimitSpin->value());
+ U2WidgetStateStorage::saveWidgetState(*this);
+ widgetStateSaved = true;
+
return settings;
}
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
index 5469acc..b4a7f7d 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
#define _U2_SPADES_SETTINGS_WIDGET_H_
#include <U2Algorithm/GenomeAssemblyRegistry.h>
-
+#include <U2Gui/U2SavableWidget.h>
#include <U2View/DnaAssemblyGUIExtension.h>
#include "ui_SpadesSettings.h"
@@ -31,7 +31,7 @@
namespace U2 {
-class SpadesSettingsWidget : public GenomeAssemblyAlgorithmMainWidget, Ui_SpadesSettings {
+class SpadesSettingsWidget : public GenomeAssemblyAlgorithmMainWidget, Ui_SpadesSettings, U2SavableWidget {
Q_OBJECT
public:
SpadesSettingsWidget(QWidget *parent);
diff --git a/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp b/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
index 18c56cb..14b9938 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesSupport.h b/src/plugins/external_tool_support/src/spades/SpadesSupport.h
index ece5bde..03b2815 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesSupport.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesTask.cpp b/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
index d5e7006..0d3ce67 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesTask.cpp
@@ -2,7 +2,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesTask.h b/src/plugins/external_tool_support/src/spades/SpadesTask.h
index 018475c..19c3645 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesTask.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesWorker.cpp b/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
index 308b183..9e66d87 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
+++ b/src/plugins/external_tool_support/src/spades/SpadesWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spades/SpadesWorker.h b/src/plugins/external_tool_support/src/spades/SpadesWorker.h
index c7f3b66..f65bb3d 100644
--- a/src/plugins/external_tool_support/src/spades/SpadesWorker.h
+++ b/src/plugins/external_tool_support/src/spades/SpadesWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spidey/SpideySupport.cpp b/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
index cabc33e..a878702 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spidey/SpideySupport.h b/src/plugins/external_tool_support/src/spidey/SpideySupport.h
index dc5b4a0..06c9468 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupport.h
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spidey/SpideySupportTask.cpp b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
index 0faabf4..50e9a17 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/spidey/SpideySupportTask.h b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
index 386ba21..76ddd54 100644
--- a/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
+++ b/src/plugins/external_tool_support/src/spidey/SpideySupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeSupport.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
index 7577c09..aeb1785 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeSupport.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
index 46df9fc..3fa4f10 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeSupportRunDialog.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
index 87511dc..e3f4ee6 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ TCoffeeSupportRunDialog::TCoffeeSupportRunDialog(TCoffeeSupportTaskSettings& _se
QDialog(_parent), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220591");
+ new HelpButton(this, buttonBox, "18223231");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -71,7 +71,7 @@ TCoffeeWithExtFileSpecifySupportRunDialog::TCoffeeWithExtFileSpecifySupportRunDi
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220591");
+ new HelpButton(this, buttonBox, "18223231");
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 ba853da..3bbdf2d 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeSupportRunDialog.ui b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.ui
index 036ab67..1ca1300 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.ui
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportRunDialog.ui
@@ -25,7 +25,7 @@
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
diff --git a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
index 822efed..80868f8 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeSupportTask.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
index f630552..cd3ba6f 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeWorker.cpp b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
index 9b155da..3b7d9d8 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tcoffee/TCoffeeWorker.h b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
index c5d8f27..21916f2 100644
--- a/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
+++ b/src/plugins/external_tool_support/src/tcoffee/TCoffeeWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSettings.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
index 280f586..f8762ab 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSettings.h b/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
index 543ada3..7d25832 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSupport.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
index 15f91a0..5a71884 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSupport.h b/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
index 87aa71d..932c5f1 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSupportTask.cpp b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
index 6f4c555..b951fb5 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatSupportTask.h b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
index 01b1357..f253612 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatWorker.cpp b/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
index e5f3dea..1cec38f 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
+++ b/src/plugins/external_tool_support/src/tophat/TopHatWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/tophat/TopHatWorker.h b/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
index bf1b1b2..31ad11a 100644
--- a/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
+++ b/src/plugins/external_tool_support/src/tophat/TopHatWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/AlignMsaAction.cpp b/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
index 4ba1e12..aa2336c 100644
--- a/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
+++ b/src/plugins/external_tool_support/src/utils/AlignMsaAction.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/AlignMsaAction.h b/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
index da20f98..7313c53 100644
--- a/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
+++ b/src/plugins/external_tool_support/src/utils/AlignMsaAction.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/BaseShortReadsAlignerWorker.cpp b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
index f5c540c..8be0488 100644
--- a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
+++ b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -74,6 +74,8 @@ const QString BASE_OUTFILE = "out.sam";
const QString LIBRARY = "library";
+const QString FILTER_UNPAIRED = "filter-unpaired";
+
//////////////////////////////////////////////////////////////////////////
//BaseShortReadsAlignerWorker
BaseShortReadsAlignerWorker::BaseShortReadsAlignerWorker(Actor *a, const QString& algName)
@@ -83,6 +85,7 @@ BaseShortReadsAlignerWorker::BaseShortReadsAlignerWorker(Actor *a, const QString
, inPairedChannel(NULL)
, output(NULL)
, pairedReadsInput(false)
+, filterUnpaired(true)
{
}
@@ -91,6 +94,7 @@ void BaseShortReadsAlignerWorker::init() {
inPairedChannel = ports.value(IN_PORT_DESCR_PAIRED);
output = ports.value(OUT_PORT_DESCR);
pairedReadsInput = getValue<QString>(LIBRARY) == "Paired-end";
+ filterUnpaired = getValue<bool>(FILTER_UNPAIRED);
readsFetcher = DatasetFetcher(this, inChannel, context);
pairedReadsFetcher = DatasetFetcher(this, inPairedChannel, context);
@@ -142,6 +146,8 @@ Task *BaseShortReadsAlignerWorker::tick() {
return new FailTask(os.getError());
}
settings.pairedReads = pairedReadsInput;
+ settings.filterUnpaired = filterUnpaired;
+ settings.tmpDirectoryForFilteredFiles = context->workingDir();
if (pairedReadsInput) {
settings.shortReadSets << toUrls(readsFetcher.takeFullDataset(), READS_URL_SLOT_ID, ShortReadSet::PairedEndReads, ShortReadSet::UpstreamMate);
@@ -286,6 +292,10 @@ void BaseShortReadsAlignerWorkerFactory::addCommonAttributes(QList<Attribute*>&
BaseShortReadsAlignerWorker::tr("Library"),
BaseShortReadsAlignerWorker::tr("Is this library mate-paired?"));
+ Descriptor filter(FILTER_UNPAIRED,
+ BaseShortReadsAlignerWorker::tr("Filter unpaired reads"),
+ BaseShortReadsAlignerWorker::tr("Should the reads be checked for incomplete pairs?"));
+
Descriptor outName(OUTPUT_NAME,
BaseShortReadsAlignerWorker::tr("Output file name"),
BaseShortReadsAlignerWorker::tr("Base name of the output file. 'out.sam' by default"));
@@ -299,6 +309,10 @@ void BaseShortReadsAlignerWorkerFactory::addCommonAttributes(QList<Attribute*>&
visibilityValues << QVariant("Paired-end");
libraryAttr->addPortRelation(PortRelationDescriptor(IN_PORT_DESCR_PAIRED, visibilityValues));
attrs << libraryAttr;
+
+ Attribute* filterAttr = new Attribute(filter, BaseTypes::BOOL_TYPE(), false, true);
+ filterAttr->addRelation(new VisibilityRelation(LIBRARY, "Paired-end"));
+ attrs << filterAttr;
}
{
@@ -310,6 +324,8 @@ void BaseShortReadsAlignerWorkerFactory::addCommonAttributes(QList<Attribute*>&
libMap["Paired-end"] = "Paired-end";
ComboBoxDelegate* libDelegate = new ComboBoxDelegate(libMap);
delegates[LIBRARY] = libDelegate;
+
+ delegates[FILTER_UNPAIRED] = new ComboBoxWithBoolsDelegate();
}
}
diff --git a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
index 9eec43e..8b47d62 100644
--- a/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
+++ b/src/plugins/external_tool_support/src/utils/BaseShortReadsAlignerWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,6 +64,7 @@ protected:
IntegralBus *inPairedChannel;
IntegralBus *output;
bool pairedReadsInput;
+ bool filterUnpaired;
DatasetFetcher readsFetcher;
DatasetFetcher pairedReadsFetcher;
diff --git a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidget.ui b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidget.ui
index 344fdea..66437ca 100644
--- a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidget.ui
+++ b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidget.ui
@@ -6,10 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
- <width>293</width>
+ <width>311</width>
<height>68</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="windowTitle">
<string>Form</string>
</property>
@@ -31,7 +37,7 @@
<item>
<widget class="QLabel" name="label_14">
<property name="text">
- <string>Database path:</string>
+ <string>Database path</string>
</property>
</widget>
</item>
@@ -55,8 +61,7 @@
</size>
</property>
<property name="text">
- <string>Select
-a database file</string>
+ <string>Database file</string>
</property>
</widget>
</item>
@@ -65,7 +70,7 @@ a database file</string>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Base name for BLAST DB files:</string>
+ <string>Base name for BLAST DB files</string>
</property>
</widget>
</item>
diff --git a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
index a4aeb12..ec93db4 100644
--- a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/BlastDBSelectorWidgetController.h b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
index 7d907a0..89c8fd2 100644
--- a/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
+++ b/src/plugins/external_tool_support/src/utils/BlastDBSelectorWidgetController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/BlastRunCommonDialog.cpp b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
index d933325..eea1273 100644
--- a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220587");
+ new HelpButton(this, buttonBox, "18223227");
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 5a96bbe..291c0cb 100644
--- a/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h
+++ b/src/plugins/external_tool_support/src/utils/BlastRunCommonDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/BlastTaskSettings.cpp b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
index 0f43586..23a4a13 100644
--- a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
+++ b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/BlastTaskSettings.h b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
index c3b2acc..6ec876c 100644
--- a/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
+++ b/src/plugins/external_tool_support/src/utils/BlastTaskSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/CistromeDelegate.cpp b/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
index f457d63..351ac05 100644
--- a/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
+++ b/src/plugins/external_tool_support/src/utils/CistromeDelegate.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/CistromeDelegate.h b/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
index a7f76e5..8745e29 100644
--- a/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
+++ b/src/plugins/external_tool_support/src/utils/CistromeDelegate.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExportTasks.cpp b/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
index 60e2298..0e5dc9e 100644
--- a/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExportTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExportTasks.h b/src/plugins/external_tool_support/src/utils/ExportTasks.h
index f0de224..5c311a1 100644
--- a/src/plugins/external_tool_support/src/utils/ExportTasks.h
+++ b/src/plugins/external_tool_support/src/utils/ExportTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolSearchTask.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
index c1ddb92..3dd14dc 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolSearchTask.h b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
index 51eef6a..93d46d7 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolSupportAction.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
index 7a6ae44..7d11f09 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolSupportAction.h b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
index de6b229..b2d5238 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolSupportAction.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolUtils.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
index 7809af8..c330bdf 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolUtils.h b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
index 748f2c9..8887115 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolValidateTask.cpp b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
index 7dab121..b7d8d33 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/utils/ExternalToolValidateTask.h b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
index ad8c46d..18a14ee 100644
--- a/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
+++ b/src/plugins/external_tool_support/src/utils/ExternalToolValidateTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusSupport.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
index 3a4c6de..13c59c1 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusSupport.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
index 10fc91e..faa1e55 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusSupportTask.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
index 80503fa..1694ac5 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusSupportTask.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
index 6024123..96de296 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusSupportTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusWorker.cpp b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
index 3aa8a8e..07634c3 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcftools/VcfConsensusWorker.h b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
index 3ff8861..80d6444 100644
--- a/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
+++ b/src/plugins/external_tool_support/src/vcftools/VcfConsensusWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcfutils/VcfutilsSupport.cpp b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
index e56f218..fce674e 100644
--- a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
+++ b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/vcfutils/VcfutilsSupport.h b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
index d4987e2..5fe77e9 100644
--- a/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
+++ b/src/plugins/external_tool_support/src/vcfutils/VcfutilsSupport.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/transl/english.ts b/src/plugins/external_tool_support/transl/english.ts
index f96a948..026fd2b 100644
--- a/src/plugins/external_tool_support/transl/english.ts
+++ b/src/plugins/external_tool_support/transl/english.ts
@@ -337,22 +337,35 @@ a database file</translation>
<context>
<name>BlastDBCmdDialog</name>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="26"/>
- <source>Fetch Sequence from BLAST Database</source>
- <translation>Fetch Sequence from BLAST Database</translation>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="32"/>
+ <source>Fetch Sequences from BLAST Database</source>
+ <translation>Fetch Sequences from BLAST Database</translation>
+ </message>
+ <message>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="59"/>
+ <source>Query ID</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="75"/>
+ <source>Select database</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="99"/>
+ <source>Output path</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="44"/>
<source>Entery query ID:</source>
- <translation>Enter query ID:</translation>
+ <translation type="vanished">Enter query ID:</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="54"/>
<source>Select database :</source>
- <translation>Select database :</translation>
+ <translation type="vanished">Select database :</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="104"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="115"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -369,12 +382,11 @@ a database file</translation>
<translation type="vanished">protein</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="88"/>
<source>Output path:</source>
- <translation>Output path:</translation>
+ <translation type="vanished">Output path:</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="116"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="127"/>
<source>Add to project</source>
<translation>Add to project</translation>
</message>
@@ -382,26 +394,38 @@ a database file</translation>
<context>
<name>BlastDBSelectorWidget</name>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="14"/>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="20"/>
<source>Form</source>
<translation type="unfinished">Form</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="34"/>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="40"/>
+ <source>Database path</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="64"/>
+ <source>Database file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="73"/>
+ <source>Base name for BLAST DB files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Database path:</source>
- <translation type="unfinished">Database path:</translation>
+ <translation type="obsolete">Database path:</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="58"/>
<source>Select
a database file</source>
- <translation type="unfinished">Select
+ <translation type="obsolete">Select
a database file</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="68"/>
<source>Base name for BLAST DB files:</source>
- <translation type="unfinished">Base name for BLAST DB files:</translation>
+ <translation type="obsolete">Base name for BLAST DB files:</translation>
</message>
</context>
<context>
@@ -1525,6 +1549,11 @@ p, li { white-space: pre-wrap; }
<translation>Align with Clustal Omega</translation>
</message>
<message>
+ <location filename="../src/clustalo/ClustalOSupportRunDialog.ui" line="34"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/clustalo/ClustalOSupportRunDialog.ui" line="42"/>
<source>Input file</source>
<translation>Input file</translation>
@@ -1584,6 +1613,11 @@ p, li { white-space: pre-wrap; }
<translation>Align with ClustalW</translation>
</message>
<message>
+ <location filename="../src/clustalw/ClustalWSupportRunDialog.ui" line="34"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/clustalw/ClustalWSupportRunDialog.ui" line="42"/>
<source>Input file</source>
<translation>Input file</translation>
@@ -1713,9 +1747,13 @@ p, li { white-space: pre-wrap; }
<translation>Check latest version of external tools package</translation>
</message>
<message>
+ <source><a href="http://ugene.net/external.html">external tools package</a></source>
+ <translation type="vanished"><a href="http://ugene.net/external.html">external tools package</a></translation>
+ </message>
+ <message>
<location filename="../src/ETSSettingsWidget.ui" line="50"/>
<source><a href="http://ugene.unipro.ru/external.html">external tools package</a></source>
- <translation><a href="http://ugene.unipro.ru/external.html">external tools package</a></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ETSSettingsWidget.ui" line="70"/>
@@ -1857,6 +1895,318 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>HmmerBuildDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="20"/>
+ <source>HMM3 Build</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="42"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="52"/>
+ <source>Input alignment file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="62"/>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="79"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="69"/>
+ <source>Build to profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="104"/>
+ <source>Construction strategies</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="126"/>
+ <source>assign cols w/ >= symfrac residues as consensus</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="129"/>
+ <source>fast</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="142"/>
+ <source>Sym fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="164"/>
+ <source>Manual construction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="167"/>
+ <source>Hand (requires reference annotation)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="185"/>
+ <source>Tag sequence as a fragment, if L < x*<L>, where x is:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="226"/>
+ <source>Relative weighting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="234"/>
+ <source>Henikoff position-based weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="250"/>
+ <source>Gerstein/Sonnhammer/Chothia tree weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="274"/>
+ <source>Henikoff simple filter weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="284"/>
+ <source>Identity cutoff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="309"/>
+ <source>Skip relative weighting; set all to 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="316"/>
+ <source>Use weights given in alignment file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="339"/>
+ <source>Effective weighting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="347"/>
+ <source>Adjust effective sequence number to achieve relative entropy target</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="381"/>
+ <source>Minimum relative entropy/position</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="433"/>
+ <source>Sigma parameter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="466"/>
+ <source>Use number of single linkage clusters as effective</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="476"/>
+ <source>Fractional identity cutoff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="501"/>
+ <source>Use number of sequences as effective</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="516"/>
+ <source>Effective sequence number for all models to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="554"/>
+ <source>E-value calibration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="573"/>
+ <source>Length of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="609"/>
+ <source>Number of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="642"/>
+ <source>Length of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="672"/>
+ <source>Number of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="702"/>
+ <source>Length of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="732"/>
+ <source>Number of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="762"/>
+ <source>Tail mass for Forward exponential tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="803"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="819"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="862"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="20"/>
+ <source>HMM3 Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="54"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="65"/>
+ <source>Query HMM file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="75"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="92"/>
+ <source>Reporting thresholds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="109"/>
+ <source>Report domains with E-value less than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="119"/>
+ <source>1E+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="146"/>
+ <source>Report domains with score greater than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="180"/>
+ <source>Score threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="229"/>
+ <source>Use profile's GA gathering cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="265"/>
+ <source>Use profile's NC noise cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="295"/>
+ <source>Use profile's TC trusted cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="312"/>
+ <source>Number of significant sequences for domain E-value calculation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="345"/>
+ <source>Acceleration heuristics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="360"/>
+ <source>Turn off composition bias filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="373"/>
+ <source>Turn off biased composition score corrections</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="386"/>
+ <source>Turn all heuristic filters off (less speed, more power)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="401"/>
+ <source>MSV filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="434"/>
+ <source>Viterbi filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="464"/>
+ <source>Forward filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="500"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="522"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="565"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IntegralBusPort</name>
<message>
<source>One of these slots must be not empty: '%1', '%2'</source>
@@ -1891,6 +2241,11 @@ p, li { white-space: pre-wrap; }
<translation>Align with MAFFT</translation>
</message>
<message>
+ <location filename="../src/mafft/MAFFTSupportRunDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/mafft/MAFFTSupportRunDialog.ui" line="36"/>
<source>Input file</source>
<translation>Input file</translation>
@@ -1991,62 +2346,215 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/mrbayes/MrBayesDialog.ui" line="329"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Display Options</translation>
</message>
</context>
<context>
- <name>PhyMLDialog</name>
+ <name>PhmmerSearchDialog</name>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="77"/>
- <source>Substitution model</source>
- <translation>Substitution model</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="20"/>
+ <source>Phmmer Search</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="98"/>
- <source>Equilibrium frequencies</source>
- <translation>Equilibrium frequencies</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="36"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="112"/>
- <source>optimized</source>
- <translation>optimized</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="50"/>
+ <source>Query sequence file:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="119"/>
- <source>empirical</source>
- <translation>empirical</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="60"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="293"/>
- <source>Transition / transversion ratio </source>
- <translation>Transition / transversion ratio </translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="87"/>
+ <source>Reporting tresholds</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="139"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="171"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="289"/>
- <source>Check to set user value.
-Uncheck to get the maximum likelihood estimate.</source>
- <translation>Check to set user value.
-Uncheck to get the maximum likelihood estimate.</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="103"/>
+ <source>Report domains with E-value less than</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="190"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="212"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="243"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="265"/>
- <source>estimated </source>
- <translation>estimated </translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="113"/>
+ <source>1E+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="143"/>
- <source>Proportion of invariable sites</source>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="142"/>
+ <source>Report domains with score greater than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="166"/>
+ <source>Number of significant sequences for domain E-value calculation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="201"/>
+ <source>Scoring system</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="217"/>
+ <source>Gap open probability</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="247"/>
+ <source>Gap extend probability</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="285"/>
+ <source>Acceleration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="297"/>
+ <source>Turn off composition bias filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="310"/>
+ <source>Turn off biased composition score corrections</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="323"/>
+ <source>Turn all heuristic filters off (less speed, more power)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="338"/>
+ <source>Viterbi filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="368"/>
+ <source>MSV filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="401"/>
+ <source>Forward filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="437"/>
+ <source>E-value calibration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="456"/>
+ <source>Length of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="492"/>
+ <source>Number of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="525"/>
+ <source>Length of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="555"/>
+ <source>Number of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="585"/>
+ <source>Length of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="615"/>
+ <source>Number of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="645"/>
+ <source>Tail mass for Forward exponential tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="686"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="702"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="745"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PhyMLDialog</name>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="77"/>
+ <source>Substitution model</source>
+ <translation>Substitution model</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="98"/>
+ <source>Equilibrium frequencies</source>
+ <translation>Equilibrium frequencies</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="112"/>
+ <source>optimized</source>
+ <translation>optimized</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="119"/>
+ <source>empirical</source>
+ <translation>empirical</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="293"/>
+ <source>Transition / transversion ratio </source>
+ <translation>Transition / transversion ratio </translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="139"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="171"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="289"/>
+ <source>Check to set user value.
+Uncheck to get the maximum likelihood estimate.</source>
+ <translation>Check to set user value.
+Uncheck to get the maximum likelihood estimate.</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="190"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="212"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="243"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="265"/>
+ <source>estimated </source>
+ <translation>estimated </translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="143"/>
+ <source>Proportion of invariable sites</source>
<translation>Proportion of invariable sites</translation>
</message>
<message>
<location filename="../src/phyml/PhyMLDialog.ui" line="63"/>
<source>Substitution Model</source>
- <translation type="unfinished"></translation>
+ <translation>Substitution Model</translation>
</message>
<message>
<location filename="../src/phyml/PhyMLDialog.ui" line="154"/>
@@ -2064,54 +2572,54 @@ Uncheck to get the maximum likelihood estimate.</translation>
<translation>Branch Support</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="321"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="315"/>
<source>Use fast likelihood-based method</source>
<translation>Use fast likelihood-based method</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="353"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="335"/>
<source>Perform bootstrap</source>
<translation>Perform bootstrap</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="369"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="345"/>
<source>It is the number of bootstrap replicates.</source>
<translation>It is the number of bootstrap replicates.</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="380"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="359"/>
<source>Tree Searching</source>
<translation>Tree Searching</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="470"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="449"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="482"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="461"/>
<source>Type of tree improvement</source>
<translation>Type of tree improvement</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="499"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="478"/>
<source>Set number of random starting tree</source>
<translation>Set number of random starting tree</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="515"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="494"/>
<source>Optimise topology</source>
<translation>Optimise topology</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="525"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="504"/>
<source>Optimise branch lengths</source>
<translation>Optimise branch lengths</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="546"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="525"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Display Options</translation>
</message>
</context>
<context>
@@ -2329,6 +2837,11 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation>Align with T-Coffee</translation>
</message>
<message>
+ <location filename="../src/tcoffee/TCoffeeSupportRunDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/tcoffee/TCoffeeSupportRunDialog.ui" line="36"/>
<source>Input file</source>
<translation>Input file</translation>
@@ -2671,12 +3184,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BlastDBCmdDialog</name>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="42"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="43"/>
<source>Fetch</source>
<translation>Fetch</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="43"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="44"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
@@ -2685,7 +3198,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation type="vanished">Select a database file</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="84"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="92"/>
<source>Set a result FASTA file name</source>
<translation>Set a result FASTA file name</translation>
</message>
@@ -3046,7 +3559,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::Bowtie2AlignTask</name>
<message>
- <location filename="../src/bowtie2/Bowtie2Task.cpp" line="147"/>
+ <location filename="../src/bowtie2/Bowtie2Task.cpp" line="148"/>
<source>Unknown short reads format %1</source>
<translation>Unknown short reads format %1</translation>
</message>
@@ -3080,17 +3593,17 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BowtieAssembleTask</name>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="160"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="161"/>
<source>Reference index file "%1" does not exist</source>
<translation>Reference index file "%1" does not exist</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="241"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="242"/>
<source>Unknown short reads format %1</source>
<translation>Unknown short reads format %1</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="315"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="317"/>
<source>There is not enough memory on the computer!</source>
<translation>There is not enough memory on the computer!</translation>
</message>
@@ -3114,7 +3627,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="105"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="106"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
@@ -3123,27 +3636,27 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation type="vanished">In paired-end mode it possible to analyze only 2 read sets using BWA</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="123"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="124"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="194"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="196"/>
<source>Align reads with BWA Multitask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="235"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="238"/>
<source>Saming reads with BWA Multitask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="286"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="291"/>
<source>Log is incomplete</source>
<translation>Log is incomplete</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="289"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="294"/>
<source>Log is incorrect</source>
<translation>Log is incorrect</translation>
</message>
@@ -3151,17 +3664,17 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaMemAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="312"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="317"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="331"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="336"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="420"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="428"/>
<source>Align reads with BWA-MEM Multitask</source>
<translation type="unfinished"></translation>
</message>
@@ -3189,12 +3702,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaSwAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="470"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="478"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="480"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="488"/>
<source>BWA SW can not align paired reads</source>
<translation>BWA SW can not align paired reads</translation>
</message>
@@ -3210,12 +3723,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="620"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="629"/>
<source>Multiple read files are not supported by bwa-sw. Please combine your reads into single FASTA file.</source>
<translation>Multiple read files are not supported by bwa-sw. Please combine your reads into single FASTA file.</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="626"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="636"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
@@ -3316,17 +3829,17 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::CAP3SupportTask</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="100"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="96"/>
<source>Output file not found</source>
<translation>Output file not found</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="102"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="98"/>
<source>Output file not found. May be %1 tool path '%2' not valid?</source>
<translation>Output file not found. May be %1 tool path '%2' not valid?</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="116"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="112"/>
<source>Output file not found: copy from tmp dir failed.</source>
<translation>Output file not found: copy from tmp dir failed.</translation>
</message>
@@ -3693,6 +4206,29 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::ConvertAlignment2Stockholm</name>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="40"/>
+ <source>Convert alignment to Stockholm format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="102"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="110"/>
+ <source>File doesn't contain any multiple alignments.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="113"/>
+ <source>File contains several multiple alignments. Only the first one is saved to the result file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::CopyFileTask</name>
<message>
<location filename="../src/samtools/TabixSupportTask.cpp" line="101"/>
@@ -3909,7 +4445,7 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSearchAndValidateTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="349"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="351"/>
<source>Can not find expected message.<br>It is possible that the specified executable file <i>%1</i> for %2 tool is invalid. You can change the path to the executable file in the external tool settings in the global preferences.</source>
<translation>Can not find expected message.<br>It is possible that the specified executable file <i>%1</i> for %2 tool is invalid. You can change the path to the executable file in the external tool settings in the global preferences.</translation>
</message>
@@ -3951,67 +4487,67 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSupportPlugin</name>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="177"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="165"/>
<source>Search tools in PATH</source>
<translation>Search tools in PATH</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="224"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="212"/>
<source>External tool support</source>
<translation>External tool support</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="224"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="212"/>
<source>Runs other external tools</source>
<translation>Runs other external tools</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="287"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="275"/>
<source>Align with ClustalW...</source>
<translation>Align with ClustalW...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="295"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="283"/>
<source>Align with ClustalO...</source>
<translation>Align with ClustalO...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="303"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="291"/>
<source>Align with MAFFT...</source>
<translation>Align with MAFFT...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="311"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="299"/>
<source>Align with T-Coffee...</source>
<translation>Align with T-Coffee...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="464"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="450"/>
<source>BLAST make database...</source>
<translation>BLAST make database...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="468"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="454"/>
<source>BLAST+ make database...</source>
<translation>BLAST+ make database...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="486"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="472"/>
<source>BLAST+ search...</source>
<translation>BLAST+ search...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="490"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="476"/>
<source>BLAST+ query database...</source>
<translation>BLAST+ query database...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="501"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="487"/>
<source>Contig assembly with %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="476"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="462"/>
<source>BLAST search...</source>
<translation>BLAST search...</translation>
</message>
@@ -4029,12 +4565,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSupportService</name>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="653"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="651"/>
<source>External tools support</source>
<translation>External tools support</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="653"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="651"/>
<source>Provides support to run external tools from UGENE</source>
<translation>Provides support to run external tools from UGENE</translation>
</message>
@@ -4142,12 +4678,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolsInstallTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="393"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="395"/>
<source>Installing external tools</source>
<translation>Installing external tools</translation>
</message>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="398"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="400"/>
<source> failed: </source>
<translation> failed: </translation>
</message>
@@ -4169,13 +4705,13 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolsValidateTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="364"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="366"/>
<source>Checking external tools</source>
<translation>Checking external tools</translation>
</message>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="382"/>
<location filename="../src/utils/ExternalToolValidateTask.cpp" line="384"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="386"/>
<source> failed: </source>
<translation> failed: </translation>
</message>
@@ -4189,6 +4725,29 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::FastQCTask</name>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="90"/>
+ <source>No input URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="95"/>
+ <source>The input file '%1' is empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="101"/>
+ <source>Directory does not exist: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="118"/>
+ <source>Result file does not exist: %1. See the log for details.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::FormatDBSupport</name>
<message>
<location filename="../src/blast/FormatDBSupport.cpp" line="66"/>
@@ -4260,53 +4819,73 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::FormatDBSupportTask</name>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="47"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="54"/>
<source>Run NCBI FormatDB task</source>
<translation>Run NCBI FormatDB task</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="60"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="146"/>
+ <source>Cannot create temp directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="153"/>
+ <source>File '%1' was skipped. Cannot detect file format.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="180"/>
+ <source>Trying to initialize Format DB task second time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="187"/>
<source>Input files paths contain space characters.</source>
<translation>Input files paths contain space characters.</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="77"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="204"/>
<source>Output database path contain space characters.</source>
<translation>Output database path contain space characters.</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="95"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="105"/>
<source>Blast database creation has been cancelled</source>
<translation>Blast database creation has been cancelled</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="102"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="95"/>
+ <source>Can not remove directory for temporary files.</source>
+ <translation type="unfinished">Can not remove directory for temporary files.</translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="112"/>
<source>Blast database has been successfully created</source>
<translation>Blast database has been successfully created</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="103"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="113"/>
<source>Source sequences: </source>
<translation>Source sequences: </translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="111"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="121"/>
<source>Database file path: %1</source>
<translation>Database file path: %1</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="113"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="123"/>
<source>Type: %1</source>
<translation>Type: %1</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="115"/>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="121"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="125"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="131"/>
<source>Formatdb log file path: </source>
<translation>Formatdb log file path: </translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="119"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="129"/>
<source>Blast database creation has been failed</source>
<translation>Blast database creation has been failed</translation>
</message>
@@ -4348,128 +4927,480 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
- <name>U2::JavaSupport</name>
+ <name>U2::HmmerAdvContext</name>
<message>
- <location filename="../src/java/JavaSupport.cpp" line="47"/>
- <source>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</source>
- <translation>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</translation>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="304"/>
+ <source>Find HMM signals with HMMER3...</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>U2::LocalWorkflow::BaseShortReadsAlignerWorker</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="238"/>
- <source>Not enough upstream reads datasets</source>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="314"/>
+ <source>error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="241"/>
- <source>Not enough downstream reads datasets</source>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="314"/>
+ <source>No sequence in focus found</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildDialog</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="276"/>
- <source>Output directory</source>
- <translation>Output directory</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="63"/>
+ <source>Build</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="277"/>
- <source>Directory to save output files.</source>
- <translation>Directory to save output files.</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="64"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="280"/>
- <source>Reference genome</source>
- <translation>Reference genome</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="78"/>
+ <source>Select hmm file to create</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="281"/>
- <source>Path to indexed reference genome.</source>
- <translation>Path to indexed reference genome.</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="120"/>
+ <source>Select multiple alignment file</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="284"/>
- <source>Library</source>
- <translation>Library</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="185"/>
+ <source>input file is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="285"/>
- <source>Is this library mate-paired?</source>
- <translation>Is this library mate-paired?</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="188"/>
+ <source>output hmm file is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="288"/>
- <source>Output file name</source>
- <translation>Output file name</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="197"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildFromFileTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="289"/>
- <source>Base name of the output file. 'out.sam' by default</source>
- <translation>Base name of the output file. 'out.sam' by default</translation>
+ <location filename="../src/hmmer/HmmerBuildFromFileTask.cpp" line="33"/>
+ <source>Build HMMER profile from file</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="321"/>
- <source>URL of a file with reads</source>
- <translation>URL of a file with reads</translation>
+ <location filename="../src/hmmer/HmmerBuildFromFileTask.cpp" line="39"/>
+ <source>Msa URL is empty</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildFromMsaTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="322"/>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="332"/>
- <source>Input reads to be aligned.</source>
- <translation>Input reads to be aligned.</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="38"/>
+ <source>Build HMMER profile from msa</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="324"/>
- <source>URL of a file with mate reads</source>
- <translation>URL of a file with mate reads</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="45"/>
+ <source>HMM profile URL is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="325"/>
- <source>Input mate reads to be aligned.</source>
- <translation>Input mate reads to be aligned.</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="104"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="331"/>
- <source>Input data</source>
- <translation>Input data</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="55"/>
+ <source>Source alignment</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="335"/>
- <source>Reverse FASTQ file</source>
- <translation>Reverse FASTQ file</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="57"/>
+ <source>Profile name</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="336"/>
- <source>Reverse paired reads to be aligned.</source>
- <translation>Reverse paired reads to be aligned.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="59"/>
+ <source>Options:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="348"/>
- <source>Assembly URL</source>
- <translation>Assembly URL</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="60"/>
+ <source>Model construction strategies</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="349"/>
- <source>Output assembly URL.</source>
- <translation>Output assembly URL.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="73"/>
+ <source>Relative model construction strategies</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="352"/>
- <source>Output data</source>
- <translation>Output data</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="76"/>
+ <source>Gerstein/Sonnhammer/Chothia tree weights</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="353"/>
- <source>Output assembly files.</source>
- <translation>Output assembly files.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="79"/>
+ <source>Henikoff simple filter weights</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>U2::LocalWorkflow::BedGraphToBigWigPrompter</name>
<message>
- <location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="75"/>
- <source>unset</source>
- <translation>unset</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="82"/>
+ <source>Henikoff position-based weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="85"/>
+ <source>No relative weighting; set all to 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="88"/>
+ <source>Weights given in MSA file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="95"/>
+ <source>Effective sequence weighting strategies</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="98"/>
+ <source>adjust effective sequence number to achieve relative entropy target</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="101"/>
+ <source>effective sequence number is number of single linkage clusters</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="104"/>
+ <source>no effective sequence number weighting: just use number of sequences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="107"/>
+ <source>set effective sequence number for all models to: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="115"/>
+ <source>Task finished with error: '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="142"/>
+ <source>Unknown model construction strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="163"/>
+ <source>Unknown relative sequence weighting strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="185"/>
+ <source>Unknown effective sequence weighting strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerMsaEditorContext</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="261"/>
+ <source>Build HMMER3 profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerParseSearchResultsTask</name>
+ <message>
+ <location filename="../src/hmmer/HmmerParseSearchResultsTask.cpp" line="80"/>
+ <source>Can't parse line %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="57"/>
+ <source>Run</source>
+ <translation type="unfinished">Run</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="58"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="161"/>
+ <source>HMM profile is not set</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="167"/>
+ <source>Settings are invalid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="178"/>
+ <source>Error</source>
+ <translation type="unfinished">Error</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="178"/>
+ <source>Cannot create an annotation object. Please check settings</source>
+ <translation type="unfinished">Cannot create an annotation object. Please check settings</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="186"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="234"/>
+ <source>HMM profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="236"/>
+ <source>Select query HMM profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSearchTask</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="48"/>
+ <source>HMMER search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="100"/>
+ <source>HMM profile used: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="103"/>
+ <source>Task was not finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="109"/>
+ <source>Result annotation table: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="111"/>
+ <source>Result annotation group: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="112"/>
+ <source>Result annotation name: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="114"/>
+ <source>Results count: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="146"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="194"/>
+ <source>Unknown option controlling model-specific thresholding</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSupport</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="135"/>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="151"/>
+ <source>Error!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="135"/>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="151"/>
+ <source>Target sequence not selected: no opened annotated dna view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="168"/>
+ <source><i>HMMER build</i> constructs HMM profiles from multiple sequence alignments.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="172"/>
+ <source>Build HMM3 profile...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="188"/>
+ <source><i>HMMER search</i> searches profile(s) against a sequence database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="192"/>
+ <source>Search with HMMER3...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="208"/>
+ <source><i>PHMMER search</i> searches a protein sequence against a protein database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="212"/>
+ <source>Search with phmmer...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="223"/>
+ <source>Path for %1 tool not selected.</source>
+ <translation type="unfinished">Path for %1 tool not selected.</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="224"/>
+ <source>Do you want to select it now?</source>
+ <translation type="unfinished">Do you want to select it now?</translation>
+ </message>
+</context>
+<context>
+ <name>U2::JavaSupport</name>
+ <message>
+ <location filename="../src/java/JavaSupport.cpp" line="47"/>
+ <source>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</source>
+ <translation>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::BaseShortReadsAlignerWorker</name>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="240"/>
+ <source>Not enough upstream reads datasets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="243"/>
+ <source>Not enough downstream reads datasets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="278"/>
+ <source>Output directory</source>
+ <translation>Output directory</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="279"/>
+ <source>Directory to save output files.</source>
+ <translation>Directory to save output files.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="282"/>
+ <source>Reference genome</source>
+ <translation>Reference genome</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="283"/>
+ <source>Path to indexed reference genome.</source>
+ <translation>Path to indexed reference genome.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="286"/>
+ <source>Library</source>
+ <translation>Library</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="287"/>
+ <source>Is this library mate-paired?</source>
+ <translation>Is this library mate-paired?</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="290"/>
+ <source>Output file name</source>
+ <translation>Output file name</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="291"/>
+ <source>Base name of the output file. 'out.sam' by default</source>
+ <translation>Base name of the output file. 'out.sam' by default</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="323"/>
+ <source>URL of a file with reads</source>
+ <translation>URL of a file with reads</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="324"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="334"/>
+ <source>Input reads to be aligned.</source>
+ <translation>Input reads to be aligned.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="326"/>
+ <source>URL of a file with mate reads</source>
+ <translation>URL of a file with mate reads</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="327"/>
+ <source>Input mate reads to be aligned.</source>
+ <translation>Input mate reads to be aligned.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="333"/>
+ <source>Input data</source>
+ <translation>Input data</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="337"/>
+ <source>Reverse FASTQ file</source>
+ <translation>Reverse FASTQ file</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="338"/>
+ <source>Reverse paired reads to be aligned.</source>
+ <translation>Reverse paired reads to be aligned.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="350"/>
+ <source>Assembly URL</source>
+ <translation>Assembly URL</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="351"/>
+ <source>Output assembly URL.</source>
+ <translation>Output assembly URL.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="354"/>
+ <source>Output data</source>
+ <translation>Output data</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="355"/>
+ <source>Output assembly files.</source>
+ <translation>Output assembly files.</translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::BedGraphToBigWigPrompter</name>
+ <message>
+ <location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="75"/>
+ <source>unset</source>
+ <translation>unset</translation>
</message>
<message>
<location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="76"/>
@@ -5088,12 +6019,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::LocalWorkflow::Bowtie2Worker</name>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="116"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="112"/>
<source>Mode</source>
<translation>Mode</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="117"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="113"/>
<source>When the -n option is specified (which is the default), bowtie determines which alignments
are valid according to the following policy, which is similar to Maq's default policy.
In -v mode, alignments may have no more than V mismatches, where V may be a number from 0
@@ -5104,76 +6035,76 @@ In -v mode, alignments may have no more than V mismatches, where V may be a numb
through 3 set using the -v option. Quality values are ignored. The -v option is mutually exclusive with the -n option.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="123"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="119"/>
<source>Number of mismatches</source>
<translation>Number of mismatches</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="124"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="120"/>
<source>Sets the number of mismatches to allowed in a seed alignment. Can be set to 0 or 1.
Setting this higher makes alignment slower (often much slower) but increases sensitivity.</source>
<translation>Sets the number of mismatches to allowed in a seed alignment. Can be set to 0 or 1.
Setting this higher makes alignment slower (often much slower) but increases sensitivity.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="128"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="124"/>
<source>Seed length (--L)</source>
<translation>Seed length (--L)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="129"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="125"/>
<source>Sets the length of the seed substrings to align. Smaller values make alignment slower but more senstive.</source>
<translation>Sets the length of the seed substrings to align. Smaller values make alignment slower but more senstive.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="132"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="128"/>
<source>Add columns to allow gaps (--dpad)</source>
<translation>Add columns to allow gaps (--dpad)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="133"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="129"/>
<source>"Pads" dynamic programming problems by specified number of columns on either side to allow gaps.</source>
<translation>"Pads" dynamic programming problems by specified number of columns on either side to allow gaps.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="136"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="132"/>
<source>Disallow gaps (--gbar)</source>
<translation>Disallow gaps (--gbar)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="137"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="133"/>
<source>Disallow gaps within specified number of positions of the beginning or end of the read.</source>
<translation>Disallow gaps within specified number of positions of the beginning or end of the read.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="140"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="136"/>
<source>Seed (--seed)</source>
<translation>Seed (--seed)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="141"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="137"/>
<source>Use specified value as the seed for pseudo-random number generator.</source>
<translation>Use specified value as the seed for pseudo-random number generator.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="144"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="140"/>
<source>Threads</source>
<translation>Threads</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="145"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="141"/>
<source>Launch specified number of parallel search threads. Threads will run on separate processors/cores and synchronize
when parsing reads and outputting alignments. Searching for alignments is highly parallel, and speedup is close to linear.</source>
<translation>Launch specified number of parallel search threads. Threads will run on separate processors/cores and synchronize
when parsing reads and outputting alignments. Searching for alignments is highly parallel, and speedup is close to linear.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="149"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="145"/>
<source>No unpaired alignments (--no-mixed)</source>
<translation>No unpaired alignments (--no-mixed)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="150"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="146"/>
<source>If Bowtie2 cannot find a paired-end alignment for a pair, by default it will go on to look for unpaired alignments
for the constituent mates. This is called "mixed mode." To disable mixed mode, set this option. Bowtie2 runs a little
faster in the mixed mode, but will only consider alignment status of pairs per se, not individual mates.</source>
@@ -5182,68 +6113,68 @@ for the constituent mates. This is called "mixed mode." To disable mix
faster in the mixed mode, but will only consider alignment status of pairs per se, not individual mates.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="155"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="151"/>
<source>No discordant alignments (--no-discordant)</source>
<translation>No discordant alignments (--no-discordant)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="156"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="152"/>
<source>By default, Bowtie2 looks for discordant alignments if it cannot find any concordant alignments. A discordant alignment
is an alignment where both mates align uniquely, but that does not satisfy the paired-end constraints. This option disables that behavior.</source>
<translation>By default, Bowtie2 looks for discordant alignments if it cannot find any concordant alignments. A discordant alignment
is an alignment where both mates align uniquely, but that does not satisfy the paired-end constraints. This option disables that behavior.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="160"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="156"/>
<source>No forward orientation (--nofw)</source>
<translation>No forward orientation (--nofw)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="161"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="157"/>
<source>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</source>
<translation>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="164"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="160"/>
<source>No reverse-complement orientation (--norc)</source>
<translation>No reverse-complement orientation (--norc)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="165"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="161"/>
<source>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</source>
<translation>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="168"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="164"/>
<source>No overlapping mates (--no-overlap)</source>
<translation>No overlapping mates (--no-overlap)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="169"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="165"/>
<source>If one mate alignment overlaps the other at all, consider that to be non-concordant. Default: mates can overlap in
a concordant alignment.</source>
<translation>If one mate alignment overlaps the other at all, consider that to be non-concordant. Default: mates can overlap in
a concordant alignment.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="173"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="169"/>
<source>No mates containing one another (--no-contain)</source>
<translation>No mates containing one another (--no-contain)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="174"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="170"/>
<source>If one mate alignment contains the other, consider that to be non-concordant. Default: a mate can contain the
other in a concordant alignment.</source>
<translation>If one mate alignment contains the other, consider that to be non-concordant. Default: a mate can contain the
other in a concordant alignment.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="224"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="220"/>
<source>Align Reads with Bowtie2</source>
<translation>Align Reads with Bowtie2</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="225"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="221"/>
<source>Performs alignment of short reads with Bowtie2.</source>
<translation>Performs alignment of short reads with Bowtie2.</translation>
</message>
@@ -5251,88 +6182,88 @@ other in a concordant alignment.</translation>
<context>
<name>U2::LocalWorkflow::BowtieWorker</name>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="142"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="138"/>
<source>Mode:</source>
<translation>Mode:</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="143"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="139"/>
<source>When the -n option is specified (which is the default), bowtie determines which alignments are valid according to the following policy, which is similar to Maq's default policy. In -v mode, alignments may have no more than V mismatches, where V may be a number from 0 through 3 set using the -v option. Quality values are ignored. The -v option is mutually exclusive with the -n op [...]
<translation>When the -n option is specified (which is the default), bowtie determines which alignments are valid according to the following policy, which is similar to Maq's default policy. In -v mode, alignments may have no more than V mismatches, where V may be a number from 0 through 3 set using the -v option. Quality values are ignored. The -v option is mutually exclusive with the -n option.</translation>
</message>
<message>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="145"/>
<location filename="../src/bowtie/BowtieWorker.cpp" line="149"/>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="153"/>
<source>Mismatches number</source>
<translation>Mismatches number</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="150"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="146"/>
<source>Mismatches number.</source>
<translation>Mismatches number.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="154"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="150"/>
<source>Maximum permitted total of quality values at all mismatched read positions throughout the entire alignment, not just in the seed. The default is 70. Like Maq, bowtie rounds quality values to the nearest 10 and saturates at 30; rounding can be disabled with --nomaqround.</source>
<translation>Maximum permitted total of quality values at all mismatched read positions throughout the entire alignment, not just in the seed. The default is 70. Like Maq, bowtie rounds quality values to the nearest 10 and saturates at 30; rounding can be disabled with --nomaqround.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="159"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="155"/>
<source>Seed length</source>
<translation>Seed length</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="160"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="156"/>
<source>The seed length; i.e., the number of bases on the high-quality end of the read to which the -n ceiling applies. The lowest permitted setting is 5 and the default is 28. bowtie is faster for larger values of -l.</source>
<translation>The seed length; i.e., the number of bases on the high-quality end of the read to which the -n ceiling applies. The lowest permitted setting is 5 and the default is 28. bowtie is faster for larger values of -l.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="164"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="160"/>
<source>No forward orientation</source>
<translation>No forward orientation</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="165"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="161"/>
<source>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</source>
<translation>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="168"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="164"/>
<source>No reverse-complement orientation</source>
<translation>No reverse-complement orientation</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="169"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="165"/>
<source>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</source>
<translation>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="172"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="168"/>
<source>Maximum of backtracks</source>
<translation>Maximum of backtracks</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="173"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="169"/>
<source>The maximum insert size for valid paired-end alignments. E.g. if -X 100 is specified and a paired-end alignment consists of two 20-bp alignments in the proper orientation with a 60-bp gap between them, that alignment is considered valid (as long as -I is also satisfied). A 61-bp gap would not be valid in that case. If trimming options -3 or -5 are also used, the -X constraint is app [...]
<translation>The maximum insert size for valid paired-end alignments. E.g. if -X 100 is specified and a paired-end alignment consists of two 20-bp alignments in the proper orientation with a 60-bp gap between them, that alignment is considered valid (as long as -I is also satisfied). A 61-bp gap would not be valid in that case. If trimming options -3 or -5 are also used, the -X constraint i [...]
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="180"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="176"/>
<source>Try as hard</source>
<translation>Try as hard</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="181"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="177"/>
<source>Try as hard as possible to find valid alignments when they exist, including paired-end alignments. This is equivalent to specifying very high values for the --maxbts and --pairtries options. This mode is generally much slower than the default settings, but can be useful for certain problems. This mode is slower when (a) the reference is very repetitive, (b) the reads are low quali [...]
<translation>Try as hard as possible to find valid alignments when they exist, including paired-end alignments. This is equivalent to specifying very high values for the --maxbts and --pairtries options. This mode is generally much slower than the default settings, but can be useful for certain problems. This mode is slower when (a) the reference is very repetitive, (b) the reads are low [...]
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="187"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="183"/>
<source>Best hits</source>
<translation>Best hits</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="188"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="184"/>
<source>The number of megabytes of memory a given thread is given to store path descriptors in --best mode. Best-first search must keep track of many paths at once to ensure it is always extending the path with the lowest cumulative cost. Bowtie tries to minimize the memory impact of the descriptors, but they can still grow very large in some cases. If you receive an error message saying [...]
<translation>The number of megabytes of memory a given thread is given to store path descriptors in --best mode.
Best-first search must keep track of many paths at once to ensure it is always extending the path with the lowest cumulative cost.
@@ -5342,62 +6273,62 @@ try adjusting this parameter up to dedicate more memory to the descriptors.
Default: 64.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="195"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="191"/>
<source>No Maq rounding</source>
<translation>No Maq rounding</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="196"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="192"/>
<source>Maq accepts quality values in the Phred quality scale, but internally rounds values to the nearest 10, with a maximum of 30. By default, bowtie also rounds this way. --nomaqround prevents this rounding in bowtie.</source>
<translation>Maq accepts quality values in the Phred quality scale, but internally rounds values to the nearest 10, with a maximum of 30. By default, bowtie also rounds this way. --nomaqround prevents this rounding in bowtie.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="200"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="196"/>
<source>Seed</source>
<translation>Seed</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="201"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="197"/>
<source>Use <int> as the seed for pseudo-random number generator.</source>
<translation>Use <int> as the seed for pseudo-random number generator.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="204"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="200"/>
<source>Best alignments</source>
<translation>Best alignments</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="205"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="201"/>
<source>Make Bowtie guarantee that reported singleton alignments are best in terms of stratum (i.e. number of mismatches, or mismatches in the seed in the case of -n mode) and in terms of the quality values at the mismatched position(s). bowtie is somewhat slower when --best is specified.</source>
<translation>Make Bowtie guarantee that reported singleton alignments are best in terms of stratum (i.e. number of mismatches, or mismatches in the seed in the case of -n mode) and in terms of the quality values at the mismatched position(s). bowtie is somewhat slower when --best is specified.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="210"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="206"/>
<source>All alignments</source>
<translation>All alignments</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="211"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="207"/>
<source>Report all valid alignments per read or pair.</source>
<translation>Report all valid alignments per read or pair.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="214"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="210"/>
<source>Colorspace</source>
<translation>Colorspace</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="215"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="211"/>
<source>When -C is specified, read sequences are treated as colors. Colors may be encoded either as numbers (0=blue, 1=green, 2=orange, 3=red) or as characters A/C/G/T (A=blue, C=green, G=orange, T=red).</source>
<translation>When -C is specified, read sequences are treated as colors. Colors may be encoded either as numbers (0=blue, 1=green, 2=orange, 3=red) or as characters A/C/G/T (A=blue, C=green, G=orange, T=red).</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="252"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="248"/>
<source>Align Reads with Bowtie</source>
<translation>Align Reads with Bowtie</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="253"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="249"/>
<source>Performs alignment of short reads with Bowtie.</source>
<translation>Performs alignment of short reads with Bowtie.</translation>
</message>
@@ -5405,188 +6336,188 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::BwaMemWorker</name>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="137"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="133"/>
<source>Number of threads</source>
<translation>Number of threads</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="138"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="134"/>
<source>Number of threads (-t).</source>
<translation>Number of threads (-t).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="141"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="137"/>
<source>Min seed length</source>
<translation>Min seed length</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="142"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="138"/>
<source>Path to indexed reference genome (-k).</source>
<translation>Path to indexed reference genome (-k).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="145"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="141"/>
<source>Index algorithm</source>
<translation>Index algorithm</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="146"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="142"/>
<source>Index algorithm (-a).</source>
<translation>Index algorithm (-a).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="149"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="145"/>
<source>Band width</source>
<translation>Band width</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="150"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="146"/>
<source>Band width for banded alignment (-w).</source>
<translation>Band width for banded alignment (-w).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="153"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="149"/>
<source>Dropoff</source>
<translation>Dropoff</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="154"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="150"/>
<source>Off-diagonal X-dropoff (-d).</source>
<translation>Off-diagonal X-dropoff (-d).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="157"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="153"/>
<source>Internal seed length</source>
<translation>Internal seed length</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="158"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="154"/>
<source>Look for internal seeds inside a seed longer than {-k} (-r).</source>
<translation>Look for internal seeds inside a seed longer than {-k} (-r).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="161"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="157"/>
<source>Skip seed threshold</source>
<translation>Skip seed threshold</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="162"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="158"/>
<source>Skip seeds with more than INT occurrences (-c).</source>
<translation>Skip seeds with more than INT occurrences (-c).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="165"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="161"/>
<source>Drop chain threshold</source>
<translation>Drop chain threshold</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="166"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="162"/>
<source>Drop chains shorter than FLOAT fraction of the longest overlapping chain (-D).</source>
<translation>Drop chains shorter than FLOAT fraction of the longest overlapping chain (-D).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="169"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="165"/>
<source>Rounds of mate rescues</source>
<translation>Rounds of mate rescues</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="170"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="166"/>
<source>Perform at most INT rounds of mate rescues for each read (-m).</source>
<translation>Perform at most INT rounds of mate rescues for each read (-m).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="173"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="169"/>
<source>Skip mate rescue</source>
<translation>Skip mate rescue</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="174"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="170"/>
<source>Skip mate rescue (-S).</source>
<translation>Skip mate rescue (-S).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="177"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="173"/>
<source>Skip pairing</source>
<translation>Skip pairing</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="178"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="174"/>
<source>Skip pairing; mate rescue performed unless -S also in use (-P).</source>
<translation>Skip pairing; mate rescue performed unless -S also in use (-P).</translation>
</message>
<message>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="177"/>
<location filename="../src/bwa/BwaMemWorker.cpp" line="181"/>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="185"/>
<source>Mismatch penalty</source>
<translation>Mismatch penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="182"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="178"/>
<source>Score for a sequence match (-A).</source>
<translation>Score for a sequence match (-A).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="186"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="182"/>
<source>Penalty for a mismatch (-B).</source>
<translation>Penalty for a mismatch (-B).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="189"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="185"/>
<source>Gap open penalty</source>
<translation>Gap open penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="190"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="186"/>
<source>Gap open penalty (-O).</source>
<translation>Gap open penalty (-O).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="193"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="189"/>
<source>Gap extension penalty</source>
<translation>Gap extension penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="194"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="190"/>
<source>Gap extension penalty; a gap of size k cost {-O} (-E).</source>
<translation>Gap extension penalty; a gap of size k cost {-O} (-E).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="197"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="193"/>
<source>Penalty for clipping</source>
<translation>Penalty for clipping</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="198"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="194"/>
<source>Penalty for clipping (-L).</source>
<translation>Penalty for clipping (-L).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="201"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="197"/>
<source>Penalty unpaired</source>
<translation>Penalty unpaired</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="202"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="198"/>
<source>Penalty for an unpaired read pair (-U).</source>
<translation>Penalty for an unpaired read pair (-U).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="205"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="201"/>
<source>Score threshold</source>
<translation>Score threshold</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="206"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="202"/>
<source>Minimum score to output (-T).</source>
<translation>Minimum score to output (-T).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="256"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="252"/>
<source>Align Reads with BWA MEM</source>
<translation>Align Reads with BWA MEM</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="257"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="253"/>
<source>Performs alignment of short reads with BWA MEM.</source>
<translation>Performs alignment of short reads with BWA MEM.</translation>
</message>
@@ -5594,218 +6525,218 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::BwaWorker</name>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="139"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="135"/>
<source>Use missing prob</source>
<translation>Use missing prob</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="140"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="136"/>
<source>Use missing prob instead maximum edit distance.</source>
<translation>Use missing prob instead maximum edit distance.</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="143"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="139"/>
<source>Max #diff</source>
<translation>Max #diff</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="144"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="140"/>
<source>Max #diff (-n)</source>
<translation>Max #diff (-n)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="147"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="143"/>
<source>Missing prob</source>
<translation>Missing prob</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="148"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="144"/>
<source>Missing prob (-n)</source>
<translation>Missing prob (-n)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="151"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="147"/>
<source>Seed length</source>
<translation>Seed length</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="152"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="148"/>
<source>Seed length (-l).</source>
<translation>Seed length (-l).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="155"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="151"/>
<source>Max gap opens</source>
<translation>Max gap opens</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="156"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="152"/>
<source>Max gap opens (-o).</source>
<translation>Max gap opens (-o).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="159"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="155"/>
<source>Index algorithm</source>
<translation>Index algorithm</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="160"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="156"/>
<source>Index algorithm (-a).</source>
<translation>Index algorithm (-a).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="163"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="159"/>
<source>Best hits</source>
<translation>Best hits</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="164"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="160"/>
<source>Best hits (-R).</source>
<translation>Best hits (-R).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="167"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="163"/>
<source>Long-scaled gap penalty for long deletions</source>
<translation>Long-scaled gap penalty for long deletions</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="168"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="164"/>
<source>Long-scaled gap penalty for long deletions (-L)</source>
<translation>Long-scaled gap penalty for long deletions (-L)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="171"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="167"/>
<source>Non iterative mode</source>
<translation>Non iterative mode</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="172"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="168"/>
<source>Non iterative mode (-N).</source>
<translation>Non iterative mode (-N).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="175"/>
- <location filename="../src/bwa/BwaWorker.cpp" line="176"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="171"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="172"/>
<source>Enable long gaps</source>
<translation>Enable long gaps</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="179"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="175"/>
<source>Max gap extensions</source>
<translation>Max gap extensions</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="180"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="176"/>
<source>Max gap extensions (-e)</source>
<translation>Max gap extensions (-e)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="183"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="179"/>
<source>Indel offset</source>
<translation>Indel offset</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="184"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="180"/>
<source>Indel offset (-i)</source>
<translation>Indel offset (-i)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="187"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="183"/>
<source>Max long deletions extensions</source>
<translation>Max long deletions extensions</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="188"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="184"/>
<source>Max long deletions extensions(-d)</source>
<translation>Max long deletions extensions(-d)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="191"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="187"/>
<source>Max queue entries</source>
<translation>Max queue entries</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="192"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="188"/>
<source>Max queue entries (-m)</source>
<translation>Max queue entries (-m)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="195"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="191"/>
<source>Barcode length</source>
<translation>Barcode length</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="196"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="192"/>
<source>Barcode length (-B)</source>
<translation>Barcode length (-B)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="199"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="195"/>
<source>Threads</source>
<translation>Threads</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="200"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="196"/>
<source>Threads (-t)</source>
<translation>Threads (-t)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="203"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="199"/>
<source>Max seed differencies</source>
<translation>Max seed differencies</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="204"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="200"/>
<source>Max seed differencies (-k)</source>
<translation>Max seed differencies (-k)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="207"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="203"/>
<source>Mismatch penalty</source>
<translation>Mismatch penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="208"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="204"/>
<source>Mismatch penalty (-M)</source>
<translation>Mismatch penalty (-M)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="211"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="207"/>
<source>Gap open penalty</source>
<translation>Gap open penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="212"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="208"/>
<source>Gap open penalty (-O).</source>
<translation>Gap open penalty (-O).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="215"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="211"/>
<source>Gap extension penalty</source>
<translation>Gap extension penalty</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="216"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="212"/>
<source>Gap extension penalty; a gap of size k cost (-E).</source>
<translation>Gap extension penalty; a gap of size k cost (-E).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="219"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="215"/>
<source>Quolity threshold</source>
<translation>Quality threshold</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="220"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="216"/>
<source>Quolity threshold (-q).</source>
<translation>Quality threshold (-q).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="286"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="282"/>
<source>Align Reads with BWA</source>
<translation>Align Reads with BWA</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="287"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="283"/>
<source>Performs alignment of short reads with BWA.</source>
<translation>Performs alignment of short reads with BWA.</translation>
</message>
@@ -7226,18 +8157,30 @@ Default: 64.</translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="124"/>
- <source>FASTA file with adapters</source>
- <translation>FASTA file with adapters</translation>
+ <source>FASTA file with 3' adapters</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="125"/>
- <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
- <translation>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</translation>
+ <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$' character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="131"/>
+ <source>FASTA file with 5' adapters</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FASTA file with adapters</source>
+ <translation type="vanished">FASTA file with adapters</translation>
+ </message>
+ <message>
+ <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
+ <translation type="vanished">A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</translation>
+ </message>
+ <message>
<source>FASTA file with reverse adapters</source>
- <translation>FASTA file with reverse adapters</translation>
+ <translation type="vanished">FASTA file with reverse adapters</translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="132"/>
@@ -7600,6 +8543,208 @@ Default: 64.</translation>
</message>
</context>
<context>
+ <name>U2::LocalWorkflow::HmmerBuildPrompter</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="129"/>
+ <source>For each MSA from <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="131"/>
+ <source>%1 builds a HMMER profile.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerBuildWorker</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="62"/>
+ <source>Input MSA</source>
+ <translation type="unfinished">Input MSA</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="63"/>
+ <source>Input multiple sequence alignment for building statistical model.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="64"/>
+ <source>HMM3 profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="64"/>
+ <source>Produced HMM3 profile URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="74"/>
+ <source>Random seed</source>
+ <translation type="unfinished">Random seed</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="74"/>
+ <source>Random generator seed. 0 - means that one-time arbitrary seed will be used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="78"/>
+ <source>HMM3 Build</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="78"/>
+ <source>Builds a HMM3 profile from a multiple sequence alignment.<p>The HMM3 profile is a statistical model which captures position-specific information about how conserved each column of the alignment is, and which residues are likely.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="94"/>
+ <source>HMMER3 Tools</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="195"/>
+ <source>Built HMMER profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerSearchPrompter</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="188"/>
+ <source>For each sequence from <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="189"/>
+ <source>using all profiles provided by <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="193"/>
+ <source>%1 search HMMER signals %2. <br>Output the list of found regions annotated as <u>%4</u>.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerSearchWorker</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="80"/>
+ <source>Filter by</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="81"/>
+ <source>Parameter to filter results by.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="82"/>
+ <source>HMMER profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="82"/>
+ <source>HMMER profile(s) URL(s) to search with.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="83"/>
+ <source>Input sequence</source>
+ <translation type="unfinished">Input sequence</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="84"/>
+ <source>An input sequence (nucleotide or protein) to search in.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="85"/>
+ <source>HMMER annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="86"/>
+ <source>Annotations marking found similar sequence regions.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="98"/>
+ <source>Result annotation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="98"/>
+ <source>A name of the result annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="99"/>
+ <source>Seed</source>
+ <translation type="unfinished">Seed</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="99"/>
+ <source>Random generator seed. 0 - means that one-time arbitrary seed will be used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="100"/>
+ <source>Filter by high E-value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="100"/>
+ <source>Report domains with e-value less than.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="101"/>
+ <source>Filter by low score</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="101"/>
+ <source>Report domains with score greater than.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="118"/>
+ <source>HMM3 Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="119"/>
+ <source>Searches each input sequence for significantly similar sequence matches to all specified HMM profiles. In case several profiles were supplied, searches with all profiles one by one and outputs united set of annotations for each sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="159"/>
+ <source>HMMER3 Tools</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="238"/>
+ <source>Value for attribute name is empty, default name used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="289"/>
+ <source>Find HMMER signals in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="294"/>
+ <source>Bad sequence supplied to input: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="323"/>
+ <source>Found %1 HMMER signals</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::LocalWorkflow::MACSPrompter</name>
<message>
<location filename="../src/macs/MACSWorker.cpp" line="571"/>
@@ -8374,22 +9519,22 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::ShortReadsAlignerPrompter</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="369"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="371"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="375"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="377"/>
<source>Aligns upstream oriented reads from <u>%1</u> and downstream oriented reads from <u>%2</u> </source>
<translation>Aligns upstream oriented reads from <u>%1</u> and downstream oriented reads from <u>%2</u> </translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="377"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="379"/>
<source>Aligns reads from <u>%1</u> </source>
<translation>Aligns reads from <u>%1</u> </translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="381"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="383"/>
<source> to reference genome <u>%1</u>.</source>
<translation> to reference genome <u>%1</u>.</translation>
</message>
@@ -8580,17 +9725,17 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::SnpEffPrompter</name>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="83"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="85"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="84"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="86"/>
<source> from <u>%1</u></source>
<translation> from <u>%1</u></translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="86"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="88"/>
<source>Annotates and filters variations %1 with SnpEff.</source>
<translation>Annotates and filters variations %1 with SnpEff.</translation>
</message>
@@ -8598,143 +9743,143 @@ Default: 64.</translation>
<context>
<name>U2::LocalWorkflow::SnpEffWorker</name>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="93"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="95"/>
<source>SnpEff Annotation and Filtration</source>
<translation>SnpEff Annotation and Filtration</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="94"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="96"/>
<source>Annotates and filters variations with SnpEff.</source>
<translation>Annotates and filters variations with SnpEff.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="98"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="100"/>
<source>Variations</source>
<translation>Variations</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="99"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="101"/>
<source>Set of variations</source>
<translation>Set of variations</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="100"/>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="101"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="102"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="103"/>
<source>Annotated variations</source>
<translation>Annotated variations</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="115"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="117"/>
<source>Output directory</source>
<translation>Output directory</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="116"/>
+ <location filename="../src/snpeff/SnpEffWorker.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>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.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="120"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="122"/>
<source>Custom directory</source>
<translation>Custom directory</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="121"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="123"/>
<source>Select the custom output directory.</source>
<translation>Select the custom output directory.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="123"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="125"/>
<source>Input format</source>
<translation>Input format</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="124"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="126"/>
<source>Select the input format of variations.</source>
<translation>Select the input format of variations.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="126"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="128"/>
<source>Output format</source>
<translation>Output format</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="127"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="129"/>
<source>Select the format of annotated output files.</source>
<translation>Select the format of annotated output files.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="129"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="131"/>
<source>Genome</source>
<translation>Genome</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="130"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="132"/>
<source>Select the target genome. Genome data will be downloaded if it is not found.</source>
<translation>Select the target genome. Genome data will be downloaded if it is not found.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="132"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="134"/>
<source>Upstream/downstream length</source>
<translation>Upstream/downstream length</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="133"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
<source>Upstream and downstream interval size. Eliminate any upstream and downstream effect by using 0 length</source>
<translation>Upstream and downstream interval size. Eliminate any upstream and downstream effect by using 0 length</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="137"/>
<source>Canonical transcripts</source>
<translation>Canonical transcripts</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="136"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
<source>Use only canonical transcripts</source>
<translation>Use only canonical transcripts</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="140"/>
<source>HGVS nomenclature</source>
<translation>HGVS nomenclature</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="139"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
<source>Annotate using HGVS nomenclature</source>
<translation>Annotate using HGVS nomenclature</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="143"/>
<source>Annotate Loss of function variations</source>
<translation>Annotate Loss of function variations</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="142"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="144"/>
<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"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="146"/>
<source>Annotate TFBSs motifs</source>
<translation>Annotate TFBSs motifs</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="145"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="147"/>
<source>Annotate transcription factor binding site motifs (only available for latest GRCh37)</source>
<translation>Annotate transcription factor binding site motifs (only available for latest GRCh37)</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="167"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="169"/>
<source>Input file</source>
<translation>Input file</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="168"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="170"/>
<source>Workflow</source>
<translation>Workflow</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="169"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="171"/>
<source>Custom</source>
<translation>Custom</translation>
</message>
@@ -9784,6 +10929,87 @@ Set it empty if you want to run Tophat once for all input reads</translation>
</message>
</context>
<context>
+ <name>U2::PhmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="56"/>
+ <source>Search</source>
+ <translation type="unfinished">Search</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="57"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="111"/>
+ <source>Select query sequence file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="159"/>
+ <source>Query sequence file path is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="177"/>
+ <source>Error</source>
+ <translation type="unfinished">Error</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="177"/>
+ <source>Cannot create an annotation object. Please check settings</source>
+ <translation type="unfinished">Cannot create an annotation object. Please check settings</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="184"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::PhmmerSearchTask</name>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="48"/>
+ <source>Search with phmmer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="100"/>
+ <source>Query sequence: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="103"/>
+ <source>Task was not finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="109"/>
+ <source>Result annotation table: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="111"/>
+ <source>Result annotation group: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="112"/>
+ <source>Result annotation name: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="114"/>
+ <source>Results count: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="146"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::PhyMLGetCalculatedTreeTask</name>
<message>
<location filename="../src/phyml/PhyMLTask.cpp" line="196"/>
@@ -9863,17 +11089,17 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::PhyMlWidget</name>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="169"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="170"/>
<source>Open an alignment file</source>
<translation>Open an alignment file</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="224"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="225"/>
<source>Path for %1 tool not selected.</source>
<translation>Path for %1 tool not selected.</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="225"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="226"/>
<source>Do you want to select it now?</source>
<translation>Do you want to select it now?</translation>
</message>
@@ -9881,12 +11107,12 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::PrepareInputForCAP3Task</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="245"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="241"/>
<source>Failed to initialize sequence writer.</source>
<translation>Failed to initialize sequence writer.</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="272"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="268"/>
<source>Failed to write sequence %1</source>
<translation>Failed to write sequence %1</translation>
</message>
@@ -10063,17 +11289,17 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::RunCap3AndOpenResultTask</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="137"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="133"/>
<source>CAP3 run and open result task</source>
<translation>CAP3 run and open result task</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="146"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="142"/>
<source>Invalid CAP3 task</source>
<translation>Invalid CAP3 task</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="162"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="158"/>
<source>Project loader is NULL</source>
<translation>Project loader is NULL</translation>
</message>
@@ -10081,12 +11307,12 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::SaveAlignmentTask</name>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="60"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="64"/>
<source>Export alignment to '%1'</source>
<translation>Export alignment to '%1'</translation>
</message>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="64"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="68"/>
<source>An alignment is empty</source>
<translation>An alignment is empty</translation>
</message>
@@ -10094,12 +11320,25 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::SaveMSA2SequencesTask</name>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="91"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="107"/>
<source>Export alignment to sequence: %1</source>
<translation>Export alignment to sequence: %1</translation>
</message>
</context>
<context>
+ <name>U2::SaveSequenceTask</name>
+ <message>
+ <location filename="../src/utils/ExportTasks.cpp" line="138"/>
+ <source>Save sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/ExportTasks.cpp" line="169"/>
+ <source>'%' format is not registered</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::SeqPosSupport</name>
<message>
<location filename="../src/seqpos/SeqPosSupport.cpp" line="46"/>
@@ -10137,7 +11376,7 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<context>
<name>U2::SnpEffTask</name>
<message>
- <location filename="../src/snpeff/SnpEffTask.cpp" line="198"/>
+ <location filename="../src/snpeff/SnpEffTask.cpp" line="205"/>
<source>SNPEff dataDir is not initialized.</source>
<translation>SNPEff dataDir is not initialized.</translation>
</message>
@@ -10553,7 +11792,7 @@ Set it empty if you want to run Tophat once for all input reads</translation>
<message>
<location filename="../src/macs/MACSWorker.cpp" line="236"/>
<location filename="../src/spades/SpadesWorker.cpp" line="189"/>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="253"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="255"/>
<source>The slot must be not empty: '%1'</source>
<translation type="unfinished">The slot must be not empty: '%1'</translation>
</message>
diff --git a/src/plugins/external_tool_support/transl/russian.ts b/src/plugins/external_tool_support/transl/russian.ts
index eebbe37..d43bedf 100644
--- a/src/plugins/external_tool_support/transl/russian.ts
+++ b/src/plugins/external_tool_support/transl/russian.ts
@@ -336,22 +336,35 @@ a database file</source>
<context>
<name>BlastDBCmdDialog</name>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="26"/>
- <source>Fetch Sequence from BLAST Database</source>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="32"/>
+ <source>Fetch Sequences from BLAST Database</source>
<translation>Извлечь последовательность из базы данных BLAST</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="44"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="59"/>
+ <source>Query ID</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="75"/>
+ <source>Select database</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="99"/>
+ <source>Output path</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Entery query ID:</source>
- <translation>Идентификатор запроса:</translation>
+ <translation type="vanished">Идентификатор запроса:</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="54"/>
<source>Select database :</source>
- <translation>Выберите базу данных:</translation>
+ <translation type="vanished">Выберите базу данных:</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="104"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="115"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -368,12 +381,11 @@ a database file</source>
<translation type="vanished">белки</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="88"/>
<source>Output path:</source>
- <translation>Выходной путь:</translation>
+ <translation type="vanished">Выходной путь:</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="116"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.ui" line="127"/>
<source>Add to project</source>
<translation>Добавить в проект</translation>
</message>
@@ -381,25 +393,37 @@ a database file</source>
<context>
<name>BlastDBSelectorWidget</name>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="14"/>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="20"/>
<source>Form</source>
<translation type="unfinished">Форма</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="34"/>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="40"/>
+ <source>Database path</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="64"/>
+ <source>Database file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BlastDBSelectorWidget.ui" line="73"/>
+ <source>Base name for BLAST DB files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Database path:</source>
- <translation type="unfinished">Путь к БД:</translation>
+ <translation type="obsolete">Путь к БД:</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="58"/>
<source>Select
a database file</source>
- <translation type="unfinished">Выберите файл базы данных</translation>
+ <translation type="obsolete">Выберите файл базы данных</translation>
</message>
<message>
- <location filename="../src/utils/BlastDBSelectorWidget.ui" line="68"/>
<source>Base name for BLAST DB files:</source>
- <translation type="unfinished">Базовое имя для файлов БД:</translation>
+ <translation type="obsolete">Базовое имя для файлов БД:</translation>
</message>
</context>
<context>
@@ -1522,6 +1546,11 @@ p, li { white-space: pre-wrap; }
<translation>Выравнивание с помощью ClustalO</translation>
</message>
<message>
+ <location filename="../src/clustalo/ClustalOSupportRunDialog.ui" line="34"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/clustalo/ClustalOSupportRunDialog.ui" line="42"/>
<source>Input file</source>
<translation>Входной файл</translation>
@@ -1581,6 +1610,11 @@ p, li { white-space: pre-wrap; }
<translation>Выравнивание с помощью ClustalW</translation>
</message>
<message>
+ <location filename="../src/clustalw/ClustalWSupportRunDialog.ui" line="34"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/clustalw/ClustalWSupportRunDialog.ui" line="42"/>
<source>Input file</source>
<translation>Входной файл</translation>
@@ -1710,9 +1744,13 @@ p, li { white-space: pre-wrap; }
<translation>Проверить наличие новой версии пакета внешних инструментов</translation>
</message>
<message>
+ <source><a href="http://ugene.net/external.html">external tools package</a></source>
+ <translation type="vanished"><a href="http://ugene.net/external.html">пакет внешних инструментов</a></translation>
+ </message>
+ <message>
<location filename="../src/ETSSettingsWidget.ui" line="50"/>
<source><a href="http://ugene.unipro.ru/external.html">external tools package</a></source>
- <translation><a href="http://ugene.unipro.ru/external.html">пакет внешних инструментов</a></translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ETSSettingsWidget.ui" line="70"/>
@@ -1854,6 +1892,318 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>HmmerBuildDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="20"/>
+ <source>HMM3 Build</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="42"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="52"/>
+ <source>Input alignment file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="62"/>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="79"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="69"/>
+ <source>Build to profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="104"/>
+ <source>Construction strategies</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="126"/>
+ <source>assign cols w/ >= symfrac residues as consensus</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="129"/>
+ <source>fast</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="142"/>
+ <source>Sym fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="164"/>
+ <source>Manual construction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="167"/>
+ <source>Hand (requires reference annotation)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="185"/>
+ <source>Tag sequence as a fragment, if L < x*<L>, where x is:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="226"/>
+ <source>Relative weighting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="234"/>
+ <source>Henikoff position-based weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="250"/>
+ <source>Gerstein/Sonnhammer/Chothia tree weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="274"/>
+ <source>Henikoff simple filter weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="284"/>
+ <source>Identity cutoff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="309"/>
+ <source>Skip relative weighting; set all to 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="316"/>
+ <source>Use weights given in alignment file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="339"/>
+ <source>Effective weighting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="347"/>
+ <source>Adjust effective sequence number to achieve relative entropy target</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="381"/>
+ <source>Minimum relative entropy/position</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="433"/>
+ <source>Sigma parameter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="466"/>
+ <source>Use number of single linkage clusters as effective</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="476"/>
+ <source>Fractional identity cutoff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="501"/>
+ <source>Use number of sequences as effective</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="516"/>
+ <source>Effective sequence number for all models to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="554"/>
+ <source>E-value calibration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="573"/>
+ <source>Length of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="609"/>
+ <source>Number of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="642"/>
+ <source>Length of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="672"/>
+ <source>Number of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="702"/>
+ <source>Length of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="732"/>
+ <source>Number of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="762"/>
+ <source>Tail mass for Forward exponential tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="803"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="819"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildDialog.ui" line="862"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="20"/>
+ <source>HMM3 Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="54"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="65"/>
+ <source>Query HMM file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="75"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="92"/>
+ <source>Reporting thresholds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="109"/>
+ <source>Report domains with E-value less than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="119"/>
+ <source>1E+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="146"/>
+ <source>Report domains with score greater than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="180"/>
+ <source>Score threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="229"/>
+ <source>Use profile's GA gathering cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="265"/>
+ <source>Use profile's NC noise cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="295"/>
+ <source>Use profile's TC trusted cutoffs</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="312"/>
+ <source>Number of significant sequences for domain E-value calculation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="345"/>
+ <source>Acceleration heuristics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="360"/>
+ <source>Turn off composition bias filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="373"/>
+ <source>Turn off biased composition score corrections</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="386"/>
+ <source>Turn all heuristic filters off (less speed, more power)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="401"/>
+ <source>MSV filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="434"/>
+ <source>Viterbi filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="464"/>
+ <source>Forward filter threshold:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="500"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="522"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.ui" line="565"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IntegralBusPort</name>
<message>
<source>One of these slots must be not empty: '%1', '%2'</source>
@@ -1888,6 +2238,11 @@ p, li { white-space: pre-wrap; }
<translation>Выравнивание с помощью MAFFT</translation>
</message>
<message>
+ <location filename="../src/mafft/MAFFTSupportRunDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/mafft/MAFFTSupportRunDialog.ui" line="36"/>
<source>Input file</source>
<translation>Входной файл</translation>
@@ -1988,62 +2343,215 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/mrbayes/MrBayesDialog.ui" line="329"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Опции отображения</translation>
</message>
</context>
<context>
- <name>PhyMLDialog</name>
+ <name>PhmmerSearchDialog</name>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="77"/>
- <source>Substitution model</source>
- <translation>Модель замен</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="20"/>
+ <source>Phmmer Search</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="98"/>
- <source>Equilibrium frequencies</source>
- <translation>Равновесные частоты</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="36"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="112"/>
- <source>optimized</source>
- <translation>оптимизированные</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="50"/>
+ <source>Query sequence file:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="119"/>
- <source>empirical</source>
- <translation>эмпирические</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="60"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="293"/>
- <source>Transition / transversion ratio </source>
- <translation>Коэффициент перехода/трансверсии</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="87"/>
+ <source>Reporting tresholds</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="139"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="171"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="289"/>
- <source>Check to set user value.
-Uncheck to get the maximum likelihood estimate.</source>
- <translation>Установите галочку, чтобы задать значение пользователя.
-Снимите галочку, чтобы получить максимальную оценку правдоподобия.</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="103"/>
+ <source>Report domains with E-value less than</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="190"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="212"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="243"/>
- <location filename="../src/phyml/PhyMLDialog.ui" line="265"/>
- <source>estimated </source>
- <translation>оценка</translation>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="113"/>
+ <source>1E+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="143"/>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="142"/>
+ <source>Report domains with score greater than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="166"/>
+ <source>Number of significant sequences for domain E-value calculation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="201"/>
+ <source>Scoring system</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="217"/>
+ <source>Gap open probability</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="247"/>
+ <source>Gap extend probability</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="285"/>
+ <source>Acceleration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="297"/>
+ <source>Turn off composition bias filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="310"/>
+ <source>Turn off biased composition score corrections</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="323"/>
+ <source>Turn all heuristic filters off (less speed, more power)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="338"/>
+ <source>Viterbi filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="368"/>
+ <source>MSV filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="401"/>
+ <source>Forward filter treshold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="437"/>
+ <source>E-value calibration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="456"/>
+ <source>Length of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="492"/>
+ <source>Number of sequences for MSV Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="525"/>
+ <source>Length of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="555"/>
+ <source>Number of sequences for Viterbi Gumbel mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="585"/>
+ <source>Length of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="615"/>
+ <source>Number of sequences for Forward exp tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="645"/>
+ <source>Tail mass for Forward exponential tail mu fit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="686"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="702"/>
+ <source>Random generator seed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.ui" line="745"/>
+ <source>* 0 means that one-time arbitrary seed will be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PhyMLDialog</name>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="77"/>
+ <source>Substitution model</source>
+ <translation>Модель замен</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="98"/>
+ <source>Equilibrium frequencies</source>
+ <translation>Равновесные частоты</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="112"/>
+ <source>optimized</source>
+ <translation>оптимизированные</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="119"/>
+ <source>empirical</source>
+ <translation>эмпирические</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="293"/>
+ <source>Transition / transversion ratio </source>
+ <translation>Коэффициент перехода/трансверсии</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="139"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="171"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="289"/>
+ <source>Check to set user value.
+Uncheck to get the maximum likelihood estimate.</source>
+ <translation>Установите галочку, чтобы задать значение пользователя.
+Снимите галочку, чтобы получить максимальную оценку правдоподобия.</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="190"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="212"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="243"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="265"/>
+ <source>estimated </source>
+ <translation>оценка</translation>
+ </message>
+ <message>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="143"/>
<source>Proportion of invariable sites</source>
<translation>Доля неизменяемых сайтов</translation>
</message>
<message>
<location filename="../src/phyml/PhyMLDialog.ui" line="63"/>
<source>Substitution Model</source>
- <translation type="unfinished"></translation>
+ <translation>Модель замен</translation>
</message>
<message>
<location filename="../src/phyml/PhyMLDialog.ui" line="154"/>
@@ -2061,54 +2569,54 @@ Uncheck to get the maximum likelihood estimate.</source>
<translation>Поддержка ветви</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="321"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="315"/>
<source>Use fast likelihood-based method</source>
<translation>Использовать быстрый метод максимального правдоподобия</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="353"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="335"/>
<source>Perform bootstrap</source>
<translation>Выполнить начальную загрузку</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="369"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="345"/>
<source>It is the number of bootstrap replicates.</source>
<translation>Это число начальных загрузок.</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="380"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="359"/>
<source>Tree Searching</source>
<translation>Поиск дерева</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="470"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="449"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="482"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="461"/>
<source>Type of tree improvement</source>
<translation>Тип улучшения дерева</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="499"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="478"/>
<source>Set number of random starting tree</source>
<translation>Установить число случайных начал дерева</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="515"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="494"/>
<source>Optimise topology</source>
<translation>Оптимизировать топологию</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="525"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="504"/>
<source>Optimise branch lengths</source>
<translation>Оптимизировать длину ветвей</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialog.ui" line="546"/>
+ <location filename="../src/phyml/PhyMLDialog.ui" line="525"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Опции отображения</translation>
</message>
</context>
<context>
@@ -2326,6 +2834,11 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation>Выравнивание с помощью T-Coffee</translation>
</message>
<message>
+ <location filename="../src/tcoffee/TCoffeeSupportRunDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/tcoffee/TCoffeeSupportRunDialog.ui" line="36"/>
<source>Input file</source>
<translation>Входной файл</translation>
@@ -2668,12 +3181,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BlastDBCmdDialog</name>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="42"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="43"/>
<source>Fetch</source>
<translation>Получить</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="43"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="44"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -2682,7 +3195,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation type="vanished">Выберите файл базы данных</translation>
</message>
<message>
- <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="84"/>
+ <location filename="../src/blast_plus/BlastDBCmdDialog.cpp" line="92"/>
<source>Set a result FASTA file name</source>
<translation>Выберите имя результирующего FASTA файла</translation>
</message>
@@ -3043,7 +3556,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::Bowtie2AlignTask</name>
<message>
- <location filename="../src/bowtie2/Bowtie2Task.cpp" line="147"/>
+ <location filename="../src/bowtie2/Bowtie2Task.cpp" line="148"/>
<source>Unknown short reads format %1</source>
<translation>Неизвестный формат ридов %1</translation>
</message>
@@ -3077,17 +3590,17 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BowtieAssembleTask</name>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="160"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="161"/>
<source>Reference index file "%1" does not exist</source>
<translation>Reference index file "%1" does not exist</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="241"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="242"/>
<source>Unknown short reads format %1</source>
<translation>Unknown short reads format %1</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieTask.cpp" line="315"/>
+ <location filename="../src/bowtie/BowtieTask.cpp" line="317"/>
<source>There is not enough memory on the computer!</source>
<translation>There is not enough memory on the computer!</translation>
</message>
@@ -3111,7 +3624,7 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="105"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="106"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
@@ -3120,27 +3633,27 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<translation type="vanished">In paired-end mode it possible to analyze only 2 read sets using BWA</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="123"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="124"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="194"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="196"/>
<source>Align reads with BWA Multitask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="235"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="238"/>
<source>Saming reads with BWA Multitask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="286"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="291"/>
<source>Log is incomplete</source>
<translation>Log is incomplete</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="289"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="294"/>
<source>Log is incorrect</source>
<translation>Log is incorrect</translation>
</message>
@@ -3148,17 +3661,17 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaMemAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="312"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="317"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="331"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="336"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="420"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="428"/>
<source>Align reads with BWA-MEM Multitask</source>
<translation type="unfinished"></translation>
</message>
@@ -3186,12 +3699,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaSwAlignTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="470"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="478"/>
<source>Short reads are not provided</source>
<translation>Short reads are not provided</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="480"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="488"/>
<source>BWA SW can not align paired reads</source>
<translation>BWA SW can not align paired reads</translation>
</message>
@@ -3207,12 +3720,12 @@ In order to achieve stable BWA performance it is strongly recommend to set the i
<context>
<name>U2::BwaTask</name>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="620"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="629"/>
<source>Multiple read files are not supported by bwa-sw. Please combine your reads into single FASTA file.</source>
<translation>Multiple read files are not supported by bwa-sw. Please combine your reads into single FASTA file.</translation>
</message>
<message>
- <location filename="../src/bwa/BwaTask.cpp" line="626"/>
+ <location filename="../src/bwa/BwaTask.cpp" line="636"/>
<source>Please, provide same number of files with downstream and upstream reads.</source>
<translation type="unfinished"></translation>
</message>
@@ -3313,17 +3826,17 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::CAP3SupportTask</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="100"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="96"/>
<source>Output file not found</source>
<translation>Выходной файл не найден</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="102"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="98"/>
<source>Output file not found. May be %1 tool path '%2' not valid?</source>
<translation>Output file not found. May be %1 tool path '%2' not valid?</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="116"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="112"/>
<source>Output file not found: copy from tmp dir failed.</source>
<translation>Output file not found: copy from tmp dir failed.</translation>
</message>
@@ -3690,6 +4203,29 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::ConvertAlignment2Stockholm</name>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="40"/>
+ <source>Convert alignment to Stockholm format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="102"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="110"/>
+ <source>File doesn't contain any multiple alignments.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/ConvertAlignment2StockholmTask.cpp" line="113"/>
+ <source>File contains several multiple alignments. Only the first one is saved to the result file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::CopyFileTask</name>
<message>
<location filename="../src/samtools/TabixSupportTask.cpp" line="101"/>
@@ -3906,7 +4442,7 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSearchAndValidateTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="349"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="351"/>
<source>Can not find expected message.<br>It is possible that the specified executable file <i>%1</i> for %2 tool is invalid. You can change the path to the executable file in the external tool settings in the global preferences.</source>
<translation>Can not find expected message.<br>It is possible that the specified executable file <i>%1</i> for %2 tool is invalid. You can change the path to the executable file in the external tool settings in the global preferences.</translation>
</message>
@@ -3948,67 +4484,67 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSupportPlugin</name>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="177"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="165"/>
<source>Search tools in PATH</source>
<translation>Search tools in PATH</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="224"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="212"/>
<source>External tool support</source>
<translation>Поддержка внешних инструментов</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="224"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="212"/>
<source>Runs other external tools</source>
<translation>Модуль позволяет использовать внешние программы</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="287"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="275"/>
<source>Align with ClustalW...</source>
<translation>Выравнивание с помощью ClustalW...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="295"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="283"/>
<source>Align with ClustalO...</source>
<translation>Выравнивание с помощью ClustalO...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="303"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="291"/>
<source>Align with MAFFT...</source>
<translation>Выравнивание с помощью MAFFT...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="311"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="299"/>
<source>Align with T-Coffee...</source>
<translation>Выравнивание с помощью T-Coffee...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="464"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="450"/>
<source>BLAST make database...</source>
<translation>Создание базы данных BLAST...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="468"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="454"/>
<source>BLAST+ make database...</source>
<translation>Создание базы данных BLAST+...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="486"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="472"/>
<source>BLAST+ search...</source>
<translation>Поиск с помощью BLAST+...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="490"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="476"/>
<source>BLAST+ query database...</source>
<translation>Запрос с помощью BLAST+...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="501"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="487"/>
<source>Contig assembly with %1...</source>
<translation>Сборка контигов с помощью %1...</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="476"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="462"/>
<source>BLAST search...</source>
<translation>Поиск с помощью BLAST...</translation>
</message>
@@ -4026,12 +4562,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolSupportService</name>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="653"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="651"/>
<source>External tools support</source>
<translation>Поддержка внешних инструментов</translation>
</message>
<message>
- <location filename="../src/ExternalToolSupportPlugin.cpp" line="653"/>
+ <location filename="../src/ExternalToolSupportPlugin.cpp" line="651"/>
<source>Provides support to run external tools from UGENE</source>
<translation>Позволяет запускать внешние инструменты из UGENE</translation>
</message>
@@ -4139,12 +4675,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolsInstallTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="393"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="395"/>
<source>Installing external tools</source>
<translation>Installing external tools</translation>
</message>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="398"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="400"/>
<source> failed: </source>
<translation> failed: </translation>
</message>
@@ -4166,13 +4702,13 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::ExternalToolsValidateTask</name>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="364"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="366"/>
<source>Checking external tools</source>
<translation>Checking external tools</translation>
</message>
<message>
- <location filename="../src/utils/ExternalToolValidateTask.cpp" line="382"/>
<location filename="../src/utils/ExternalToolValidateTask.cpp" line="384"/>
+ <location filename="../src/utils/ExternalToolValidateTask.cpp" line="386"/>
<source> failed: </source>
<translation> failed: </translation>
</message>
@@ -4186,6 +4722,29 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
+ <name>U2::FastQCTask</name>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="90"/>
+ <source>No input URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="95"/>
+ <source>The input file '%1' is empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="101"/>
+ <source>Directory does not exist: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/fastqc/FastqcTask.cpp" line="118"/>
+ <source>Result file does not exist: %1. See the log for details.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::FormatDBSupport</name>
<message>
<location filename="../src/blast/FormatDBSupport.cpp" line="66"/>
@@ -4257,53 +4816,73 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::FormatDBSupportTask</name>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="47"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="54"/>
<source>Run NCBI FormatDB task</source>
<translation>Run NCBI FormatDB task</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="60"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="146"/>
+ <source>Cannot create temp directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="153"/>
+ <source>File '%1' was skipped. Cannot detect file format.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="180"/>
+ <source>Trying to initialize Format DB task second time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="187"/>
<source>Input files paths contain space characters.</source>
<translation>Input files paths contain space characters.</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="77"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="204"/>
<source>Output database path contain space characters.</source>
<translation>Output database path contain space characters.</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="95"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="105"/>
<source>Blast database creation has been cancelled</source>
<translation>Создание базы данных BLAST было отменено</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="102"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="95"/>
+ <source>Can not remove directory for temporary files.</source>
+ <translation type="unfinished">Can not remove directory for temporary files.</translation>
+ </message>
+ <message>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="112"/>
<source>Blast database has been successfully created</source>
<translation>База данных BLAST успешно создана</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="103"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="113"/>
<source>Source sequences: </source>
<translation>Исходные последовательности: </translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="111"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="121"/>
<source>Database file path: %1</source>
<translation>Путь до базы данных: %1</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="113"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="123"/>
<source>Type: %1</source>
<translation>Тип: %1</translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="115"/>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="121"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="125"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="131"/>
<source>Formatdb log file path: </source>
<translation>Formatdb log file path: </translation>
</message>
<message>
- <location filename="../src/blast/FormatDBSupportTask.cpp" line="119"/>
+ <location filename="../src/blast/FormatDBSupportTask.cpp" line="129"/>
<source>Blast database creation has been failed</source>
<translation>Создание базы данных BLAST завершилось неудачно</translation>
</message>
@@ -4345,128 +4924,480 @@ To save under other name press 'Cancel' and change name in 'Resul
</message>
</context>
<context>
- <name>U2::JavaSupport</name>
+ <name>U2::HmmerAdvContext</name>
<message>
- <location filename="../src/java/JavaSupport.cpp" line="47"/>
- <source>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</source>
- <translation>Java позволяет разрабатывать приложения Java на компьютерах и серверах <br> <i> (Требуется Java 1.7 или выше) </i> <br> Java можно свободно скачать на официальном веб-сайте:. HTTPS: / /www.java.com/en/download/</translation>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="304"/>
+ <source>Find HMM signals with HMMER3...</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>U2::LocalWorkflow::BaseShortReadsAlignerWorker</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="238"/>
- <source>Not enough upstream reads datasets</source>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="314"/>
+ <source>error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="241"/>
- <source>Not enough downstream reads datasets</source>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="314"/>
+ <source>No sequence in focus found</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildDialog</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="276"/>
- <source>Output directory</source>
- <translation>Выходная директория</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="63"/>
+ <source>Build</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="277"/>
- <source>Directory to save output files.</source>
- <translation>Директория для сохранения выходных файлов.</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="64"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Отмена</translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="280"/>
- <source>Reference genome</source>
- <translation>Референсный геном</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="78"/>
+ <source>Select hmm file to create</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="281"/>
- <source>Path to indexed reference genome.</source>
- <translation>Путь до индексированного референсного генома.</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="120"/>
+ <source>Select multiple alignment file</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="284"/>
- <source>Library</source>
- <translation>Библиотека</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="185"/>
+ <source>input file is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="285"/>
- <source>Is this library mate-paired?</source>
- <translation>Это парная библиотека?</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="188"/>
+ <source>output hmm file is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="288"/>
- <source>Output file name</source>
- <translation>Имя выходного файла</translation>
+ <location filename="../src/hmmer/HmmerBuildDialog.cpp" line="197"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildFromFileTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="289"/>
- <source>Base name of the output file. 'out.sam' by default</source>
- <translation>Базовое имя для выходных файлов. По умолчанию 'out.sam'</translation>
+ <location filename="../src/hmmer/HmmerBuildFromFileTask.cpp" line="33"/>
+ <source>Build HMMER profile from file</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="321"/>
- <source>URL of a file with reads</source>
- <translation>Путь до файла с ридами</translation>
+ <location filename="../src/hmmer/HmmerBuildFromFileTask.cpp" line="39"/>
+ <source>Msa URL is empty</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildFromMsaTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="322"/>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="332"/>
- <source>Input reads to be aligned.</source>
- <translation>Входные риды будут выровнены.</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="38"/>
+ <source>Build HMMER profile from msa</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="324"/>
- <source>URL of a file with mate reads</source>
- <translation>Путь до файла с ридами</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="45"/>
+ <source>HMM profile URL is empty</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="325"/>
- <source>Input mate reads to be aligned.</source>
- <translation>Входные риды будут выровнены.</translation>
+ <location filename="../src/hmmer/HmmerBuildFromMsaTask.cpp" line="104"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>U2::HmmerBuildTask</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="331"/>
- <source>Input data</source>
- <translation>Входные данные</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="55"/>
+ <source>Source alignment</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="335"/>
- <source>Reverse FASTQ file</source>
- <translation>Обратный FASTQ файл</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="57"/>
+ <source>Profile name</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="336"/>
- <source>Reverse paired reads to be aligned.</source>
- <translation>Обратные парные риды будут выровнены.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="59"/>
+ <source>Options:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="348"/>
- <source>Assembly URL</source>
- <translation>Путь до сборки</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="60"/>
+ <source>Model construction strategies</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="349"/>
- <source>Output assembly URL.</source>
- <translation>Путь выходной сборки.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="73"/>
+ <source>Relative model construction strategies</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="352"/>
- <source>Output data</source>
- <translation>Выходные данные</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="76"/>
+ <source>Gerstein/Sonnhammer/Chothia tree weights</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="353"/>
- <source>Output assembly files.</source>
- <translation>Выходные файлы сборки.</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="79"/>
+ <source>Henikoff simple filter weights</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>U2::LocalWorkflow::BedGraphToBigWigPrompter</name>
<message>
- <location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="75"/>
- <source>unset</source>
- <translation>не указан</translation>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="82"/>
+ <source>Henikoff position-based weights</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="85"/>
+ <source>No relative weighting; set all to 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="88"/>
+ <source>Weights given in MSA file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="95"/>
+ <source>Effective sequence weighting strategies</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="98"/>
+ <source>adjust effective sequence number to achieve relative entropy target</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="101"/>
+ <source>effective sequence number is number of single linkage clusters</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="104"/>
+ <source>no effective sequence number weighting: just use number of sequences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="107"/>
+ <source>set effective sequence number for all models to: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="115"/>
+ <source>Task finished with error: '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="142"/>
+ <source>Unknown model construction strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="163"/>
+ <source>Unknown relative sequence weighting strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildTask.cpp" line="185"/>
+ <source>Unknown effective sequence weighting strategy</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerMsaEditorContext</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="261"/>
+ <source>Build HMMER3 profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerParseSearchResultsTask</name>
+ <message>
+ <location filename="../src/hmmer/HmmerParseSearchResultsTask.cpp" line="80"/>
+ <source>Can't parse line %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="57"/>
+ <source>Run</source>
+ <translation type="unfinished">Запустить</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="58"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="161"/>
+ <source>HMM profile is not set</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="167"/>
+ <source>Settings are invalid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="178"/>
+ <source>Error</source>
+ <translation type="unfinished">Ошибка</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="178"/>
+ <source>Cannot create an annotation object. Please check settings</source>
+ <translation type="unfinished">Невозможно создать аннотацию. Проверьте настройки</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="186"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="234"/>
+ <source>HMM profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchDialog.cpp" line="236"/>
+ <source>Select query HMM profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSearchTask</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="48"/>
+ <source>HMMER search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="100"/>
+ <source>HMM profile used: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="103"/>
+ <source>Task was not finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="109"/>
+ <source>Result annotation table: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="111"/>
+ <source>Result annotation group: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="112"/>
+ <source>Result annotation name: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="114"/>
+ <source>Results count: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="146"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchTask.cpp" line="194"/>
+ <source>Unknown option controlling model-specific thresholding</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::HmmerSupport</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="135"/>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="151"/>
+ <source>Error!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="135"/>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="151"/>
+ <source>Target sequence not selected: no opened annotated dna view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="168"/>
+ <source><i>HMMER build</i> constructs HMM profiles from multiple sequence alignments.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="172"/>
+ <source>Build HMM3 profile...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="188"/>
+ <source><i>HMMER search</i> searches profile(s) against a sequence database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="192"/>
+ <source>Search with HMMER3...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="208"/>
+ <source><i>PHMMER search</i> searches a protein sequence against a protein database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="212"/>
+ <source>Search with phmmer...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="223"/>
+ <source>Path for %1 tool not selected.</source>
+ <translation type="unfinished">Путь для %1 не установлен.</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSupport.cpp" line="224"/>
+ <source>Do you want to select it now?</source>
+ <translation type="unfinished">Выбрать сейчас?</translation>
+ </message>
+</context>
+<context>
+ <name>U2::JavaSupport</name>
+ <message>
+ <location filename="../src/java/JavaSupport.cpp" line="47"/>
+ <source>Java Platform lets you develop and deploy Java applications on desktops and servers.<br><i>(Requires Java 1.7 or higher)</i>.<br>Java can be freely downloaded on the official web-site: https://www.java.com/en/download/</source>
+ <translation>Java позволяет разрабатывать приложения Java на компьютерах и серверах <br> <i> (Требуется Java 1.7 или выше) </i> <br> Java можно свободно скачать на официальном веб-сайте:. HTTPS: / /www.java.com/en/download/</translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::BaseShortReadsAlignerWorker</name>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="240"/>
+ <source>Not enough upstream reads datasets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="243"/>
+ <source>Not enough downstream reads datasets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="278"/>
+ <source>Output directory</source>
+ <translation>Выходная директория</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="279"/>
+ <source>Directory to save output files.</source>
+ <translation>Директория для сохранения выходных файлов.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="282"/>
+ <source>Reference genome</source>
+ <translation>Референсный геном</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="283"/>
+ <source>Path to indexed reference genome.</source>
+ <translation>Путь до индексированного референсного генома.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="286"/>
+ <source>Library</source>
+ <translation>Библиотека</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="287"/>
+ <source>Is this library mate-paired?</source>
+ <translation>Это парная библиотека?</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="290"/>
+ <source>Output file name</source>
+ <translation>Имя выходного файла</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="291"/>
+ <source>Base name of the output file. 'out.sam' by default</source>
+ <translation>Базовое имя для выходных файлов. По умолчанию 'out.sam'</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="323"/>
+ <source>URL of a file with reads</source>
+ <translation>Путь до файла с ридами</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="324"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="334"/>
+ <source>Input reads to be aligned.</source>
+ <translation>Входные риды будут выровнены.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="326"/>
+ <source>URL of a file with mate reads</source>
+ <translation>Путь до файла с ридами</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="327"/>
+ <source>Input mate reads to be aligned.</source>
+ <translation>Входные риды будут выровнены.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="333"/>
+ <source>Input data</source>
+ <translation>Входные данные</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="337"/>
+ <source>Reverse FASTQ file</source>
+ <translation>Обратный FASTQ файл</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="338"/>
+ <source>Reverse paired reads to be aligned.</source>
+ <translation>Обратные парные риды будут выровнены.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="350"/>
+ <source>Assembly URL</source>
+ <translation>Путь до сборки</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="351"/>
+ <source>Output assembly URL.</source>
+ <translation>Путь выходной сборки.</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="354"/>
+ <source>Output data</source>
+ <translation>Выходные данные</translation>
+ </message>
+ <message>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="355"/>
+ <source>Output assembly files.</source>
+ <translation>Выходные файлы сборки.</translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::BedGraphToBigWigPrompter</name>
+ <message>
+ <location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="75"/>
+ <source>unset</source>
+ <translation>не указан</translation>
</message>
<message>
<location filename="../src/bigWigTools/BedGraphToBigWigWorker.cpp" line="76"/>
@@ -5085,12 +6016,12 @@ To save under other name press 'Cancel' and change name in 'Resul
<context>
<name>U2::LocalWorkflow::Bowtie2Worker</name>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="116"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="112"/>
<source>Mode</source>
<translation>Режим</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="117"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="113"/>
<source>When the -n option is specified (which is the default), bowtie determines which alignments
are valid according to the following policy, which is similar to Maq's default policy.
In -v mode, alignments may have no more than V mismatches, where V may be a number from 0
@@ -5100,139 +6031,139 @@ through 3 set using the -v option. Quality values are ignored. The -v option is
В -v режиме, выравнивание может иметь не больше чем V несоответствий, где V может быть число от 0. Опция -v является взаимоисключающим с опцией -n.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="123"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="119"/>
<source>Number of mismatches</source>
<translation>Число несоответствий</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="124"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="120"/>
<source>Sets the number of mismatches to allowed in a seed alignment. Can be set to 0 or 1.
Setting this higher makes alignment slower (often much slower) but increases sensitivity.</source>
<translation>Задает количество несовпадений с разрешенным в выравнивании. Может быть 0 или 1. Повышение этого параметра делает выранивание более медленным (чаще всего очень медленным) но повышает точность.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="128"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="124"/>
<source>Seed length (--L)</source>
<translation>Длина затравки (--L)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="129"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="125"/>
<source>Sets the length of the seed substrings to align. Smaller values make alignment slower but more senstive.</source>
<translation>Задает длину затравок для выравнивания. Меньшие значения замедляют выравнивание, но повышают точность.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="132"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="128"/>
<source>Add columns to allow gaps (--dpad)</source>
<translation>Добавить столбцы, чтобы допустить пробелы (--dpad)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="133"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="129"/>
<source>"Pads" dynamic programming problems by specified number of columns on either side to allow gaps.</source>
<translation>Добавляет столбцы, чтобы допустить пробелы.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="136"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="132"/>
<source>Disallow gaps (--gbar)</source>
<translation>Запретить пробелы (--gbar)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="137"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="133"/>
<source>Disallow gaps within specified number of positions of the beginning or end of the read.</source>
<translation>Запрещает пробелы в указанных позициях в начале или в конце рида.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="140"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="136"/>
<source>Seed (--seed)</source>
<translation>Затравка (--seed)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="141"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="137"/>
<source>Use specified value as the seed for pseudo-random number generator.</source>
<translation>Использует указанное значение в качестве затравки для псевдо-случайного генератора.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="144"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="140"/>
<source>Threads</source>
<translation>Потоки</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="145"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="141"/>
<source>Launch specified number of parallel search threads. Threads will run on separate processors/cores and synchronize
when parsing reads and outputting alignments. Searching for alignments is highly parallel, and speedup is close to linear.</source>
<translation>Запуск определенного количество параллельных потоков поиска. Потоки будут работать на отдельных процессорах/ ядрах и синхронизоваться при разборе ридов и выводе выравнивания.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="149"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="145"/>
<source>No unpaired alignments (--no-mixed)</source>
<translation>Только парное выравнивание (--no-mixed)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="150"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="146"/>
<source>If Bowtie2 cannot find a paired-end alignment for a pair, by default it will go on to look for unpaired alignments
for the constituent mates. This is called "mixed mode." To disable mixed mode, set this option. Bowtie2 runs a little
faster in the mixed mode, but will only consider alignment status of pairs per se, not individual mates.</source>
<translation>Если Bowtie2 не сможет найти пару для выполнения парного выравнивания по умолчанию будет сделано непарное выравнивание. Это называется "смешанным режимом." Чтобы отключить смешанный режим, установите эту опцию. Bowtie2 запустится немного быстрее в смешанном режиме чем для парного выравнивания.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="155"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="151"/>
<source>No discordant alignments (--no-discordant)</source>
<translation>Только согласованные выравнивания (--no-discordant)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="156"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="152"/>
<source>By default, Bowtie2 looks for discordant alignments if it cannot find any concordant alignments. A discordant alignment
is an alignment where both mates align uniquely, but that does not satisfy the paired-end constraints. This option disables that behavior.</source>
<translation>По умолчанию, Bowtie2 ищет несогласованные выравнивания, если он не может найти какие-либо согласованные выравнивания. Несогласованное выравнивание это выравнивание, в котором оба рида выровнены однозначно, но они не удовлетворяют условию парности. Это опция отключает это поведение.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="160"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="156"/>
<source>No forward orientation (--nofw)</source>
<translation>Не прямая ориентация (--nofw)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="161"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="157"/>
<source>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</source>
<translation>Если установлена опция --nofw, bowtie не будет пытаться выровнять прямую цепь.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="164"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="160"/>
<source>No reverse-complement orientation (--norc)</source>
<translation>Не обратно-комплементарная ориентация (--norc)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="165"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="161"/>
<source>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</source>
<translation>Если установлена опция --norc, bowtie не будет пытаться выровнять обратно-комплементарную цепь.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="168"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="164"/>
<source>No overlapping mates (--no-overlap)</source>
<translation>Без перекрытий (--no-overlap)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="169"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="165"/>
<source>If one mate alignment overlaps the other at all, consider that to be non-concordant. Default: mates can overlap in
a concordant alignment.</source>
<translation>Если один участник выравнивания перекрывается с другим, то это несогласованное выравнивание. По умолчанию: участники могут перекрываться в согласованном выравнивании.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="173"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="169"/>
<source>No mates containing one another (--no-contain)</source>
<translation>Без вложений (--no-contain)</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="174"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="170"/>
<source>If one mate alignment contains the other, consider that to be non-concordant. Default: a mate can contain the
other in a concordant alignment.</source>
<translation>Если один участник выравнивания содержит другой, то это несогласованное выравнивание. По умолчанию одна часть выравнивания может содержать другую в согласованном выравнивании.</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="224"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="220"/>
<source>Align Reads with Bowtie2</source>
<translation>Выравнивание с помощью Bowtie2</translation>
</message>
<message>
- <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="225"/>
+ <location filename="../src/bowtie2/Bowtie2Worker.cpp" line="221"/>
<source>Performs alignment of short reads with Bowtie2.</source>
<translation>Выполняет выравнивание коротких ридов при помощи Bowtie2.</translation>
</message>
@@ -5240,73 +6171,73 @@ other in a concordant alignment.</source>
<context>
<name>U2::LocalWorkflow::BowtieWorker</name>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="142"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="138"/>
<source>Mode:</source>
<translation>Режим:</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="143"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="139"/>
<source>When the -n option is specified (which is the default), bowtie determines which alignments are valid according to the following policy, which is similar to Maq's default policy. In -v mode, alignments may have no more than V mismatches, where V may be a number from 0 through 3 set using the -v option. Quality values are ignored. The -v option is mutually exclusive with the -n op [...]
<translation>Когда задана опция -n, bowtie определяет, какие выравнивания
действительны в соответствии со следующей политикой, которая похожа на политику Maq по умолчанию.
В -v режиме, выравнивание может иметь не больше чем V несоответствий, где V может быть число от 0. Опция -v является взаимоисключающим с опцией -n.</translation>
</message>
<message>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="145"/>
<location filename="../src/bowtie/BowtieWorker.cpp" line="149"/>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="153"/>
<source>Mismatches number</source>
<translation>Число несоответствий</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="150"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="146"/>
<source>Mismatches number.</source>
<translation>Число несоответствий.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="154"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="150"/>
<source>Maximum permitted total of quality values at all mismatched read positions throughout the entire alignment, not just in the seed. The default is 70. Like Maq, bowtie rounds quality values to the nearest 10 and saturates at 30; rounding can be disabled with --nomaqround.</source>
<translation>Максимальн допустимое общее значение качества всех несогласованных позиций ридов на протяжении всего выравнивания.
По умолчанию 70.
Подобно Maq, значения качества близки к 10 и максимальны к значению 30, округление может быть отключено при помощи --nomaqround.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="159"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="155"/>
<source>Seed length</source>
<translation>Длина затравки</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="160"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="156"/>
<source>The seed length; i.e., the number of bases on the high-quality end of the read to which the -n ceiling applies. The lowest permitted setting is 5 and the default is 28. bowtie is faster for larger values of -l.</source>
<translation>"Длина затравки" т.е., число оснований в высококачественном конце рида, для которого применяется -n.
Наименьшее допустимое значение 5, по умолчанию 28. Большие значения -l увеличивают скорость.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="164"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="160"/>
<source>No forward orientation</source>
<translation>Не прямая ориентация</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="165"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="161"/>
<source>If --nofw is specified, bowtie will not attempt to align against the forward reference strand.</source>
<translation>Если установлена опция --nofw, bowtie не будет пытаться выровнять прямую цепь.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="168"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="164"/>
<source>No reverse-complement orientation</source>
<translation>Не обратно-комплементарная ориентация</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="169"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="165"/>
<source>If --norc is specified, bowtie will not attempt to align against the reverse-complement reference strand.</source>
<translation>Если установлена опция --norc, bowtie не будет пытаться выровнять обратно-комплементарную цепь.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="172"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="168"/>
<source>Maximum of backtracks</source>
<translation>Максимальное число отступов</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="173"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="169"/>
<source>The maximum insert size for valid paired-end alignments. E.g. if -X 100 is specified and a paired-end alignment consists of two 20-bp alignments in the proper orientation with a 60-bp gap between them, that alignment is considered valid (as long as -I is also satisfied). A 61-bp gap would not be valid in that case. If trimming options -3 or -5 are also used, the -X constraint is app [...]
<translation>Максимальный размер вставки для выравнивания paired-end.
Если -X 100 и выравнивание состоит из участков по 20 нуклеотидов и расстоянием между ними в 60 нуклеотидов,
@@ -5317,12 +6248,12 @@ other in a concordant alignment.</source>
По умолчанию: 250.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="180"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="176"/>
<source>Try as hard</source>
<translation>Упорно пытаться</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="181"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="177"/>
<source>Try as hard as possible to find valid alignments when they exist, including paired-end alignments. This is equivalent to specifying very high values for the --maxbts and --pairtries options. This mode is generally much slower than the default settings, but can be useful for certain problems. This mode is slower when (a) the reference is very repetitive, (b) the reads are low quali [...]
<translation>Пытаться пока это возможно найти подходящее выравнивание, когда они есть, включая paired-end выравнивания.
Это равносильно очень высоким значениям параметров --maxbts и --pairtries.
@@ -5333,12 +6264,12 @@ other in a concordant alignment.</source>
или (c) не очень много ридов имеют подходящее выравнивание.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="187"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="183"/>
<source>Best hits</source>
<translation>Лучшие попытки</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="188"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="184"/>
<source>The number of megabytes of memory a given thread is given to store path descriptors in --best mode. Best-first search must keep track of many paths at once to ensure it is always extending the path with the lowest cumulative cost. Bowtie tries to minimize the memory impact of the descriptors, but they can still grow very large in some cases. If you receive an error message saying [...]
<translation>Количество мегабайт памяти для данного потока задается для хранения дескрипторов пути в --best режиме.
Поиск по первому наилучшему совпадению должен отслеживать множество путей одновременно, убедитесь, что расширение пути происходит с наименьшей стоимостью.
@@ -5348,12 +6279,12 @@ Bowtie пытается свести к минимуму воздействие
Значение по умолчанию: 64.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="195"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="191"/>
<source>No Maq rounding</source>
<translation>Без округления Maq</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="196"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="192"/>
<source>Maq accepts quality values in the Phred quality scale, but internally rounds values to the nearest 10, with a maximum of 30. By default, bowtie also rounds this way. --nomaqround prevents this rounding in bowtie.</source>
<translation>Maq принимает значения качества в масштабе качества Phred,
но внутренние значения близки к 10,
@@ -5361,22 +6292,22 @@ Bowtie пытается свести к минимуму воздействие
По умолчанию, bowtie также вокруг этих значений. --nomaqround препятствует этому округлению в bowtie.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="200"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="196"/>
<source>Seed</source>
<translation>Затравка</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="201"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="197"/>
<source>Use <int> as the seed for pseudo-random number generator.</source>
<translation>Используйте <int> в качестве затравки для псевдо-случайного генератора.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="204"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="200"/>
<source>Best alignments</source>
<translation>Лучшие выравнивания</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="205"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="201"/>
<source>Make Bowtie guarantee that reported singleton alignments are best in terms of stratum (i.e. number of mismatches, or mismatches in the seed in the case of -n mode) and in terms of the quality values at the mismatched position(s). bowtie is somewhat slower when --best is specified.</source>
<translation>Создать Bowtie гарантию того, что одиночные выравнивания являются "лучшими" в плане слоя
(т.е. число несовпадений, или несоответствия в затравке в -n режиме)
@@ -5384,32 +6315,32 @@ Bowtie пытается свести к минимуму воздействие
bowtie медленнее, когда указан режим --best.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="210"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="206"/>
<source>All alignments</source>
<translation>Все выравнивания</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="211"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="207"/>
<source>Report all valid alignments per read or pair.</source>
<translation>Сообщить о всех допустимых выравниваниях для рида или пары.</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="214"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="210"/>
<source>Colorspace</source>
<translation>Цвета</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="215"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="211"/>
<source>When -C is specified, read sequences are treated as colors. Colors may be encoded either as numbers (0=blue, 1=green, 2=orange, 3=red) or as characters A/C/G/T (A=blue, C=green, G=orange, T=red).</source>
<translation>Когда -С указано, последовательности рассматриваются как цвета. Цвета могут быть закодированы либо как номера (0 = синий, 1 = зеленый, 2 = оранжевый, 3 = красный) или символов A / C / G / T (A = синий, С = зеленый, G = оранжевый, Т = красный).</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="252"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="248"/>
<source>Align Reads with Bowtie</source>
<translation>Выравнивание с помощью Bowtie</translation>
</message>
<message>
- <location filename="../src/bowtie/BowtieWorker.cpp" line="253"/>
+ <location filename="../src/bowtie/BowtieWorker.cpp" line="249"/>
<source>Performs alignment of short reads with Bowtie.</source>
<translation>Выполняет выравнивание коротких ридов при помощи Bowtie.</translation>
</message>
@@ -5417,188 +6348,188 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::BwaMemWorker</name>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="137"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="133"/>
<source>Number of threads</source>
<translation>Число потоков</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="138"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="134"/>
<source>Number of threads (-t).</source>
<translation>Число потоков (-t).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="141"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="137"/>
<source>Min seed length</source>
<translation>Минимальная длина затравки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="142"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="138"/>
<source>Path to indexed reference genome (-k).</source>
<translation>Путь до индексированного референсного генома (-k).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="145"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="141"/>
<source>Index algorithm</source>
<translation>Алгоритм</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="146"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="142"/>
<source>Index algorithm (-a).</source>
<translation>Алгоритм (-а).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="149"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="145"/>
<source>Band width</source>
<translation>Ширина полосы</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="150"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="146"/>
<source>Band width for banded alignment (-w).</source>
<translation>Ширина полосы для выравнивания (-w).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="153"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="149"/>
<source>Dropoff</source>
<translation>Снижение</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="154"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="150"/>
<source>Off-diagonal X-dropoff (-d).</source>
<translation>Снижение (-d).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="157"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="153"/>
<source>Internal seed length</source>
<translation>Внутренняя длина затравки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="158"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="154"/>
<source>Look for internal seeds inside a seed longer than {-k} (-r).</source>
<translation>Поиск внутренние затравки внутри затравки длиннее чем {-k} * (-r).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="161"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="157"/>
<source>Skip seed threshold</source>
<translation>Порог затравки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="162"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="158"/>
<source>Skip seeds with more than INT occurrences (-c).</source>
<translation>Пропускает затравки с более чем с указанным количеством вхождений (-c).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="165"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="161"/>
<source>Drop chain threshold</source>
<translation>Порог снижения цепи</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="166"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="162"/>
<source>Drop chains shorter than FLOAT fraction of the longest overlapping chain (-D).</source>
<translation>Снижение цепи короче FLOAT фракции самого длинного перекрытия цепи (-D).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="169"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="165"/>
<source>Rounds of mate rescues</source>
<translation>Округление за освобождение участника</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="170"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="166"/>
<source>Perform at most INT rounds of mate rescues for each read (-m).</source>
<translation>Выполняет для большинства INT округлений освобождений участников для каждого рида (-m).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="173"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="169"/>
<source>Skip mate rescue</source>
<translation>Пропустить освобождение участника</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="174"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="170"/>
<source>Skip mate rescue (-S).</source>
<translation>Пропустить освобождение участника (-S).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="177"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="173"/>
<source>Skip pairing</source>
<translation>Пропустить спаривание</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="178"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="174"/>
<source>Skip pairing; mate rescue performed unless -S also in use (-P).</source>
<translation>Пропустить спаривание; участник освобождается кроме случая когда -S также используется (-P).</translation>
</message>
<message>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="177"/>
<location filename="../src/bwa/BwaMemWorker.cpp" line="181"/>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="185"/>
<source>Mismatch penalty</source>
<translation>Штраф за несовпадение</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="182"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="178"/>
<source>Score for a sequence match (-A).</source>
<translation>Вес совпадения (-A).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="186"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="182"/>
<source>Penalty for a mismatch (-B).</source>
<translation>Штраф за несовпадение (-B).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="189"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="185"/>
<source>Gap open penalty</source>
<translation>Штраф за открытие пробела</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="190"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="186"/>
<source>Gap open penalty (-O).</source>
<translation>Штраф за открытие пробела (-O).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="193"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="189"/>
<source>Gap extension penalty</source>
<translation>Штраф за промежуточный пробел</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="194"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="190"/>
<source>Gap extension penalty; a gap of size k cost {-O} (-E).</source>
<translation>Штраф за расширение пробела; пробел размера k стоит {-O} (-E).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="197"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="193"/>
<source>Penalty for clipping</source>
<translation>Штраф за отсечение</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="198"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="194"/>
<source>Penalty for clipping (-L).</source>
<translation>Штраф за отсечение (-L).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="201"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="197"/>
<source>Penalty unpaired</source>
<translation>Штраф за непарные риды</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="202"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="198"/>
<source>Penalty for an unpaired read pair (-U).</source>
<translation>Штраф за непарные риды (-U).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="205"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="201"/>
<source>Score threshold</source>
<translation>Порог оценки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="206"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="202"/>
<source>Minimum score to output (-T).</source>
<translation>Минимальная оценка для вывода (-T).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="256"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="252"/>
<source>Align Reads with BWA MEM</source>
<translation>Выравнивание с помощью BWA MEM</translation>
</message>
<message>
- <location filename="../src/bwa/BwaMemWorker.cpp" line="257"/>
+ <location filename="../src/bwa/BwaMemWorker.cpp" line="253"/>
<source>Performs alignment of short reads with BWA MEM.</source>
<translation>Выполняет выравнивание коротких ридов при помощи BWA MEM.</translation>
</message>
@@ -5606,218 +6537,218 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::BwaWorker</name>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="139"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="135"/>
<source>Use missing prob</source>
<translation>Использовать долю потери</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="140"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="136"/>
<source>Use missing prob instead maximum edit distance.</source>
<translation>Использовать долю потери вместо максимального расстояния редактирования.</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="143"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="139"/>
<source>Max #diff</source>
<translation>Максимальное расстояние редактирования</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="144"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="140"/>
<source>Max #diff (-n)</source>
<translation>Максимальное расстояние редактирования (-n)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="147"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="143"/>
<source>Missing prob</source>
<translation>Доля потери</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="148"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="144"/>
<source>Missing prob (-n)</source>
<translation>Доля потери (-n)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="151"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="147"/>
<source>Seed length</source>
<translation>Длина затравки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="152"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="148"/>
<source>Seed length (-l).</source>
<translation>Длина затравки (-l).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="155"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="151"/>
<source>Max gap opens</source>
<translation>Максимальное число пробелов</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="156"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="152"/>
<source>Max gap opens (-o).</source>
<translation>Максимальное число пробелов (-o).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="159"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="155"/>
<source>Index algorithm</source>
<translation>Алгоритм</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="160"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="156"/>
<source>Index algorithm (-a).</source>
<translation>Алгоритм (-а).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="163"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="159"/>
<source>Best hits</source>
<translation>Лучшие попытки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="164"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="160"/>
<source>Best hits (-R).</source>
<translation>Лучшие попытки (-R).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="167"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="163"/>
<source>Long-scaled gap penalty for long deletions</source>
<translation>Долгосрочный штраф за длительный пробел</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="168"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="164"/>
<source>Long-scaled gap penalty for long deletions (-L)</source>
<translation>Долгосрочный штраф за длительный пробел (-L)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="171"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="167"/>
<source>Non iterative mode</source>
<translation>Неитеративный режим</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="172"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="168"/>
<source>Non iterative mode (-N).</source>
<translation>Неитеративный режим (-N).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="175"/>
- <location filename="../src/bwa/BwaWorker.cpp" line="176"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="171"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="172"/>
<source>Enable long gaps</source>
<translation>Допустимы длинные пробелы</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="179"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="175"/>
<source>Max gap extensions</source>
<translation>Максимальное расширение пробела</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="180"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="176"/>
<source>Max gap extensions (-e)</source>
<translation>Максимальное расширение пробела (-e)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="183"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="179"/>
<source>Indel offset</source>
<translation>Смещение</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="184"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="180"/>
<source>Indel offset (-i)</source>
<translation>Смещение (-i)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="187"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="183"/>
<source>Max long deletions extensions</source>
<translation>Максимальная длина сокрашения пропуска</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="188"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="184"/>
<source>Max long deletions extensions(-d)</source>
<translation>Максимальная длина сокрашения пропуска (-d)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="191"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="187"/>
<source>Max queue entries</source>
<translation>Максимальное число записей в очереди</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="192"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="188"/>
<source>Max queue entries (-m)</source>
<translation>Максимальное число записей в очереди (-m)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="195"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="191"/>
<source>Barcode length</source>
<translation>Длина штрих-кода</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="196"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="192"/>
<source>Barcode length (-B)</source>
<translation>Длина штрих-кода (-B)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="199"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="195"/>
<source>Threads</source>
<translation>Потоки</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="200"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="196"/>
<source>Threads (-t)</source>
<translation>Потоки (-t)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="203"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="199"/>
<source>Max seed differencies</source>
<translation>Максимальное различие затравок</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="204"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="200"/>
<source>Max seed differencies (-k)</source>
<translation>Максимальное различие затравок (-k)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="207"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="203"/>
<source>Mismatch penalty</source>
<translation>Штраф за несовпадение</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="208"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="204"/>
<source>Mismatch penalty (-M)</source>
<translation>Штраф за несовпадение (-M)</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="211"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="207"/>
<source>Gap open penalty</source>
<translation>Штраф за открытие пробела</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="212"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="208"/>
<source>Gap open penalty (-O).</source>
<translation>Штраф за открытие пробела (-O).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="215"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="211"/>
<source>Gap extension penalty</source>
<translation>Штраф за промежуточный пробел</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="216"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="212"/>
<source>Gap extension penalty; a gap of size k cost (-E).</source>
<translation>Штраф за расширение пробела; пробел размера k стоит (-E).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="219"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="215"/>
<source>Quolity threshold</source>
<translation>Порог качества</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="220"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="216"/>
<source>Quolity threshold (-q).</source>
<translation>Порог качества (-q).</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="286"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="282"/>
<source>Align Reads with BWA</source>
<translation>Выравнивание с помощью BWA</translation>
</message>
<message>
- <location filename="../src/bwa/BwaWorker.cpp" line="287"/>
+ <location filename="../src/bwa/BwaWorker.cpp" line="283"/>
<source>Performs alignment of short reads with BWA.</source>
<translation>Выполняет выравнивание коротких ридов при помощи BWA.</translation>
</message>
@@ -6916,12 +7847,12 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="134"/>
<source>Assembly Transcripts with Cufflinks</source>
- <translation>Сборка транскрипций с помощью Cufflinks</translation>
+ <translation>Сборка транскриптов с помощью Cufflinks</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="135"/>
<source>Cufflinks accepts aligned RNA-Seq reads and assembles the alignments into a parsimonious set of transcripts. Cufflinks then estimates the relative abundances of these transcripts based on how many reads support each one, taking into account biases in library preparation protocols.</source>
- <translation>Cufflinks принимает выровненые риды RNA-Seq и собирает выравнивание в набор транскрипций. После этого Cufflinks оценивает относительное содержание этих транскрипций на основе того, сколько ридов поддерживает каждый из них, с учетом пристрастий в библиотеке протоколов подготовки.</translation>
+ <translation>Cufflinks принимает выровненные риды RNA-Seq и собирает выравнивание в набор транскрипций. После этого Cufflinks оценивает относительное содержание этих транскриптов на основе того, сколько ридов поддерживает каждый из них, с учетом возможных систематических ошибок разных протоколов подготовки библиотек.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="143"/>
@@ -6931,7 +7862,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="144"/>
<source>The base name of output directory. It could be modified with a suffix.</source>
- <translation>Базовое имя для выходной директории.</translation>
+ <translation>базовое имя для выходной директории.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="147"/>
@@ -6941,7 +7872,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="148"/>
<source>Tells Cufflinks to use the supplied reference annotation to estimate isoform expression. Cufflinks will not assemble novel transcripts and the program will ignore alignments not structurally compatible with any reference transcript.</source>
- <translation>Сообщает Cufflinks использовать прилагаемую референсную аннотацию для оценки экспрессии изоформ. Cufflinks не будет собирать новые транскрипции и программа будет игнорировать выравнивания структурно не совместимые с любым эталоном транскрипции.</translation>
+ <translation>указывает Cufflinks использовать прилагаемую референсную аннотацию для оценки экспрессии изоформ. Cufflinks не будет собирать новые транскрипты и программа будет игнорировать выравнивания, по структуре не совместимые с каким-либо референсным транскриптом.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="154"/>
@@ -6951,7 +7882,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="155"/>
<source>Tells Cufflinks to use the supplied reference annotation to guide Reference Annotation Based Transcript (RABT) assembly. Reference transcripts will be tiled with faux-reads to provide additional information in assembly. Output will include all reference transcripts as well as any novel genes and isoforms that are assembled.</source>
- <translation>Сообщает Cufflinks использовать прилагаемую референсную аннотацию для сборки базовой транскрипции (Reference Annotation Based Transcript (RABT)). Референсные транскрипции использованы для подготовки дополнительной информации в сборке.</translation>
+ <translation>указывает Cufflinks использовать прилагаемую референсную аннотацию для сборки транскриптома по референсу (Reference Annotation Based Transcript (RABT)). Референсные транскрипции наряду со сгенерированными ридами будут использованы как дополнительная информация в сборке. В итоговый результат войдут как референсные транскрипты, так и гены и изоформы из новой сборки.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="162"/>
@@ -6961,7 +7892,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="163"/>
<source>Specifies RNA-Seq protocol.</source>
- <translation>Задает протокол RNA-Seq.</translation>
+ <translation>задает протокол секвенирования РНК.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="166"/>
@@ -6971,7 +7902,7 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="167"/>
<source>Ignore all reads that could have come from transcripts in this file. It is recommended to include any annotated rRNA, mitochondrial transcripts other abundant transcripts you wish to ignore in your analysis in this file. Due to variable efficiency of mRNA enrichment methods and rRNA depletion kits, masking these transcripts often improves the overall robustness of transcript abundance estimates.</source>
- <translation>Игнорирует все риды, которые могли произойти от транскрипций в этом файле.</translation>
+ <translation>игнорирует все риды, которые могли произойти от транскрипций в этом файле.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="175"/>
@@ -6981,27 +7912,27 @@ bowtie медленнее, когда указан режим --best.</translati
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="176"/>
<source>Tells Cufflinks to do an initial estimation procedure to more accurately weight reads mapping to multiple locations in the genome.</source>
- <translation>Начальная процедура оценки для более точного отображения веса ридов в нескольких местах в геноме.</translation>
+ <translation>начальная процедура оценки для более точного отображения веса ридов в нескольких местах в геноме.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="180"/>
<source>Min isoform fraction</source>
- <translation>Содержание изоформ</translation>
+ <translation>Минимальное содержание изоформ</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="181"/>
<source>After calculating isoform abundance for a gene, Cufflinks filters out transcripts that it believes are very low abundance, because isoforms expressed at extremely low levels often cannot reliably be assembled, and may even be artifacts of incompletely spliced precursors of processed transcripts. This parameter is also used to filter out introns that have far fewer spliced alignments supporting them.</source>
- <translation>После расчета изоформ для гена, Cufflinks отфильтровывает транскрипции, которые имеют очень низкая численность, потому что изоформы, выраженные на низком уровне часто не могут быть надежно собраны. Этот параметр также используется для фильтрации интронов, которые имеют гораздо меньше склеенных внахлест выравниваний.</translation>
+ <translation>после расчета уровня изоформ конкретного гена Cufflinks удалит транскрипты с очень маленькой обильностью, потому что изоформы с таким низким уровнем экспрессии часто не могут быть надежно собраны. Этот параметр также используется для удаления из анализа предполагаемых интронов в том случае, если их существование поддерживает очень мало сплайсированных выравниваний.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="189"/>
<source>Frag bias correct</source>
- <translation>Регулировка смещения</translation>
+ <translation>Корректировка смещения</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="190"/>
<source>Providing Cufflinks with a multifasta file via this option instructs it to run the bias detection and correction algorithm which can significantly improve accuracy of transcript abundance estimates.</source>
- <translation>Cufflinks с несколькими файлами Fasta с помощью этой опции указывает на запуск обнаружения и коррекции смещения алгоритма, который может значительно улучшить точность оценок численности транскрипций.</translation>
+ <translation>при указании файла с последовательностями в формате fasta Cufflinks с несколькими файлами запустит алгоритм обнаружения и коррекции смещения, который может значительно улучшить точность оценки обилия транскриптов.</translation>
</message>
<message>
<location filename="../src/cufflinks/CufflinksWorker.cpp" line="195"/>
@@ -7238,18 +8169,30 @@ bowtie медленнее, когда указан режим --best.</translati
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="124"/>
- <source>FASTA file with adapters</source>
- <translation>FASTA файл с адаптерами</translation>
+ <source>FASTA file with 3' adapters</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="125"/>
- <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
- <translation>FASTA файл с одним или несколькими адаптерами. Сам адаптер и все, что следует за ним обрезано. Если последовательность адаптера заканчивается символом $, адаптер прикрепляется к концу рида.</translation>
+ <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$' character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="131"/>
+ <source>FASTA file with 5' adapters</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FASTA file with adapters</source>
+ <translation type="vanished">FASTA файл с адаптерами</translation>
+ </message>
+ <message>
+ <source>A FASTA file with one or multiple sequences of adapter that were ligated to the 3' end. The adapter itself and anything that follows is trimmed. If the adapter sequence ends with the '$ character, the adapter is anchored to the end of the read and only found if it is a suffix of the read.</source>
+ <translation type="vanished">FASTA файл с одним или несколькими адаптерами. Сам адаптер и все, что следует за ним обрезано. Если последовательность адаптера заканчивается символом $, адаптер прикрепляется к концу рида.</translation>
+ </message>
+ <message>
<source>FASTA file with reverse adapters</source>
- <translation>FASTA файл с обратными адаптерами</translation>
+ <translation type="vanished">FASTA файл с обратными адаптерами</translation>
</message>
<message>
<location filename="../src/cutadapt/CutadaptWorker.cpp" line="132"/>
@@ -7612,6 +8555,208 @@ bowtie медленнее, когда указан режим --best.</translati
</message>
</context>
<context>
+ <name>U2::LocalWorkflow::HmmerBuildPrompter</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="129"/>
+ <source>For each MSA from <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="131"/>
+ <source>%1 builds a HMMER profile.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerBuildWorker</name>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="62"/>
+ <source>Input MSA</source>
+ <translation type="unfinished">Входное MSA</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="63"/>
+ <source>Input multiple sequence alignment for building statistical model.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="64"/>
+ <source>HMM3 profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="64"/>
+ <source>Produced HMM3 profile URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="74"/>
+ <source>Random seed</source>
+ <translation type="unfinished">Затравка</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="74"/>
+ <source>Random generator seed. 0 - means that one-time arbitrary seed will be used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="78"/>
+ <source>HMM3 Build</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="78"/>
+ <source>Builds a HMM3 profile from a multiple sequence alignment.<p>The HMM3 profile is a statistical model which captures position-specific information about how conserved each column of the alignment is, and which residues are likely.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="94"/>
+ <source>HMMER3 Tools</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerBuildWorker.cpp" line="195"/>
+ <source>Built HMMER profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerSearchPrompter</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="188"/>
+ <source>For each sequence from <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="189"/>
+ <source>using all profiles provided by <u>%1</u>,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="193"/>
+ <source>%1 search HMMER signals %2. <br>Output the list of found regions annotated as <u>%4</u>.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::HmmerSearchWorker</name>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="80"/>
+ <source>Filter by</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="81"/>
+ <source>Parameter to filter results by.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="82"/>
+ <source>HMMER profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="82"/>
+ <source>HMMER profile(s) URL(s) to search with.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="83"/>
+ <source>Input sequence</source>
+ <translation type="unfinished">Входная последовательность</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="84"/>
+ <source>An input sequence (nucleotide or protein) to search in.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="85"/>
+ <source>HMMER annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="86"/>
+ <source>Annotations marking found similar sequence regions.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="98"/>
+ <source>Result annotation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="98"/>
+ <source>A name of the result annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="99"/>
+ <source>Seed</source>
+ <translation type="unfinished">Затравка</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="99"/>
+ <source>Random generator seed. 0 - means that one-time arbitrary seed will be used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="100"/>
+ <source>Filter by high E-value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="100"/>
+ <source>Report domains with e-value less than.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="101"/>
+ <source>Filter by low score</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="101"/>
+ <source>Report domains with score greater than.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="118"/>
+ <source>HMM3 Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="119"/>
+ <source>Searches each input sequence for significantly similar sequence matches to all specified HMM profiles. In case several profiles were supplied, searches with all profiles one by one and outputs united set of annotations for each sequence.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="159"/>
+ <source>HMMER3 Tools</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="238"/>
+ <source>Value for attribute name is empty, default name used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="289"/>
+ <source>Find HMMER signals in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="294"/>
+ <source>Bad sequence supplied to input: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/HmmerSearchWorker.cpp" line="323"/>
+ <source>Found %1 HMMER signals</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::LocalWorkflow::MACSPrompter</name>
<message>
<location filename="../src/macs/MACSWorker.cpp" line="571"/>
@@ -8379,22 +9524,22 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::ShortReadsAlignerPrompter</name>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="369"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="371"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="375"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="377"/>
<source>Aligns upstream oriented reads from <u>%1</u> and downstream oriented reads from <u>%2</u> </source>
<translation>Выравнивает верховые риды из <u>%1</u> и низовые риды из <u>%2</u> </translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="377"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="379"/>
<source>Aligns reads from <u>%1</u> </source>
<translation>Выравнивает риды из <u>%1</u> </translation>
</message>
<message>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="381"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="383"/>
<source> to reference genome <u>%1</u>.</source>
<translation> на референсный геном <u>%1</u>.</translation>
</message>
@@ -8582,17 +9727,17 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::SnpEffPrompter</name>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="83"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="85"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="84"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="86"/>
<source> from <u>%1</u></source>
<translation> из <u>%1</u></translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="86"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="88"/>
<source>Annotates and filters variations %1 with SnpEff.</source>
<translation>Аннотирует и фильтрует вариации %1 при помощи SnpEff.</translation>
</message>
@@ -8600,143 +9745,143 @@ bowtie медленнее, когда указан режим --best.</translati
<context>
<name>U2::LocalWorkflow::SnpEffWorker</name>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="93"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="95"/>
<source>SnpEff Annotation and Filtration</source>
<translation>Аннотация и фильтрация с помощью SnpEff</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="94"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="96"/>
<source>Annotates and filters variations with SnpEff.</source>
<translation>этот элемент аннотирует и фильтрует вариации при помощи SnpEff.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="98"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="100"/>
<source>Variations</source>
<translation>Вариации</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="99"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="101"/>
<source>Set of variations</source>
<translation>Набор вариаций</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="100"/>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="101"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="102"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="103"/>
<source>Annotated variations</source>
<translation>Аннотированные вариации</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="115"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="117"/>
<source>Output directory</source>
<translation>Выходная директория</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="116"/>
+ <location filename="../src/snpeff/SnpEffWorker.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>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="120"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="122"/>
<source>Custom directory</source>
<translation>Частная директория</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="121"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="123"/>
<source>Select the custom output directory.</source>
<translation>Укажите частную выходную директорию.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="123"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="125"/>
<source>Input format</source>
<translation>Входной формат</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="124"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="126"/>
<source>Select the input format of variations.</source>
<translation>выберите входной формат вариаций.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="126"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="128"/>
<source>Output format</source>
<translation>Выходной формат</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="127"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="129"/>
<source>Select the format of annotated output files.</source>
<translation>выберите формат выходных аннотированных файлов.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="129"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="131"/>
<source>Genome</source>
<translation>Геном</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="130"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="132"/>
<source>Select the target genome. Genome data will be downloaded if it is not found.</source>
<translation>выберите референсный геном. Если он не найден, данные генома будут загружены из сети Интернет.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="132"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="134"/>
<source>Upstream/downstream length</source>
<translation>Верхняя/нижняя длина</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="133"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
<source>Upstream and downstream interval size. Eliminate any upstream and downstream effect by using 0 length</source>
<translation>верхний и нижний размеры интервала.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="135"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="137"/>
<source>Canonical transcripts</source>
<translation>Канонические транскрипты</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="136"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
<source>Use only canonical transcripts</source>
<translation>использовать только канонические транскрипты.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="138"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="140"/>
<source>HGVS nomenclature</source>
<translation>Номенклатура HGVS</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="139"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
<source>Annotate using HGVS nomenclature</source>
<translation>аннотировать при помощи номенклатуры HGVS.</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="141"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="143"/>
<source>Annotate Loss of function variations</source>
<translation>Аннотировать варианты loss of function</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="142"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="144"/>
<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"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="146"/>
<source>Annotate TFBSs motifs</source>
<translation>Аннотировать мотивы TFBS</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="145"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="147"/>
<source>Annotate transcription factor binding site motifs (only available for latest GRCh37)</source>
<translation>аннотирует сайты связывания транскрипционных факторов (опция доступна только для последней версии сборки GRCh37).</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="167"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="169"/>
<source>Input file</source>
<translation>Входной файл</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="168"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="170"/>
<source>Workflow</source>
<translation>Схема</translation>
</message>
<message>
- <location filename="../src/snpeff/SnpEffWorker.cpp" line="169"/>
+ <location filename="../src/snpeff/SnpEffWorker.cpp" line="171"/>
<source>Custom</source>
<translation>Частный</translation>
</message>
@@ -9190,22 +10335,22 @@ Set it empty if you want to run Tophat once for all input reads</source>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="245"/>
<source>Known transcript file</source>
- <translation>Известный транскрипционный файл</translation>
+ <translation>Файл с известными транскриптами</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="246"/>
<source>A set of gene model annotations and/or known transcripts.</source>
- <translation>Набор аннотаций и/или известных транскрипций.</translation>
+ <translation>файл с аннотацией моделей генов и/или известными транскриптами.</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="249"/>
<source>Max multihits</source>
- <translation>Макс. мультихитов</translation>
+ <translation>Максимальное количество множественных выравниваний</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="250"/>
<source>Instructs TopHat to allow up to this many alignments to the reference for a given read, and suppresses all alignments for reads with more than this many alignments.</source>
- <translation>Tophat подавляет все выравнивания для ридов с более чем указанное количество выравниваний.</translation>
+ <translation>Tophat не будет анализировать все выравнивания для ридов с большим количеством выравниваний, чем указанный параметр.</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="255"/>
@@ -9215,17 +10360,17 @@ Set it empty if you want to run Tophat once for all input reads</source>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="256"/>
<source>Each read is cut up into segments, each at least this long. These segments are mapped independently.</source>
- <translation>Каждый рид разрезается на сегменты. Эти сегменты отображаются независимо.</translation>
+ <translation>каждый рид разрезается на сегменты указанной длины. Эти сегменты выравниваются независимо.</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="268"/>
<source>Fusion search</source>
- <translation>Поиск слияния</translation>
+ <translation>Поиск химер</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="269"/>
<source>Turn on fusion mapping.</source>
- <translation>Включает отображение слияния.</translation>
+ <translation>искать выравнивание для химерных ридов.</translation>
</message>
<message>
<location filename="../src/tophat/TopHatWorker.cpp" line="272"/>
@@ -9785,6 +10930,87 @@ Set it empty if you want to run Tophat once for all input reads</source>
</message>
</context>
<context>
+ <name>U2::PhmmerSearchDialog</name>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="56"/>
+ <source>Search</source>
+ <translation type="unfinished">Искать</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="57"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Отмена</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="111"/>
+ <source>Select query sequence file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="159"/>
+ <source>Query sequence file path is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="177"/>
+ <source>Error</source>
+ <translation type="unfinished">Ошибка</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="177"/>
+ <source>Cannot create an annotation object. Please check settings</source>
+ <translation type="unfinished">Невозможно создать аннотацию. Проверьте настройки</translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchDialog.cpp" line="184"/>
+ <source>Error: bad arguments!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::PhmmerSearchTask</name>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="48"/>
+ <source>Search with phmmer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="100"/>
+ <source>Query sequence: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="103"/>
+ <source>Task was not finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="109"/>
+ <source>Result annotation table: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="111"/>
+ <source>Result annotation group: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="112"/>
+ <source>Result annotation name: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="114"/>
+ <source>Results count: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/hmmer/PhmmerSearchTask.cpp" line="146"/>
+ <source>Cannot create a directory for temporary files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::PhyMLGetCalculatedTreeTask</name>
<message>
<location filename="../src/phyml/PhyMLTask.cpp" line="196"/>
@@ -9864,17 +11090,17 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::PhyMlWidget</name>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="169"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="170"/>
<source>Open an alignment file</source>
<translation>Открыть выравнивание</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="224"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="225"/>
<source>Path for %1 tool not selected.</source>
<translation>Путь для %1 не установлен.</translation>
</message>
<message>
- <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="225"/>
+ <location filename="../src/phyml/PhyMLDialogWidget.cpp" line="226"/>
<source>Do you want to select it now?</source>
<translation>Выбрать сейчас?</translation>
</message>
@@ -9882,12 +11108,12 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::PrepareInputForCAP3Task</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="245"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="241"/>
<source>Failed to initialize sequence writer.</source>
<translation>Failed to initialize sequence writer.</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="272"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="268"/>
<source>Failed to write sequence %1</source>
<translation>Failed to write sequence %1</translation>
</message>
@@ -10064,17 +11290,17 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::RunCap3AndOpenResultTask</name>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="137"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="133"/>
<source>CAP3 run and open result task</source>
<translation>CAP3 run and open result task</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="146"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="142"/>
<source>Invalid CAP3 task</source>
<translation>Invalid CAP3 task</translation>
</message>
<message>
- <location filename="../src/cap3/CAP3SupportTask.cpp" line="162"/>
+ <location filename="../src/cap3/CAP3SupportTask.cpp" line="158"/>
<source>Project loader is NULL</source>
<translation>Project loader is NULL</translation>
</message>
@@ -10082,12 +11308,12 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::SaveAlignmentTask</name>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="60"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="64"/>
<source>Export alignment to '%1'</source>
<translation>Export alignment to '%1'</translation>
</message>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="64"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="68"/>
<source>An alignment is empty</source>
<translation>An alignment is empty</translation>
</message>
@@ -10095,12 +11321,25 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::SaveMSA2SequencesTask</name>
<message>
- <location filename="../src/utils/ExportTasks.cpp" line="91"/>
+ <location filename="../src/utils/ExportTasks.cpp" line="107"/>
<source>Export alignment to sequence: %1</source>
<translation>Export alignment to sequence: %1</translation>
</message>
</context>
<context>
+ <name>U2::SaveSequenceTask</name>
+ <message>
+ <location filename="../src/utils/ExportTasks.cpp" line="138"/>
+ <source>Save sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/utils/ExportTasks.cpp" line="169"/>
+ <source>'%' format is not registered</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::SeqPosSupport</name>
<message>
<location filename="../src/seqpos/SeqPosSupport.cpp" line="46"/>
@@ -10138,7 +11377,7 @@ Set it empty if you want to run Tophat once for all input reads</source>
<context>
<name>U2::SnpEffTask</name>
<message>
- <location filename="../src/snpeff/SnpEffTask.cpp" line="198"/>
+ <location filename="../src/snpeff/SnpEffTask.cpp" line="205"/>
<source>SNPEff dataDir is not initialized.</source>
<translation>SNPEff dataDir is not initialized.</translation>
</message>
@@ -10554,7 +11793,7 @@ Set it empty if you want to run Tophat once for all input reads</source>
<message>
<location filename="../src/macs/MACSWorker.cpp" line="236"/>
<location filename="../src/spades/SpadesWorker.cpp" line="189"/>
- <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="253"/>
+ <location filename="../src/utils/BaseShortReadsAlignerWorker.cpp" line="255"/>
<source>The slot must be not empty: '%1'</source>
<translation type="unfinished">Слот не должен быть пустым: '%1'</translation>
</message>
diff --git a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
index c759213..fe5be69 100644
--- a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
+++ b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/BuildSArraySettingsWidget.h b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
index 7682ef6..3f4a714 100644
--- a/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
+++ b/src/plugins/genome_aligner/src/BuildSArraySettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/DataBunch.cpp b/src/plugins/genome_aligner/src/DataBunch.cpp
index 4eb9101..5f01533 100644
--- a/src/plugins/genome_aligner/src/DataBunch.cpp
+++ b/src/plugins/genome_aligner/src/DataBunch.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/DataBunch.h b/src/plugins/genome_aligner/src/DataBunch.h
index 51b8f97..de50836 100644
--- a/src/plugins/genome_aligner/src/DataBunch.h
+++ b/src/plugins/genome_aligner/src/DataBunch.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerCMDLineTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
index 47da596..a76b98e 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerCMDLineTask.h b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
index 252baae..e64f58f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerCMDLineTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerFindTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
index 4f0e7e6..7493c85 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ void GenomeAlignerFindTask::prepare() {
void GenomeAlignerFindTask::run() {
- // TODO: this is a fastfix of reopened https://ugene.unipro.ru/tracker/browse/UGENE-1190
+ // TODO: this is a fastfix of reopened https://ugene.net/tracker/browse/UGENE-1190
// Problem:
// If reference sequence contains Ns only, ShortReadAligners will return without waiting for all short reads.
// GenomeAlignerTask will create another ReadShortReadsSubTask on GenomeAlignerFindTask->WriteAlignedReadsSubTask subtask finish
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
index 16c26b0..45031e0 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerFindTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIO.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
index a8161ba..3b4b238 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIO.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIO.h b/src/plugins/genome_aligner/src/GenomeAlignerIO.h
index e592278..763ffaf 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIO.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIO.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndex.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
index db726e8..1e9d13e 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndex.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndex.h b/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
index 799f5de..4856d60 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndex.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexPart.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
index d04584f..22e8674 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexPart.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
index 2586516..19d8dea 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexPart.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
index de98157..7379b7c 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexTask.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
index 5df7793..85d1968 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexWorker.cpp b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
index b104056..fddaa63 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerIndexWorker.h b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
index 5a9bc7c..3d235d6 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerIndexWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerPlugin.cpp b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
index ee61321..1ad3cf5 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerPlugin.h b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
index e457505..4191bc8 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerSearchQuery.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
index 3c18ab2..14e169d 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerSearchQuery.h b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
index 3f10d40..8b1895f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSearchQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerSettingsController.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
index d9b8821..eaf4c06 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -73,7 +73,7 @@ AppSettingsGUIPageWidget* GenomeAlignerSettingsPageController::createWidget(AppS
return r;
}
-const QString GenomeAlignerSettingsPageController::helpPageId = QString("18220312");
+const QString GenomeAlignerSettingsPageController::helpPageId = QString("18222952");
GenomeAlignerSettingsPageWidget::GenomeAlignerSettingsPageWidget(GenomeAlignerSettingsPageController* ) {
setupUi(this);
diff --git a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
index 240fb6a..6133098 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerSettingsWidget.cpp b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
index 2703666..84fb0e5 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerSettingsWidget.h b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
index cff8f5f..9753dd0 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerSettingsWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
index a915995..5d8c16c 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerTask.h b/src/plugins/genome_aligner/src/GenomeAlignerTask.h
index af41344..4981eea 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerWorker.cpp b/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
index 54cac6c..c80f58f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerWorker.h b/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
index c79c850..0c202a1 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerWriteTask.cpp b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
index ebd0038..796573f 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/genome_aligner/src/GenomeAlignerWriteTask.h b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
index 4691efc..833059d 100644
--- a/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
+++ b/src/plugins/genome_aligner/src/GenomeAlignerWriteTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
diff --git a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
index be2381a..d76e846 100644
--- a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
+++ b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/ReadShortReadsSubTask.h b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
index 581e8a7..9b1d8d1 100644
--- a/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
+++ b/src/plugins/genome_aligner/src/ReadShortReadsSubTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/WriteAlignedReadsSubTask.cpp b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
index ecd5c2e..9d9085b 100644
--- a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
+++ b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/genome_aligner/src/WriteAlignedReadsSubTask.h b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
index ffd7f07..8c992ef 100644
--- a/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
+++ b/src/plugins/genome_aligner/src/WriteAlignedReadsSubTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/linkdata_support/src/LinkDataScriptLibrary.cpp b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
index aeff4fe..d9ee8aa 100644
--- a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
+++ b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/linkdata_support/src/LinkDataScriptLibrary.h b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
index 5e78624..18d0e79 100644
--- a/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
+++ b/src/plugins/linkdata_support/src/LinkDataScriptLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/linkdata_support/src/LinkDataSupportPlugin.cpp b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
index 00df38f..ddf04e1 100644
--- a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
+++ b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/linkdata_support/src/LinkDataSupportPlugin.h b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
index 9f6ea5a..0ad4613 100644
--- a/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
+++ b/src/plugins/linkdata_support/src/LinkDataSupportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/opencl_support/src/OpenCLSupportPlugin.cpp b/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
index 16474c1..0b74ce8 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
+++ b/src/plugins/opencl_support/src/OpenCLSupportPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/opencl_support/src/OpenCLSupportPlugin.h b/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
index 49eefe6..b0ade6b 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
+++ b/src/plugins/opencl_support/src/OpenCLSupportPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/opencl_support/src/OpenCLSupportSettingsController.cpp b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
index 7a9ebe0..c8389c6 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
+++ b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -74,7 +74,7 @@ AppSettingsGUIPageWidget * OpenCLSupportSettingsPageController::createWidget( Ap
return w;
}
-const QString OpenCLSupportSettingsPageController::helpPageId = QString("18220310");
+const QString OpenCLSupportSettingsPageController::helpPageId = QString("18222950");
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 2a2e9db..b35c35c 100644
--- a/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h
+++ b/src/plugins/opencl_support/src/OpenCLSupportSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/opencl_support/transl/english.ts b/src/plugins/opencl_support/transl/english.ts
index 6b71ff3..6897cce 100644
--- a/src/plugins/opencl_support/transl/english.ts
+++ b/src/plugins/opencl_support/transl/english.ts
@@ -4,52 +4,52 @@
<context>
<name>U2::OpenCLSupportPlugin</name>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="51"/>
- <source>Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></source>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="52"/>
+ <source>Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="58"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="59"/>
<source>OpenCL Support</source>
<translation>OpenCL Support</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="59"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="60"/>
<source>Plugin provides support for OpenCL-enabled GPUs.</source>
<translation>Plugin provides support for OpenCL-enabled GPUs.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="105"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="106"/>
<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="109"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="110"/>
<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="127"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="128"/>
<source>Initializing OpenCL</source>
<translation>Initializing OpenCL</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="138"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="139"/>
<source>Number of OpenCL platforms: %1</source>
<translation>Number of OpenCL platforms: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="153"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="154"/>
<source>Number of OpenCL devices: %1</source>
<translation>Number of OpenCL devices: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="254"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="255"/>
<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="272"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="273"/>
<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 05978a9..e19f25b 100644
--- a/src/plugins/opencl_support/transl/russian.ts
+++ b/src/plugins/opencl_support/transl/russian.ts
@@ -4,52 +4,52 @@
<context>
<name>U2::OpenCLSupportPlugin</name>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="51"/>
- <source>Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></source>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="52"/>
+ <source>Problem occurred loading the OpenCL driver. Please try to update drivers if you're going to make calculations on your video card. For details see this page: <a href="%1">%1</a></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="58"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="59"/>
<source>OpenCL Support</source>
<translation>Поддержка OpenCL</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="59"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="60"/>
<source>Plugin provides support for OpenCL-enabled GPUs.</source>
<translation>Плагин поддерживает OpenCL GPUs.</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="105"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="106"/>
<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="109"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="110"/>
<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="127"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="128"/>
<source>Initializing OpenCL</source>
<translation>Инициализация OpenCL</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="138"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="139"/>
<source>Number of OpenCL platforms: %1</source>
<translation>Число OpenCL платформ: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="153"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="154"/>
<source>Number of OpenCL devices: %1</source>
<translation>Число OpenCL устройств: %1</translation>
</message>
<message>
- <location filename="../src/OpenCLSupportPlugin.cpp" line="254"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="255"/>
<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="272"/>
+ <location filename="../src/OpenCLSupportPlugin.cpp" line="273"/>
<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 b863109..3a87717 100644
--- a/src/plugins/orf_marker/src/ORFDialog.cpp
+++ b/src/plugins/orf_marker/src/ORFDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -79,7 +79,7 @@ ORFDialog::ORFDialog(ADVSequenceObjectContext* _ctx)
: QDialog(_ctx->getAnnotatedDNAView()->getWidget()), aaUpdateTask(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220518");
+ new HelpButton(this, buttonBox, "18223158");
tabWidget->setCurrentIndex(0);
diff --git a/src/plugins/orf_marker/src/ORFDialog.h b/src/plugins/orf_marker/src/ORFDialog.h
index 2943455..a8fb90b 100644
--- a/src/plugins/orf_marker/src/ORFDialog.h
+++ b/src/plugins/orf_marker/src/ORFDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerPlugin.cpp b/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
index 5f7c77e..0daf069 100644
--- a/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerPlugin.h b/src/plugins/orf_marker/src/ORFMarkerPlugin.h
index 4eb833e..b06a861 100644
--- a/src/plugins/orf_marker/src/ORFMarkerPlugin.h
+++ b/src/plugins/orf_marker/src/ORFMarkerPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerTask.cpp b/src/plugins/orf_marker/src/ORFMarkerTask.cpp
index 3ec1877..fe61757 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTask.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerTask.h b/src/plugins/orf_marker/src/ORFMarkerTask.h
index 62c3be9..eb0751f 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTask.h
+++ b/src/plugins/orf_marker/src/ORFMarkerTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerTests.cpp b/src/plugins/orf_marker/src/ORFMarkerTests.cpp
index fced54f..16cee4e 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTests.cpp
+++ b/src/plugins/orf_marker/src/ORFMarkerTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFMarkerTests.h b/src/plugins/orf_marker/src/ORFMarkerTests.h
index c3def98..8e8c98c 100644
--- a/src/plugins/orf_marker/src/ORFMarkerTests.h
+++ b/src/plugins/orf_marker/src/ORFMarkerTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFQuery.cpp b/src/plugins/orf_marker/src/ORFQuery.cpp
index 507dbf6..80e214a 100644
--- a/src/plugins/orf_marker/src/ORFQuery.cpp
+++ b/src/plugins/orf_marker/src/ORFQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFQuery.h b/src/plugins/orf_marker/src/ORFQuery.h
index 8c92bb1..91d67c2 100644
--- a/src/plugins/orf_marker/src/ORFQuery.h
+++ b/src/plugins/orf_marker/src/ORFQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFWorker.cpp b/src/plugins/orf_marker/src/ORFWorker.cpp
index 52da8e3..d61b06b 100644
--- a/src/plugins/orf_marker/src/ORFWorker.cpp
+++ b/src/plugins/orf_marker/src/ORFWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/orf_marker/src/ORFWorker.h b/src/plugins/orf_marker/src/ORFWorker.h
index 9d74db3..eb4d338 100644
--- a/src/plugins/orf_marker/src/ORFWorker.h
+++ b/src/plugins/orf_marker/src/ORFWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/EditPrimerDialog.cpp b/src/plugins/pcr/src/EditPrimerDialog.cpp
index 91fec33..777562e 100644
--- a/src/plugins/pcr/src/EditPrimerDialog.cpp
+++ b/src/plugins/pcr/src/EditPrimerDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220609");
+ new HelpButton(this, buttonBox, "18223249");
primerEdit->setValidator(new PrimerValidator(this));
diff --git a/src/plugins/pcr/src/EditPrimerDialog.h b/src/plugins/pcr/src/EditPrimerDialog.h
index d0da989..706050e 100644
--- a/src/plugins/pcr/src/EditPrimerDialog.h
+++ b/src/plugins/pcr/src/EditPrimerDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/ExtractProductTask.cpp b/src/plugins/pcr/src/ExtractProductTask.cpp
index 9d154b9..5e7fabf 100644
--- a/src/plugins/pcr/src/ExtractProductTask.cpp
+++ b/src/plugins/pcr/src/ExtractProductTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/ExtractProductTask.h b/src/plugins/pcr/src/ExtractProductTask.h
index d1c31e0..816a81f 100644
--- a/src/plugins/pcr/src/ExtractProductTask.h
+++ b/src/plugins/pcr/src/ExtractProductTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/FindPrimerPairsWorker.cpp b/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
index e090155..9a6ca22 100644
--- a/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
+++ b/src/plugins/pcr/src/FindPrimerPairsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/FindPrimerPairsWorker.h b/src/plugins/pcr/src/FindPrimerPairsWorker.h
index 05a654a..4bf58a1 100644
--- a/src/plugins/pcr/src/FindPrimerPairsWorker.h
+++ b/src/plugins/pcr/src/FindPrimerPairsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrOPWidgetFactory.cpp b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
index bd7164b..4690706 100644
--- a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
namespace U2 {
-const QString InSilicoPcrOPWidgetFactory::GROUP_DOC_PAGE = "18220607";
+const QString InSilicoPcrOPWidgetFactory::GROUP_DOC_PAGE = "18223247";
InSilicoPcrOPWidgetFactory::InSilicoPcrOPWidgetFactory()
: OPWidgetFactory()
diff --git a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
index 1479561..e8ad5d1 100644
--- a/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
+++ b/src/plugins/pcr/src/InSilicoPcrOPWidgetFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrOptionPanelWidget.cpp b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
index af99777..abcfd3d 100644
--- a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrOptionPanelWidget.h b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
index bcd942b..ec8b644 100644
--- a/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
+++ b/src/plugins/pcr/src/InSilicoPcrOptionPanelWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrProductsTable.cpp b/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
index 6134306..87aea3a 100644
--- a/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrProductsTable.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrProductsTable.h b/src/plugins/pcr/src/InSilicoPcrProductsTable.h
index 7ade87c..839e577 100644
--- a/src/plugins/pcr/src/InSilicoPcrProductsTable.h
+++ b/src/plugins/pcr/src/InSilicoPcrProductsTable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrTask.cpp b/src/plugins/pcr/src/InSilicoPcrTask.cpp
index 0d5082e..3895d3c 100644
--- a/src/plugins/pcr/src/InSilicoPcrTask.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrTask.h b/src/plugins/pcr/src/InSilicoPcrTask.h
index be98e05..44a5172 100644
--- a/src/plugins/pcr/src/InSilicoPcrTask.h
+++ b/src/plugins/pcr/src/InSilicoPcrTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/InSilicoPcrWorker.cpp b/src/plugins/pcr/src/InSilicoPcrWorker.cpp
index 40103ee..a8b1e81 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorker.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/pcr/src/InSilicoPcrWorker.h b/src/plugins/pcr/src/InSilicoPcrWorker.h
index d166057..9aaefd0 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorker.h
+++ b/src/plugins/pcr/src/InSilicoPcrWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/pcr/src/InSilicoPcrWorkflowTask.cpp b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
index 136eb17..b53430f 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
+++ b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/pcr/src/InSilicoPcrWorkflowTask.h b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
index a0dd7f3..1930f4a 100644
--- a/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
+++ b/src/plugins/pcr/src/InSilicoPcrWorkflowTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/pcr/src/PcrOptionsPanelSavableTab.cpp b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
index f5fc6c4..c0251da 100644
--- a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
+++ b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/pcr/src/PcrOptionsPanelSavableTab.h b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
index 6317698..ee591d6 100644
--- a/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
+++ b/src/plugins/pcr/src/PcrOptionsPanelSavableTab.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PcrPlugin.cpp b/src/plugins/pcr/src/PcrPlugin.cpp
index df54734..4b34f0f 100644
--- a/src/plugins/pcr/src/PcrPlugin.cpp
+++ b/src/plugins/pcr/src/PcrPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PcrPlugin.h b/src/plugins/pcr/src/PcrPlugin.h
index aec5ade..5823812 100644
--- a/src/plugins/pcr/src/PcrPlugin.h
+++ b/src/plugins/pcr/src/PcrPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/Primer.cpp b/src/plugins/pcr/src/Primer.cpp
index 4941644..9953bc3 100644
--- a/src/plugins/pcr/src/Primer.cpp
+++ b/src/plugins/pcr/src/Primer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/Primer.h b/src/plugins/pcr/src/Primer.h
index 44597d2..8c303a1 100644
--- a/src/plugins/pcr/src/Primer.h
+++ b/src/plugins/pcr/src/Primer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerDimersFinder.cpp b/src/plugins/pcr/src/PrimerDimersFinder.cpp
index cc4988a..9373e04 100644
--- a/src/plugins/pcr/src/PrimerDimersFinder.cpp
+++ b/src/plugins/pcr/src/PrimerDimersFinder.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerDimersFinder.h b/src/plugins/pcr/src/PrimerDimersFinder.h
index cf98f33..7c3f754 100644
--- a/src/plugins/pcr/src/PrimerDimersFinder.h
+++ b/src/plugins/pcr/src/PrimerDimersFinder.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerGroupBox.cpp b/src/plugins/pcr/src/PrimerGroupBox.cpp
index 959d645..d431fb6 100644
--- a/src/plugins/pcr/src/PrimerGroupBox.cpp
+++ b/src/plugins/pcr/src/PrimerGroupBox.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerGroupBox.h b/src/plugins/pcr/src/PrimerGroupBox.h
index 8a9e25a..13ab5a0 100644
--- a/src/plugins/pcr/src/PrimerGroupBox.h
+++ b/src/plugins/pcr/src/PrimerGroupBox.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibrary.cpp b/src/plugins/pcr/src/PrimerLibrary.cpp
index 4aed8a4..84e350b 100644
--- a/src/plugins/pcr/src/PrimerLibrary.cpp
+++ b/src/plugins/pcr/src/PrimerLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibrary.h b/src/plugins/pcr/src/PrimerLibrary.h
index d460275..446175e 100644
--- a/src/plugins/pcr/src/PrimerLibrary.h
+++ b/src/plugins/pcr/src/PrimerLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryMdiWindow.cpp b/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
index 36e57c8..8d1019d 100644
--- a/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryMdiWindow.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryMdiWindow.h b/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
index 6ed4b9b..78a0c7c 100644
--- a/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
+++ b/src/plugins/pcr/src/PrimerLibraryMdiWindow.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibrarySelector.cpp b/src/plugins/pcr/src/PrimerLibrarySelector.cpp
index e067c1c..abcfe3a 100644
--- a/src/plugins/pcr/src/PrimerLibrarySelector.cpp
+++ b/src/plugins/pcr/src/PrimerLibrarySelector.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@ PrimerLibrarySelector::PrimerLibrarySelector(QWidget *parent)
{
GCOUNTER(cvar, tvar, "PrimerLibrarySelector");
setupUi(this);
- new HelpButton(this, buttonBox, "18220607");
+ new HelpButton(this, buttonBox, "18223247");
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 509cd6a..197649e 100644
--- a/src/plugins/pcr/src/PrimerLibrarySelector.h
+++ b/src/plugins/pcr/src/PrimerLibrarySelector.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryTable.cpp b/src/plugins/pcr/src/PrimerLibraryTable.cpp
index 71c3044..abd1f42 100644
--- a/src/plugins/pcr/src/PrimerLibraryTable.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryTable.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryTable.h b/src/plugins/pcr/src/PrimerLibraryTable.h
index 9302f8a..41ee115 100644
--- a/src/plugins/pcr/src/PrimerLibraryTable.h
+++ b/src/plugins/pcr/src/PrimerLibraryTable.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryTableController.cpp b/src/plugins/pcr/src/PrimerLibraryTableController.cpp
index 3e273cd..9938a4e 100644
--- a/src/plugins/pcr/src/PrimerLibraryTableController.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryTableController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryTableController.h b/src/plugins/pcr/src/PrimerLibraryTableController.h
index f1a6d22..ff77da6 100644
--- a/src/plugins/pcr/src/PrimerLibraryTableController.h
+++ b/src/plugins/pcr/src/PrimerLibraryTableController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLibraryWidget.cpp b/src/plugins/pcr/src/PrimerLibraryWidget.cpp
index 67d3e70..0ad089f 100644
--- a/src/plugins/pcr/src/PrimerLibraryWidget.cpp
+++ b/src/plugins/pcr/src/PrimerLibraryWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ PrimerLibraryWidget::PrimerLibraryWidget(QWidget *parent)
: QWidget(parent), editPrimerButton(NULL), removePrimersButton(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220609");
+ new HelpButton(this, buttonBox, "18223249");
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 6888618..58713d9 100644
--- a/src/plugins/pcr/src/PrimerLibraryWidget.h
+++ b/src/plugins/pcr/src/PrimerLibraryWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLineEdit.cpp b/src/plugins/pcr/src/PrimerLineEdit.cpp
index 094d3ab..fe9ef1e 100644
--- a/src/plugins/pcr/src/PrimerLineEdit.cpp
+++ b/src/plugins/pcr/src/PrimerLineEdit.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerLineEdit.h b/src/plugins/pcr/src/PrimerLineEdit.h
index d3103ae..c5d431a 100644
--- a/src/plugins/pcr/src/PrimerLineEdit.h
+++ b/src/plugins/pcr/src/PrimerLineEdit.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerStatistics.cpp b/src/plugins/pcr/src/PrimerStatistics.cpp
index 01dd62c..0661294 100644
--- a/src/plugins/pcr/src/PrimerStatistics.cpp
+++ b/src/plugins/pcr/src/PrimerStatistics.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimerStatistics.h b/src/plugins/pcr/src/PrimerStatistics.h
index c087f4a..a52e1b4 100644
--- a/src/plugins/pcr/src/PrimerStatistics.h
+++ b/src/plugins/pcr/src/PrimerStatistics.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimersDetailsDialog.cpp b/src/plugins/pcr/src/PrimersDetailsDialog.cpp
index 4a00a55..9e38b9d 100644
--- a/src/plugins/pcr/src/PrimersDetailsDialog.cpp
+++ b/src/plugins/pcr/src/PrimersDetailsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ PrimersDetailsDialog::PrimersDetailsDialog(QWidget *parent, const QString &detai
{
GCOUNTER(cvar, tvar, "PrimersDetailsDialog");
setupUi(this);
- new HelpButton(this, buttonBox, "18220608");
+ new HelpButton(this, buttonBox, "18223248");
textEdit->setText(details);
}
diff --git a/src/plugins/pcr/src/PrimersDetailsDialog.h b/src/plugins/pcr/src/PrimersDetailsDialog.h
index e656d16..a41f467 100644
--- a/src/plugins/pcr/src/PrimersDetailsDialog.h
+++ b/src/plugins/pcr/src/PrimersDetailsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimersGrouperWorker.cpp b/src/plugins/pcr/src/PrimersGrouperWorker.cpp
index d81487c..81659ad 100644
--- a/src/plugins/pcr/src/PrimersGrouperWorker.cpp
+++ b/src/plugins/pcr/src/PrimersGrouperWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/PrimersGrouperWorker.h b/src/plugins/pcr/src/PrimersGrouperWorker.h
index fb70d96..10d8e9b 100644
--- a/src/plugins/pcr/src/PrimersGrouperWorker.h
+++ b/src/plugins/pcr/src/PrimersGrouperWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/export/ExportPrimersDialog.cpp b/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
index bacd267..47423be 100644
--- a/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -61,7 +61,7 @@ ExportPrimersDialog::ExportPrimersDialog(const QList<Primer> &primers, QWidget *
primers(primers)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220609");
+ new HelpButton(this, buttonBox, "18223249");
init();
connectSignals();
diff --git a/src/plugins/pcr/src/export/ExportPrimersDialog.h b/src/plugins/pcr/src/export/ExportPrimersDialog.h
index a81768c..99996db 100644
--- a/src/plugins/pcr/src/export/ExportPrimersDialog.h
+++ b/src/plugins/pcr/src/export/ExportPrimersDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/export/ExportPrimersToDatabaseTask.cpp b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
index efdbdc1..dbf3b73 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/export/ExportPrimersToDatabaseTask.h b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
index 8d671a7..30480dd 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
+++ b/src/plugins/pcr/src/export/ExportPrimersToDatabaseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/export/ExportPrimersToLocalFileTask.cpp b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
index 8da167b..2ac9af5 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
+++ b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/export/ExportPrimersToLocalFileTask.h b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
index 2031ef2..7df7f7f 100644
--- a/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
+++ b/src/plugins/pcr/src/export/ExportPrimersToLocalFileTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimerFromObjectTask.cpp b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
index 0a38ea0..0d186eb 100644
--- a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimerFromObjectTask.h b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
index 35aaa62..784def2 100644
--- a/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimerFromObjectTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersDialog.cpp b/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
index 799e762..4ebeeb6 100644
--- a/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -49,7 +49,7 @@ ImportPrimersDialog::ImportPrimersDialog(QWidget *parent) :
waitForConnection(false)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220609");
+ new HelpButton(this, buttonBox, "18223249");
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 fc2d8c4..4ea2c6b 100644
--- a/src/plugins/pcr/src/import/ImportPrimersDialog.h
+++ b/src/plugins/pcr/src/import/ImportPrimersDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersFromFileTask.cpp b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
index 8d1075e..c2f8813 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersFromFileTask.h b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
index a8f46b5..6d226f2 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFileTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersFromFolderTask.cpp b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
index 041c936..3998db6 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersFromFolderTask.h b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
index 10596f2..d90e58c 100644
--- a/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersFromFolderTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersMultiTask.cpp b/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
index a08a997..504ba62 100644
--- a/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
+++ b/src/plugins/pcr/src/import/ImportPrimersMultiTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/pcr/src/import/ImportPrimersMultiTask.h b/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
index c810b1b..9daf1f2 100644
--- a/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
+++ b/src/plugins/pcr/src/import/ImportPrimersMultiTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perf_monitor/src/PerfMonitorPlugin.cpp b/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
index 1f83443..8880b7c 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
+++ b/src/plugins/perf_monitor/src/PerfMonitorPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perf_monitor/src/PerfMonitorPlugin.h b/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
index f7284e7..64b5cdb 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
+++ b/src/plugins/perf_monitor/src/PerfMonitorPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perf_monitor/src/PerfMonitorView.cpp b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
index 5fe82e8..290f206 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorView.cpp
+++ b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/perf_monitor/src/PerfMonitorView.h b/src/plugins/perf_monitor/src/PerfMonitorView.h
index b72dcd0..f4ec1e8 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorView.h
+++ b/src/plugins/perf_monitor/src/PerfMonitorView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDDocument.cpp b/src/plugins/query_designer/src/QDDocument.cpp
index 676aacf..5fe0a83 100644
--- a/src/plugins/query_designer/src/QDDocument.cpp
+++ b/src/plugins/query_designer/src/QDDocument.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDDocument.h b/src/plugins/query_designer/src/QDDocument.h
index 785a8b3..6b9058f 100644
--- a/src/plugins/query_designer/src/QDDocument.h
+++ b/src/plugins/query_designer/src/QDDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDDocumentFormat.cpp b/src/plugins/query_designer/src/QDDocumentFormat.cpp
index 9b99b3f..7ee941f 100644
--- a/src/plugins/query_designer/src/QDDocumentFormat.cpp
+++ b/src/plugins/query_designer/src/QDDocumentFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDDocumentFormat.h b/src/plugins/query_designer/src/QDDocumentFormat.h
index 3e8652c..ece077e 100644
--- a/src/plugins/query_designer/src/QDDocumentFormat.h
+++ b/src/plugins/query_designer/src/QDDocumentFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDGroupsEditor.cpp b/src/plugins/query_designer/src/QDGroupsEditor.cpp
index d34b6e6..37af98a 100644
--- a/src/plugins/query_designer/src/QDGroupsEditor.cpp
+++ b/src/plugins/query_designer/src/QDGroupsEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDGroupsEditor.h b/src/plugins/query_designer/src/QDGroupsEditor.h
index 4f2f83f..1444593 100644
--- a/src/plugins/query_designer/src/QDGroupsEditor.h
+++ b/src/plugins/query_designer/src/QDGroupsEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDRunDialog.cpp b/src/plugins/query_designer/src/QDRunDialog.cpp
index e4bc09b..6cdfc59 100644
--- a/src/plugins/query_designer/src/QDRunDialog.cpp
+++ b/src/plugins/query_designer/src/QDRunDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -79,7 +79,7 @@ QDRunDialog::QDRunDialog(QDScheme* _scheme, QWidget* parent, const QString& defa
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220225");
+ new HelpButton(this, buttonBox, "18222865");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Run"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -293,7 +293,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, "18220226");
+ new HelpButton(this, buttonBox, "18222866");
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 080a4a6..158e1ee 100644
--- a/src/plugins/query_designer/src/QDRunDialog.h
+++ b/src/plugins/query_designer/src/QDRunDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDSamples.cpp b/src/plugins/query_designer/src/QDSamples.cpp
index 0503014..8908995 100644
--- a/src/plugins/query_designer/src/QDSamples.cpp
+++ b/src/plugins/query_designer/src/QDSamples.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDSamples.h b/src/plugins/query_designer/src/QDSamples.h
index d689afb..23ce749 100644
--- a/src/plugins/query_designer/src/QDSamples.h
+++ b/src/plugins/query_designer/src/QDSamples.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDSceneIOTasks.cpp b/src/plugins/query_designer/src/QDSceneIOTasks.cpp
index 7df3f84..7c19a83 100644
--- a/src/plugins/query_designer/src/QDSceneIOTasks.cpp
+++ b/src/plugins/query_designer/src/QDSceneIOTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDSceneIOTasks.h b/src/plugins/query_designer/src/QDSceneIOTasks.h
index 77a6d79..037b2cf 100644
--- a/src/plugins/query_designer/src/QDSceneIOTasks.h
+++ b/src/plugins/query_designer/src/QDSceneIOTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDTests.cpp b/src/plugins/query_designer/src/QDTests.cpp
index fa353ec..15bbb27 100644
--- a/src/plugins/query_designer/src/QDTests.cpp
+++ b/src/plugins/query_designer/src/QDTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDTests.h b/src/plugins/query_designer/src/QDTests.h
index 36d3d5d..aea28c2 100644
--- a/src/plugins/query_designer/src/QDTests.h
+++ b/src/plugins/query_designer/src/QDTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDWorker.cpp b/src/plugins/query_designer/src/QDWorker.cpp
index 82878b5..03c795d 100644
--- a/src/plugins/query_designer/src/QDWorker.cpp
+++ b/src/plugins/query_designer/src/QDWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QDWorker.h b/src/plugins/query_designer/src/QDWorker.h
index 4932634..b4afcfa 100644
--- a/src/plugins/query_designer/src/QDWorker.h
+++ b/src/plugins/query_designer/src/QDWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryDesignerPlugin.cpp b/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
index ed9a371..1eba9c5 100644
--- a/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
+++ b/src/plugins/query_designer/src/QueryDesignerPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryDesignerPlugin.h b/src/plugins/query_designer/src/QueryDesignerPlugin.h
index 2b20346..96f04d6 100644
--- a/src/plugins/query_designer/src/QueryDesignerPlugin.h
+++ b/src/plugins/query_designer/src/QueryDesignerPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryEditor.cpp b/src/plugins/query_designer/src/QueryEditor.cpp
index 20cf438..b4b7bdd 100644
--- a/src/plugins/query_designer/src/QueryEditor.cpp
+++ b/src/plugins/query_designer/src/QueryEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryEditor.h b/src/plugins/query_designer/src/QueryEditor.h
index 05e17a4..7c84d91 100644
--- a/src/plugins/query_designer/src/QueryEditor.h
+++ b/src/plugins/query_designer/src/QueryEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryPalette.cpp b/src/plugins/query_designer/src/QueryPalette.cpp
index ff3a266..1f6cb50 100644
--- a/src/plugins/query_designer/src/QueryPalette.cpp
+++ b/src/plugins/query_designer/src/QueryPalette.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryPalette.h b/src/plugins/query_designer/src/QueryPalette.h
index 55b707e..28b04d6 100644
--- a/src/plugins/query_designer/src/QueryPalette.h
+++ b/src/plugins/query_designer/src/QueryPalette.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryProcCfgDelegate.h b/src/plugins/query_designer/src/QueryProcCfgDelegate.h
index cf73125..859eed9 100644
--- a/src/plugins/query_designer/src/QueryProcCfgDelegate.h
+++ b/src/plugins/query_designer/src/QueryProcCfgDelegate.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryProcCfgModel.h b/src/plugins/query_designer/src/QueryProcCfgModel.h
index 11c8cad..55416d8 100644
--- a/src/plugins/query_designer/src/QueryProcCfgModel.h
+++ b/src/plugins/query_designer/src/QueryProcCfgModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryViewAdapter.cpp b/src/plugins/query_designer/src/QueryViewAdapter.cpp
index 7ee6c94..fcc484f 100644
--- a/src/plugins/query_designer/src/QueryViewAdapter.cpp
+++ b/src/plugins/query_designer/src/QueryViewAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryViewAdapter.h b/src/plugins/query_designer/src/QueryViewAdapter.h
index ed1e4b9..424ef33 100644
--- a/src/plugins/query_designer/src/QueryViewAdapter.h
+++ b/src/plugins/query_designer/src/QueryViewAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryViewController.cpp b/src/plugins/query_designer/src/QueryViewController.cpp
index 7360f6d..d13a8d0 100644
--- a/src/plugins/query_designer/src/QueryViewController.cpp
+++ b/src/plugins/query_designer/src/QueryViewController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1147,7 +1147,7 @@ AddConstraintDialog::AddConstraintDialog(QueryScene* _scene, QDDistanceType _kin
QDElement* defSrc, QDElement* defDst)
: scene(_scene), kind(_kind) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220210");
+ new HelpButton(this, buttonBox, "18222850");
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 539e0bf..a030bb1 100644
--- a/src/plugins/query_designer/src/QueryViewController.h
+++ b/src/plugins/query_designer/src/QueryViewController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryViewItems.cpp b/src/plugins/query_designer/src/QueryViewItems.cpp
index 1b38c41..0e99acd 100644
--- a/src/plugins/query_designer/src/QueryViewItems.cpp
+++ b/src/plugins/query_designer/src/QueryViewItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/QueryViewItems.h b/src/plugins/query_designer/src/QueryViewItems.h
index 0fca7ff..0d76331 100644
--- a/src/plugins/query_designer/src/QueryViewItems.h
+++ b/src/plugins/query_designer/src/QueryViewItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDFindActor.cpp b/src/plugins/query_designer/src/library/QDFindActor.cpp
index 9af4b3c..de745ae 100644
--- a/src/plugins/query_designer/src/library/QDFindActor.cpp
+++ b/src/plugins/query_designer/src/library/QDFindActor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDFindActor.h b/src/plugins/query_designer/src/library/QDFindActor.h
index 362ac06..8eb9ac6 100644
--- a/src/plugins/query_designer/src/library/QDFindActor.h
+++ b/src/plugins/query_designer/src/library/QDFindActor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDFindPolyRegionsActor.cpp b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
index e52ad1e..dccf3c6 100644
--- a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
+++ b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDFindPolyRegionsActor.h b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
index 82732ce..b5abf8d 100644
--- a/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
+++ b/src/plugins/query_designer/src/library/QDFindPolyRegionsActor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDGcContentActor.cpp b/src/plugins/query_designer/src/library/QDGcContentActor.cpp
index 8506445..6c34d17 100644
--- a/src/plugins/query_designer/src/library/QDGcContentActor.cpp
+++ b/src/plugins/query_designer/src/library/QDGcContentActor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/query_designer/src/library/QDGcContentActor.h b/src/plugins/query_designer/src/library/QDGcContentActor.h
index 8166ec8..357e21c 100644
--- a/src/plugins/query_designer/src/library/QDGcContentActor.h
+++ b/src/plugins/query_designer/src/library/QDGcContentActor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/BlastQuery.cpp b/src/plugins/remote_blast/src/BlastQuery.cpp
index 80aace6..fa2ad13 100644
--- a/src/plugins/remote_blast/src/BlastQuery.cpp
+++ b/src/plugins/remote_blast/src/BlastQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/BlastQuery.h b/src/plugins/remote_blast/src/BlastQuery.h
index 154c110..d5c4780 100644
--- a/src/plugins/remote_blast/src/BlastQuery.h
+++ b/src/plugins/remote_blast/src/BlastQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/DBRequestFactory.h b/src/plugins/remote_blast/src/DBRequestFactory.h
index e4c80e3..6813762 100644
--- a/src/plugins/remote_blast/src/DBRequestFactory.h
+++ b/src/plugins/remote_blast/src/DBRequestFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/HttpRequest.h b/src/plugins/remote_blast/src/HttpRequest.h
index 334629c..5aec2c6 100644
--- a/src/plugins/remote_blast/src/HttpRequest.h
+++ b/src/plugins/remote_blast/src/HttpRequest.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/HttpRequestBLAST.cpp b/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
index 7a9f1ea..06f2c63 100644
--- a/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
+++ b/src/plugins/remote_blast/src/HttpRequestBLAST.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTConsts.cpp b/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
index 47d028a..86a57e6 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTConsts.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTConsts.h b/src/plugins/remote_blast/src/RemoteBLASTConsts.h
index e864284..97b8837 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTConsts.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTConsts.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTPlugin.cpp b/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
index 81c395d..65d2d7f 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTPlugin.h b/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
index a37b74a..61151c8 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTPluginTests.cpp b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
index 2423fc5..0b215ea 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTPluginTests.h b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
index c2e4666..7db3ba5 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTPluginTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTTask.cpp b/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
index dde17b3..2bbadc9 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTTask.h b/src/plugins/remote_blast/src/RemoteBLASTTask.h
index 09818d9..d5dcb9c 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTTask.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTWorker.cpp b/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
index 2045f28..85edbfa 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
+++ b/src/plugins/remote_blast/src/RemoteBLASTWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/RemoteBLASTWorker.h b/src/plugins/remote_blast/src/RemoteBLASTWorker.h
index 7dd175a..a291f46 100644
--- a/src/plugins/remote_blast/src/RemoteBLASTWorker.h
+++ b/src/plugins/remote_blast/src/RemoteBLASTWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/remote_blast/src/SendSelectionDialog.cpp b/src/plugins/remote_blast/src/SendSelectionDialog.cpp
index 6943bcf..0a12f40 100644
--- a/src/plugins/remote_blast/src/SendSelectionDialog.cpp
+++ b/src/plugins/remote_blast/src/SendSelectionDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220519");
+ new HelpButton(this, buttonBox, "18223159");
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 f9f6ca9..843a383 100644
--- a/src/plugins/remote_blast/src/SendSelectionDialog.h
+++ b/src/plugins/remote_blast/src/SendSelectionDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/FindRepeatsDialog.cpp b/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
index 9981e93..b1f3dcb 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
+++ b/src/plugins/repeat_finder/src/FindRepeatsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -78,7 +78,7 @@ FindRepeatsDialog::FindRepeatsDialog(ADVSequenceObjectContext* _sc)
{
sc = _sc;
setupUi(this);
- new HelpButton(this, buttonBox, "18220523");
+ new HelpButton(this, buttonBox, "18223163");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins/repeat_finder/src/FindRepeatsDialog.h b/src/plugins/repeat_finder/src/FindRepeatsDialog.h
index f48da36..0c19332 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsDialog.h
+++ b/src/plugins/repeat_finder/src/FindRepeatsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/FindRepeatsTask.cpp b/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
index 82ffa79..b38fc2d 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
+++ b/src/plugins/repeat_finder/src/FindRepeatsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/FindRepeatsTask.h b/src/plugins/repeat_finder/src/FindRepeatsTask.h
index ff3e54e..c2090ad 100644
--- a/src/plugins/repeat_finder/src/FindRepeatsTask.h
+++ b/src/plugins/repeat_finder/src/FindRepeatsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/FindTandemsDialog.cpp b/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
index 911666d..597e707 100644
--- a/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
+++ b/src/plugins/repeat_finder/src/FindTandemsDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@ FindTandemsDialog::FindTandemsDialog(ADVSequenceObjectContext* _sc)
{
sc = _sc;
setupUi(this);
- new HelpButton(this, buttonBox, "18220524");
+ new HelpButton(this, buttonBox, "18223164");
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 2dd237d..8a083d6 100644
--- a/src/plugins/repeat_finder/src/FindTandemsDialog.h
+++ b/src/plugins/repeat_finder/src/FindTandemsDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFBase.cpp b/src/plugins/repeat_finder/src/RFBase.cpp
index 1873469..8ce37a2 100644
--- a/src/plugins/repeat_finder/src/RFBase.cpp
+++ b/src/plugins/repeat_finder/src/RFBase.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFBase.h b/src/plugins/repeat_finder/src/RFBase.h
index 8497af4..882597e 100644
--- a/src/plugins/repeat_finder/src/RFBase.h
+++ b/src/plugins/repeat_finder/src/RFBase.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFConstants.h b/src/plugins/repeat_finder/src/RFConstants.h
index a5cf117..253ab2f 100644
--- a/src/plugins/repeat_finder/src/RFConstants.h
+++ b/src/plugins/repeat_finder/src/RFConstants.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFDiagonal.cpp b/src/plugins/repeat_finder/src/RFDiagonal.cpp
index 1a7c169..fcf236b 100644
--- a/src/plugins/repeat_finder/src/RFDiagonal.cpp
+++ b/src/plugins/repeat_finder/src/RFDiagonal.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFDiagonal.h b/src/plugins/repeat_finder/src/RFDiagonal.h
index 79e3405..f05c538 100644
--- a/src/plugins/repeat_finder/src/RFDiagonal.h
+++ b/src/plugins/repeat_finder/src/RFDiagonal.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFSArray.cpp b/src/plugins/repeat_finder/src/RFSArray.cpp
index db83e48..51288a4 100644
--- a/src/plugins/repeat_finder/src/RFSArray.cpp
+++ b/src/plugins/repeat_finder/src/RFSArray.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFSArray.h b/src/plugins/repeat_finder/src/RFSArray.h
index 29041b3..6cef66f 100644
--- a/src/plugins/repeat_finder/src/RFSArray.h
+++ b/src/plugins/repeat_finder/src/RFSArray.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFSArrayWK.cpp b/src/plugins/repeat_finder/src/RFSArrayWK.cpp
index b9a34ed..c19a030 100644
--- a/src/plugins/repeat_finder/src/RFSArrayWK.cpp
+++ b/src/plugins/repeat_finder/src/RFSArrayWK.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFSArrayWK.h b/src/plugins/repeat_finder/src/RFSArrayWK.h
index 188654a..842e2ee 100644
--- a/src/plugins/repeat_finder/src/RFSArrayWK.h
+++ b/src/plugins/repeat_finder/src/RFSArrayWK.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFTaskFactory.cpp b/src/plugins/repeat_finder/src/RFTaskFactory.cpp
index 7902ba7..cf35883 100644
--- a/src/plugins/repeat_finder/src/RFTaskFactory.cpp
+++ b/src/plugins/repeat_finder/src/RFTaskFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RFTaskFactory.h b/src/plugins/repeat_finder/src/RFTaskFactory.h
index ccdaa57..afd56e9 100644
--- a/src/plugins/repeat_finder/src/RFTaskFactory.h
+++ b/src/plugins/repeat_finder/src/RFTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RF_BitMask.h b/src/plugins/repeat_finder/src/RF_BitMask.h
index 4b06fb2..d4e0226 100644
--- a/src/plugins/repeat_finder/src/RF_BitMask.h
+++ b/src/plugins/repeat_finder/src/RF_BitMask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RF_SArray_TandemFinder.cpp b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
index cc83754..d1920ec 100644
--- a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
+++ b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RF_SArray_TandemFinder.h b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
index ad18925..b2100b4 100644
--- a/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
+++ b/src/plugins/repeat_finder/src/RF_SArray_TandemFinder.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RF_SuffixArray.cpp b/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
index 4b9d888..47f1a2e 100644
--- a/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
+++ b/src/plugins/repeat_finder/src/RF_SuffixArray.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RF_SuffixArray.h b/src/plugins/repeat_finder/src/RF_SuffixArray.h
index d62247f..dfa9281 100644
--- a/src/plugins/repeat_finder/src/RF_SuffixArray.h
+++ b/src/plugins/repeat_finder/src/RF_SuffixArray.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatFinderPlugin.cpp b/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
index 13c1c86..9d4cae1 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
+++ b/src/plugins/repeat_finder/src/RepeatFinderPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatFinderPlugin.h b/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
index af8ab6b..a1e919c 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
+++ b/src/plugins/repeat_finder/src/RepeatFinderPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatFinderTests.cpp b/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
index de48d39..cb11a33 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
+++ b/src/plugins/repeat_finder/src/RepeatFinderTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatFinderTests.h b/src/plugins/repeat_finder/src/RepeatFinderTests.h
index eba0672..422e8d7 100644
--- a/src/plugins/repeat_finder/src/RepeatFinderTests.h
+++ b/src/plugins/repeat_finder/src/RepeatFinderTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatQuery.cpp b/src/plugins/repeat_finder/src/RepeatQuery.cpp
index c02ea1a..5ad55d4 100644
--- a/src/plugins/repeat_finder/src/RepeatQuery.cpp
+++ b/src/plugins/repeat_finder/src/RepeatQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatQuery.h b/src/plugins/repeat_finder/src/RepeatQuery.h
index 92f32da..4cc7618 100644
--- a/src/plugins/repeat_finder/src/RepeatQuery.h
+++ b/src/plugins/repeat_finder/src/RepeatQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatWorker.cpp b/src/plugins/repeat_finder/src/RepeatWorker.cpp
index d6963dc..12d4f97 100644
--- a/src/plugins/repeat_finder/src/RepeatWorker.cpp
+++ b/src/plugins/repeat_finder/src/RepeatWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/RepeatWorker.h b/src/plugins/repeat_finder/src/RepeatWorker.h
index a011ad9..a639fc6 100644
--- a/src/plugins/repeat_finder/src/RepeatWorker.h
+++ b/src/plugins/repeat_finder/src/RepeatWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/TandemQuery.cpp b/src/plugins/repeat_finder/src/TandemQuery.cpp
index a66ac75..9fd32d4 100644
--- a/src/plugins/repeat_finder/src/TandemQuery.cpp
+++ b/src/plugins/repeat_finder/src/TandemQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/repeat_finder/src/TandemQuery.h b/src/plugins/repeat_finder/src/TandemQuery.h
index 97ef1ea..d4b501e 100644
--- a/src/plugins/repeat_finder/src/TandemQuery.h
+++ b/src/plugins/repeat_finder/src/TandemQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/PairAlignSequences.cpp b/src/plugins/smith_waterman/src/PairAlignSequences.cpp
index 93a3183..1571f25 100644
--- a/src/plugins/smith_waterman/src/PairAlignSequences.cpp
+++ b/src/plugins/smith_waterman/src/PairAlignSequences.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/PairAlignSequences.h b/src/plugins/smith_waterman/src/PairAlignSequences.h
index f7f98f3..08a3754 100644
--- a/src/plugins/smith_waterman/src/PairAlignSequences.h
+++ b/src/plugins/smith_waterman/src/PairAlignSequences.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
index 22bbe51..5283b82 100644
--- a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
+++ b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
index 9d73133..546d0b0 100644
--- a/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
+++ b/src/plugins/smith_waterman/src/PairwiseAlignmentSmithWatermanGUIExtension.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWAlgorithmPlugin.cpp b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
index eef09b2..bcf6c7f 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
+++ b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWAlgorithmPlugin.h b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
index 546243b..7459b93 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
+++ b/src/plugins/smith_waterman/src/SWAlgorithmPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWAlgorithmTask.cpp b/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
index 72f58e5..4c74ac5 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
+++ b/src/plugins/smith_waterman/src/SWAlgorithmTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -489,10 +489,10 @@ void SWResultsPostprocessingTask::run(){
}
PairwiseAlignmentSmithWatermanTaskSettings::PairwiseAlignmentSmithWatermanTaskSettings(const PairwiseAlignmentTaskSettings &s) :
- PairwiseAlignmentTaskSettings(s),
+ PairwiseAlignmentTaskSettings(s),
reportCallback(NULL),
resultListener(NULL),
- resultFilter(NULL),
+ resultFilter(NULL),
gapOpen(0),
gapExtd(0),
percentOfScore(0) {}
diff --git a/src/plugins/smith_waterman/src/SWAlgorithmTask.h b/src/plugins/smith_waterman/src/SWAlgorithmTask.h
index 2846b5f..ca539df 100644
--- a/src/plugins/smith_waterman/src/SWAlgorithmTask.h
+++ b/src/plugins/smith_waterman/src/SWAlgorithmTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWQuery.cpp b/src/plugins/smith_waterman/src/SWQuery.cpp
index d53e9f8..d407d26 100644
--- a/src/plugins/smith_waterman/src/SWQuery.cpp
+++ b/src/plugins/smith_waterman/src/SWQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWQuery.h b/src/plugins/smith_waterman/src/SWQuery.h
index 16ad6e3..a59c879 100644
--- a/src/plugins/smith_waterman/src/SWQuery.h
+++ b/src/plugins/smith_waterman/src/SWQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWTaskFactory.cpp b/src/plugins/smith_waterman/src/SWTaskFactory.cpp
index e7e4a93..543caa4 100644
--- a/src/plugins/smith_waterman/src/SWTaskFactory.cpp
+++ b/src/plugins/smith_waterman/src/SWTaskFactory.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWTaskFactory.h b/src/plugins/smith_waterman/src/SWTaskFactory.h
index 6e241de..c6039d3 100644
--- a/src/plugins/smith_waterman/src/SWTaskFactory.h
+++ b/src/plugins/smith_waterman/src/SWTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SWWorker.cpp b/src/plugins/smith_waterman/src/SWWorker.cpp
index 3e2ec70..24dc025 100644
--- a/src/plugins/smith_waterman/src/SWWorker.cpp
+++ b/src/plugins/smith_waterman/src/SWWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/smith_waterman/src/SWWorker.h b/src/plugins/smith_waterman/src/SWWorker.h
index 1b9192c..b6ee0aa 100644
--- a/src/plugins/smith_waterman/src/SWWorker.h
+++ b/src/plugins/smith_waterman/src/SWWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithm.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
index 9fe64b1..42bb2c1 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithm.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
index 83b7669..93677e0 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
index d65a341..9a24c51 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmCUDA.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
index 4b040df..5a80e29 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmCUDA.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
index 8cc8289..7e4529c 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
index dad22f0..2e070e8 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmOPENCL.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
index 0b51dd8..f98372e 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanAlgorithmSSE2.h b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
index 7a585e2..64bed74 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanAlgorithmSSE2.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanTests.cpp b/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
index 60b610e..78c8248 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
+++ b/src/plugins/smith_waterman/src/SmithWatermanTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/SmithWatermanTests.h b/src/plugins/smith_waterman/src/SmithWatermanTests.h
index ef3430c..68bc8b5 100644
--- a/src/plugins/smith_waterman/src/SmithWatermanTests.h
+++ b/src/plugins/smith_waterman/src/SmithWatermanTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/sw_cuda_cpp.cpp b/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
index d1bd367..d784e2c 100644
--- a/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
+++ b/src/plugins/smith_waterman/src/sw_cuda_cpp.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/smith_waterman/src/sw_cuda_cpp.h b/src/plugins/smith_waterman/src/sw_cuda_cpp.h
index b56a0d4..d4318e3 100644
--- a/src/plugins/smith_waterman/src/sw_cuda_cpp.h
+++ b/src/plugins/smith_waterman/src/sw_cuda_cpp.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/GTestScriptWrapper.cpp b/src/plugins/test_runner/src/GTestScriptWrapper.cpp
index 1bede78..ec0cdf2 100644
--- a/src/plugins/test_runner/src/GTestScriptWrapper.cpp
+++ b/src/plugins/test_runner/src/GTestScriptWrapper.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/GTestScriptWrapper.h b/src/plugins/test_runner/src/GTestScriptWrapper.h
index 1d86781..aca0aa0 100644
--- a/src/plugins/test_runner/src/GTestScriptWrapper.h
+++ b/src/plugins/test_runner/src/GTestScriptWrapper.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/TestRunnerPlugin.cpp b/src/plugins/test_runner/src/TestRunnerPlugin.cpp
index 106c6e7..99790a7 100644
--- a/src/plugins/test_runner/src/TestRunnerPlugin.cpp
+++ b/src/plugins/test_runner/src/TestRunnerPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/TestRunnerPlugin.h b/src/plugins/test_runner/src/TestRunnerPlugin.h
index eb6107e..b63d12b 100644
--- a/src/plugins/test_runner/src/TestRunnerPlugin.h
+++ b/src/plugins/test_runner/src/TestRunnerPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/TestViewController.cpp b/src/plugins/test_runner/src/TestViewController.cpp
index 1fd8692..3b4d917 100644
--- a/src/plugins/test_runner/src/TestViewController.cpp
+++ b/src/plugins/test_runner/src/TestViewController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/TestViewController.h b/src/plugins/test_runner/src/TestViewController.h
index d35ce79..a1bba9c 100644
--- a/src/plugins/test_runner/src/TestViewController.h
+++ b/src/plugins/test_runner/src/TestViewController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/test_runner/src/TestViewReporter.cpp b/src/plugins/test_runner/src/TestViewReporter.cpp
index a9aa5e3..9853bdd 100644
--- a/src/plugins/test_runner/src/TestViewReporter.cpp
+++ b/src/plugins/test_runner/src/TestViewReporter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -168,7 +168,7 @@ const QString TestViewReporter::getHTMLFirstPart(const char *info1, const char *
QString rezult;
rezult=("\n\n<table width=\"100%\" class=\"title\">\n<tr>\n<td class=\"title\">UGENE Test Report</td><td align=\"right\"><em>\n");
if(info1)rezult+= info1;
- rezult+=("</em></td>\n</tr>\n<tr>\n<td> generated by <A HREF=\"http://ugene.unipro.ru\">UGENE</A></td><td align=\"right\"><em>\n");
+ rezult+=("</em></td>\n</tr>\n<tr>\n<td> generated by <A HREF=\"http://ugene.net\">UGENE</A></td><td align=\"right\"><em>\n");
if(info2)rezult+= info2;
rezult+=("</em></td>\n</tr>\n<tr>\n<td> \n");
QDate d = QDate::currentDate ();
diff --git a/src/plugins/test_runner/src/TestViewReporter.h b/src/plugins/test_runner/src/TestViewReporter.h
index bfced85..0bb9714 100644
--- a/src/plugins/test_runner/src/TestViewReporter.h
+++ b/src/plugins/test_runner/src/TestViewReporter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/PMatrixFormat.cpp b/src/plugins/weight_matrix/src/PMatrixFormat.cpp
index 3ed4985..c7f6cee 100644
--- a/src/plugins/weight_matrix/src/PMatrixFormat.cpp
+++ b/src/plugins/weight_matrix/src/PMatrixFormat.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/PMatrixFormat.h b/src/plugins/weight_matrix/src/PMatrixFormat.h
index 640ba7d..b059a71 100644
--- a/src/plugins/weight_matrix/src/PMatrixFormat.h
+++ b/src/plugins/weight_matrix/src/PMatrixFormat.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/PWMBuildDialogController.cpp b/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
index 884f0d7..b9776fb 100644
--- a/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMBuildDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@ PWMBuildDialogController::PWMBuildDialogController(QWidget* w)
logoArea(NULL) {
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "18220579");
+ new HelpButton(this, buttonBox, "18223219");
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 ac5399b..33172c0 100644
--- a/src/plugins/weight_matrix/src/PWMBuildDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMBuildDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/PWMJASPARDialogController.cpp b/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
index db16f85..bc42c27 100644
--- a/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMJASPARDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ namespace U2 {
PWMJASPARDialogController::PWMJASPARDialogController(QWidget *w)
: QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220578");
+ new HelpButton(this, buttonBox, "18223218");
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 87a550b..3719284 100644
--- a/src/plugins/weight_matrix/src/PWMJASPARDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMJASPARDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/PWMSearchDialogController.cpp b/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
index fd8a21c..81f1aac 100644
--- a/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
+++ b/src/plugins/weight_matrix/src/PWMSearchDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -108,7 +108,7 @@ public:
PWMSearchDialogController::PWMSearchDialogController(ADVSequenceObjectContext* _ctx, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220577");
+ new HelpButton(this, buttonBox, "18223217");
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 855230c..0771cf5 100644
--- a/src/plugins/weight_matrix/src/PWMSearchDialogController.h
+++ b/src/plugins/weight_matrix/src/PWMSearchDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/SetParametersDialogController.cpp b/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
index aad27f0..6c46cb8 100644
--- a/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
+++ b/src/plugins/weight_matrix/src/SetParametersDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ SetParametersDialogController::SetParametersDialogController(QWidget *w)
: QDialog(w) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220577");
+ new HelpButton(this, buttonBox, "18223217");
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 dd79f7e..bb4b826 100644
--- a/src/plugins/weight_matrix/src/SetParametersDialogController.h
+++ b/src/plugins/weight_matrix/src/SetParametersDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/ViewMatrixDialogController.cpp b/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
index 5d7b2e9..3ea1e1d 100644
--- a/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
+++ b/src/plugins/weight_matrix/src/ViewMatrixDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -183,7 +183,7 @@ ViewMatrixDialogController::ViewMatrixDialogController(PFMatrix matrix, QWidget
ViewMatrixDialogController::ViewMatrixDialogController(PWMatrix matrix, QWidget *w): QDialog(w){
setupUi(this);
- new HelpButton(this, buttonBox, "18220579");
+ new HelpButton(this, buttonBox, "18223219");
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 2fe998b..3a52d2a 100644
--- a/src/plugins/weight_matrix/src/ViewMatrixDialogController.h
+++ b/src/plugins/weight_matrix/src/ViewMatrixDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WMQuery.cpp b/src/plugins/weight_matrix/src/WMQuery.cpp
index 28f4032..bddccc5 100644
--- a/src/plugins/weight_matrix/src/WMQuery.cpp
+++ b/src/plugins/weight_matrix/src/WMQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WMQuery.h b/src/plugins/weight_matrix/src/WMQuery.h
index 6f81a62..38d3b10 100644
--- a/src/plugins/weight_matrix/src/WMQuery.h
+++ b/src/plugins/weight_matrix/src/WMQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixAlgorithm.cpp b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
index d459935..e3a0b11 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixAlgorithm.h b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
index 658a11d..d06fcff 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixBuildWorker.cpp b/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
index 1b94b29..5776760 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixBuildWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixIO.cpp b/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
index 01158eb..d298d8b 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixIO.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixIO.h b/src/plugins/weight_matrix/src/WeightMatrixIO.h
index 14d6508..f6238e5 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIO.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixIO.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixIOWorkers.cpp b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
index 99fee21..3b084f3 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixIOWorkers.h b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
index b860829..5b9879d 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixIOWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixPlugin.cpp b/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
index 233fdce..e553cb4 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixPlugin.h b/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
index a3f7bc8..be44550 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixSearchTask.cpp b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
index 65a4510..4a5928c 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixSearchTask.h b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
index 46215c0..6ab9333 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixSearchWorker.cpp b/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
index 183ce46..404d5db 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
+++ b/src/plugins/weight_matrix/src/WeightMatrixSearchWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/weight_matrix/src/WeightMatrixWorkers.h b/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
index ad5ac12..5777672 100644
--- a/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
+++ b/src/plugins/weight_matrix/src/WeightMatrixWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ActorCfgFilterProxyModel.cpp b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
index c3b28ab..bbeaf52 100644
--- a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
+++ b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ActorCfgFilterProxyModel.h b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
index 6b0a077..e37d467 100644
--- a/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
+++ b/src/plugins/workflow_designer/src/ActorCfgFilterProxyModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ActorCfgModel.cpp b/src/plugins/workflow_designer/src/ActorCfgModel.cpp
index f2c67c8..3da6e77 100644
--- a/src/plugins/workflow_designer/src/ActorCfgModel.cpp
+++ b/src/plugins/workflow_designer/src/ActorCfgModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ActorCfgModel.h b/src/plugins/workflow_designer/src/ActorCfgModel.h
index 21055f3..7777e43 100644
--- a/src/plugins/workflow_designer/src/ActorCfgModel.h
+++ b/src/plugins/workflow_designer/src/ActorCfgModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/BreakpointManagerView.cpp b/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
index 69f8e35..b0092ce 100644
--- a/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
+++ b/src/plugins/workflow_designer/src/BreakpointManagerView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/BreakpointManagerView.h b/src/plugins/workflow_designer/src/BreakpointManagerView.h
index 807cba9..efa7a76 100644
--- a/src/plugins/workflow_designer/src/BreakpointManagerView.h
+++ b/src/plugins/workflow_designer/src/BreakpointManagerView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ChooseItemDialog.cpp b/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
index 47070fa..a5d2285 100644
--- a/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
+++ b/src/plugins/workflow_designer/src/ChooseItemDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ChooseItemDialog.h b/src/plugins/workflow_designer/src/ChooseItemDialog.h
index 216236d..c1f1cea 100644
--- a/src/plugins/workflow_designer/src/ChooseItemDialog.h
+++ b/src/plugins/workflow_designer/src/ChooseItemDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/CreateScriptWorker.cpp b/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
index 2272c15..b0a3db4 100644
--- a/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
+++ b/src/plugins/workflow_designer/src/CreateScriptWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -358,7 +358,7 @@ private:
CreateScriptElementDialog::CreateScriptElementDialog(QWidget *p, ActorPrototype* proto): QDialog(p), editing(false) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220701");
+ new HelpButton(this, buttonBox, "18223341");
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 8475f14..7d3fc0b 100644
--- a/src/plugins/workflow_designer/src/CreateScriptWorker.h
+++ b/src/plugins/workflow_designer/src/CreateScriptWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/DashboardsManagerDialog.cpp b/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
index 71232e7..8b88592 100644
--- a/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
+++ b/src/plugins/workflow_designer/src/DashboardsManagerDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -45,7 +45,7 @@ DashboardsManagerDialog::DashboardsManagerDialog(ScanDashboardsDirTask *_task, Q
: QDialog(parent), task(_task)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220699");
+ new HelpButton(this, buttonBox, "18223339");
setupList();
diff --git a/src/plugins/workflow_designer/src/DashboardsManagerDialog.h b/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
index a6e737f..3b64520 100644
--- a/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
+++ b/src/plugins/workflow_designer/src/DashboardsManagerDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/EstimationDialog.cpp b/src/plugins/workflow_designer/src/EstimationDialog.cpp
index 77af2df..355f8db 100644
--- a/src/plugins/workflow_designer/src/EstimationDialog.cpp
+++ b/src/plugins/workflow_designer/src/EstimationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/EstimationDialog.h b/src/plugins/workflow_designer/src/EstimationDialog.h
index 1d35992..aaa1b5d 100644
--- a/src/plugins/workflow_designer/src/EstimationDialog.h
+++ b/src/plugins/workflow_designer/src/EstimationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
index 901ce19..f812820 100644
--- a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
+++ b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
index 2b99323..c3f6efc 100644
--- a/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
+++ b/src/plugins/workflow_designer/src/GalaxyConfigConfigurationDialogImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ImportSchemaDialog.cpp b/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
index a2bc1f1..9ba9400 100644
--- a/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
+++ b/src/plugins/workflow_designer/src/ImportSchemaDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@ namespace U2 {
ImportSchemaDialog::ImportSchemaDialog(QWidget* p) : QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220713");
+ new HelpButton(this, buttonBox, "18223353");
}
void ImportSchemaDialog::accept() {
diff --git a/src/plugins/workflow_designer/src/ImportSchemaDialog.h b/src/plugins/workflow_designer/src/ImportSchemaDialog.h
index 53b2838..2cb455a 100644
--- a/src/plugins/workflow_designer/src/ImportSchemaDialog.h
+++ b/src/plugins/workflow_designer/src/ImportSchemaDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/InvestigationDataModel.cpp b/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
index 68c0014..c8a847f 100644
--- a/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
+++ b/src/plugins/workflow_designer/src/InvestigationDataModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/InvestigationDataModel.h b/src/plugins/workflow_designer/src/InvestigationDataModel.h
index 7727432..8ce1a44 100644
--- a/src/plugins/workflow_designer/src/InvestigationDataModel.h
+++ b/src/plugins/workflow_designer/src/InvestigationDataModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ItemViewStyle.cpp b/src/plugins/workflow_designer/src/ItemViewStyle.cpp
index 2c89dbc..e082c2b 100644
--- a/src/plugins/workflow_designer/src/ItemViewStyle.cpp
+++ b/src/plugins/workflow_designer/src/ItemViewStyle.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/ItemViewStyle.h b/src/plugins/workflow_designer/src/ItemViewStyle.h
index 516d1e0..cd58cac 100644
--- a/src/plugins/workflow_designer/src/ItemViewStyle.h
+++ b/src/plugins/workflow_designer/src/ItemViewStyle.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/PortAliasesConfigurationDialog.cpp b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
index b89e966..46860f8 100644
--- a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
+++ b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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, "18220713");
+ new HelpButton(this, buttonBox, "18223353");
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 e3b0b8e..01b5573 100644
--- a/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h
+++ b/src/plugins/workflow_designer/src/PortAliasesConfigurationDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/SampleActionsManager.cpp b/src/plugins/workflow_designer/src/SampleActionsManager.cpp
index 31aad09..f07fdab 100644
--- a/src/plugins/workflow_designer/src/SampleActionsManager.cpp
+++ b/src/plugins/workflow_designer/src/SampleActionsManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/SampleActionsManager.h b/src/plugins/workflow_designer/src/SampleActionsManager.h
index aab8636..db3fe5d 100644
--- a/src/plugins/workflow_designer/src/SampleActionsManager.h
+++ b/src/plugins/workflow_designer/src/SampleActionsManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/SceneSerializer.cpp b/src/plugins/workflow_designer/src/SceneSerializer.cpp
index 7823824..28b7d97 100644
--- a/src/plugins/workflow_designer/src/SceneSerializer.cpp
+++ b/src/plugins/workflow_designer/src/SceneSerializer.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/SceneSerializer.h b/src/plugins/workflow_designer/src/SceneSerializer.h
index 1c0f433..8b84df8 100644
--- a/src/plugins/workflow_designer/src/SceneSerializer.h
+++ b/src/plugins/workflow_designer/src/SceneSerializer.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
index ed55b33..8c6c20a 100644
--- a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
+++ b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ namespace Workflow {
SchemaAliasesConfigurationDialogImpl::SchemaAliasesConfigurationDialogImpl( const Schema & schema, QWidget * p )
: QDialog(p), procNameMaxSz(0) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220713");
+ new HelpButton(this, buttonBox, "18223353");
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 3ad7edb..1d1ab6e 100644
--- a/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h
+++ b/src/plugins/workflow_designer/src/SchemaAliasesConfigurationDialogImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/StartupDialog.cpp b/src/plugins/workflow_designer/src/StartupDialog.cpp
index 46814fc..c859627 100644
--- a/src/plugins/workflow_designer/src/StartupDialog.cpp
+++ b/src/plugins/workflow_designer/src/StartupDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@ StartupDialog::StartupDialog(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220670");
+ new HelpButton(this, buttonBox, "18223310");
label->setStyleSheet(L10N::infoHintStyleSheet());
diff --git a/src/plugins/workflow_designer/src/StartupDialog.h b/src/plugins/workflow_designer/src/StartupDialog.h
index 701d672..4c7d899 100644
--- a/src/plugins/workflow_designer/src/StartupDialog.h
+++ b/src/plugins/workflow_designer/src/StartupDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/TableViewTabKey.cpp b/src/plugins/workflow_designer/src/TableViewTabKey.cpp
index e221a2c..d48af3f 100644
--- a/src/plugins/workflow_designer/src/TableViewTabKey.cpp
+++ b/src/plugins/workflow_designer/src/TableViewTabKey.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/TableViewTabKey.h b/src/plugins/workflow_designer/src/TableViewTabKey.h
index 7366aa2..1a70b53 100644
--- a/src/plugins/workflow_designer/src/TableViewTabKey.h
+++ b/src/plugins/workflow_designer/src/TableViewTabKey.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowDesignerPlugin.cpp b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
index 7b78a37..85a0575 100644
--- a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowDesignerPlugin.h b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
index 8c96284..8b0959a 100644
--- a/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
+++ b/src/plugins/workflow_designer/src/WorkflowDesignerPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowDocument.cpp b/src/plugins/workflow_designer/src/WorkflowDocument.cpp
index ce3026d..cac8a61 100644
--- a/src/plugins/workflow_designer/src/WorkflowDocument.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowDocument.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowDocument.h b/src/plugins/workflow_designer/src/WorkflowDocument.h
index ad1d28e..2a7f215 100644
--- a/src/plugins/workflow_designer/src/WorkflowDocument.h
+++ b/src/plugins/workflow_designer/src/WorkflowDocument.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowEditor.cpp b/src/plugins/workflow_designer/src/WorkflowEditor.cpp
index a663274..db6d1c7 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditor.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowEditor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowEditor.h b/src/plugins/workflow_designer/src/WorkflowEditor.h
index 626d36a..84f6d54 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditor.h
+++ b/src/plugins/workflow_designer/src/WorkflowEditor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowEditorDelegates.cpp b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
index ed321ed..e953777 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowEditorDelegates.h b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
index 356e673..7957fdb 100644
--- a/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
+++ b/src/plugins/workflow_designer/src/WorkflowEditorDelegates.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
index 0c252c8..8f47f43 100644
--- a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowInvestigationWidgetsController.h b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
index 1914281..09cfe11 100644
--- a/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
+++ b/src/plugins/workflow_designer/src/WorkflowInvestigationWidgetsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowMetaDialog.cpp b/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
index 23dfc1d..f3482de 100644
--- a/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowMetaDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ WorkflowMetaDialog::WorkflowMetaDialog(QWidget * p, const Metadata& meta)
meta(meta),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220692");
+ new HelpButton(this, buttonBox, "18223332");
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 661252a..9e7371d 100644
--- a/src/plugins/workflow_designer/src/WorkflowMetaDialog.h
+++ b/src/plugins/workflow_designer/src/WorkflowMetaDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowPalette.cpp b/src/plugins/workflow_designer/src/WorkflowPalette.cpp
index a319214..fb398b1 100644
--- a/src/plugins/workflow_designer/src/WorkflowPalette.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowPalette.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowPalette.h b/src/plugins/workflow_designer/src/WorkflowPalette.h
index c3fb64b..007e00a 100644
--- a/src/plugins/workflow_designer/src/WorkflowPalette.h
+++ b/src/plugins/workflow_designer/src/WorkflowPalette.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowSamples.cpp b/src/plugins/workflow_designer/src/WorkflowSamples.cpp
index 7c332dd..29065ae 100644
--- a/src/plugins/workflow_designer/src/WorkflowSamples.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSamples.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowSamples.h b/src/plugins/workflow_designer/src/WorkflowSamples.h
index 83eec7c..af23979 100644
--- a/src/plugins/workflow_designer/src/WorkflowSamples.h
+++ b/src/plugins/workflow_designer/src/WorkflowSamples.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowSceneIOTasks.cpp b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
index a8030eb..e3d469b 100644
--- a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowSceneIOTasks.h b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
index 5af62f0..ce7daad 100644
--- a/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
+++ b/src/plugins/workflow_designer/src/WorkflowSceneIOTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowSettingsController.cpp b/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
index 42d2eab..89f6b78 100644
--- a/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowSettingsController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -75,7 +75,7 @@ AppSettingsGUIPageWidget* WorkflowSettingsPageController::createWidget(AppSettin
return r;
}
-const QString WorkflowSettingsPageController::helpPageId = QString("18220311");
+const QString WorkflowSettingsPageController::helpPageId = QString("18222951");
WorkflowSettingsPageWidget::WorkflowSettingsPageWidget(WorkflowSettingsPageController* ) {
setupUi(this);
diff --git a/src/plugins/workflow_designer/src/WorkflowSettingsController.h b/src/plugins/workflow_designer/src/WorkflowSettingsController.h
index 3380734..0d1ce0b 100644
--- a/src/plugins/workflow_designer/src/WorkflowSettingsController.h
+++ b/src/plugins/workflow_designer/src/WorkflowSettingsController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowTabView.cpp b/src/plugins/workflow_designer/src/WorkflowTabView.cpp
index 00f00a1..6f5a29e 100644
--- a/src/plugins/workflow_designer/src/WorkflowTabView.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowTabView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowTabView.h b/src/plugins/workflow_designer/src/WorkflowTabView.h
index c8fde95..c20f959 100644
--- a/src/plugins/workflow_designer/src/WorkflowTabView.h
+++ b/src/plugins/workflow_designer/src/WorkflowTabView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowViewController.cpp b/src/plugins/workflow_designer/src/WorkflowViewController.cpp
index 31fdbf2..6b43abd 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewController.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowViewController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowViewController.h b/src/plugins/workflow_designer/src/WorkflowViewController.h
index 54cacd9..542dd9f 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewController.h
+++ b/src/plugins/workflow_designer/src/WorkflowViewController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowViewItems.cpp b/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
index 086eba9..6fb857e 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
+++ b/src/plugins/workflow_designer/src/WorkflowViewItems.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/WorkflowViewItems.h b/src/plugins/workflow_designer/src/WorkflowViewItems.h
index 8523581..f093675 100644
--- a/src/plugins/workflow_designer/src/WorkflowViewItems.h
+++ b/src/plugins/workflow_designer/src/WorkflowViewItems.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/cmdline/GalaxyConfigTask.cpp b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
index 421536d..77201a7 100644
--- a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
+++ b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/cmdline/GalaxyConfigTask.h b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
index a361fc1..f26c626 100644
--- a/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
+++ b/src/plugins/workflow_designer/src/cmdline/GalaxyConfigTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
index 5dcdf45..ea67549 100644
--- a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
+++ b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
index 00ca863..d8f4c50 100644
--- a/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
+++ b/src/plugins/workflow_designer/src/cmdline/WorkflowCMDLineTasks.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
index 50e8d71..df658de 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
index 4f381ef..5ee165c 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AnnotationsMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
index 021a807..23d1200 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
index 4e8706c..7f62f22 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/AssemblyMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
index a03df22..6013cc8 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
index a040445..71c807b 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/BaseMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
index 7554250..7efadef 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
index 42b780d..d818b08 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/MultipleAlignmentMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
index 5f0b595..5d5a67c 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
index b0cd067..5150df6 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/SequenceMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
index 1d54967..aebbf73 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
index 4992ee4..711f360 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/VariationTrackMessageTranslator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
index 5bf7b9b..a5d351d 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
index c751104..351db33 100644
--- a/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
+++ b/src/plugins/workflow_designer/src/debug_messages_translation/WorkflowDebugMessageParserImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/AlignToReferenceWorker.cpp b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
index a6e257e..7d5bf27 100644
--- a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/workflow_designer/src/library/AlignToReferenceWorker.h b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
index c8ec9b6..dd8a96f 100644
--- a/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/AlignToReferenceWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/workflow_designer/src/library/AminoTranslationWorker.h b/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
index 72c26fd..6e8b99c 100644
--- a/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
+++ b/src/plugins/workflow_designer/src/library/AminoTranslationWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/workflow_designer/src/library/AssemblyToSequenceWorker.cpp b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
index 9120661..45ba0ce 100644
--- a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/AssemblyToSequenceWorker.h b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
index 0dc2e17..446a432 100644
--- a/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/AssemblyToSequenceWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/BaseDocWriter.cpp b/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
index 811c4f8..8b705ed 100644
--- a/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
+++ b/src/plugins/workflow_designer/src/library/BaseDocWriter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/BaseDocWriter.h b/src/plugins/workflow_designer/src/library/BaseDocWriter.h
index 0995786..00e1eb8 100644
--- a/src/plugins/workflow_designer/src/library/BaseDocWriter.h
+++ b/src/plugins/workflow_designer/src/library/BaseDocWriter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CDSearchWorker.cpp b/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
index 71cbb4c..f4ac4e7 100644
--- a/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/CDSearchWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CDSearchWorker.h b/src/plugins/workflow_designer/src/library/CDSearchWorker.h
index 2b29e8e..f56aab9 100644
--- a/src/plugins/workflow_designer/src/library/CDSearchWorker.h
+++ b/src/plugins/workflow_designer/src/library/CDSearchWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CfgExternalToolModel.cpp b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
index 39119a0..f67dd89 100644
--- a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
+++ b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CfgExternalToolModel.h b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
index 147cbfb..638b1c3 100644
--- a/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
+++ b/src/plugins/workflow_designer/src/library/CfgExternalToolModel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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/workflow_designer/src/library/ConvertFilesFormatWorker.cpp b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
index c5c7af5..690a9c3 100644
--- a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ConvertFilesFormatWorker.h b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
index 9196a01..2230b2d 100644
--- a/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
+++ b/src/plugins/workflow_designer/src/library/ConvertFilesFormatWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp
index 7054092..96d7fab 100644
--- a/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.h
index 23741e3..6777a13 100644
--- a/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/ConvertSnpeffVariationsToAnnotationsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CoreLib.cpp b/src/plugins/workflow_designer/src/library/CoreLib.cpp
index e297095..327211b 100644
--- a/src/plugins/workflow_designer/src/library/CoreLib.cpp
+++ b/src/plugins/workflow_designer/src/library/CoreLib.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CoreLib.h b/src/plugins/workflow_designer/src/library/CoreLib.h
index ed0d4b5..f7998bc 100644
--- a/src/plugins/workflow_designer/src/library/CoreLib.h
+++ b/src/plugins/workflow_designer/src/library/CoreLib.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CreateExternalProcessDialog.cpp b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
index a61d304..56fbe1e 100644
--- a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
+++ b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/CreateExternalProcessDialog.h b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
index d57499b..e9c6eb1 100644
--- a/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
+++ b/src/plugins/workflow_designer/src/library/CreateExternalProcessDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/DocActors.cpp b/src/plugins/workflow_designer/src/library/DocActors.cpp
index cf0c302..ecbdb8a 100644
--- a/src/plugins/workflow_designer/src/library/DocActors.cpp
+++ b/src/plugins/workflow_designer/src/library/DocActors.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/DocActors.h b/src/plugins/workflow_designer/src/library/DocActors.h
index cd10fe1..dca062e 100644
--- a/src/plugins/workflow_designer/src/library/DocActors.h
+++ b/src/plugins/workflow_designer/src/library/DocActors.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/DocWorkers.cpp b/src/plugins/workflow_designer/src/library/DocWorkers.cpp
index 26251af..fdac6ce 100644
--- a/src/plugins/workflow_designer/src/library/DocWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/DocWorkers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/DocWorkers.h b/src/plugins/workflow_designer/src/library/DocWorkers.h
index b1d74a8..e10d585 100644
--- a/src/plugins/workflow_designer/src/library/DocWorkers.h
+++ b/src/plugins/workflow_designer/src/library/DocWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExternalProcessWorker.cpp b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
index 6cec366..58dcc57 100644
--- a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExternalProcessWorker.h b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
index 721b34c..219f3fc 100644
--- a/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExternalProcessWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
index 92c27f0..5746aaf 100644
--- a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
index a39a89d..9c6ee8b 100644
--- a/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractAssemblyCoverageWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractConsensusWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
index 7423568..3188268 100644
--- a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractConsensusWorker.h b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
index 4d2eeb3..b3792f6 100644
--- a/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractConsensusWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
index 1f3647d..876f936 100644
--- a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ExtractMSAConsensusWorker.h b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
index e9c6db5..e9091bd 100644
--- a/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
+++ b/src/plugins/workflow_designer/src/library/ExtractMSAConsensusWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FASTQWorkersLibrary.cpp b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
index 3c454c3..af2469b 100644
--- a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
+++ b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FASTQWorkersLibrary.h b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
index e10ddcb..71205da 100644
--- a/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
+++ b/src/plugins/workflow_designer/src/library/FASTQWorkersLibrary.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
index 1353b49..b1f17f8 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
index b492a59..9e6b564 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsByQualifierWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
index e67efdc..dc90016 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
index 4986e00..c1c2181 100644
--- a/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterAnnotationsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterBamWorker.cpp b/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
index dce2aee..b0b1bd8 100644
--- a/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FilterBamWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FilterBamWorker.h b/src/plugins/workflow_designer/src/library/FilterBamWorker.h
index c3c77ec..a3c2b49 100644
--- a/src/plugins/workflow_designer/src/library/FilterBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/FilterBamWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FindWorker.cpp b/src/plugins/workflow_designer/src/library/FindWorker.cpp
index a566c4b..99160f1 100644
--- a/src/plugins/workflow_designer/src/library/FindWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/FindWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/FindWorker.h b/src/plugins/workflow_designer/src/library/FindWorker.h
index 3630179..d616b1c 100644
--- a/src/plugins/workflow_designer/src/library/FindWorker.h
+++ b/src/plugins/workflow_designer/src/library/FindWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GenericReadActor.cpp b/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
index 9975867..77de0dd 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
+++ b/src/plugins/workflow_designer/src/library/GenericReadActor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GenericReadActor.h b/src/plugins/workflow_designer/src/library/GenericReadActor.h
index 63d99c8..471feca 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadActor.h
+++ b/src/plugins/workflow_designer/src/library/GenericReadActor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GenericReadWorker.cpp b/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
index 62c8688..c3c8f4c 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GenericReadWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GenericReadWorker.h b/src/plugins/workflow_designer/src/library/GenericReadWorker.h
index 2b51fa3..fabe06e 100644
--- a/src/plugins/workflow_designer/src/library/GenericReadWorker.h
+++ b/src/plugins/workflow_designer/src/library/GenericReadWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GetFileListWorker.cpp b/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
index a0efa7f..ca9585f 100644
--- a/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GetFileListWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GetFileListWorker.h b/src/plugins/workflow_designer/src/library/GetFileListWorker.h
index 0398155..7170e41 100644
--- a/src/plugins/workflow_designer/src/library/GetFileListWorker.h
+++ b/src/plugins/workflow_designer/src/library/GetFileListWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GroupWorker.cpp b/src/plugins/workflow_designer/src/library/GroupWorker.cpp
index 73cf962..7dbf152 100644
--- a/src/plugins/workflow_designer/src/library/GroupWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/GroupWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/GroupWorker.h b/src/plugins/workflow_designer/src/library/GroupWorker.h
index a559c78..27ff37c 100644
--- a/src/plugins/workflow_designer/src/library/GroupWorker.h
+++ b/src/plugins/workflow_designer/src/library/GroupWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ImportAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
index ac3429b..b19b355 100644
--- a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ImportAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
index d7a8717..4bab309 100644
--- a/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/ImportAnnotationsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
index af51acd..a799027 100644
--- a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
+++ b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/IncludedProtoFactoryImpl.h b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
index f2c96b5..54318f5 100644
--- a/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
+++ b/src/plugins/workflow_designer/src/library/IncludedProtoFactoryImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MSA2SequenceWorker.cpp b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
index 65e9ea2..073c030 100644
--- a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MSA2SequenceWorker.h b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
index a0a918a..cc4bd21 100644
--- a/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/MSA2SequenceWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MarkSequenceWorker.cpp b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
index e861639..5df514e 100644
--- a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MarkSequenceWorker.h b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
index 125ad21..6c73364 100644
--- a/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/MarkSequenceWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MergeBamWorker.cpp b/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
index ec33aac..7241f0d 100644
--- a/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MergeBamWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MergeBamWorker.h b/src/plugins/workflow_designer/src/library/MergeBamWorker.h
index 005f99e..935d0ef 100644
--- a/src/plugins/workflow_designer/src/library/MergeBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/MergeBamWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MultiplexerWorker.cpp b/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
index 34cca77..4e3a800 100644
--- a/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/MultiplexerWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/MultiplexerWorker.h b/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
index 8eaeaa3..ea9eb5c 100644
--- a/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
+++ b/src/plugins/workflow_designer/src/library/MultiplexerWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/PassFilterWorker.cpp b/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
index f265286..e2ea501 100644
--- a/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/PassFilterWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/PassFilterWorker.h b/src/plugins/workflow_designer/src/library/PassFilterWorker.h
index 1f22a28..6e79f4a 100644
--- a/src/plugins/workflow_designer/src/library/PassFilterWorker.h
+++ b/src/plugins/workflow_designer/src/library/PassFilterWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ReadAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
index 3a510e1..e1cf778 100644
--- a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,6 +52,11 @@ namespace U2 {
namespace LocalWorkflow {
const QString ReadAnnotationsWorkerFactory::ACTOR_ID("read-annotations");
+namespace {
+const QString MODE_ATTR("mode");
+const QString ANN_TABLE_NAME_ATTR("ann-table-name");
+const QString ANN_TABLE_DEFAULT_NAME("Unknown features");
+}
/************************************************************************/
/* Worker */
@@ -64,7 +69,7 @@ ReadAnnotationsWorker::ReadAnnotationsWorker(Actor *p)
void ReadAnnotationsWorker::init() {
GenericDocReader::init();
- mode = ReadAnnotationsProto::Mode(getValue<int>(ReadAnnotationsProto::MODE_ATTR));
+ mode = ReadAnnotationsProto::Mode(getValue<int>(MODE_ATTR));
IntegralBus *outBus = dynamic_cast<IntegralBus*>(ch);
assert(outBus);
mtype = outBus->getBusType();
@@ -72,7 +77,8 @@ void ReadAnnotationsWorker::init() {
Task * ReadAnnotationsWorker::createReadTask(const QString &url, const QString &datasetName) {
bool mergeAnnotations = (mode != ReadAnnotationsProto::SPLIT);
- return new ReadAnnotationsTask(url, datasetName, context, mergeAnnotations);
+ return new ReadAnnotationsTask(url, datasetName, context, mergeAnnotations,
+ mergeAnnotations ? getValue<QString>(ANN_TABLE_NAME_ATTR) : "");
}
QString ReadAnnotationsWorker::addReadDbObjectToData(const QString &objUrl, QVariantMap &data) {
@@ -94,14 +100,13 @@ void ReadAnnotationsWorker::onTaskFinished(Task *task) {
void ReadAnnotationsWorker::sl_datasetEnded() {
CHECK(datasetData.size() > 0,);
- QList<SharedDbiDataHandler> annTableIds;
QList<SharedAnnotationData> anns;
foreach (const QVariantMap &m, datasetData) {
const QVariant annsVar = m[BaseSlots::ANNOTATION_TABLE_SLOT().getId()];
anns << StorageUtils::getAnnotationTable(context->getDataStorage(), annsVar);
}
- const SharedDbiDataHandler resultTableId = context->getDataStorage()->putAnnotationTable(anns);
+ const SharedDbiDataHandler resultTableId = context->getDataStorage()->putAnnotationTable(anns, getValue<QString>(ANN_TABLE_NAME_ATTR));
QVariantMap m;
m[BaseSlots::ANNOTATION_TABLE_SLOT().getId()] = qVariantFromValue<SharedDbiDataHandler>(resultTableId);
@@ -124,7 +129,6 @@ void ReadAnnotationsWorker::sendData(const QList<QVariantMap> &data) {
/************************************************************************/
/* Factory */
/************************************************************************/
-const QString ReadAnnotationsProto::MODE_ATTR("mode");
ReadAnnotationsProto::ReadAnnotationsProto()
: GenericReadDocProto(ReadAnnotationsWorkerFactory::ACTOR_ID)
{
@@ -147,20 +151,26 @@ ReadAnnotationsProto::ReadAnnotationsProto()
ports << new PortDescriptor(outDesc, outTypeSet, false, true);
}
- Descriptor md(ReadAnnotationsProto::MODE_ATTR, ReadAnnotationsWorker::tr("Mode"),
- ReadAnnotationsWorker::tr("If the file contains more than one annotation table, <i>Split</i> mode sends them \"as is\" to the output, "
- "while <i>Merge</i> appends all the annotation tables and outputs the sole merged annotation table."
- "In <i>Merge files</i> is the same as <i>Merge</i> but it operates with all annotation tables from all files of one dataset."));
+ Descriptor md(MODE_ATTR, ReadAnnotationsWorker::tr("Mode"),
+ ReadAnnotationsWorker::tr("<ul>"
+ "<li><i>\"Separate\"</i> mode keeps the tables as they are;</li>"
+ "<li><i>\"Merge from file\"</i> unites annotation tables from one file into one annotations table;</li>"
+ "<li><i>\"Merge from dataset\"</i> unites all annotation tables from all files from dataset;</li>"
+ "</ul>"));
+ attrs << new Attribute(md, BaseTypes::NUM_TYPE(), true, SPLIT);
+ Descriptor annTableNameDesc(ANN_TABLE_NAME_ATTR, ReadAnnotationsWorker::tr("Annotation table name"),
+ ReadAnnotationsWorker::tr("The name for the result annotation table that contains merged annotation data from file or dataset."));
+ Attribute *objNameAttr = new Attribute(annTableNameDesc, BaseTypes::STRING_TYPE(), false, ANN_TABLE_DEFAULT_NAME);
+ objNameAttr->addRelation(new VisibilityRelation(MODE_ATTR, QVariantList() << MERGE << MERGE_FILES));
- attrs << new Attribute(md, BaseTypes::NUM_TYPE(), true, MERGE);
+ attrs << objNameAttr;
- QMap<QString, PropertyDelegate*> delegates;
{
QVariantMap modeMap;
- QString splitStr = ReadAnnotationsWorker::tr("Split");
- QString mergeStr = ReadAnnotationsWorker::tr("Merge");
- QString mergeFilesStr = ReadAnnotationsWorker::tr("Merge files");
+ QString splitStr = ReadAnnotationsWorker::tr("Separate annotation tables");
+ QString mergeStr = ReadAnnotationsWorker::tr("Merge annotation tables from file");
+ QString mergeFilesStr = ReadAnnotationsWorker::tr("Merge all annotation tables from dataset");
modeMap[splitStr] = SPLIT;
modeMap[mergeStr] = MERGE;
modeMap[mergeFilesStr] = MERGE_FILES;
@@ -187,18 +197,18 @@ Worker * ReadAnnotationsWorkerFactory::createWorker(Actor *a) {
/************************************************************************/
/* Task */
/************************************************************************/
-ReadAnnotationsTask::ReadAnnotationsTask(const QString &_url, const QString &_datasetName,
- WorkflowContext *_context, bool _mergeAnnotations)
- : Task(tr("Read annotations from %1").arg(_url), TaskFlag_None), url(_url),
- datasetName(_datasetName), mergeAnnotations(_mergeAnnotations), context(_context)
+ReadAnnotationsTask::ReadAnnotationsTask(const QString &url, const QString &datasetName, WorkflowContext *context,
+ bool mergeAnnotations, const QString& mergedAnnTableName)
+ : Task(tr("Read annotations from %1").arg(url), TaskFlag_None),
+ url(url),
+ datasetName(datasetName),
+ mergeAnnotations(mergeAnnotations),
+ mergedAnnTableName(mergedAnnTableName),
+ context(context)
{
SAFE_POINT(NULL != context, "Invalid workflow context encountered!",);
}
-const QString & ReadAnnotationsTask::getDatasetName() const {
- return datasetName;
-}
-
void ReadAnnotationsTask::prepare() {
int memUseMB = 0;
QFileInfo file(url);
@@ -263,7 +273,7 @@ void ReadAnnotationsTask::run() {
}
if (mergeAnnotations && annsObjList.size() > 1) {
- const SharedDbiDataHandler tableId = context->getDataStorage()->putAnnotationTable(dataList);
+ const SharedDbiDataHandler tableId = context->getDataStorage()->putAnnotationTable(dataList, mergedAnnTableName);
m[BaseSlots::ANNOTATION_TABLE_SLOT().getId()] = qVariantFromValue<SharedDbiDataHandler>(tableId);
results.append(m);
}
diff --git a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
index f19e6b9..97df956 100644
--- a/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadAnnotationsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -35,7 +35,6 @@ public:
MERGE,
MERGE_FILES
};
- static const QString MODE_ATTR;
ReadAnnotationsProto();
}; // ReadAnnotationsProto
@@ -77,18 +76,18 @@ class ReadAnnotationsTask : public Task {
Q_OBJECT
public:
ReadAnnotationsTask(const QString &url, const QString &datasetName, WorkflowContext *context,
- bool mergeAnnotations);
+ bool mergeAnnotations, const QString& mergedAnnTableName = QString());
virtual void prepare();
virtual void run();
virtual void cleanup();
QList<QVariantMap> takeResults();
- const QString & getDatasetName() const;
private:
QString url;
QString datasetName;
bool mergeAnnotations;
+ QString mergedAnnTableName;
WorkflowContext *context;
QList<QVariantMap> results;
diff --git a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
index a697ebb..f6eaaa0 100644
--- a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ReadAssemblyWorker.h b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
index 12502e0..15a7333 100644
--- a/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadAssemblyWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ReadVariationWorker.cpp b/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
index 4bc1290..856c6c9 100644
--- a/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ReadVariationWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ReadVariationWorker.h b/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
index 9eec4ba..76b0730 100644
--- a/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/ReadVariationWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RemoteDBFetcherWorker.cpp b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
index 8eed64a..948acef 100644
--- a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RemoteDBFetcherWorker.h b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
index 0b1c38b..f451756 100644
--- a/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
+++ b/src/plugins/workflow_designer/src/library/RemoteDBFetcherWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
index dd6d1e9..dfd7b54 100644
--- a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RenameChromosomeInVariationWorker.h b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
index 4455ae5..fc7b89f 100644
--- a/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/RenameChromosomeInVariationWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RmdupBamWorker.cpp b/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
index 5277276..5df33e3 100644
--- a/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/RmdupBamWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/RmdupBamWorker.h b/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
index 508c61b..4be163a 100644
--- a/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/RmdupBamWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SchemaWorker.cpp b/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
index d00d548..ac7e05e 100644
--- a/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SchemaWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SchemaWorker.h b/src/plugins/workflow_designer/src/library/SchemaWorker.h
index 9b63a14..93432c1 100644
--- a/src/plugins/workflow_designer/src/library/SchemaWorker.h
+++ b/src/plugins/workflow_designer/src/library/SchemaWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ScriptWorker.cpp b/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
index c18a1b2..4751204 100644
--- a/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/ScriptWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/ScriptWorker.h b/src/plugins/workflow_designer/src/library/ScriptWorker.h
index 8ac17cd..8522469 100644
--- a/src/plugins/workflow_designer/src/library/ScriptWorker.h
+++ b/src/plugins/workflow_designer/src/library/ScriptWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SequenceSplitWorker.cpp b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
index d0e8d19..e2aa372 100644
--- a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SequenceSplitWorker.h b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
index f795ab8..d8f54d7 100644
--- a/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
+++ b/src/plugins/workflow_designer/src/library/SequenceSplitWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SequencesToMSAWorker.cpp b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
index f2654b1..7f8cb3e 100644
--- a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SequencesToMSAWorker.h b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
index 16071b5..260aebd 100644
--- a/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
+++ b/src/plugins/workflow_designer/src/library/SequencesToMSAWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SortBamWorker.cpp b/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
index 8a5f098..0cffc7a 100644
--- a/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/SortBamWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/SortBamWorker.h b/src/plugins/workflow_designer/src/library/SortBamWorker.h
index 9f9a0dd..97e682d 100644
--- a/src/plugins/workflow_designer/src/library/SortBamWorker.h
+++ b/src/plugins/workflow_designer/src/library/SortBamWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/StatisticWorkers.cpp b/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
index b0d7a66..d13252a 100644
--- a/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/StatisticWorkers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/StatisticWorkers.h b/src/plugins/workflow_designer/src/library/StatisticWorkers.h
index ef79cec..fecef65 100644
--- a/src/plugins/workflow_designer/src/library/StatisticWorkers.h
+++ b/src/plugins/workflow_designer/src/library/StatisticWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/Text2SequenceWorker.cpp b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
index c9429d7..bec2a8a 100644
--- a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/Text2SequenceWorker.h b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
index bd75ef7..31cd441 100644
--- a/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
+++ b/src/plugins/workflow_designer/src/library/Text2SequenceWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/WriteAnnotationsWorker.cpp b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
index 162a141..7edfbc1 100644
--- a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -63,12 +63,14 @@ const QString WriteAnnotationsWorkerFactory::ACTOR_ID("write-annotations");
static const QString WRITE_ANNOTATIONS_IN_TYPE_ID("write-annotations-in-type");
static const QString CSV_FORMAT_ID("csv");
-static const QString ANNOTATIONS_NAME("annotations-name");
-static const QString ANN_OBJ_NAME("ann-obj-name");
+static const QString ANN_TABLE_NAME_4_LOCAL_ST("annotations-name");
+static const QString ANN_TABLE_NAME_4_SHARED_ST("ann-obj-name");
static const QString ANNOTATIONS_NAME_DEF_VAL("Unknown features");
static const QString SEPARATOR("separator");
static const QString SEPARATOR_DEFAULT_VALUE (",");
static const QString WRITE_NAMES("write_names");
+static const QString MERGE_TABLES_LOCAL("merge");
+static const QString MERGE_TABLES_SHARED("merge_in_shared_db");
/*******************************
* WriteAnnotationsWorker
@@ -117,15 +119,14 @@ Task * WriteAnnotationsWorker::takeParameters(QString &formatId, SaveDocFlags &f
return NULL;
}
-void WriteAnnotationsWorker::updateResultPath(int metadataId, const QString &formatId, DataStorage storage, QString &resultPath) {
+void WriteAnnotationsWorker::updateResultPath(int metadataId, const QString &formatId, DataStorage storage, QString &resultPath, bool byDataset) {
CHECK(LocalFs == storage, );
CHECK(resultPath.isEmpty(), );
MessageMetadata metadata = context->getMetadataStorage().get(metadataId);
- bool groupByDatasets = false;
QString suffix = getValue<QString>(BaseAttributes::URL_SUFFIX().getId());
QString defaultName = actor->getId() + "_output";
- resultPath = BaseDocWriter::generateUrl(metadata, groupByDatasets, suffix, getExtension(formatId), defaultName);
+ resultPath = BaseDocWriter::generateUrl(metadata, byDataset, suffix, getExtension(formatId), defaultName);
}
Task * WriteAnnotationsWorker::tick() {
@@ -138,6 +139,7 @@ Task * WriteAnnotationsWorker::tick() {
Task *failTask = takeParameters(formatId, fl, resultPath, dstDbiRef, storage);
CHECK(NULL == failTask, failTask);
+ bool merge = getValue<bool>(MERGE_TABLES_LOCAL);
while(annotationsPort->hasMessage()) {
Message inputMessage = getMessageAndSetupScriptValues(annotationsPort);
if (inputMessage.isEmpty()) {
@@ -147,7 +149,7 @@ Task * WriteAnnotationsWorker::tick() {
if (LocalFs == storage) {
resultPath = resultPath.isEmpty() ? qm.value(BaseSlots::URL_SLOT().getId()).value<QString>() : resultPath;
- updateResultPath(inputMessage.getMetadataId(), formatId, storage, resultPath);
+ updateResultPath(inputMessage.getMetadataId(), formatId, storage, resultPath, merge);
CHECK(!resultPath.isEmpty(), new FailTask(tr("Unspecified URL to write")));
resultPath = context->absolutePath(resultPath);
}
@@ -178,14 +180,28 @@ QString WriteAnnotationsWorker::fetchIncomingSequenceName(const QVariantMap &inc
return seqObj.isNull() ? QString() : seqObj->getSequenceName();
}
-QString WriteAnnotationsWorker::getAnnotationName() const {
+bool WriteAnnotationsWorker::getMergeAttribute() const {
+ const QString storageStr = getValue<QString>(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId());
+
+ bool merge = false;
+ if (BaseAttributes::LOCAL_FS_DATA_STORAGE() == storageStr) {
+ merge = getValue<bool>(MERGE_TABLES_LOCAL);
+ } else if (BaseAttributes::SHARED_DB_DATA_STORAGE() == storageStr) {
+ merge = getValue<bool>(MERGE_TABLES_SHARED);
+ } else {
+ FAIL("Invalid worker data storage attribute", false);
+ }
+ return merge;
+}
+
+QString WriteAnnotationsWorker::getAnnotationTableName() const {
const QString storageStr = getValue<QString>(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId());
QString objName;
if (BaseAttributes::LOCAL_FS_DATA_STORAGE() == storageStr) {
- objName = getValue<QString>(ANNOTATIONS_NAME);
+ objName = getValue<QString>(ANN_TABLE_NAME_4_LOCAL_ST);
} else if (BaseAttributes::SHARED_DB_DATA_STORAGE() == storageStr) {
- objName = getValue<QString>(ANN_OBJ_NAME);
+ objName = getValue<QString>(ANN_TABLE_NAME_4_SHARED_ST);
} else {
FAIL("Invalid worker data storage attribute", ANNOTATIONS_NAME_DEF_VAL);
}
@@ -200,14 +216,6 @@ QString WriteAnnotationsWorker::getAnnotationName() const {
void WriteAnnotationsWorker::fetchIncomingAnnotations(const QVariantMap &incomingData, const QString &resultPath) {
const QVariant annVar = incomingData[BaseSlots::ANNOTATION_TABLE_SLOT().getId()];
QList<AnnotationTableObject *> annTables = StorageUtils::getAnnotationTableObjects(context->getDataStorage(), annVar);
-
- if (shouldAnnotationTablesBeMerged() && annTables.size() > 1) {
- AnnotationTableObject *mergedTable = mergeAnnotationTables(annTables, getAnnotationName());
- qDeleteAll(annTables);
- annTables.clear();
- annTables << mergedTable;
- }
-
annotationsByUrl[resultPath] << annTables;
const QString seqObjName = fetchIncomingSequenceName(incomingData);
@@ -224,11 +232,15 @@ void WriteAnnotationsWorker::fetchIncomingAnnotations(const QVariantMap &incomin
}
}
-bool WriteAnnotationsWorker::shouldAnnotationTablesBeMerged() const {
- return actor->isAttributeVisible(actor->getParameter(ANNOTATIONS_NAME)) || actor->isAttributeVisible(actor->getParameter(ANN_OBJ_NAME));
-}
-AnnotationTableObject * WriteAnnotationsWorker::mergeAnnotationTables(const QList<AnnotationTableObject *> &annTables, const QString &mergedTableName) const {
+void WriteAnnotationsWorker::mergeAnnTablesIfNecessary(QList<AnnotationTableObject *> &annTables) const {
+ CHECK(getMergeAttribute() == true, );
+ QString mergedTableName = getAnnotationTableName();
+ if (annTables.size() == 1) {
+ annTables.first()->setGObjectName(mergedTableName);
+ return;
+ }
+
AnnotationTableObject *mergedTable = new AnnotationTableObject(mergedTableName, context->getDataStorage()->getDbiRef());
foreach (AnnotationTableObject *annTable, annTables) {
QList<SharedAnnotationData> anns;
@@ -237,7 +249,10 @@ AnnotationTableObject * WriteAnnotationsWorker::mergeAnnotationTables(const QLis
}
mergedTable->addAnnotations(anns);
}
- return mergedTable;
+
+ qDeleteAll(annTables);
+ annTables.clear();
+ annTables << mergedTable;
}
Task * WriteAnnotationsWorker::createWriteMultitask(const QList<Task *> &taskList) const {
@@ -253,7 +268,9 @@ Task * WriteAnnotationsWorker::createWriteMultitask(const QList<Task *> &taskLis
Task * WriteAnnotationsWorker::getSaveObjTask(const U2DbiRef &dstDbiRef) const {
QList<Task *> taskList;
foreach (const QString &path, annotationsByUrl.keys()) {
- foreach (AnnotationTableObject *annTable, annotationsByUrl[path]) {
+ QList<AnnotationTableObject *> annTables = annotationsByUrl.value(path);
+ mergeAnnTablesIfNecessary(annTables);
+ foreach (AnnotationTableObject *annTable, annTables) {
taskList << new ImportObjectToDatabaseTask(annTable, dstDbiRef, path);
}
}
@@ -287,6 +304,7 @@ Task * WriteAnnotationsWorker::getSaveDocTask(const QString &formatId, SaveDocFl
QSet<QString> excludeFileNames = DocumentUtils::getNewDocFileNameExcludesHint();
foreach (const QString &filepath, annotationsByUrl.keys()) {
QList<AnnotationTableObject *> annTables = annotationsByUrl.value(filepath);
+ mergeAnnTablesIfNecessary(annTables);
Task *task = NULL;
if(formatId == CSV_FORMAT_ID) {
@@ -393,37 +411,66 @@ void WriteAnnotationsWorkerFactory::init() {
Attribute *fileModeAttr = new Attribute(BaseAttributes::FILE_MODE_ATTRIBUTE(), BaseTypes::NUM_TYPE(), false, SaveDoc_Roll);
fileModeAttr->addRelation(new VisibilityRelation(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId(), BaseAttributes::LOCAL_FS_DATA_STORAGE()));
attrs << fileModeAttr;
- Descriptor annotationsNameDesc(ANNOTATIONS_NAME, WriteAnnotationsWorker::tr("Annotations name"),
- WriteAnnotationsWorker::tr("Name of the saved"
- " annotations. This option is only available for document formats"
- " that support saving of annotations names."));
+
+ // Merge for Local storage
+ Descriptor mergeDesc(MERGE_TABLES_LOCAL, WriteAnnotationsWorker::tr("Merge annotation tables"),
+ WriteAnnotationsWorker::tr("If <i>true</i> all annotation tables from dataset will be merged into one. "
+ "The value of <i>Annotation table name</i> parameter will be used as the name of result annotation table."));
+ Attribute *mergeAttr = new Attribute(mergeDesc, BaseTypes::BOOL_TYPE(), false, false);
+ mergeAttr->addRelation(new VisibilityRelation(BaseAttributes::DOCUMENT_FORMAT_ATTRIBUTE().getId(),
+ QVariantList()
+ << CSV_FORMAT_ID
+ << BaseDocumentFormats::PLAIN_EMBL
+ << BaseDocumentFormats::PLAIN_GENBANK
+ << BaseDocumentFormats::GFF
+ << BaseDocumentFormats::PLAIN_SWISS_PROT));
+ attrs << mergeAttr;
+
+ Descriptor annotationsNameDesc(ANN_TABLE_NAME_4_LOCAL_ST, WriteAnnotationsWorker::tr("Annotation table name"),
+ WriteAnnotationsWorker::tr("The name for the result annotation table that contains merged annotation data from file or dataset."));
Attribute *nameAttr = new Attribute(annotationsNameDesc, BaseTypes::STRING_TYPE(), false, ANNOTATIONS_NAME_DEF_VAL);
+ nameAttr->addRelation(new VisibilityRelation(MERGE_TABLES_LOCAL, true));
+ nameAttr->addRelation(new VisibilityRelation(BaseAttributes::DOCUMENT_FORMAT_ATTRIBUTE().getId(),
+ QVariantList()
+ << CSV_FORMAT_ID
+ << BaseDocumentFormats::PLAIN_EMBL
+ << BaseDocumentFormats::PLAIN_GENBANK
+ << BaseDocumentFormats::GFF
+ << BaseDocumentFormats::PLAIN_SWISS_PROT));
attrs << nameAttr;
- Descriptor annObjNameDesc(ANN_OBJ_NAME, WriteAnnotationsWorker::tr("Annotation object name"),
+
+ // Merge for shared DB
+ Descriptor merge2Desc(MERGE_TABLES_SHARED, WriteAnnotationsWorker::tr("Merge annotation tables"),
+ WriteAnnotationsWorker::tr("If <i>true</i> all annotation tables from dataset will be merged into one annotation object. "
+ "The value of <i>Annotation object name</i> parameter will be used as the name of result annotation object."));
+ Attribute *merge2Attr = new Attribute(merge2Desc, BaseTypes::BOOL_TYPE(), false, false);
+ merge2Attr->addRelation(new VisibilityRelation(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId(), BaseAttributes::SHARED_DB_DATA_STORAGE()));
+ attrs << merge2Attr;
+
+ Descriptor annObjNameDesc(ANN_TABLE_NAME_4_SHARED_ST, WriteAnnotationsWorker::tr("Annotation object name"),
WriteAnnotationsWorker::tr("Name of the saved annotation object."));
Attribute *objNameAttr = new Attribute(annObjNameDesc, BaseTypes::STRING_TYPE(), false, ANNOTATIONS_NAME_DEF_VAL);
- attrs << objNameAttr;
objNameAttr->addRelation(new VisibilityRelation(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId(), BaseAttributes::SHARED_DB_DATA_STORAGE()));
+ objNameAttr->addRelation(new VisibilityRelation(MERGE_TABLES_SHARED, true));
+ attrs << objNameAttr;
+
+ // Attributes for CSV format START
Descriptor separatorDesc(SEPARATOR, WriteAnnotationsWorker::tr("CSV separator"),
WriteAnnotationsWorker::tr("String which separates values in CSV files."));
Attribute *csvSeparatorAttr = new Attribute(separatorDesc, BaseTypes::STRING_TYPE(), false, SEPARATOR_DEFAULT_VALUE);
csvSeparatorAttr->addRelation(new VisibilityRelation(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId(), BaseAttributes::LOCAL_FS_DATA_STORAGE()));
+ csvSeparatorAttr->addRelation(new VisibilityRelation(BaseAttributes::DOCUMENT_FORMAT_ATTRIBUTE().getId(), CSV_FORMAT_ID));
attrs << csvSeparatorAttr;
Descriptor writeNamesDesc(WRITE_NAMES, WriteAnnotationsWorker::tr("Write sequence names"),
WriteAnnotationsWorker::tr("Add names of sequences into CSV file."));
Attribute *seqNamesAttr = new Attribute(writeNamesDesc, BaseTypes::BOOL_TYPE(), false, false);
seqNamesAttr->addRelation(new VisibilityRelation(BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId(), BaseAttributes::LOCAL_FS_DATA_STORAGE()));
+ seqNamesAttr->addRelation(new VisibilityRelation(BaseAttributes::DOCUMENT_FORMAT_ATTRIBUTE().getId(), CSV_FORMAT_ID));
attrs << seqNamesAttr;
+ // Attributes for CSV format END
docFormatAttr->addRelation(new FileExtensionRelation(urlAttr->getId()));
- nameAttr->addRelation(new VisibilityRelation(BaseAttributes::DOCUMENT_FORMAT_ATTRIBUTE().getId(),
- QVariantList()
- << CSV_FORMAT_ID
- << BaseDocumentFormats::PLAIN_EMBL
- << BaseDocumentFormats::PLAIN_GENBANK
- << BaseDocumentFormats::GFF
- << BaseDocumentFormats::PLAIN_SWISS_PROT));
}
Descriptor protoDesc(WriteAnnotationsWorkerFactory::ACTOR_ID,
@@ -446,6 +493,9 @@ void WriteAnnotationsWorkerFactory::init() {
delegates[BaseAttributes::DATA_STORAGE_ATTRIBUTE().getId()] = new ComboBoxDelegate(BaseAttributes::DATA_STORAGE_ATTRIBUTE_VALUES_MAP());
delegates[BaseAttributes::DATABASE_ATTRIBUTE().getId()] = new ComboBoxWithDbUrlsDelegate;
+
+ delegates[MERGE_TABLES_LOCAL] = new ComboBoxWithBoolsDelegate;
+ delegates[MERGE_TABLES_SHARED] = new ComboBoxWithBoolsDelegate;
}
proto->setEditor(new DelegateEditor(delegates));
proto->setPrompter(new WriteAnnotationsPrompter());
diff --git a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
index 917186d..ac6bd81 100644
--- a/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
+++ b/src/plugins/workflow_designer/src/library/WriteAnnotationsWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -63,13 +63,13 @@ private slots:
private:
Task * takeParameters(QString &formatId, SaveDocFlags &fl, QString &resultPath, U2DbiRef &dstDbiRef, DataStorage &storage);
- void updateResultPath(int metadataId, const QString &formatId, DataStorage storage, QString &resultPath);
+ void updateResultPath(int metadataId, const QString &formatId, DataStorage storage, QString &resultPath, bool byDataset = false);
QString fetchIncomingSequenceName(const QVariantMap &incomingData);
- QString getAnnotationName() const;
+ bool getMergeAttribute() const;
+ QString getAnnotationTableName() const;
void fetchIncomingAnnotations(const QVariantMap &incomingData, const QString &resultPath);
- bool shouldAnnotationTablesBeMerged() const;
- AnnotationTableObject *mergeAnnotationTables(const QList<AnnotationTableObject *> &annTables, const QString &mergedTableName) const;
+ void mergeAnnTablesIfNecessary(QList<AnnotationTableObject *> &annTables) const;
Task * getSaveDocTask(const QString &formatId, SaveDocFlags &fl);
Task * getSaveObjTask(const U2DbiRef &dstDbiRef) const;
diff --git a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
index 6353a5b..b1c45eb 100644
--- a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/WriteAssemblyWorkers.h b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
index cbe3d7b..fb64d53 100644
--- a/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
+++ b/src/plugins/workflow_designer/src/library/WriteAssemblyWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/WriteVariationWorker.cpp b/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
index b09c155..828c556 100644
--- a/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
+++ b/src/plugins/workflow_designer/src/library/WriteVariationWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/library/WriteVariationWorker.h b/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
index d96c553..2d1278f 100644
--- a/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
+++ b/src/plugins/workflow_designer/src/library/WriteVariationWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/tasks/ReadAssemblyTask.cpp b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
index 8c8deaf..16ab4cc 100644
--- a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
+++ b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/tasks/ReadAssemblyTask.h b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
index 5a7096c..60fe86d 100644
--- a/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
+++ b/src/plugins/workflow_designer/src/tasks/ReadAssemblyTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
index dc65c9c..854114b 100644
--- a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
+++ b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
index 601fe1c..29ffde5 100644
--- a/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
+++ b/src/plugins/workflow_designer/src/tasks/RenameChromosomeInVariationTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/DatasetValidator.cpp b/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
index 9b2f11c..7954ad6 100644
--- a/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/DatasetValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/DatasetValidator.h b/src/plugins/workflow_designer/src/util/DatasetValidator.h
index 6330cf6..e74d13e 100644
--- a/src/plugins/workflow_designer/src/util/DatasetValidator.h
+++ b/src/plugins/workflow_designer/src/util/DatasetValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/DatasetsCountValidator.cpp b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
index 9dca67c..332f219 100644
--- a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/DatasetsCountValidator.h b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
index 2407e93..f0e7673 100644
--- a/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
+++ b/src/plugins/workflow_designer/src/util/DatasetsCountValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/GrouperActionUtils.cpp b/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
index 4c413ea..1be78d3 100644
--- a/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
+++ b/src/plugins/workflow_designer/src/util/GrouperActionUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/GrouperActionUtils.h b/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
index a68128b..983e067 100644
--- a/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
+++ b/src/plugins/workflow_designer/src/util/GrouperActionUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/RequiredSlotsValidator.cpp b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
index 68320ce..2ea1b6a 100644
--- a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/RequiredSlotsValidator.h b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
index 2d5d980..629100f 100644
--- a/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
+++ b/src/plugins/workflow_designer/src/util/RequiredSlotsValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/SaveSchemaImageUtils.cpp b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
index 22ecb2f..027582c 100644
--- a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
+++ b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/SaveSchemaImageUtils.h b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
index 44ef5c3..3347c56 100644
--- a/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
+++ b/src/plugins/workflow_designer/src/util/SaveSchemaImageUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/WorkerNameValidator.cpp b/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
index 52b67e6..181611e 100644
--- a/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/WorkerNameValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/WorkerNameValidator.h b/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
index bfacc40..2bbeb10 100644
--- a/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
+++ b/src/plugins/workflow_designer/src/util/WorkerNameValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/WriteSequenceValidator.cpp b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
index 7e251bb..7ee98ae 100644
--- a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
+++ b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/src/util/WriteSequenceValidator.h b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
index 9149a77..14c8f36 100644
--- a/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
+++ b/src/plugins/workflow_designer/src/util/WriteSequenceValidator.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_designer/transl/english.ts b/src/plugins/workflow_designer/transl/english.ts
index da843a4..360d3a3 100644
--- a/src/plugins/workflow_designer/transl/english.ts
+++ b/src/plugins/workflow_designer/transl/english.ts
@@ -577,7 +577,7 @@ p, li { white-space: pre-wrap; }
<translation>Can not copy the file here: </translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1477"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1478"/>
<source>Run workflow</source>
<translation>Run workflow</translation>
</message>
@@ -627,7 +627,7 @@ p, li { white-space: pre-wrap; }
<translation>bases count</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="250"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="265"/>
<source>Save annotations</source>
<translation>Save annotations</translation>
</message>
@@ -1407,7 +1407,7 @@ You could also reset the dialog to the initial state.</translation>
</message>
<message>
<location filename="../src/library/BaseDocWriter.cpp" line="122"/>
- <location filename="../src/library/BaseDocWriter.cpp" line="364"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="365"/>
<source>Unexpected data storage attribute value</source>
<translation>Unexpected data storage attribute value</translation>
</message>
@@ -1427,32 +1427,32 @@ You could also reset the dialog to the initial state.</translation>
<translation>Can not open a file for writing: %1</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="343"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="344"/>
<source>No data to write</source>
<translation>No data to write</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="382"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="383"/>
<source>Nothing to write</source>
<translation>Nothing to write</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="395"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="396"/>
<source>Unable to fetch data from a message</source>
<translation>Unable to fetch data from a message</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="407"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="408"/>
<source>Save objects to a shared database</source>
<translation>Save objects to a shared database</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="428"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="429"/>
<source>Writing to %1 [%2]</source>
<translation>Writing to %1 [%2]</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="436"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="437"/>
<source>Save documents</source>
<translation>Save documents</translation>
</message>
@@ -1821,6 +1821,47 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
</context>
<context>
+ <name>U2::LocalWorkflow::ConvertSnpeffVariationsToAnnotationsPrompter</name>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="60"/>
+ <source>unset</source>
+ <translation type="unfinished">unset</translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="62"/>
+ <source>Parses information in variations from <u>%1</u> into annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::ConvertSnpeffVariationsToAnnotationsWorker</name>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="81"/>
+ <source>Input URL</source>
+ <translation type="unfinished">Input URL</translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="82"/>
+ <source>Input variation file URL.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="107"/>
+ <source>Convert SnpEff Variations to Annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="108"/>
+ <source>Parses information, added to variations by SnpEff, into standard annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="116"/>
+ <source>Produced from the input file name</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::LocalWorkflow::DASAnnotationPrompter</name>
<message>
<source>unset</source>
@@ -3440,17 +3481,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::MergeFastqPrompter</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="410"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="416"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="411"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="417"/>
<source> from <u>%1</u></source>
<translation> from <u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="413"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="419"/>
<source>Merges input sequences %1.</source>
<translation>Merges input sequences %1.</translation>
</message>
@@ -3458,77 +3499,77 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::MergeFastqWorker</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="421"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="427"/>
<source>FASTQ Merger</source>
<translation>FASTQ Merger</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="422"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="428"/>
<source>Merges input sequences to one output file</source>
<translation>Merges input sequences to one output file</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="426"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="432"/>
<source>Input File</source>
<translation>Input File</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="427"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="433"/>
<source>Set of FASTQ reads files</source>
<translation>Set of FASTQ reads files</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="428"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="434"/>
<source>Output File</source>
<translation>Output File</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="429"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="435"/>
<source>Output FASTQ file</source>
<translation>Output FASTQ file</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="442"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="448"/>
<source>Output directory</source>
<translation>Output directory</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="443"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="449"/>
<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>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.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="447"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="453"/>
<source>Custom directory</source>
<translation>Custom directory</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="448"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="454"/>
<source>Select the custom output directory.</source>
<translation>Select the custom output directory.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="450"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="456"/>
<source>Output file name</source>
<translation>Output file name</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="451"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="457"/>
<source>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</source>
<translation>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="466"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="472"/>
<source>Custom</source>
<translation>Custom</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="464"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="470"/>
<source>Input file</source>
<translation>Input file</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="465"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="471"/>
<source>Workflow</source>
<translation>Workflow</translation>
</message>
@@ -3686,17 +3727,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::QualityTrimPrompter</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="215"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="218"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="216"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="219"/>
<source><u>%1</u></source>
<translation><u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="218"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="221"/>
<source>Trim input sequence %1 from the end, using the quality threshold.</source>
<translation>Trim input sequence %1 from the end, using the quality threshold.</translation>
</message>
@@ -3704,107 +3745,107 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::QualityTrimWorker</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="226"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="229"/>
<source>FASTQ Quality Trimmer</source>
<translation>FASTQ Quality Trimmer</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="227"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="230"/>
<source>The workflow scans each input sequence from the end to find the first position where the quality is greater or equal to the minimum quality threshold. Then it trims the sequence to that position. If a the whole sequence has quality less than the threshold or the length of the output sequence less than the minimum length threshold then the sequence is skipped.</source>
<translation>The workflow scans each input sequence from the end to find the first position where the quality is greater or equal to the minimum quality threshold. Then it trims the sequence to that position. If a the whole sequence has quality less than the threshold or the length of the output sequence less than the minimum length threshold then the sequence is skipped.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="233"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="236"/>
<source>Input File</source>
<translation>Input File</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="234"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="237"/>
<source>Set of FASTQ reads files</source>
<translation>Set of FASTQ reads files</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="235"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="238"/>
<source>Output File</source>
<translation>Output File</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="236"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="239"/>
<source>Output FASTQ files</source>
<translation>Output FASTQ files</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="249"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="252"/>
<source>Output directory</source>
<translation>Output directory</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="250"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="253"/>
<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>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.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="254"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="257"/>
<source>Custom directory</source>
<translation>Custom directory</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="255"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="258"/>
<source>Select the custom output directory.</source>
<translation>Select the custom output directory.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="257"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="260"/>
<source>Output file name</source>
<translation>Output file name</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="258"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="261"/>
<source>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</source>
<translation>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="260"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="263"/>
<source>Quality threshold</source>
<translation>Quality threshold</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="261"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="264"/>
<source>Quality threshold for trimming.</source>
<translation>Quality threshold for trimming.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="263"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="266"/>
<source>Min Length</source>
<translation>Min Length</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="264"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="267"/>
<source>Too short reads are discarded by the filter.</source>
<translation>Too short reads are discarded by the filter.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="266"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="269"/>
<source>Trim both ends</source>
<translation>Trim both ends</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="267"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="270"/>
<source>Trim the both ends of a read or not. Usually, you need to set <b>True</b> for <b>Sanger</b> sequencing and <b>False</b> for <b>NGS</b></source>
<translation>Trim the both ends of a read or not. Usually, you need to set <b>True</b> for <b>Sanger</b> sequencing and <b>False</b> for <b>NGS</b></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="284"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="287"/>
<source>Custom</source>
<translation>Custom</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="282"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="285"/>
<source>Input file</source>
<translation>Input file</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="283"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="286"/>
<source>Workflow</source>
<translation>Workflow</translation>
</message>
@@ -3902,22 +3943,22 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::ReadAnnotationsTask</name>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="192"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="202"/>
<source>Read annotations from %1</source>
<translation>Read annotations from %1</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="221"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="231"/>
<source>File '%1' does not exist</source>
<translation>File '%1' does not exist</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="231"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="241"/>
<source>Unsupported document format: %1</source>
<translation>Unsupported document format: %1</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="233"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="243"/>
<source>Reading annotations from %1 [%2]</source>
<translation>Reading annotations from %1 [%2]</translation>
</message>
@@ -3925,52 +3966,78 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::ReadAnnotationsWorker</name>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="133"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="137"/>
<source>Read Annotations</source>
<translation>Read Annotations</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="134"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="138"/>
<source>Reads annotations from files.</source>
<translation>Reads annotations from files.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="144"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="148"/>
<source>Annotations</source>
<translation>Annotations</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="145"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="149"/>
<source>Annotations.</source>
<translation>Annotations.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="150"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="154"/>
<source>Mode</source>
<translation>Mode</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="151"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="155"/>
+ <source><ul><li><i>"Separate"</i> mode keeps the tables as they are;</li><li><i>"Merge from file"</i> unites annotation tables from one file into one annotations table;</li><li><i>"Merge from dataset"</i> unites all annotation tables from all files from dataset;</li></ul></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="162"/>
+ <source>Annotation table name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="163"/>
+ <source>The name for the result annotation table that contains merged annotation data from file or dataset.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="171"/>
+ <source>Separate annotation tables</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="172"/>
+ <source>Merge annotation tables from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="173"/>
+ <source>Merge all annotation tables from dataset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>If the file contains more than one annotation table, <i>Split</i> mode sends them "as is" to the output, while <i>Merge</i> appends all the annotation tables and outputs the sole merged annotation table.In <i>Merge files</i> is the same as <i>Merge</i> but it operates with all annotation tables from all files of one dataset.</source>
- <translation>If the file contains more than one annotation table, <i>Split</i> mode sends them "as is" to the output, while <i>Merge</i> appends all the annotation tables and outputs the sole merged annotation table.In <i>Merge files</i> is the same as <i>Merge</i> but it operates with all annotation tables from all files of one dataset.</translation>
+ <translation type="vanished">If the file contains more than one annotation table, <i>Split</i> mode sends them "as is" to the output, while <i>Merge</i> appends all the annotation tables and outputs the sole merged annotation table.In <i>Merge files</i> is the same as <i>Merge</i> but it operates with all annotation tables from all files of one dataset.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="161"/>
<source>Split</source>
- <translation>Split</translation>
+ <translation type="vanished">Split</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="162"/>
<source>Merge</source>
- <translation>Merge</translation>
+ <translation type="vanished">Merge</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="163"/>
<source>Merge files</source>
- <translation>Merge files</translation>
+ <translation type="vanished">Merge files</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="170"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="180"/>
<source>Reads annotations from <u>%1</u>.</source>
<translation>Reads annotations from <u>%1</u>.</translation>
</message>
@@ -4456,32 +4523,32 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::SamtoolsViewFilterTask</name>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="367"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="368"/>
<source>Samtool view (filter) for %1 </source>
<translation>Samtool view (filter) for %1 </translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="373"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="374"/>
<source>No assembly URL to filter</source>
<translation>No assembly URL to filter</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="379"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="380"/>
<source>Directory does not exist: </source>
<translation>Directory does not exist: </translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="416"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="417"/>
<source>Can not run %1 tool</source>
<translation>Can not run %1 tool</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="422"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="423"/>
<source>%1 tool exited with code %2</source>
<translation>%1 tool exited with code %2</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="424"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="425"/>
<source>Tool %1 finished successfully</source>
<translation>Tool %1 finished successfully</translation>
</message>
@@ -4996,32 +5063,32 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::WriteAnnotationsPrompter</name>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="465"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="516"/>
<source>unset</source>
<translation>unset</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="478"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="529"/>
<source>default file</source>
<translation>default file</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="498"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="549"/>
<source>Save all annotations from <u>%1</u> to %2</source>
<translation>Save all annotations from <u>%1</u> to %2</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="501"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="552"/>
<source> in %1 format.</source>
<translation> in %1 format.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="502"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="553"/>
<source> in the </source>
<translation> in the </translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="502"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="553"/>
<source> database.</source>
<translation> database.</translation>
</message>
@@ -5029,102 +5096,126 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::WriteAnnotationsWorker</name>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="106"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="108"/>
<source>Unrecognized formatId: '%1'</source>
<translation>Unrecognized formatId: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="111"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="113"/>
<source>Invalid shared DB URL</source>
<translation>Invalid shared DB URL</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="113"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="115"/>
<source>Invalid path in shared DB</source>
<translation>Invalid path in shared DB</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="115"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="117"/>
<source>Unrecognized data storage: '%1'</source>
<translation>Unrecognized data storage: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="151"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="153"/>
<source>Unspecified URL to write</source>
<translation>Unspecified URL to write</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="170"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="172"/>
<source>Unrecognized data storage</source>
<translation>Unrecognized data storage</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="195"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="211"/>
<source>Annotations name not specified. Default value used: '%1'</source>
<translation>Annotations name not specified. Default value used: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="245"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="260"/>
<source>Nothing to write</source>
<translation>Nothing to write</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="360"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="379"/>
<source>Input annotations</source>
<translation>Input annotations</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="361"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="380"/>
<source>Input annotations which will be written to output file</source>
<translation>Input annotations which will be written to output file</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="395"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="416"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="443"/>
+ <source>Merge annotation tables</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="417"/>
+ <source>If <i>true</i> all annotation tables from dataset will be merged into one. The value of <i>Annotation table name</i> parameter will be used as the name of result annotation table.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="429"/>
+ <source>Annotation table name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="430"/>
+ <source>The name for the result annotation table that contains merged annotation data from file or dataset.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="444"/>
+ <source>If <i>true</i> all annotation tables from dataset will be merged into one annotation object. The value of <i>Annotation object name</i> parameter will be used as the name of result annotation object.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Annotations name</source>
- <translation>Annotations name</translation>
+ <translation type="vanished">Annotations name</translation>
</message>
<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>Name of the saved annotations. This option is only available for document formats that support saving of annotations names.</translation>
+ <translation type="vanished">Name of the saved annotations. This option is only available for document formats that support saving of annotations names.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="401"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="450"/>
<source>Annotation object name</source>
<translation>Annotation object name</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="402"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="451"/>
<source>Name of the saved annotation object.</source>
<translation>Name of the saved annotation object.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="406"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="458"/>
<source>CSV separator</source>
<translation>CSV separator</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="407"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="459"/>
<source>String which separates values in CSV files.</source>
<translation>String which separates values in CSV files.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="412"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="465"/>
<source>Write sequence names</source>
<translation>Write sequence names</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="413"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="466"/>
<source>Add names of sequences into CSV file.</source>
<translation>Add names of sequences into CSV file.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="429"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="477"/>
<source>Write Annotations</source>
<translation>Write Annotations</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="430"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="478"/>
<source>Writes all supplied annotations to file(s) in selected format.</source>
<translation>Writes all supplied annotations to file(s) in selected format.</translation>
</message>
@@ -5286,116 +5377,116 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::Workflow::CoreLib</name>
<message>
- <location filename="../src/library/CoreLib.cpp" line="125"/>
+ <location filename="../src/library/CoreLib.cpp" line="126"/>
<source>Location</source>
<translation>Location</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="125"/>
+ <location filename="../src/library/CoreLib.cpp" line="126"/>
<source>Location for writing data</source>
<translation>Location for writing data</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="152"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<source>Write FASTA</source>
<translation>Write FASTA</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="152"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<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="153"/>
- <location filename="../src/library/CoreLib.cpp" line="251"/>
+ <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="252"/>
<location filename="../src/library/GenericReadActor.cpp" line="100"/>
<source>Sequence</source>
<translation>Sequence</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="153"/>
+ <location filename="../src/library/CoreLib.cpp" line="154"/>
<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="173"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
<source>Read Plain Text</source>
<translation>Read Plain Text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="173"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
<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="174"/>
- <location filename="../src/library/CoreLib.cpp" line="194"/>
+ <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="195"/>
<source>Plain text</source>
<translation>Plain text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="177"/>
+ <location filename="../src/library/CoreLib.cpp" line="178"/>
<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="193"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Write Plain Text</source>
<translation>Write Plain Text</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="193"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Write strings to a file.</source>
<translation>Write strings to a file.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="200"/>
+ <location filename="../src/library/CoreLib.cpp" line="201"/>
<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="426"/>
+ <location filename="../src/library/CoreLib.cpp" line="428"/>
<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="428"/>
+ <location filename="../src/library/CoreLib.cpp" line="430"/>
<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="215"/>
+ <location filename="../src/library/CoreLib.cpp" line="216"/>
<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="228"/>
+ <location filename="../src/library/CoreLib.cpp" line="229"/>
<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="214"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<source>Write Alignment</source>
<translation>Write Alignment</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="214"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<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="250"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<source>Write Sequence</source>
<translation>Write Sequence</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="250"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<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="281"/>
+ <location filename="../src/library/CoreLib.cpp" line="282"/>
<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>
@@ -5771,51 +5862,56 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/WorkflowDesignerPlugin.cpp" line="346"/>
+ <source>Variant calling and effects prediction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="348"/>
<source>Annotate variants and predict effects</source>
<translation>Annotate variants and predict effects</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="348"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="350"/>
<source>Raw RNA-Seq data processing</source>
<translation>Raw RNA-Seq data processing</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="350"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="352"/>
<source>RNA-Seq data analysis</source>
<translation>RNA-Seq data analysis</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="352"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="354"/>
<source>Extract transcript sequences</source>
<translation>Extract transcript sequences</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="354"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="356"/>
<source>Raw ChIP-Seq data processing</source>
<translation>Raw ChIP-Seq data processing</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="356"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="358"/>
<source>ChIP-Seq data analysis</source>
<translation>ChIP-Seq data analysis</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="358"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="360"/>
<source>ChIP-Seq coverage</source>
<translation>ChIP-Seq coverage</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="360"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="362"/>
<source>Extract coverage from assemblies</source>
<translation>Extract coverage from assemblies</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="362"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="364"/>
<source>Extract consensus from assemblies</source>
<translation>Extract consensus from assemblies</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="365"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="367"/>
<source>Remote NCBI BLAST</source>
<translation>Remote NCBI BLAST</translation>
</message>
@@ -6015,22 +6111,22 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::WorkflowScene</name>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2535"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2536"/>
<source>Open document(s)</source>
<translation>Open document(s)</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2695"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2696"/>
<source>Workflow Designer</source>
<translation>Workflow Designer</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2695"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2696"/>
<source>Unable to open specified documents. Watch log for details.</source>
<translation>Unable to open specified documents. Watch log for details.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2777"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2778"/>
<source>Drop an element from the palette here</source>
<translation>Drop an element from the palette here</translation>
</message>
@@ -6105,7 +6201,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/WorkflowViewController.cpp" line="325"/>
- <location filename="../src/WorkflowViewController.cpp" line="2332"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2333"/>
<source>Workflow Designer</source>
<translation>Workflow Designer</translation>
</message>
@@ -6128,8 +6224,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/WorkflowViewController.cpp" line="441"/>
<location filename="../src/WorkflowViewController.cpp" line="443"/>
- <location filename="../src/WorkflowViewController.cpp" line="2255"/>
- <location filename="../src/WorkflowViewController.cpp" line="2257"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2256"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2258"/>
<source>Warning!</source>
<translation>Warning!</translation>
</message>
@@ -6245,18 +6341,18 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Can't load element.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1313"/>
- <location filename="../src/WorkflowViewController.cpp" line="1374"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1314"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1375"/>
<source>Element style</source>
<translation>Element style</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1367"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1368"/>
<source>Element properties</source>
<translation>Element properties</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2269"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2270"/>
<source>New workflow</source>
<translation type="unfinished">New workflow</translation>
</message>
@@ -6311,14 +6407,14 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Unlock Scene</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1319"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1320"/>
<source>Scripting mode</source>
<translation>Scripting mode</translation>
</message>
<message>
<location filename="../src/WorkflowViewController.cpp" line="928"/>
- <location filename="../src/WorkflowViewController.cpp" line="1280"/>
- <location filename="../src/WorkflowViewController.cpp" line="1384"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1281"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1385"/>
<source>Add element</source>
<translation>Add element</translation>
</message>
@@ -6338,116 +6434,116 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Can't remove element %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1419"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1420"/>
<source>Empty workflow!</source>
<translation>Empty workflow!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1419"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1420"/>
<source>Nothing to run: empty workflow</source>
<translation>Nothing to run: empty workflow</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1444"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1445"/>
<source>Workflow cannot be executed</source>
<translation>Workflow cannot be executed</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1445"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1446"/>
<source>Please fix issues listed in the error list (located under workflow).</source>
<translation>Please fix issues listed in the error list (located under workflow).</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1448"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1449"/>
<source>Workflow is valid.
</source>
<translation>Workflow is valid.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1450"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1451"/>
<source>Well done!</source>
<translation>Well done!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1452"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1453"/>
<source>There are non-critical warnings.</source>
<translation>There are non-critical warnings.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1454"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1455"/>
<source>Workflow is valid</source>
<translation>Workflow is valid</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1696"/>
- <location filename="../src/WorkflowViewController.cpp" line="1729"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1697"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1730"/>
<source>Bad input!</source>
<translation>Bad input!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1696"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1697"/>
<source>Aliases for workflow parameters should be different!</source>
<translation>Aliases for workflow parameters should be different!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1799"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1800"/>
<source>The workflow contains a wizard. Sorry, but current version of UGENE doesn't support of wizards in the includes.</source>
<translation>The workflow contains a wizard. Sorry, but current version of UGENE doesn't support of wizards in the includes.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1801"/>
- <location filename="../src/WorkflowViewController.cpp" line="1829"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1802"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1830"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1729"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1730"/>
<source>Workflow does not contain any parameter aliases</source>
<translation>Workflow does not contain any parameter aliases</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1743"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1744"/>
<source>Internal error!</source>
<translation>Internal error!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1743"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1744"/>
<source>Can not create Galaxy config</source>
<translation>Can not create Galaxy config</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1845"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1846"/>
<source>Drag the palette element to the scene or just click on the scene to add the element.</source>
<translation>Drag the palette element to the scene or just click on the scene to add the element.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2135"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2136"/>
<source>File is not found: %1</source>
<translation>File is not found: %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2173"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2174"/>
<source>Show dashboard</source>
<translation>Show dashboard</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2182"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2183"/>
<source>Show workflow</source>
<translation>Show workflow</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2228"/>
- <location filename="../src/WorkflowViewController.cpp" line="2231"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2229"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2232"/>
<source>Open workflow file</source>
<translation>Open workflow file</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2301"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2302"/>
<source>Workflow Designer - %1</source>
<translation>Workflow Designer - %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2333"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2334"/>
<source>The workflow has been modified.
Do you want to save changes?</source>
<translation>The workflow has been modified.
diff --git a/src/plugins/workflow_designer/transl/russian.ts b/src/plugins/workflow_designer/transl/russian.ts
index 5433ea0..12233fa 100644
--- a/src/plugins/workflow_designer/transl/russian.ts
+++ b/src/plugins/workflow_designer/transl/russian.ts
@@ -527,7 +527,7 @@ p, li { white-space: pre-wrap; }
<translation>Невозможно скопировать файл:</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1477"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1478"/>
<source>Run workflow</source>
<translation>Запустить схему</translation>
</message>
@@ -577,7 +577,7 @@ p, li { white-space: pre-wrap; }
<translation>число оснований</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="250"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="265"/>
<source>Save annotations</source>
<translation>Сохранить аннотации</translation>
</message>
@@ -1357,7 +1357,7 @@ You could also reset the dialog to the initial state.</source>
</message>
<message>
<location filename="../src/library/BaseDocWriter.cpp" line="122"/>
- <location filename="../src/library/BaseDocWriter.cpp" line="364"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="365"/>
<source>Unexpected data storage attribute value</source>
<translation>Unexpected data storage attribute value</translation>
</message>
@@ -1377,32 +1377,32 @@ You could also reset the dialog to the initial state.</source>
<translation>Невозможно открыть файл для записи: %1</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="343"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="344"/>
<source>No data to write</source>
<translation>Нет данных для записи</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="382"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="383"/>
<source>Nothing to write</source>
<translation>Нет данных для записи</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="395"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="396"/>
<source>Unable to fetch data from a message</source>
<translation>Unable to fetch data from a message</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="407"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="408"/>
<source>Save objects to a shared database</source>
<translation>Save objects to a shared database</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="428"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="429"/>
<source>Writing to %1 [%2]</source>
<translation>Запись %1 [формат %2]</translation>
</message>
<message>
- <location filename="../src/library/BaseDocWriter.cpp" line="436"/>
+ <location filename="../src/library/BaseDocWriter.cpp" line="437"/>
<source>Save documents</source>
<translation>Сохранение документов</translation>
</message>
@@ -1767,6 +1767,47 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
</context>
<context>
+ <name>U2::LocalWorkflow::ConvertSnpeffVariationsToAnnotationsPrompter</name>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="60"/>
+ <source>unset</source>
+ <translation type="unfinished">не указан</translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="62"/>
+ <source>Parses information in variations from <u>%1</u> into annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>U2::LocalWorkflow::ConvertSnpeffVariationsToAnnotationsWorker</name>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="81"/>
+ <source>Input URL</source>
+ <translation type="unfinished">Входной путь</translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="82"/>
+ <source>Input variation file URL.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="107"/>
+ <source>Convert SnpEff Variations to Annotations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="108"/>
+ <source>Parses information, added to variations by SnpEff, into standard annotations.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ConvertSnpeffVariationsToAnnotationsWorker.cpp" line="116"/>
+ <source>Produced from the input file name</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::LocalWorkflow::DNAStatWorker</name>
<message>
<location filename="../src/library/StatisticWorkers.cpp" line="62"/>
@@ -3154,17 +3195,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::MergeFastqPrompter</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="410"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="416"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="411"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="417"/>
<source> from <u>%1</u></source>
<translation>из <u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="413"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="419"/>
<source>Merges input sequences %1.</source>
<translation>Соединяет входные файлы %1.</translation>
</message>
@@ -3172,77 +3213,77 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::MergeFastqWorker</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="421"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="427"/>
<source>FASTQ Merger</source>
<translation>Слияние файлов FASTQ</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="422"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="428"/>
<source>Merges input sequences to one output file</source>
<translation>Соединяет входные последовательности в один выходной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="426"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="432"/>
<source>Input File</source>
<translation>Входной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="427"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="433"/>
<source>Set of FASTQ reads files</source>
<translation>Набор файлов с FASTQ ридами</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="428"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="434"/>
<source>Output File</source>
<translation>Выходной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="429"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="435"/>
<source>Output FASTQ file</source>
<translation>Выходной FASTQ файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="442"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="448"/>
<source>Output directory</source>
<translation>Выходная директория</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="443"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="449"/>
<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>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="447"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="453"/>
<source>Custom directory</source>
<translation>Частная директория</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="448"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="454"/>
<source>Select the custom output directory.</source>
<translation>Укажите частную выходную директорию.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="450"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="456"/>
<source>Output file name</source>
<translation>Имя выходного файла</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="451"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="457"/>
<source>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</source>
<translation>Имя выходного файла.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="466"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="472"/>
<source>Custom</source>
<translation>Частная</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="464"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="470"/>
<source>Input file</source>
<translation>Входной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="465"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="471"/>
<source>Workflow</source>
<translation>Схема</translation>
</message>
@@ -3400,17 +3441,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::QualityTrimPrompter</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="215"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="218"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="216"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="219"/>
<source><u>%1</u></source>
<translation><u>%1</u></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="218"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="221"/>
<source>Trim input sequence %1 from the end, using the quality threshold.</source>
<translation>Обрезает входные последовательности %1 от конца, используя порог качества.</translation>
</message>
@@ -3418,107 +3459,107 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::QualityTrimWorker</name>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="226"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="229"/>
<source>FASTQ Quality Trimmer</source>
<translation>Обрезание последовательностей в файле FASTQ с учетом качества прочтения</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="227"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="230"/>
<source>The workflow scans each input sequence from the end to find the first position where the quality is greater or equal to the minimum quality threshold. Then it trims the sequence to that position. If a the whole sequence has quality less than the threshold or the length of the output sequence less than the minimum length threshold then the sequence is skipped.</source>
<translation>Схема сканирует каждую входную последовательность начиная с конца для поиска первой позиции где качество больше или равно минимальному порогу качества. После этого происходит подрезание до этой позиции.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="233"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="236"/>
<source>Input File</source>
<translation>Входной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="234"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="237"/>
<source>Set of FASTQ reads files</source>
<translation>Набор файлов с FASTQ ридами</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="235"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="238"/>
<source>Output File</source>
<translation>Выходной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="236"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="239"/>
<source>Output FASTQ files</source>
<translation>Выхордные FASTQ файлы</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="249"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="252"/>
<source>Output directory</source>
<translation>Выходная директория</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="250"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="253"/>
<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>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="254"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="257"/>
<source>Custom directory</source>
<translation>Частная директория</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="255"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="258"/>
<source>Select the custom output directory.</source>
<translation>Укажите частную выходную директорию.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="257"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="260"/>
<source>Output file name</source>
<translation>Имя выходного файла</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="258"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="261"/>
<source>A name of an output file. If default of empty value is provided the output name is the name of the first file with additional extention.</source>
<translation>Имя выходного файла.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="260"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="263"/>
<source>Quality threshold</source>
<translation>Порог качества</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="261"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="264"/>
<source>Quality threshold for trimming.</source>
<translation>Порог качества для подрезания.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="263"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="266"/>
<source>Min Length</source>
<translation>Минимальная длина</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="264"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="267"/>
<source>Too short reads are discarded by the filter.</source>
<translation>Слишком короткие риды отбрасываются фильтром.</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="266"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="269"/>
<source>Trim both ends</source>
<translation>Подрезание обоих концов</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="267"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="270"/>
<source>Trim the both ends of a read or not. Usually, you need to set <b>True</b> for <b>Sanger</b> sequencing and <b>False</b> for <b>NGS</b></source>
<translation>Подрезать оба конца рида или нет. Обычно, необходимо установить значение <b>Истина</b> для <b>Sanger</b> ридов и <b>Ложь</b> для <b>NGS</b></translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="284"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="287"/>
<source>Custom</source>
<translation>Частная</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="282"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="285"/>
<source>Input file</source>
<translation>Входной файл</translation>
</message>
<message>
- <location filename="../src/library/FASTQWorkersLibrary.cpp" line="283"/>
+ <location filename="../src/library/FASTQWorkersLibrary.cpp" line="286"/>
<source>Workflow</source>
<translation>Схема</translation>
</message>
@@ -3616,22 +3657,22 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::ReadAnnotationsTask</name>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="192"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="202"/>
<source>Read annotations from %1</source>
<translation>Читать аннотации из %1</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="221"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="231"/>
<source>File '%1' does not exist</source>
<translation>Файл '%1' не существует</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="231"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="241"/>
<source>Unsupported document format: %1</source>
<translation>Неподдерживаемый формат документа: %1</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="233"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="243"/>
<source>Reading annotations from %1 [%2]</source>
<translation>Чтение аннотаций из %1 [%2]</translation>
</message>
@@ -3639,52 +3680,78 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::ReadAnnotationsWorker</name>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="133"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="137"/>
<source>Read Annotations</source>
<translation>Чтение аннотаций</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="134"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="138"/>
<source>Reads annotations from files.</source>
<translation>этот элемент считывает аннотации из файлов.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="144"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="148"/>
<source>Annotations</source>
<translation>Аннотации</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="145"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="149"/>
<source>Annotations.</source>
<translation>Аннотации.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="150"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="154"/>
<source>Mode</source>
<translation>Режим</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="151"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="155"/>
+ <source><ul><li><i>"Separate"</i> mode keeps the tables as they are;</li><li><i>"Merge from file"</i> unites annotation tables from one file into one annotations table;</li><li><i>"Merge from dataset"</i> unites all annotation tables from all files from dataset;</li></ul></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="162"/>
+ <source>Annotation table name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="163"/>
+ <source>The name for the result annotation table that contains merged annotation data from file or dataset.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="171"/>
+ <source>Separate annotation tables</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="172"/>
+ <source>Merge annotation tables from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="173"/>
+ <source>Merge all annotation tables from dataset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>If the file contains more than one annotation table, <i>Split</i> mode sends them "as is" to the output, while <i>Merge</i> appends all the annotation tables and outputs the sole merged annotation table.In <i>Merge files</i> is the same as <i>Merge</i> but it operates with all annotation tables from all files of one dataset.</source>
- <translation>Если файл содержит более одной таблицы аннотаций, <i>Разбиение</i> отправляет все аннотации на выход, <i>Сшивка</i> добавляет все таблицы и выводит одну объединенную таблицу аннотаций. В <i>Сшивка файлов</i> одинаково с <i>Сшивка</i> но работает со всеми таблицами аннотаций из всех файлов одного набора.</translation>
+ <translation type="vanished">Если файл содержит более одной таблицы аннотаций, <i>Разбиение</i> отправляет все аннотации на выход, <i>Сшивка</i> добавляет все таблицы и выводит одну объединенную таблицу аннотаций. В <i>Сшивка файлов</i> одинаково с <i>Сшивка</i> но работает со всеми таблицами аннотаций из всех файлов одного набора.</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="161"/>
<source>Split</source>
- <translation>Разбиение</translation>
+ <translation type="vanished">Разбиение</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="162"/>
<source>Merge</source>
- <translation>Сшивка</translation>
+ <translation type="vanished">Сшивка</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="163"/>
<source>Merge files</source>
- <translation>Сшивка файлов</translation>
+ <translation type="vanished">Сшивка файлов</translation>
</message>
<message>
- <location filename="../src/library/ReadAnnotationsWorker.cpp" line="170"/>
+ <location filename="../src/library/ReadAnnotationsWorker.cpp" line="180"/>
<source>Reads annotations from <u>%1</u>.</source>
<translation>Прочитать аннотации из <u>%1</u>.</translation>
</message>
@@ -4171,32 +4238,32 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::SamtoolsViewFilterTask</name>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="367"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="368"/>
<source>Samtool view (filter) for %1 </source>
<translation>Samtool view (filter) for %1 </translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="373"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="374"/>
<source>No assembly URL to filter</source>
<translation>No assembly URL to filter</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="379"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="380"/>
<source>Directory does not exist: </source>
<translation>Directory does not exist: </translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="416"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="417"/>
<source>Can not run %1 tool</source>
<translation>Can not run %1 tool</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="422"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="423"/>
<source>%1 tool exited with code %2</source>
<translation>%1 tool exited with code %2</translation>
</message>
<message>
- <location filename="../src/library/FilterBamWorker.cpp" line="424"/>
+ <location filename="../src/library/FilterBamWorker.cpp" line="425"/>
<source>Tool %1 finished successfully</source>
<translation>Tool %1 finished successfully</translation>
</message>
@@ -4711,32 +4778,32 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::WriteAnnotationsPrompter</name>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="465"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="516"/>
<source>unset</source>
<translation>не указан</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="478"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="529"/>
<source>default file</source>
<translation>файл по умолчанию</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="498"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="549"/>
<source>Save all annotations from <u>%1</u> to %2</source>
<translation>Сохранить все аннотации из <u>%1</u> в %2</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="501"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="552"/>
<source> in %1 format.</source>
<translation> в формат %1.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="502"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="553"/>
<source> in the </source>
<translation>в</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="502"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="553"/>
<source> database.</source>
<translation> базе данных.</translation>
</message>
@@ -4744,102 +4811,126 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::LocalWorkflow::WriteAnnotationsWorker</name>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="106"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="108"/>
<source>Unrecognized formatId: '%1'</source>
<translation>Unrecognized formatId: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="111"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="113"/>
<source>Invalid shared DB URL</source>
<translation>Invalid shared DB URL</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="113"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="115"/>
<source>Invalid path in shared DB</source>
<translation>Invalid path in shared DB</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="115"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="117"/>
<source>Unrecognized data storage: '%1'</source>
<translation>Unrecognized data storage: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="151"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="153"/>
<source>Unspecified URL to write</source>
<translation>Unspecified URL to write</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="170"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="172"/>
<source>Unrecognized data storage</source>
<translation>Unrecognized data storage</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="195"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="211"/>
<source>Annotations name not specified. Default value used: '%1'</source>
<translation>Annotations name not specified. Default value used: '%1'</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="245"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="260"/>
<source>Nothing to write</source>
<translation>Нет данных для записи</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="360"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="379"/>
<source>Input annotations</source>
<translation>Входные аннотации</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="361"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="380"/>
<source>Input annotations which will be written to output file</source>
<translation>Входные аннотации, которые будут записаны в выходной файл</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="395"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="416"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="443"/>
+ <source>Merge annotation tables</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="417"/>
+ <source>If <i>true</i> all annotation tables from dataset will be merged into one. The value of <i>Annotation table name</i> parameter will be used as the name of result annotation table.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="429"/>
+ <source>Annotation table name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="430"/>
+ <source>The name for the result annotation table that contains merged annotation data from file or dataset.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="444"/>
+ <source>If <i>true</i> all annotation tables from dataset will be merged into one annotation object. The value of <i>Annotation object name</i> parameter will be used as the name of result annotation object.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Annotations name</source>
- <translation>Имя аннотаций</translation>
+ <translation type="vanished">Имя аннотаций</translation>
</message>
<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 type="vanished">имя для сохранения аннотаций. Этот параметр доступен только для форматов, которые поддерживают сохранение имен аннотаций.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="401"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="450"/>
<source>Annotation object name</source>
<translation>Имя объекта аннотации</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="402"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="451"/>
<source>Name of the saved annotation object.</source>
<translation>Имя аннотаций: имя для сохранения объекта аннотации.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="406"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="458"/>
<source>CSV separator</source>
<translation>Разделитель CSV</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="407"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="459"/>
<source>String which separates values in CSV files.</source>
<translation>символ, который разделяет значения в файлах CSV.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="412"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="465"/>
<source>Write sequence names</source>
<translation>Записать имена последовательностей</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="413"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="466"/>
<source>Add names of sequences into CSV file.</source>
<translation>добавить имена последовательностей в CSV-файл.</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="429"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="477"/>
<source>Write Annotations</source>
<translation>Запись аннотаций</translation>
</message>
<message>
- <location filename="../src/library/WriteAnnotationsWorker.cpp" line="430"/>
+ <location filename="../src/library/WriteAnnotationsWorker.cpp" line="478"/>
<source>Writes all supplied annotations to file(s) in selected format.</source>
<translation>этот элемент записывает все аннотации в файл заданного формата.</translation>
</message>
@@ -5001,101 +5092,101 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::Workflow::CoreLib</name>
<message>
- <location filename="../src/library/CoreLib.cpp" line="152"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<source>Write FASTA</source>
<translation>Запись FASTA</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="173"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
<source>Read Plain Text</source>
<translation>Чтение текста</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="173"/>
+ <location filename="../src/library/CoreLib.cpp" line="174"/>
<source>Reads text from local or remote files.</source>
<translation>этот элемент считывает текстовые данные из файлов, расположенных локально или удаленно.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="193"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Write Plain Text</source>
<translation>Запись текста</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="193"/>
+ <location filename="../src/library/CoreLib.cpp" line="194"/>
<source>Write strings to a file.</source>
<translation>этот элемент записывает текстовые данные в файл.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="250"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<source>Writes all supplied sequences to file(s) in selected format.</source>
<translation>этот элемент записывает последовательности в файл(ы) заданного формата.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="281"/>
+ <location filename="../src/library/CoreLib.cpp" line="282"/>
<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="426"/>
+ <location filename="../src/library/CoreLib.cpp" line="428"/>
<source>Another worker with this name is already registered: %1</source>
<translation>Другой эелемент с таким именем уже был зарегистрирован: %1</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="428"/>
+ <location filename="../src/library/CoreLib.cpp" line="430"/>
<source>The actor '%1' has been already registered</source>
<translation>Метка '%1' уже была зарегистрирована</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="153"/>
- <location filename="../src/library/CoreLib.cpp" line="251"/>
+ <location filename="../src/library/CoreLib.cpp" line="154"/>
+ <location filename="../src/library/CoreLib.cpp" line="252"/>
<location filename="../src/library/GenericReadActor.cpp" line="100"/>
<source>Sequence</source>
<translation>Последовательность</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="174"/>
- <location filename="../src/library/CoreLib.cpp" line="194"/>
+ <location filename="../src/library/CoreLib.cpp" line="175"/>
+ <location filename="../src/library/CoreLib.cpp" line="195"/>
<source>Plain text</source>
<translation>Текстовые данные</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="125"/>
+ <location filename="../src/library/CoreLib.cpp" line="126"/>
<source>Location</source>
<translation>Путь к файлу</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="177"/>
+ <location filename="../src/library/CoreLib.cpp" line="178"/>
<source>Reads text from <u>%1</u>.</source>
<translation>Прочитать текст из <u>%1</u>.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="200"/>
+ <location filename="../src/library/CoreLib.cpp" line="201"/>
<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="215"/>
+ <location filename="../src/library/CoreLib.cpp" line="216"/>
<location filename="../src/library/GenericReadActor.cpp" line="160"/>
<source>Multiple sequence alignment</source>
<translation>Множественное выравнивание</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="228"/>
+ <location filename="../src/library/CoreLib.cpp" line="229"/>
<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="214"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<source>Write Alignment</source>
<translation>Запись множественного выравнивания</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="214"/>
+ <location filename="../src/library/CoreLib.cpp" line="215"/>
<source>Writes all supplied alignments to file(s) in selected format.</source>
<translation>этот элемент записывает все входные выравнивания в файл(ы) заданного формата.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="250"/>
+ <location filename="../src/library/CoreLib.cpp" line="251"/>
<source>Write Sequence</source>
<translation>Запись последовательности</translation>
</message>
@@ -5125,17 +5216,17 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Биологические последовательности разных видов (ДНК, РНК, протеины).</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="125"/>
+ <location filename="../src/library/CoreLib.cpp" line="126"/>
<source>Location for writing data</source>
<translation>Путь к файлу для записи данных</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="153"/>
+ <location filename="../src/library/CoreLib.cpp" line="154"/>
<source>A sequence along with FASTA header line.</source>
<translation>Последовательность вместе с заголовком FASTA.</translation>
</message>
<message>
- <location filename="../src/library/CoreLib.cpp" line="152"/>
+ <location filename="../src/library/CoreLib.cpp" line="153"/>
<source>Writes all supplied sequences to file(s) in FASTA format.</source>
<translation>этот элемент записывает все входные данные в файл(ы) в формате FASTA.</translation>
</message>
@@ -5478,51 +5569,56 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/WorkflowDesignerPlugin.cpp" line="346"/>
+ <source>Variant calling and effects prediction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="348"/>
<source>Annotate variants and predict effects</source>
<translation>Аннотация вариаций и предсказание эффекта</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="348"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="350"/>
<source>Raw RNA-Seq data processing</source>
<translation>Обработка сырых данных секвенирования РНК</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="350"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="352"/>
<source>RNA-Seq data analysis</source>
<translation>Анализ данных секвенирования РНК</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="352"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="354"/>
<source>Extract transcript sequences</source>
<translation>Извлечение последовательности транскриптов</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="354"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="356"/>
<source>Raw ChIP-Seq data processing</source>
<translation>Обработка сырых данных ChIP-Seq</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="356"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="358"/>
<source>ChIP-Seq data analysis</source>
<translation>Анализ данных ChIP-Seq</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="358"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="360"/>
<source>ChIP-Seq coverage</source>
<translation>Покрытие ChIP-Seq</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="360"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="362"/>
<source>Extract coverage from assemblies</source>
<translation>Расчет покрытия по сборке</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="362"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="364"/>
<source>Extract consensus from assemblies</source>
<translation>Извлечение консенсуса из сборки</translation>
</message>
<message>
- <location filename="../src/WorkflowDesignerPlugin.cpp" line="365"/>
+ <location filename="../src/WorkflowDesignerPlugin.cpp" line="367"/>
<source>Remote NCBI BLAST</source>
<translation>Удаленный поиск с помощью NCBI BLAST</translation>
</message>
@@ -5723,22 +5819,22 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<context>
<name>U2::WorkflowScene</name>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2535"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2536"/>
<source>Open document(s)</source>
<translation>Открыть документы</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2695"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2696"/>
<source>Workflow Designer</source>
<translation>Дизайнер вычислительных схем</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2695"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2696"/>
<source>Unable to open specified documents. Watch log for details.</source>
<translation>Невозможно открыть указанные документы. Посмотрите лог для выяснения деталей.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2777"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2778"/>
<source>Drop an element from the palette here</source>
<translation>Перенесите сюда элемент из палитры</translation>
</message>
@@ -5791,7 +5887,7 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<name>U2::WorkflowView</name>
<message>
<location filename="../src/WorkflowViewController.cpp" line="325"/>
- <location filename="../src/WorkflowViewController.cpp" line="2332"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2333"/>
<source>Workflow Designer</source>
<translation>Дизайнер схем</translation>
</message>
@@ -5804,8 +5900,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<message>
<location filename="../src/WorkflowViewController.cpp" line="441"/>
<location filename="../src/WorkflowViewController.cpp" line="443"/>
- <location filename="../src/WorkflowViewController.cpp" line="2255"/>
- <location filename="../src/WorkflowViewController.cpp" line="2257"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2256"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2258"/>
<source>Warning!</source>
<translation>Предупреждение!</translation>
</message>
@@ -5846,14 +5942,14 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Не могу удалить элемент %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1313"/>
- <location filename="../src/WorkflowViewController.cpp" line="1374"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1314"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1375"/>
<source>Element style</source>
<translation>Стиль</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1801"/>
- <location filename="../src/WorkflowViewController.cpp" line="1829"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1802"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1830"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
@@ -5901,8 +5997,8 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
</message>
<message>
<location filename="../src/WorkflowViewController.cpp" line="928"/>
- <location filename="../src/WorkflowViewController.cpp" line="1280"/>
- <location filename="../src/WorkflowViewController.cpp" line="1384"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1281"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1385"/>
<source>Add element</source>
<translation>Добавить элемент</translation>
</message>
@@ -6012,126 +6108,126 @@ TCCTTACTGTCTGAGCAATGGGATTCCATCTTTTACGATCTAGACATGGCT
<translation>Добавить элемент при помощи инструмента командной строки...</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1419"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1420"/>
<source>Empty workflow!</source>
<translation>Пустая схема!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1419"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1420"/>
<source>Nothing to run: empty workflow</source>
<translation>Выполнять нечего: схема пуста</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1444"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1445"/>
<source>Workflow cannot be executed</source>
<translation>Схема не может быть выполнена</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1445"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1446"/>
<source>Please fix issues listed in the error list (located under workflow).</source>
<translation>Исправьте ошибки представленные в списке ошибок (располодженный под схемой).</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1450"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1451"/>
<source>Well done!</source>
<translation>Готово!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1452"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1453"/>
<source>There are non-critical warnings.</source>
<translation>Нет критических ошибок.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1454"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1455"/>
<source>Workflow is valid</source>
<translation>Схема валидна</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1696"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1697"/>
<source>Aliases for workflow parameters should be different!</source>
<translation>Алиасы для параметров схемы должны бть разными!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1729"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1730"/>
<source>Workflow does not contain any parameter aliases</source>
<translation>Схема не содержит алиасов параметров</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1743"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1744"/>
<source>Internal error!</source>
<translation>Веутренняя ошибка!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1743"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1744"/>
<source>Can not create Galaxy config</source>
<translation>Невозможно создать конфигурацию Galaxy</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1799"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1800"/>
<source>The workflow contains a wizard. Sorry, but current version of UGENE doesn't support of wizards in the includes.</source>
<translation>Схема содержит визард. Текущая версия UGENE не поддерживает визарды в схемах.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2135"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2136"/>
<source>File is not found: %1</source>
<translation>Файл не найден: %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2173"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2174"/>
<source>Show dashboard</source>
<translation>Показать панель</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2182"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2183"/>
<source>Show workflow</source>
<translation>Показать схему</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2228"/>
- <location filename="../src/WorkflowViewController.cpp" line="2231"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2229"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2232"/>
<source>Open workflow file</source>
<translation>Открыть файл схемы</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2269"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2270"/>
<source>New workflow</source>
<translation>Новая схема</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2333"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2334"/>
<source>The workflow has been modified.
Do you want to save changes?</source>
<translation>Схема была изменена. Вы хотите сохранить изменения?</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1319"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1320"/>
<source>Scripting mode</source>
<translation>Скриптинг</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1367"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1368"/>
<source>Element properties</source>
<translation>Свойства элемента</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1448"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1449"/>
<source>Workflow is valid.
</source>
<translation>Схема валидна.</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1696"/>
- <location filename="../src/WorkflowViewController.cpp" line="1729"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1697"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1730"/>
<source>Bad input!</source>
<translation>Неверные входные данные!</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="2301"/>
+ <location filename="../src/WorkflowViewController.cpp" line="2302"/>
<source>Workflow Designer - %1</source>
<translation>Дизайнер схем - %1</translation>
</message>
<message>
- <location filename="../src/WorkflowViewController.cpp" line="1845"/>
+ <location filename="../src/WorkflowViewController.cpp" line="1846"/>
<source>Drag the palette element to the scene or just click on the scene to add the element.</source>
<translation>Перетащите элемент из палитры на плоскость или просто кликните мышью в нужном месте схемы.</translation>
</message>
diff --git a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
index 7c139e3..1d6d025 100644
--- a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
+++ b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/workflow_dump/src/WorkflowDumpPlugin.h b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
index fa240e9..c16c760 100644
--- a/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
+++ b/src/plugins/workflow_dump/src/WorkflowDumpPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/BallPlugin.cpp b/src/plugins_3rdparty/ball/src/BallPlugin.cpp
index a0fba65..301e45d 100644
--- a/src/plugins_3rdparty/ball/src/BallPlugin.cpp
+++ b/src/plugins_3rdparty/ball/src/BallPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/BallPlugin.h b/src/plugins_3rdparty/ball/src/BallPlugin.h
index d09036f..d326787 100644
--- a/src/plugins_3rdparty/ball/src/BallPlugin.h
+++ b/src/plugins_3rdparty/ball/src/BallPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/SAS.cpp b/src/plugins_3rdparty/ball/src/SAS.cpp
index 89fdf81..6bab8ec 100644
--- a/src/plugins_3rdparty/ball/src/SAS.cpp
+++ b/src/plugins_3rdparty/ball/src/SAS.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/SAS.h b/src/plugins_3rdparty/ball/src/SAS.h
index 3fbc4cc..52df92c 100644
--- a/src/plugins_3rdparty/ball/src/SAS.h
+++ b/src/plugins_3rdparty/ball/src/SAS.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/SES.cpp b/src/plugins_3rdparty/ball/src/SES.cpp
index 0761f4f..5c31ace 100644
--- a/src/plugins_3rdparty/ball/src/SES.cpp
+++ b/src/plugins_3rdparty/ball/src/SES.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ball/src/SES.h b/src/plugins_3rdparty/ball/src/SES.h
index 3e7f4c8..408e8f5 100644
--- a/src/plugins_3rdparty/ball/src/SES.h
+++ b/src/plugins_3rdparty/ball/src/SES.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/gor4/src/GorIVAlgTask.cpp b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
index e4db1ea..6776d5b 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
+++ b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/gor4/src/GorIVAlgTask.h b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
index e1353f9..dede85a 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
+++ b/src/plugins_3rdparty/gor4/src/GorIVAlgTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/gor4/src/GorIVPlugin.cpp b/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
index 4651f9e..54d9301 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
+++ b/src/plugins_3rdparty/gor4/src/GorIVPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/gor4/src/GorIVPlugin.h b/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
index 5e1777b..e1c73d2 100644
--- a/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
+++ b/src/plugins_3rdparty/gor4/src/GorIVPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/HMMIO.cpp b/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
index 74d74e5..f4bc8f3 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
+++ b/src/plugins_3rdparty/hmm2/src/HMMIO.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/HMMIO.h b/src/plugins_3rdparty/hmm2/src/HMMIO.h
index a9113b5..4e4585a 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIO.h
+++ b/src/plugins_3rdparty/hmm2/src/HMMIO.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/HMMIOWorker.cpp b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
index 0aeb42c..7fcdf13 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
+++ b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/HMMIOWorker.h b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
index 63b94a0..f4b5a6c 100644
--- a/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
+++ b/src/plugins_3rdparty/hmm2/src/HMMIOWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
index 233a34a..0189743 100644
--- a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/TaskLocalStorage.h b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
index ec8768b..cb62cf4 100644
--- a/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/hmm2/src/TaskLocalStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/hmmer2/altivec_algorithms.cpp b/src/plugins_3rdparty/hmm2/src/hmmer2/altivec_algorithms.cpp
index 1537aaa..b778e73 100644
--- a/src/plugins_3rdparty/hmm2/src/hmmer2/altivec_algorithms.cpp
+++ b/src/plugins_3rdparty/hmm2/src/hmmer2/altivec_algorithms.cpp
@@ -1,6 +1,6 @@
/*****************************************************************
* Unipro UGENE - Genome analysis suite
-* Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru)
+* Copyright (C) 2008 Unipro, Russia (http://ugene.net)
* All Rights Reserved
*
* This source code is distributed under the terms of the
diff --git a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
index b6a86e2..de1e1d4 100644
--- a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
+++ b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/uHMMPlugin.h b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
index 9687dac..1bf1995 100644
--- a/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
+++ b/src/plugins_3rdparty/hmm2/src/uHMMPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
index 1089195..2368792 100644
--- a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -51,7 +51,7 @@ HMMBuildDialogController::HMMBuildDialogController(const QString& _pn, const MAl
profileName(_pn),
saveController(NULL) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220555");
+ new HelpButton(this, buttonBox, "18223195");
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 54627a5..ec1a213 100644
--- a/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_build/HMMBuildDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
index c812832..95cde59 100644
--- a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ HMMCalibrateDialogController::HMMCalibrateDialogController(QWidget* w)
saveController(NULL) {
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "18220556");
+ new HelpButton(this, buttonBox, "18223196");
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 6d08786..2f0629e 100644
--- a/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_calibrate/HMMCalibrateDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
index bc8a3ee..855943e 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C)2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ HMMSearchDialogController::HMMSearchDialogController(const DNASequence& sequence
searchTask = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "18220557");
+ new HelpButton(this, buttonBox, "18223197");
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 7586991..5de8023 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
index 9cfdc14..f1ae29b 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
index 055da02..2b543b4 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchQDActor.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
index 4814be5..a3d61f7 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/hmm2/src/u_search/HMMSearchTask.h b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
index 670c794..a1f3138 100644
--- a/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
+++ b/src/plugins_3rdparty/hmm2/src/u_search/HMMSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignAdapter.cpp b/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
index 15a3bd6..289c5a9 100644
--- a/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignAdapter.h b/src/plugins_3rdparty/kalign/src/KalignAdapter.h
index 35a1123..014667d 100644
--- a/src/plugins_3rdparty/kalign/src/KalignAdapter.h
+++ b/src/plugins_3rdparty/kalign/src/KalignAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignConstants.h b/src/plugins_3rdparty/kalign/src/KalignConstants.h
index df5aad9..538c3a6 100644
--- a/src/plugins_3rdparty/kalign/src/KalignConstants.h
+++ b/src/plugins_3rdparty/kalign/src/KalignConstants.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignDialog.ui b/src/plugins_3rdparty/kalign/src/KalignDialog.ui
index 1c68cfa..4f0a45a 100644
--- a/src/plugins_3rdparty/kalign/src/KalignDialog.ui
+++ b/src/plugins_3rdparty/kalign/src/KalignDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>510</width>
- <height>319</height>
+ <height>366</height>
</rect>
</property>
<property name="sizePolicy">
@@ -43,7 +43,7 @@
</sizepolicy>
</property>
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
diff --git a/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp b/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
index 2c2d643..6d02bf0 100644
--- a/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -59,7 +59,7 @@ KalignDialogController::KalignDialogController(QWidget* w, const MAlignment& _ma
: QDialog(w), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220601");
+ new HelpButton(this, buttonBox, "18223241");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -123,7 +123,7 @@ KalignAlignWithExtFileSpecifyDialogController::KalignAlignWithExtFileSpecifyDial
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220627");
+ new HelpButton(this, buttonBox, "18223267");
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 485a3bd..01c45c8 100644
--- a/src/plugins_3rdparty/kalign/src/KalignDialogController.h
+++ b/src/plugins_3rdparty/kalign/src/KalignDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignException.cpp b/src/plugins_3rdparty/kalign/src/KalignException.cpp
index f92bb4d..f514cf6 100644
--- a/src/plugins_3rdparty/kalign/src/KalignException.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignException.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignException.h b/src/plugins_3rdparty/kalign/src/KalignException.h
index 29da8cb..fae768e 100644
--- a/src/plugins_3rdparty/kalign/src/KalignException.h
+++ b/src/plugins_3rdparty/kalign/src/KalignException.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignPlugin.cpp b/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
index b0118e4..0be3400 100644
--- a/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignPlugin.h b/src/plugins_3rdparty/kalign/src/KalignPlugin.h
index 86e8198..1a94231 100644
--- a/src/plugins_3rdparty/kalign/src/KalignPlugin.h
+++ b/src/plugins_3rdparty/kalign/src/KalignPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignTask.cpp b/src/plugins_3rdparty/kalign/src/KalignTask.cpp
index 8787e99..e311eb9 100644
--- a/src/plugins_3rdparty/kalign/src/KalignTask.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignTask.h b/src/plugins_3rdparty/kalign/src/KalignTask.h
index 56f73c4..8986ff7 100644
--- a/src/plugins_3rdparty/kalign/src/KalignTask.h
+++ b/src/plugins_3rdparty/kalign/src/KalignTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignUtils.cpp b/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
index ec243ab..8475fa9 100644
--- a/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignUtils.h b/src/plugins_3rdparty/kalign/src/KalignUtils.h
index 7e656fb..71f7a39 100644
--- a/src/plugins_3rdparty/kalign/src/KalignUtils.h
+++ b/src/plugins_3rdparty/kalign/src/KalignUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignWorker.cpp b/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
index 35b7f4f..d27d906 100644
--- a/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
+++ b/src/plugins_3rdparty/kalign/src/KalignWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/KalignWorker.h b/src/plugins_3rdparty/kalign/src/KalignWorker.h
index 306ef11..d5ba032 100644
--- a/src/plugins_3rdparty/kalign/src/KalignWorker.h
+++ b/src/plugins_3rdparty/kalign/src/KalignWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
index 3c0f600..5ad8549 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergGUIExtensionFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
index 66a5d6e..b454ff8 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
index 82bf1aa..e1de8ce 100644
--- a/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
+++ b/src/plugins_3rdparty/kalign/src/PairwiseAlignmentHirschbergTaskFactory.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
index 5b9d2b0..dfc5837 100644
--- a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/TaskLocalStorage.h b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
index 2e2c88c..633e70e 100644
--- a/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/kalign/src/TaskLocalStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/kalign_tests/KalignTests.cpp b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
index 30fb696..e8e5c31 100644
--- a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
+++ b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/src/kalign_tests/KalignTests.h b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
index 3c95e07..de247f4 100644
--- a/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
+++ b/src/plugins_3rdparty/kalign/src/kalign_tests/KalignTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/kalign/transl/english.ts b/src/plugins_3rdparty/kalign/transl/english.ts
index fdde279..6375178 100644
--- a/src/plugins_3rdparty/kalign/transl/english.ts
+++ b/src/plugins_3rdparty/kalign/transl/english.ts
@@ -9,6 +9,11 @@
<translation>Align with Kalign</translation>
</message>
<message>
+ <location filename="../src/KalignDialog.ui" line="46"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/KalignDialog.ui" line="54"/>
<source>Input file</source>
<translation>Input file</translation>
diff --git a/src/plugins_3rdparty/kalign/transl/russian.ts b/src/plugins_3rdparty/kalign/transl/russian.ts
index f771c55..505a96a 100644
--- a/src/plugins_3rdparty/kalign/transl/russian.ts
+++ b/src/plugins_3rdparty/kalign/transl/russian.ts
@@ -9,6 +9,11 @@
<translation>Выравнивание с помощью Kalign</translation>
</message>
<message>
+ <location filename="../src/KalignDialog.ui" line="46"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/KalignDialog.ui" line="54"/>
<source>Input file</source>
<translation>Входной файл</translation>
diff --git a/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp b/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
index be921b2..19008ba 100644
--- a/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
+++ b/src/plugins_3rdparty/phylip/src/DistanceMatrix.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/DistanceMatrix.h b/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
index 93804d6..8e0f3cd 100644
--- a/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
+++ b/src/plugins_3rdparty/phylip/src/DistanceMatrix.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/NeighborJoinAdapter.cpp b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
index 38276c5..ec600f5 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/NeighborJoinAdapter.h b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
index 14608a4..261acfc 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/NeighborJoinWidget.cpp b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
index bedd6e6..9242295 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/NeighborJoinWidget.h b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
index 2be601f..2634618 100644
--- a/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
+++ b/src/plugins_3rdparty/phylip/src/NeighborJoinWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipCmdlineTask.cpp b/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.cpp
index 731df7c..3941752 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipCmdlineTask.h b/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.h
index a4e98af..288e5f7 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipCmdlineTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipPlugin.cpp b/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
index 8724409..deac683 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipPlugin.h b/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
index b3c34c9..6ee9fca 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipPluginTests.cpp b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
index 535770a..2de32fa 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipPluginTests.h b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
index b26a6b9..9e31b7f 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipPluginTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipTask.cpp b/src/plugins_3rdparty/phylip/src/PhylipTask.cpp
index 5ddfecc..65e35ab 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipTask.cpp
+++ b/src/plugins_3rdparty/phylip/src/PhylipTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/PhylipTask.h b/src/plugins_3rdparty/phylip/src/PhylipTask.h
index 1ef5b20..db8e1f2 100644
--- a/src/plugins_3rdparty/phylip/src/PhylipTask.h
+++ b/src/plugins_3rdparty/phylip/src/PhylipTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/SeqBootAdapter.cpp b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
index b4aa109..e292062 100644
--- a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
+++ b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/src/SeqBootAdapter.h b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
index 71f3567..44b4fc1 100644
--- a/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
+++ b/src/plugins_3rdparty/phylip/src/SeqBootAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* 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_3rdparty/phylip/transl/english.ts b/src/plugins_3rdparty/phylip/transl/english.ts
index 1a4be2c..c11acc9 100644
--- a/src/plugins_3rdparty/phylip/transl/english.ts
+++ b/src/plugins_3rdparty/phylip/transl/english.ts
@@ -59,7 +59,7 @@
<message>
<location filename="../src/NeighborJoinWidget.ui" line="185"/>
<source>Enable bootstrapping</source>
- <translation type="unfinished"></translation>
+ <translation>Enable bootstrapping</translation>
</message>
<message>
<location filename="../src/NeighborJoinWidget.ui" line="218"/>
@@ -84,7 +84,7 @@
<message>
<location filename="../src/NeighborJoinWidget.ui" line="331"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Display Options</translation>
</message>
</context>
<context>
diff --git a/src/plugins_3rdparty/phylip/transl/russian.ts b/src/plugins_3rdparty/phylip/transl/russian.ts
index c1d37bb..f161bc9 100644
--- a/src/plugins_3rdparty/phylip/transl/russian.ts
+++ b/src/plugins_3rdparty/phylip/transl/russian.ts
@@ -59,7 +59,7 @@
<message>
<location filename="../src/NeighborJoinWidget.ui" line="185"/>
<source>Enable bootstrapping</source>
- <translation type="unfinished"></translation>
+ <translation>Бутстреп-анализ</translation>
</message>
<message>
<location filename="../src/NeighborJoinWidget.ui" line="218"/>
@@ -84,7 +84,7 @@
<message>
<location filename="../src/NeighborJoinWidget.ui" line="331"/>
<source>Display Options</source>
- <translation type="unfinished"></translation>
+ <translation>Опции отображения</translation>
</message>
</context>
<context>
diff --git a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
index 89a9d63..4c7ac1d 100644
--- a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
+++ b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/FindExonRegionsTask.h b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
index 0966755..25501b8 100644
--- a/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
+++ b/src/plugins_3rdparty/primer3/src/FindExonRegionsTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Dialog.cpp b/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
index 5de6890..78fe3d0 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Dialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@ Primer3Dialog::Primer3Dialog(const Primer3TaskSettings &defaultSettings, ADVSequ
defaultSettings(defaultSettings)
{
ui.setupUi(this);
- new HelpButton(this, ui.helpButton, "18220580");
+ new HelpButton(this, ui.helpButton, "18223220");
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 af5262e..525cf53 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Dialog.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Dialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Plugin.cpp b/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
index 693e373..68cb737 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Plugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Plugin.h b/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
index 4c948d0..27dd143 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Plugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Query.cpp b/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
index 10de41f..b680d19 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Query.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Query.h b/src/plugins_3rdparty/primer3/src/Primer3Query.h
index 363b096..cbb2bf0 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Query.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Query.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Task.cpp b/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
index 043ac17..d7e6db3 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Task.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Task.h b/src/plugins_3rdparty/primer3/src/Primer3Task.h
index 72e82c0..c9fba99 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Task.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Task.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3TaskSettings.cpp b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
index c1fc03f..7858f59 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3TaskSettings.h b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
index e72f1b5..3abf9e9 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3TaskSettings.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Tests.cpp b/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
index 453908c..f12f294 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
+++ b/src/plugins_3rdparty/primer3/src/Primer3Tests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/primer3/src/Primer3Tests.h b/src/plugins_3rdparty/primer3/src/Primer3Tests.h
index 5e23200..2f9c317 100644
--- a/src/plugins_3rdparty/primer3/src/Primer3Tests.h
+++ b/src/plugins_3rdparty/primer3/src/Primer3Tests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/psipred/src/PsipredAlgTask.cpp b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
index 8798c9e..d2d769a 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
+++ b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/psipred/src/PsipredAlgTask.h b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
index 9443c92..5a61729 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
+++ b/src/plugins_3rdparty/psipred/src/PsipredAlgTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/psipred/src/PsipredPlugin.cpp b/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
index 535452e..3b1928e 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
+++ b/src/plugins_3rdparty/psipred/src/PsipredPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/psipred/src/PsipredPlugin.h b/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
index 3c138dc..7147f86 100644
--- a/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
+++ b/src/plugins_3rdparty/psipred/src/PsipredPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsAligner.cpp b/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
index f0e325a..5b3579a 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsAligner.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsAligner.h b/src/plugins_3rdparty/ptools/src/PToolsAligner.h
index 5703900..db92edd 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsAligner.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsAligner.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsPlugin.cpp b/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
index 3b95fc6..e741a1b 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsPlugin.h b/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
index f9760ae..3703023 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsTests.cpp b/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
index d40dd11..59b6c8f 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
+++ b/src/plugins_3rdparty/ptools/src/PToolsTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/ptools/src/PToolsTests.h b/src/plugins_3rdparty/ptools/src/PToolsTests.h
index 05d4cd8..bb13b13 100644
--- a/src/plugins_3rdparty/ptools/src/PToolsTests.h
+++ b/src/plugins_3rdparty/ptools/src/PToolsTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/DIPropertiesSitecon.cpp b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
index 7e048d4..30f0068 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/DIPropertiesSitecon.h b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
index ba8dbbe..47c7563 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesSitecon.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/DIPropertiesTests.cpp b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
index 2823257..77ce8c2 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/DIPropertiesTests.h b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
index e2a5535..f962aba 100644
--- a/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
+++ b/src/plugins_3rdparty/sitecon/src/DIPropertiesTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconAlgorithm.cpp b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
index 79f2397..5f3fc15 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconAlgorithm.h b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
index 2be7cde..6766e27 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithm.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
index 5b33f3a..e9f67fb 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconAlgorithmTests.h b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
index 13449a0..142d05d 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconAlgorithmTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconBuildDialogController.cpp b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
index 6f526d3..638e72b 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@ SiteconBuildDialogController::SiteconBuildDialogController(SiteconPlugin* pl, QW
saveController(NULL) {
task = NULL;
setupUi(this);
- new HelpButton(this, buttonBox, "18220552");
+ new HelpButton(this, buttonBox, "18223192");
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 0509d8e..dd9c559 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconBuildWorker.cpp b/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
index c561f64..fba980e 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconBuildWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconIO.cpp b/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
index c2d6da9..d58a8e8 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIO.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconIO.h b/src/plugins_3rdparty/sitecon/src/SiteconIO.h
index eecaa95..1479ea6 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIO.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIO.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconIOWorkers.cpp b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
index 5c6ea06..a1cb1a3 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconIOWorkers.h b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
index 44aa276..bd14d86 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconIOWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconPlugin.cpp b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
index 81e7950..f31fa08 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconPlugin.h b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
index 5424cc3..5e11330 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconQuery.cpp b/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
index f478e33..2516191 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconQuery.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconQuery.h b/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
index 7ab675e..8d1853f 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconQuery.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconSearchDialogController.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
index 61b3691..bd39f91 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -86,7 +86,7 @@ public:
SiteconSearchDialogController::SiteconSearchDialogController(ADVSequenceObjectContext* _ctx, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220548");
+ new HelpButton(this, buttonBox, "18223188");
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 dedacde..3e9a113 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconSearchTask.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
index 2a73521..3692f99 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconSearchTask.h b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
index 31910bc..edff7a5 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconSearchWorker.cpp b/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
index b74ccfd..e4209f9 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
+++ b/src/plugins_3rdparty/sitecon/src/SiteconSearchWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/sitecon/src/SiteconWorkers.h b/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
index 77dd286..9dd5e41 100644
--- a/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
+++ b/src/plugins_3rdparty/sitecon/src/SiteconWorkers.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleAdapter.cpp b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
index 6ea4ee5..90da78c 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleAdapter.h b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
index e06cb3e..c014c35 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAdapter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleAlignDialog.ui b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialog.ui
index b460c39..4a161d2 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialog.ui
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>523</width>
- <height>494</height>
+ <height>554</height>
</rect>
</property>
<property name="minimumSize">
@@ -25,7 +25,7 @@
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="title">
- <string/>
+ <string>Input and output</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
index fe3c280..aa55d38 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,7 +43,7 @@ MuscleAlignDialogController::MuscleAlignDialogController(QWidget* w, const MAlig
: QDialog(w), ma(_ma), settings(_settings)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220563");
+ new HelpButton(this, buttonBox, "18223203");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
@@ -133,7 +133,7 @@ MuscleAlignWithExtFileSpecifyDialogController::MuscleAlignWithExtFileSpecifyDial
saveController(NULL)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220562");
+ new HelpButton(this, buttonBox, "18223202");
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Align"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
diff --git a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
index 1013ccc..3d32aba 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleAlignDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleConstants.h b/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
index 0089bf8..38f00ea 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleConstants.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleParallel.cpp b/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
index 6ba49ed..023307d 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleParallel.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleParallel.h b/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
index 9f1d955..3aeae82 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleParallel.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MusclePlugin.cpp b/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
index 167307d..4f4875f 100644
--- a/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MusclePlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MusclePlugin.h b/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
index ee2e1d9..44c4478 100644
--- a/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
+++ b/src/plugins_3rdparty/umuscle/src/MusclePlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleTask.cpp b/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
index 22a214d..a5645f4 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleTask.h b/src/plugins_3rdparty/umuscle/src/MuscleTask.h
index 541aafa..b571a7d 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleTask.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleUtils.cpp b/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
index 35d7775..ff68ba5 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleUtils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleUtils.h b/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
index 7721d0c..3011228 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleUtils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleWorkPool.cpp b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
index 6a5630e..b8cf906 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleWorkPool.h b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
index bbf0a2a..a319323 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorkPool.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleWorker.cpp b/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
index 1a35a3d..a4acc96 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/MuscleWorker.h b/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
index 4a2877f..e817930 100644
--- a/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
+++ b/src/plugins_3rdparty/umuscle/src/MuscleWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/ProfileToProfileWorker.cpp b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
index 75d686f..47d6cbb 100644
--- a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
+++ b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/ProfileToProfileWorker.h b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
index 901d431..3606846 100644
--- a/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
+++ b/src/plugins_3rdparty/umuscle/src/ProfileToProfileWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/TaskLocalStorage.cpp b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
index 4309272..6fc39a7 100644
--- a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
+++ b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/TaskLocalStorage.h b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
index e75cafe..ab4523c 100644
--- a/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
+++ b/src/plugins_3rdparty/umuscle/src/TaskLocalStorage.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/refinehorizP.cpp b/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
index c78285d..84f7da3 100644
--- a/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
+++ b/src/plugins_3rdparty/umuscle/src/refinehorizP.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/refinevertP.cpp b/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
index fee28a2..e9bd756 100644
--- a/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
+++ b/src/plugins_3rdparty/umuscle/src/refinevertP.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
index d179c74..381553c 100644
--- a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
+++ b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
index bcfac74..f4ca3c8 100644
--- a/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
+++ b/src/plugins_3rdparty/umuscle/src/umuscle_tests/umuscleTests.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/umuscle/transl/english.ts b/src/plugins_3rdparty/umuscle/transl/english.ts
index e16edd1..b7abb4e 100644
--- a/src/plugins_3rdparty/umuscle/transl/english.ts
+++ b/src/plugins_3rdparty/umuscle/transl/english.ts
@@ -9,6 +9,11 @@
<translation>Align with MUSCLE</translation>
</message>
<message>
+ <location filename="../src/MuscleAlignDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/MuscleAlignDialog.ui" line="36"/>
<source>Input file</source>
<translation>Input file</translation>
diff --git a/src/plugins_3rdparty/umuscle/transl/russian.ts b/src/plugins_3rdparty/umuscle/transl/russian.ts
index b93351e..6f671cc 100644
--- a/src/plugins_3rdparty/umuscle/transl/russian.ts
+++ b/src/plugins_3rdparty/umuscle/transl/russian.ts
@@ -9,6 +9,11 @@
<translation>Выравнивание с помощью MUSCLE</translation>
</message>
<message>
+ <location filename="../src/MuscleAlignDialog.ui" line="28"/>
+ <source>Input and output</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/MuscleAlignDialog.ui" line="36"/>
<source>Input file</source>
<translation>Входной файл</translation>
diff --git a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
index 98f16d5..4b4b8d7 100644
--- a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
+++ b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/variants/src/AssemblySamtoolsMpileup.h b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
index 78dbd5d..88b0709 100644
--- a/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
+++ b/src/plugins_3rdparty/variants/src/AssemblySamtoolsMpileup.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/variants/src/SamtoolMpileupWorker.cpp b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
index bf01a74..a0d150b 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
+++ b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/variants/src/SamtoolMpileupWorker.h b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
index 2a34f36..c6bdd15 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
+++ b/src/plugins_3rdparty/variants/src/SamtoolMpileupWorker.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/variants/src/SamtoolsPlugin.cpp b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
index 91f7a4c..0fdcdd6 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
+++ b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_3rdparty/variants/src/SamtoolsPlugin.h b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
index 405ffe2..c7e3630 100644
--- a/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
+++ b/src/plugins_3rdparty/variants/src/SamtoolsPlugin.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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_checker/src/Main.cpp b/src/plugins_checker/src/Main.cpp
index 7c7af12..f316d2f 100644
--- a/src/plugins_checker/src/Main.cpp
+++ b/src/plugins_checker/src/Main.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugene_version.pri b/src/ugene_version.pri
index a94bd3e..9f1ba68 100644
--- a/src/ugene_version.pri
+++ b/src/ugene_version.pri
@@ -1,13 +1,13 @@
# This file contains UGENE version info
# product version
-UGENE_VERSION=1.24.2
+UGENE_VERSION=1.25.0
# minimum UGENE version whose SQLite databases are compatible with this version
-UGENE_MIN_VERSION_SQLITE=1.13.0
+UGENE_MIN_VERSION_SQLITE=1.25.0
# minimum UGENE version whose MySQL databases are compatible with this version
-UGENE_MIN_VERSION_MYSQL=1.24.0
+UGENE_MIN_VERSION_MYSQL=1.25.0
# distribution info
isEmpty( U2_DISTRIBUTION_INFO ) {
@@ -16,5 +16,5 @@ U2_DISTRIBUTION_INFO=sources
# int version levels for executables
UGENE_VER_MAJOR=1
-UGENE_VER_MINOR=24
-UGENE_VER_PATCH=2
+UGENE_VER_MINOR=25
+UGENE_VER_PATCH=0
diff --git a/src/ugenecl/CMakeLists.txt b/src/ugenecl/CMakeLists.txt
index f35702a..1e05d05 100644
--- a/src/ugenecl/CMakeLists.txt
+++ b/src/ugenecl/CMakeLists.txt
@@ -21,5 +21,5 @@ add_executable(ugenecl ${HDRS} ${SRCS})
target_link_libraries(ugenecl
Qt5::Core Qt5::Gui
ugenedb breakpad samtools
- U2Core U2Algorithm U2Formats U2Remote U2Lang U2Gui U2View U2Test)
+ U2Core U2Algorithm U2Formats U2Lang U2Gui U2View U2Test)
diff --git a/src/ugenecl/src/DumpHelpTask.cpp b/src/ugenecl/src/DumpHelpTask.cpp
index fbb6b2b..3e26e05 100644
--- a/src/ugenecl/src/DumpHelpTask.cpp
+++ b/src/ugenecl/src/DumpHelpTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/DumpHelpTask.h b/src/ugenecl/src/DumpHelpTask.h
index ad7efbb..f31ae22 100644
--- a/src/ugenecl/src/DumpHelpTask.h
+++ b/src/ugenecl/src/DumpHelpTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/DumpLicenseTask.cpp b/src/ugenecl/src/DumpLicenseTask.cpp
index 25f4556..60e7049 100644
--- a/src/ugenecl/src/DumpLicenseTask.cpp
+++ b/src/ugenecl/src/DumpLicenseTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/DumpLicenseTask.h b/src/ugenecl/src/DumpLicenseTask.h
index 5dcc503..03e304f 100644
--- a/src/ugenecl/src/DumpLicenseTask.h
+++ b/src/ugenecl/src/DumpLicenseTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/DumpVersionTask.cpp b/src/ugenecl/src/DumpVersionTask.cpp
index 2f99c42..11227ca 100644
--- a/src/ugenecl/src/DumpVersionTask.cpp
+++ b/src/ugenecl/src/DumpVersionTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/DumpVersionTask.h b/src/ugenecl/src/DumpVersionTask.h
index fbab0ac..d2739b8 100644
--- a/src/ugenecl/src/DumpVersionTask.h
+++ b/src/ugenecl/src/DumpVersionTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/ForeverTask.cpp b/src/ugenecl/src/ForeverTask.cpp
index acae0dd..4218c57 100644
--- a/src/ugenecl/src/ForeverTask.cpp
+++ b/src/ugenecl/src/ForeverTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/ForeverTask.h b/src/ugenecl/src/ForeverTask.h
index 831739c..4ee4359 100644
--- a/src/ugenecl/src/ForeverTask.h
+++ b/src/ugenecl/src/ForeverTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/Main.cpp b/src/ugenecl/src/Main.cpp
index 55d5a0a..4f53f2b 100644
--- a/src/ugenecl/src/Main.cpp
+++ b/src/ugenecl/src/Main.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/TaskStatusBar.cpp b/src/ugenecl/src/TaskStatusBar.cpp
index 039d17e..6e7d1e2 100644
--- a/src/ugenecl/src/TaskStatusBar.cpp
+++ b/src/ugenecl/src/TaskStatusBar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/TaskStatusBar.h b/src/ugenecl/src/TaskStatusBar.h
index fcb1ad0..9d0548b 100644
--- a/src/ugenecl/src/TaskStatusBar.h
+++ b/src/ugenecl/src/TaskStatusBar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/TestStarter.cpp b/src/ugenecl/src/TestStarter.cpp
index 71cc154..d7087e5 100644
--- a/src/ugenecl/src/TestStarter.cpp
+++ b/src/ugenecl/src/TestStarter.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenecl/src/TestStarter.h b/src/ugenecl/src/TestStarter.h
index d3df9f8..76498cf 100644
--- a/src/ugenecl/src/TestStarter.h
+++ b/src/ugenecl/src/TestStarter.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/DetectWin10.cpp b/src/ugenem/src/DetectWin10.cpp
index ccafaf3..1053ff5 100644
--- a/src/ugenem/src/DetectWin10.cpp
+++ b/src/ugenem/src/DetectWin10.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/DetectWin10.h b/src/ugenem/src/DetectWin10.h
index 825ea53..34caab0 100644
--- a/src/ugenem/src/DetectWin10.h
+++ b/src/ugenem/src/DetectWin10.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/SendReportDialog.cpp b/src/ugenem/src/SendReportDialog.cpp
index e137005..3f58528 100644
--- a/src/ugenem/src/SendReportDialog.cpp
+++ b/src/ugenem/src/SendReportDialog.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
-* http://ugene.unipro.ru
+* http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@
#include "Utils.h"
#include "getMemorySize.c"
-#define HOST_URL "http://ugene.unipro.ru"
+#define HOST_URL "http://ugene.net"
//#define HOST_URL "http://127.0.0.1:80"
#ifdef Q_OS_LINUX
#define DESTINATION_URL_KEEPER_PAGE "/crash_reports_dest_breakpad_lin.html"
diff --git a/src/ugenem/src/SendReportDialog.h b/src/ugenem/src/SendReportDialog.h
index 8b97960..9484c6e 100644
--- a/src/ugenem/src/SendReportDialog.h
+++ b/src/ugenem/src/SendReportDialog.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/Utils.cpp b/src/ugenem/src/Utils.cpp
index 78d31b1..80b20ca 100644
--- a/src/ugenem/src/Utils.cpp
+++ b/src/ugenem/src/Utils.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/Utils.h b/src/ugenem/src/Utils.h
index 104a26c..1ffcc03 100644
--- a/src/ugenem/src/Utils.h
+++ b/src/ugenem/src/Utils.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugenem/src/getMemorySize.c b/src/ugenem/src/getMemorySize.c
index 816db64..93ae776 100644
--- a/src/ugenem/src/getMemorySize.c
+++ b/src/ugenem/src/getMemorySize.c
@@ -28,70 +28,70 @@
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;
+ /* 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;
+ /* 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 */
+ /* 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;
+ int mib[2];
+ mib[0] = CTL_HW;
#if defined(HW_MEMSIZE)
- mib[1] = HW_MEMSIZE; /* OSX. --------------------- */
+ mib[1] = HW_MEMSIZE; /* OSX. --------------------- */
#elif defined(HW_PHYSMEM64)
- mib[1] = HW_PHYSMEM64; /* NetBSD, OpenBSD. --------- */
+ 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? */
+ 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;
+ /* 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 );
+ /* 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 );
+ /* 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;
+ /* DragonFly BSD, FreeBSD, NetBSD, OpenBSD, and OSX. -------- */
+ int mib[2];
+ mib[0] = CTL_HW;
#if defined(HW_REALMEM)
- mib[1] = HW_REALMEM; /* FreeBSD. ----------------- */
+ mib[1] = HW_REALMEM; /* FreeBSD. ----------------- */
#elif defined(HW_PYSMEM)
- mib[1] = HW_PHYSMEM; /* Others. ------------------ */
+ 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? */
+ 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. */
+ return 0L; /* Unknown OS. */
#endif
}
diff --git a/src/ugenem/src/main.cpp b/src/ugenem/src/main.cpp
index 3cce3e1..d6cf04a 100644
--- a/src/ugenem/src/main.cpp
+++ b/src/ugenem/src/main.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
sender.send("", dumpUrl);
return 0;
}
-
+
if (useGui) {
SendReportDialog dlg(message, dumpUrl);
diff --git a/src/ugeneui/CMakeLists.txt b/src/ugeneui/CMakeLists.txt
index 4e2e452..cbac3ff 100644
--- a/src/ugeneui/CMakeLists.txt
+++ b/src/ugeneui/CMakeLists.txt
@@ -26,5 +26,5 @@ add_executable(ugeneui ${HDRS} ${SRCS} ${QM_FILES} ${RCC_SRCS})
target_link_libraries(ugeneui
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::Script Qt5::WebKit Qt5::WebKitWidgets
ugenedb breakpad samtools
- U2Core U2Algorithm U2Formats U2Remote U2Lang U2Gui U2View U2Test)
+ U2Core U2Algorithm U2Formats U2Lang U2Gui U2View U2Test)
diff --git a/src/ugeneui/html/version_news.html b/src/ugeneui/html/version_news.html
index 6ff7cab..4f927c6 100644
--- a/src/ugeneui/html/version_news.html
+++ b/src/ugeneui/html/version_news.html
@@ -3,17 +3,17 @@
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,
@@ -24,12 +24,16 @@
<meta charset="utf-8">
<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;
@@ -52,27 +56,27 @@
</head>
<body>
<div>
- <h3 lang="en">Major changes in UGENE 1.24</h3>
+ <h3 lang="en">Changes in UGENE 1.25</h3>
+ <h3 lang="ru">Изменения в UGENE 1.25</h3>
<ul class="features_list" lang="en">
- <li><span class="research_field">Workflow Designer:</span>
- <ul class="sub_features_list">
- <li>New element: "Convert SnpEff Variations to Annotations". Element converts variations with SnpEff information into standard annotations, so you can observe them in the Sequence View.</li>
- <li>NGS workflows improvements.</li>
+ <li><span class="research_field">NGS:</span>
+ <ul class="sub_features_list">
+ <li>New parameter for reads mappers (BWA, Bowtie2, etc.) to remove "unpaired" reads from quality-filtered paired-end FASTQ files before the mapping</li>
+ <li>Support of different options for CutAdapt parameters in the "Raw NGS data processing" wizards (5' adapters, 3' adapters, 5' and 3' adapters)</li>
+ <li>Optimization of the coverage calculation in the Assembly Browser</li>
</ul>
- </li>
- <li>Bug fixes.</li>
+ </li>
+ <li><span class="research_field">Bug fixes and minor improvements</span></li>
</ul>
-
- <h3 lang="ru">Изменения в UGENE 1.24</h3>
- <ul class="features_list" lang="ru">
- <li><span class="research_field">Дизайнер вычислительных схем:</span>
- <ul class="sub_features_list">
- <li>Новый элемент: "Преобразование вариаций SnpEff в аннотации". Элемент преобразует вариации с информацией от SnpEff в стандартные аннотации, которые вы можете открыть в редакторе последовательностей.</li>
- <li>Улучшения схем NGS.</li>
- </ul>
- </li>
- <li>Исправление ошибок.</li>
+ <ul class="features_list" lang="ru">
+ <li><span class="research_field">NGS:</span>
+ <ul class="sub_features_list">
+ <li>Возможность фильтрации прочтений, не имеющих пары, при картировании парных прочтений на референсную последовательность (с помощью BWA, Bowtie2 и т. п.)</li>
+ <li>Расширеный набор параметров для обрезания адаптерных последовательностей (5'-адаптеры, 3'-адаптеры, 5'- и 3'-адаптеры) в диалогах настройки схем анализа сырых данных NGS</li>
+ <li>Оптимизация вычисления покрытия в Assembly Browser</li>
+ </ul>
+ </li>
+ <li><span class="research_field">Исправление ошибок, мелкие улучшения</span></li>
</ul>
-
</div>
</body>
diff --git a/src/ugeneui/src/Main.cpp b/src/ugeneui/src/Main.cpp
index f06c0c8..6033873 100644
--- a/src/ugeneui/src/Main.cpp
+++ b/src/ugeneui/src/Main.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/AppSettingsDialogController.cpp b/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
index 0853706..e6a05f5 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/AppSettingsDialogController.h b/src/ugeneui/src/app_settings/AppSettingsDialogController.h
index 442269a..b137601 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogController.h
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/AppSettingsDialogTree.h b/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
index fc690cc..9253977 100644
--- a/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
+++ b/src/ugeneui/src/app_settings/AppSettingsDialogTree.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
index 86fad3d..ef5ccb8 100644
--- a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
+++ b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/AppSettingsGUIImpl.h b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
index 4009377..5dd8dd2 100644
--- a/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
+++ b/src/ugeneui/src/app_settings/AppSettingsGUIImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
index 707294c..4d57f1a 100644
--- a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -82,7 +82,7 @@ AppSettingsGUIPageWidget* DirectoriesSettingsPageController::createWidget(AppSet
return r;
}
-const QString DirectoriesSettingsPageController::helpPageId = QString("18220315");
+const QString DirectoriesSettingsPageController::helpPageId = QString("18222955");
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 f6121d3..ab25319 100644
--- a/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/directories_settings/DirectoriesSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
index f771558..5fd2c92 100644
--- a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -71,7 +71,7 @@ AppSettingsGUIPageWidget* FormatSettingsGUIPageController::createWidget(AppSetti
return r;
}
-const QString FormatSettingsGUIPageController::helpPageId = QString("18220308");
+const QString FormatSettingsGUIPageController::helpPageId = QString("18222948");
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 2a6ed55..6b1b95e 100644
--- a/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/format_settings/FormatSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
index 471cefc..f7bf165 100644
--- a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -62,7 +62,7 @@ AppSettingsGUIPageWidget* LogSettingsPageController::createWidget(AppSettingsGUI
return w;
}
-const QString LogSettingsPageController::helpPageId = QString("18220309");
+const QString LogSettingsPageController::helpPageId = QString("18222949");
//////////////////////////////////////////////////////////////////////////
// widget
diff --git a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
index d4a1817..0d25244 100644
--- a/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/logview_settings/LogSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
index 0c98a7b..65f55e9 100644
--- a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -65,7 +65,7 @@ AppSettingsGUIPageWidget* NetworkSettingsPageController::createWidget(AppSetting
return r;
}
-const QString NetworkSettingsPageController::helpPageId = QString("18220307");
+const QString NetworkSettingsPageController::helpPageId = QString("18222947");
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 225ea62..f35033d 100644
--- a/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/network_settings/NetworkSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
index 8e61327..e0f4561 100644
--- a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -59,7 +59,7 @@ AppSettingsGUIPageWidget* ResourceSettingsGUIPageController::createWidget(AppSet
return r;
}
-const QString ResourceSettingsGUIPageController::helpPageId = QString("18220306");
+const QString ResourceSettingsGUIPageController::helpPageId = QString("18222946");
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 32483e5..8257c01 100644
--- a/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/resource_settings/ResourceSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
index 75c4530..2a0d71c 100644
--- a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
+++ b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -110,7 +110,7 @@ AppSettingsGUIPageWidget* UserApplicationsSettingsPageController::createWidget(A
return r;
}
-const QString UserApplicationsSettingsPageController::helpPageId = QString("18220305");
+const QString UserApplicationsSettingsPageController::helpPageId = QString("18222945");
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 7580af4..cd2335f 100644
--- a/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h
+++ b/src/ugeneui/src/app_settings/user_apps_settings/UserApplicationsSettingsGUIController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/AboutDialogController.cpp b/src/ugeneui/src/main_window/AboutDialogController.cpp
index 5fd68bd..b7eadb5 100644
--- a/src/ugeneui/src/main_window/AboutDialogController.cpp
+++ b/src/ugeneui/src/main_window/AboutDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/AboutDialogController.h b/src/ugeneui/src/main_window/AboutDialogController.h
index 5d2c7be..ec8f70b 100644
--- a/src/ugeneui/src/main_window/AboutDialogController.h
+++ b/src/ugeneui/src/main_window/AboutDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/CheckUpdatesTask.cpp b/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
index 249d0c6..a642200 100644
--- a/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
+++ b/src/ugeneui/src/main_window/CheckUpdatesTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ CheckUpdatesTask::CheckUpdatesTask(bool startUp)
startError = false;
}
-#define SITE_URL QString("ugene.unipro.ru")
+#define SITE_URL QString("ugene.net")
#define PAGE_NAME QString("/current_version.html")
void CheckUpdatesTask::run() {
diff --git a/src/ugeneui/src/main_window/CheckUpdatesTask.h b/src/ugeneui/src/main_window/CheckUpdatesTask.h
index 8a59447..2e06dd2 100644
--- a/src/ugeneui/src/main_window/CheckUpdatesTask.h
+++ b/src/ugeneui/src/main_window/CheckUpdatesTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/DockManagerImpl.cpp b/src/ugeneui/src/main_window/DockManagerImpl.cpp
index 286fd4d..8431bb5 100644
--- a/src/ugeneui/src/main_window/DockManagerImpl.cpp
+++ b/src/ugeneui/src/main_window/DockManagerImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/DockManagerImpl.h b/src/ugeneui/src/main_window/DockManagerImpl.h
index 1aeeeb3..6e9450e 100644
--- a/src/ugeneui/src/main_window/DockManagerImpl.h
+++ b/src/ugeneui/src/main_window/DockManagerImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/MDIManagerImpl.cpp b/src/ugeneui/src/main_window/MDIManagerImpl.cpp
index d355518..b79b8ed 100644
--- a/src/ugeneui/src/main_window/MDIManagerImpl.cpp
+++ b/src/ugeneui/src/main_window/MDIManagerImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/MDIManagerImpl.h b/src/ugeneui/src/main_window/MDIManagerImpl.h
index cfe7ef2..cf41385 100644
--- a/src/ugeneui/src/main_window/MDIManagerImpl.h
+++ b/src/ugeneui/src/main_window/MDIManagerImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/MainWindowImpl.cpp b/src/ugeneui/src/main_window/MainWindowImpl.cpp
index 12c8da8..6b4a086 100644
--- a/src/ugeneui/src/main_window/MainWindowImpl.cpp
+++ b/src/ugeneui/src/main_window/MainWindowImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -402,10 +402,10 @@ void MainWindowImpl::setShutDownInProcess(bool flag) {
}
void MainWindowImpl::sl_visitWeb() {
- GUIUtils::runWebBrowser("http://ugene.unipro.ru");
+ GUIUtils::runWebBrowser("http://ugene.net");
}
void MainWindowImpl::sl_viewOnlineDocumentation(){
- GUIUtils::runWebBrowser("http://ugene.unipro.ru/documentation.html");
+ GUIUtils::runWebBrowser("http://ugene.net/documentation.html");
}
void MainWindowImpl::sl_openManualAction()
@@ -486,7 +486,7 @@ void MainWindowImpl::sl_installToPathAction() {
void MainWindowImpl::openManual(const QString& name){
QFileInfo fileInfo( QString(PATH_PREFIX_DATA)+":"+"/manuals/" + name );
if(!fileInfo.exists()){
- GUIUtils::runWebBrowser(QString("http://ugene.unipro.ru/downloads/") + name);
+ GUIUtils::runWebBrowser(QString("http://ugene.net/downloads/") + name);
}else{
if(!QDesktopServices::openUrl(QUrl("file:///"+fileInfo.absoluteFilePath()))){
QObjectScopedPointer<QMessageBox> msgBox = new QMessageBox;
@@ -500,7 +500,7 @@ void MainWindowImpl::openManual(const QString& name){
switch (ret) {
case QMessageBox::Yes:
- GUIUtils::runWebBrowser("http://ugene.unipro.ru/documentation.html");
+ GUIUtils::runWebBrowser("http://ugene.net/documentation.html");
break;
case QMessageBox::No:
return;
@@ -588,7 +588,7 @@ QMdiSubWindow* FixedMdiArea::addSubWindow(QWidget* widget)
}
void FixedMdiArea::tileSubWindows() {
- // A fix for https://local.ugene.unipro.ru/tracker/browse/UGENE-4361
+ // A fix for https://local.ugene.net/tracker/browse/UGENE-4361
// An appropriate Qt bug: https://bugreports.qt.io/browse/QTBUG-29758
// After Qt bug fixing just remove this method.
diff --git a/src/ugeneui/src/main_window/MainWindowImpl.h b/src/ugeneui/src/main_window/MainWindowImpl.h
index fa1f794..6a2e83f 100644
--- a/src/ugeneui/src/main_window/MainWindowImpl.h
+++ b/src/ugeneui/src/main_window/MainWindowImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/MenuManager.cpp b/src/ugeneui/src/main_window/MenuManager.cpp
index 9baf330..629f7cd 100644
--- a/src/ugeneui/src/main_window/MenuManager.cpp
+++ b/src/ugeneui/src/main_window/MenuManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/MenuManager.h b/src/ugeneui/src/main_window/MenuManager.h
index d874c9c..db22e2e 100644
--- a/src/ugeneui/src/main_window/MenuManager.h
+++ b/src/ugeneui/src/main_window/MenuManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/ShutdownTask.cpp b/src/ugeneui/src/main_window/ShutdownTask.cpp
index eacaa5c..4ca4aef 100644
--- a/src/ugeneui/src/main_window/ShutdownTask.cpp
+++ b/src/ugeneui/src/main_window/ShutdownTask.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/ShutdownTask.h b/src/ugeneui/src/main_window/ShutdownTask.h
index 6a91eb1..cc044ae 100644
--- a/src/ugeneui/src/main_window/ShutdownTask.h
+++ b/src/ugeneui/src/main_window/ShutdownTask.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/SplashScreen.cpp b/src/ugeneui/src/main_window/SplashScreen.cpp
index 49ee568..46d2d13 100644
--- a/src/ugeneui/src/main_window/SplashScreen.cpp
+++ b/src/ugeneui/src/main_window/SplashScreen.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/SplashScreen.h b/src/ugeneui/src/main_window/SplashScreen.h
index 627824f..5a43a21 100644
--- a/src/ugeneui/src/main_window/SplashScreen.h
+++ b/src/ugeneui/src/main_window/SplashScreen.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/TmpDirChangeDialogController.cpp b/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
index 95fed61..e600c51 100644
--- a/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
+++ b/src/ugeneui/src/main_window/TmpDirChangeDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/TmpDirChangeDialogController.h b/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
index 8ede9e2..8d8e62d 100644
--- a/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
+++ b/src/ugeneui/src/main_window/TmpDirChangeDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/ToolBarManager.cpp b/src/ugeneui/src/main_window/ToolBarManager.cpp
index b7bea30..1b4b038 100644
--- a/src/ugeneui/src/main_window/ToolBarManager.cpp
+++ b/src/ugeneui/src/main_window/ToolBarManager.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/main_window/ToolBarManager.h b/src/ugeneui/src/main_window/ToolBarManager.h
index 6ee1054..d345501 100644
--- a/src/ugeneui/src/main_window/ToolBarManager.h
+++ b/src/ugeneui/src/main_window/ToolBarManager.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/plugin_viewer/PluginViewerController.cpp b/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
index 0fc7917..2aea67c 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/plugin_viewer/PluginViewerController.h b/src/ugeneui/src/plugin_viewer/PluginViewerController.h
index 82d3187..7144b8b 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerController.h
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
index f7435d4..3f608b4 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/plugin_viewer/PluginViewerImpl.h b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
index 6efdf42..2962e73 100644
--- a/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
+++ b/src/ugeneui/src/plugin_viewer/PluginViewerImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/DocumentFormatSelectorController.cpp b/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
index 7a0cd77..25c7f3f 100644
--- a/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentFormatSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,6 +25,7 @@
#include <U2Core/DocumentImport.h>
#include <U2Core/TextUtils.h>
#include <U2Core/U2SafePoints.h>
+#include <U2Core/DocumentModel.h>
#include <U2Gui/HelpButton.h>
#include <U2Core/QObjectScopedPointer.h>
@@ -58,7 +59,7 @@ DocumentFormatSelectorController::DocumentFormatSelectorController(QList<FormatD
: QDialog(p), formatDetectionResults(results)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220284");
+ new HelpButton(this, buttonBox, "18222924");
setObjectName("DocumentFormatSelectorDialog");
}
@@ -132,7 +133,7 @@ int DocumentFormatSelectorController::selectResult(const GUrl& url, QByteArray&
label->installEventFilter(new LabelClickProvider(label, rb));
d->userSelectedFormat = new QComboBox();
- d->userSelectedFormat->setObjectName("userSelectedFormat");
+ d->userSelectedFormat->setObjectName("userSelectedFormat");
const DocumentFormatRegistry *formatRegistry = AppContext::getDocumentFormatRegistry();
SAFE_POINT(formatRegistry != NULL, "FormatRegistry is NULL!", -1);
DocumentFormatConstraints constraints;
@@ -143,6 +144,7 @@ int DocumentFormatSelectorController::selectResult(const GUrl& url, QByteArray&
d->userSelectedFormat->insertItem(0, formatName, id);
}
}
+ d->userSelectedFormat->model()->sort(0);
hbox->addWidget(rb);
hbox->addWidget(label);
diff --git a/src/ugeneui/src/project_support/DocumentFormatSelectorController.h b/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
index d73ef6c..cb409f4 100644
--- a/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentFormatSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/DocumentProviderSelectorController.cpp b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
index 92ccef7..4053df0 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -99,7 +99,7 @@ DocumentProviderSelectorController::DocumentProviderSelectorController(const QLi
formatDetectionResults(formatDetectionResults)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220492");
+ new HelpButton(this, buttonBox, "18223132");
}
int DocumentProviderSelectorController::getSelectedFormatIdx() const {
diff --git a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
index 74ddc91..60f2d1f 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
index 2c9ad2c..006fde8 100644
--- a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -80,7 +80,7 @@ bool DocumentReadingModeSelectorController::adjustReadingMode(FormatDetectionRes
d->setModal(true);
ui.setupUi(d.data());
- new HelpButton(d.data(), ui.buttonBox, "18220257");
+ new HelpButton(d.data(), ui.buttonBox, "18222897");
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 0fad606..72fd23d 100644
--- a/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentReadingModeSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ExportProjectDialogController.cpp b/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
index f655c7f..a936653 100644
--- a/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
+++ b/src/ugeneui/src/project_support/ExportProjectDialogController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@ ExportProjectDialogController::ExportProjectDialogController(QWidget *p, const Q
: QDialog(p)
{
setupUi(this);
- new HelpButton(this, buttonBox, "18220257");
+ new HelpButton(this, buttonBox, "18222897");
setModal(true);
projectFile = fixProjectFile(defaultProjectFileName);
diff --git a/src/ugeneui/src/project_support/ExportProjectDialogController.h b/src/ugeneui/src/project_support/ExportProjectDialogController.h
index c860c9d..7211632 100644
--- a/src/ugeneui/src/project_support/ExportProjectDialogController.h
+++ b/src/ugeneui/src/project_support/ExportProjectDialogController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
index c4d9a3e..58d5943 100644
--- a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
+++ b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -119,7 +119,7 @@ QString MultipleDocumentsReadingModeDialog::setupNewUrl() {
bool MultipleDocumentsReadingModeDialog::setupGUI(QList<GUrl>& _urls, QVariantMap& props, const QMap<QString, qint64>& headerSequenceLengths){
setModal(true);
setupUi(this);
- new HelpButton(this, buttonBox, "18220348");
+ new HelpButton(this, buttonBox, "18222988");
// 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 1c4876b..044dd51 100644
--- a/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h
+++ b/src/ugeneui/src/project_support/MultipleDocumentsReadingModeSelectorController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectImpl.cpp b/src/ugeneui/src/project_support/ProjectImpl.cpp
index 78c15da..c6ad9a2 100644
--- a/src/ugeneui/src/project_support/ProjectImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectImpl.h b/src/ugeneui/src/project_support/ProjectImpl.h
index 82c1ef1..163a7d4 100644
--- a/src/ugeneui/src/project_support/ProjectImpl.h
+++ b/src/ugeneui/src/project_support/ProjectImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectLoaderImpl.cpp b/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
index bba6b0c..81571d7 100644
--- a/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectLoaderImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -821,7 +821,7 @@ void SaveProjectDialogController::sl_clicked(QAbstractButton *button) {
//////////////////////////////////////////////////////////////////////////
ProjectDialogController::ProjectDialogController(ProjectDialogController::Mode m, QWidget *p):QDialog(p) {
setupUi(this);
- new HelpButton(this, buttonBox, "18220281");
+ new HelpButton(this, buttonBox, "18222921");
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 e47b40f..01afd41 100644
--- a/src/ugeneui/src/project_support/ProjectLoaderImpl.h
+++ b/src/ugeneui/src/project_support/ProjectLoaderImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectServiceImpl.cpp b/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
index d197e51..c0f18d2 100644
--- a/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
+++ b/src/ugeneui/src/project_support/ProjectServiceImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectServiceImpl.h b/src/ugeneui/src/project_support/ProjectServiceImpl.h
index fb59742..c8eb506 100644
--- a/src/ugeneui/src/project_support/ProjectServiceImpl.h
+++ b/src/ugeneui/src/project_support/ProjectServiceImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectTasksGui.cpp b/src/ugeneui/src/project_support/ProjectTasksGui.cpp
index 5a29293..e902a95 100644
--- a/src/ugeneui/src/project_support/ProjectTasksGui.cpp
+++ b/src/ugeneui/src/project_support/ProjectTasksGui.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_support/ProjectTasksGui.h b/src/ugeneui/src/project_support/ProjectTasksGui.h
index 2f69f17..72638c0 100644
--- a/src/ugeneui/src/project_support/ProjectTasksGui.h
+++ b/src/ugeneui/src/project_support/ProjectTasksGui.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_view/BuiltInObjectViews.cpp b/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
index 2515b4f..9faafef 100644
--- a/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
+++ b/src/ugeneui/src/project_view/BuiltInObjectViews.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_view/ProjectViewImpl.cpp b/src/ugeneui/src/project_view/ProjectViewImpl.cpp
index 3c75013..a586c61 100644
--- a/src/ugeneui/src/project_view/ProjectViewImpl.cpp
+++ b/src/ugeneui/src/project_view/ProjectViewImpl.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_view/ProjectViewImpl.h b/src/ugeneui/src/project_view/ProjectViewImpl.h
index b8eec4c..ba5da36 100644
--- a/src/ugeneui/src/project_view/ProjectViewImpl.h
+++ b/src/ugeneui/src/project_view/ProjectViewImpl.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_view/ProjectViewSearchBox.cpp b/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
index 07a3c88..165cc73 100644
--- a/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
+++ b/src/ugeneui/src/project_view/ProjectViewSearchBox.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/project_view/ProjectViewSearchBox.h b/src/ugeneui/src/project_view/ProjectViewSearchBox.h
index 8b6964f..441c6cd 100644
--- a/src/ugeneui/src/project_view/ProjectViewSearchBox.h
+++ b/src/ugeneui/src/project_view/ProjectViewSearchBox.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/shtirlitz/Shtirlitz.cpp b/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
index 95f2fe2..5aa29db 100644
--- a/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
+++ b/src/ugeneui/src/shtirlitz/Shtirlitz.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@ const static char * SETTINGS_UGENE_UID = "shtirlitz/uid";
const static int DAYS_BETWEEN_REPORTS = 7;
//This file stores the actual location of reports-receiver script.
-const static char * DESTINATION_URL_KEEPER_SRV = "http://ugene.unipro.ru";
+const static char * DESTINATION_URL_KEEPER_SRV = "http://ugene.net";
const static char * DESTINATION_URL_KEEPER_PAGE = "/reports_dest.html";
namespace U2 {
diff --git a/src/ugeneui/src/shtirlitz/Shtirlitz.h b/src/ugeneui/src/shtirlitz/Shtirlitz.h
index 9ee8146..b78302e 100644
--- a/src/ugeneui/src/shtirlitz/Shtirlitz.h
+++ b/src/ugeneui/src/shtirlitz/Shtirlitz.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/shtirlitz/StatisticalReportController.cpp b/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
index 3c43fcb..8b46f41 100644
--- a/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
+++ b/src/ugeneui/src/shtirlitz/StatisticalReportController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/shtirlitz/StatisticalReportController.h b/src/ugeneui/src/shtirlitz/StatisticalReportController.h
index 2f952e0..b52e54f 100644
--- a/src/ugeneui/src/shtirlitz/StatisticalReportController.h
+++ b/src/ugeneui/src/shtirlitz/StatisticalReportController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/task_view/TaskStatusBar.cpp b/src/ugeneui/src/task_view/TaskStatusBar.cpp
index be19a5f..90e0b5a 100644
--- a/src/ugeneui/src/task_view/TaskStatusBar.cpp
+++ b/src/ugeneui/src/task_view/TaskStatusBar.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/task_view/TaskStatusBar.h b/src/ugeneui/src/task_view/TaskStatusBar.h
index 7458e40..f2a4701 100644
--- a/src/ugeneui/src/task_view/TaskStatusBar.h
+++ b/src/ugeneui/src/task_view/TaskStatusBar.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/task_view/TaskViewController.cpp b/src/ugeneui/src/task_view/TaskViewController.cpp
index 17207c0..fe50702 100644
--- a/src/ugeneui/src/task_view/TaskViewController.cpp
+++ b/src/ugeneui/src/task_view/TaskViewController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/task_view/TaskViewController.h b/src/ugeneui/src/task_view/TaskViewController.h
index 28f531e..9bd0f41 100644
--- a/src/ugeneui/src/task_view/TaskViewController.h
+++ b/src/ugeneui/src/task_view/TaskViewController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/update/UgeneUpdater.cpp b/src/ugeneui/src/update/UgeneUpdater.cpp
index 02d8300..fe008fa 100644
--- a/src/ugeneui/src/update/UgeneUpdater.cpp
+++ b/src/ugeneui/src/update/UgeneUpdater.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ void UgeneUpdater::update() {
setUpdateOnClose(true);
emit si_update();
} else {
- GUIUtils::runWebBrowser("http://ugene.unipro.ru/download.html");
+ GUIUtils::runWebBrowser("http://ugene.net/download.html");
}
}
diff --git a/src/ugeneui/src/update/UgeneUpdater.h b/src/ugeneui/src/update/UgeneUpdater.h
index eb396fe..53f1d0a 100644
--- a/src/ugeneui/src/update/UgeneUpdater.h
+++ b/src/ugeneui/src/update/UgeneUpdater.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/utils/MultilingualHtmlView.cpp b/src/ugeneui/src/utils/MultilingualHtmlView.cpp
index 83ab490..3744d48 100644
--- a/src/ugeneui/src/utils/MultilingualHtmlView.cpp
+++ b/src/ugeneui/src/utils/MultilingualHtmlView.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/utils/MultilingualHtmlView.h b/src/ugeneui/src/utils/MultilingualHtmlView.h
index c712fe0..982703d 100644
--- a/src/ugeneui/src/utils/MultilingualHtmlView.h
+++ b/src/ugeneui/src/utils/MultilingualHtmlView.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/welcome_page/WelcomePageController.cpp b/src/ugeneui/src/welcome_page/WelcomePageController.cpp
index 1d8a911..90e7936 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageController.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageController.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -159,7 +159,7 @@ QString WelcomePageController::getUrlById(const QString &urlId) {
return "http://feeds2.feedburner.com/NewsOfUgeneProject";
}
if ("quick_start" == urlId) {
- return "https://ugene.unipro.ru/wiki/display/QSG/Quick+Start+Guide";
+ return "https://ugene.net/wiki/display/QSG/Quick+Start+Guide";
}
return "";
}
diff --git a/src/ugeneui/src/welcome_page/WelcomePageController.h b/src/ugeneui/src/welcome_page/WelcomePageController.h
index 905e602..f067419 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageController.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageController.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/welcome_page/WelcomePageMdi.cpp b/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
index 36183fa..b92f6ec 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageMdi.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/welcome_page/WelcomePageMdi.h b/src/ugeneui/src/welcome_page/WelcomePageMdi.h
index e21ac68..341506b 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageMdi.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageMdi.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/welcome_page/WelcomePageWidget.cpp b/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
index 180a536..198a9c7 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
+++ b/src/ugeneui/src/welcome_page/WelcomePageWidget.cpp
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/src/welcome_page/WelcomePageWidget.h b/src/ugeneui/src/welcome_page/WelcomePageWidget.h
index 1355ccc..f8f0d6b 100644
--- a/src/ugeneui/src/welcome_page/WelcomePageWidget.h
+++ b/src/ugeneui/src/welcome_page/WelcomePageWidget.h
@@ -1,7 +1,7 @@
/**
* UGENE - Integrated Bioinformatics Tools.
* Copyright (C) 2008-2016 UniPro <ugene at unipro.ru>
- * http://ugene.unipro.ru
+ * http://ugene.net
*
* 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/ugeneui/transl/english.ts b/src/ugeneui/transl/english.ts
index ec3ac63..3c10036 100644
--- a/src/ugeneui/transl/english.ts
+++ b/src/ugeneui/transl/english.ts
@@ -468,7 +468,7 @@ p, li { white-space: pre-wrap; }
<translation>UGENE distribution: %1</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="92"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="192"/>
<source>Close windows</source>
<translation>Close windows</translation>
</message>
@@ -722,6 +722,14 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>U2::CancelAllTask</name>
+ <message>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="240"/>
+ <source>Canceling: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::CheckUpdatesTask</name>
<message>
<location filename="../src/main_window/CheckUpdatesTask.cpp" line="43"/>
@@ -793,6 +801,14 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>U2::CloseWindowsTask</name>
+ <message>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="212"/>
+ <source>Closing views</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::DirectoriesSettingsPageController</name>
<message>
<location filename="../src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp" line="47"/>
@@ -835,62 +851,62 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::DocumentFormatSelectorController</name>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="73"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="74"/>
<source>Options for %1</source>
<translation>Options for %1</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="90"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="91"/>
<source><b>%1</b> format. Score: %2 <i>(%3)</i></source>
<translation><b>%1</b> format. Score: %2 <i>(%3)</i></translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="94"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="95"/>
<source><b><font color=#A6392E>Import: </font>%1</b>. Score: %2 (<i>%3</i>)</source>
<translation><b><font color=#A6392E>Import: </font>%1</b>. Score: %2 (<i>%3</i>)</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="124"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="125"/>
<source>Choose format manually</source>
<translation>Choose format manually</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="175"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="177"/>
<source>Not matched</source>
<translation>Not matched</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="178"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="180"/>
<source>Very low similarity</source>
<translation>Very low similarity</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="181"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="183"/>
<source>Low similarity</source>
<translation>Low similarity</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="184"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="186"/>
<source>Average similarity</source>
<translation>Average similarity</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="187"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="189"/>
<source>High similarity</source>
<translation>High similarity</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="190"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="192"/>
<source>Very high similarity</source>
<translation>Very high similarity</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="192"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="194"/>
<source>Perfect match</source>
<translation>Perfect match</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="200"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="202"/>
<source>Format details for '%1' format</source>
<translation>Format details for '%1' format</translation>
</message>
@@ -999,22 +1015,22 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::ExportProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="343"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="337"/>
<source>Export project task</source>
<translation>Export project task</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="371"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="365"/>
<source>One of the project documents has empty URL</source>
<translation>One of the project documents has empty URL</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="390"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="384"/>
<source>Error during coping documents: file already exist</source>
<translation>Error during coping documents: file already exist</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="392"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="386"/>
<source>Error during coping documents</source>
<translation>Error during coping documents</translation>
</message>
@@ -1048,17 +1064,17 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_ExportProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="494"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="488"/>
<source>GTest_ExportProject::prepare unable to clean directory for exporting</source>
<translation>GTest_ExportProject::prepare unable to clean directory for exporting</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="499"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="493"/>
<source>GTest_ExportProject::prepare unable to create directory for exporting</source>
<translation>GTest_ExportProject::prepare unable to create directory for exporting</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="519"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="513"/>
<source>GTest_ExportProject::cleanup unable to delete exported files</source>
<translation>GTest_ExportProject::cleanup unable to delete exported files</translation>
</message>
@@ -1066,17 +1082,17 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_LoadDocumentFromProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="580"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="574"/>
<source>No project loaded</source>
<translation>No project loaded</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="584"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="578"/>
<source>Document name to load is empty</source>
<translation>Document name to load is empty</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="599"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="593"/>
<source>File %1 not found in project</source>
<translation>File %1 not found in project</translation>
</message>
@@ -1084,7 +1100,7 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_LoadProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="441"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="435"/>
<source>Unload previous project, then load new</source>
<translation>Unload previous project, then load new</translation>
</message>
@@ -1092,27 +1108,27 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::LoadProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="317"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="311"/>
<source>Unable to detect parser for project</source>
<translation>Unable to detect parser for project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="297"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="291"/>
<source>Load project</source>
<translation>Load project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="308"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="302"/>
<source>Loading project from: %1</source>
<translation>Loading project from: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="318"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="312"/>
<source>failed to parse project file %1</source>
<translation>failed to parse project file %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="323"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="317"/>
<source>Project loaded: %1</source>
<translation>Project loaded: %1</translation>
</message>
@@ -1921,7 +1937,7 @@ Do you want view online documentation?</translation>
<context>
<name>U2::RegisterProjectServiceTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="333"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="327"/>
<source>Register project</source>
<translation>Register project</translation>
</message>
@@ -1937,12 +1953,12 @@ Do you want view online documentation?</translation>
<context>
<name>U2::SaveOnlyProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="220"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="214"/>
<source>Save project</source>
<translation>Save project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="280"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="274"/>
<source>Saving project %1</source>
<translation>Saving project %1</translation>
</message>
@@ -1956,14 +1972,18 @@ Do you want view online documentation?</translation>
</message>
<message>
<location filename="../src/project_support/ProjectTasksGui.cpp" line="206"/>
+ <source>Save documents, remove phantom docs, save project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save documents, remove phantom docs, save project</source>
- <translation>Save documents, remove phantom docs, save project</translation>
+ <translation type="vanished">Save documents, remove phantom docs, save project</translation>
</message>
</context>
<context>
<name>U2::ShtirlitzStartupTask</name>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="317"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="318"/>
<source>Shtirlitz Startup Task</source>
<translation>Shtirlitz Startup Task</translation>
</message>
@@ -1971,32 +1991,32 @@ Do you want view online documentation?</translation>
<context>
<name>U2::ShtirlitzTask</name>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="121"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="122"/>
<source>Shtirlitz is sending the first-time report</source>
<translation>Shtirlitz is sending the first-time report</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="133"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="134"/>
<source>%1 days passed passed since previous Shtirlitz's report. Shtirlitz is sending the new one.</source>
<translation>%1 days passed passed since previous Shtirlitz's report. Shtirlitz is sending the new one.</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="275"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="276"/>
<source>Connecting to remote server</source>
<translation>Connecting to remote server</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="294"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="295"/>
<source>Cannot resolve destination path for statistical reports</source>
<translation>Cannot resolve destination path for statistical reports</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="298"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="299"/>
<source>Network error while resolving destination URL: </source>
<translation>Network error while resolving destination URL: </translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="311"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="312"/>
<source>Network error while sending report: </source>
<translation>Network error while sending report: </translation>
</message>
@@ -2009,22 +2029,22 @@ Do you want view online documentation?</translation>
<translation>Shutdown</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="128"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="230"/>
<source>Cancel active tasks</source>
<translation>Cancel active tasks</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="159"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="100"/>
<source>Starting shutdown process...</source>
<translation>Starting shutdown process...</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="179"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="120"/>
<source>Shutdown confirmation</source>
<translation>Shutdown confirmation</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="180"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="121"/>
<source>There are active tasks. Stop them now?</source>
<translation>There are active tasks. Stop them now?</translation>
</message>
diff --git a/src/ugeneui/transl/russian.ts b/src/ugeneui/transl/russian.ts
index ccb1f6f..1a04e4b 100644
--- a/src/ugeneui/transl/russian.ts
+++ b/src/ugeneui/transl/russian.ts
@@ -468,7 +468,7 @@ p, li { white-space: pre-wrap; }
<translation>Распределение UGENE: %1</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="92"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="192"/>
<source>Close windows</source>
<translation>Закрытие окон</translation>
</message>
@@ -722,6 +722,14 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>U2::CancelAllTask</name>
+ <message>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="240"/>
+ <source>Canceling: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::CheckUpdatesTask</name>
<message>
<location filename="../src/main_window/CheckUpdatesTask.cpp" line="43"/>
@@ -793,6 +801,14 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
+ <name>U2::CloseWindowsTask</name>
+ <message>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="212"/>
+ <source>Closing views</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>U2::DirectoriesSettingsPageController</name>
<message>
<location filename="../src/app_settings/directories_settings/DirectoriesSettingsGUIController.cpp" line="47"/>
@@ -835,62 +851,62 @@ p, li { white-space: pre-wrap; }
<context>
<name>U2::DocumentFormatSelectorController</name>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="73"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="74"/>
<source>Options for %1</source>
<translation>Опции для %1</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="90"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="91"/>
<source><b>%1</b> format. Score: %2 <i>(%3)</i></source>
<translation><b>%1</b> формат. Счет: %2 <i>(%3)</i></translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="94"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="95"/>
<source><b><font color=#A6392E>Import: </font>%1</b>. Score: %2 (<i>%3</i>)</source>
<translation><b><font color=#A6392E>Импорт: </font>%1</b>. Счет: %2 (<i>%3</i>)</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="124"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="125"/>
<source>Choose format manually</source>
<translation>Выбрать формат</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="175"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="177"/>
<source>Not matched</source>
<translation>Не соответствует</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="178"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="180"/>
<source>Very low similarity</source>
<translation>Очень низкая схожесть</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="181"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="183"/>
<source>Low similarity</source>
<translation>Низкая схожесть</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="184"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="186"/>
<source>Average similarity</source>
<translation>Средняя схожесть</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="187"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="189"/>
<source>High similarity</source>
<translation>Высокая схожесть</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="190"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="192"/>
<source>Very high similarity</source>
<translation>Очень высокая схожесть</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="192"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="194"/>
<source>Perfect match</source>
<translation>Идеальное совпадение</translation>
</message>
<message>
- <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="200"/>
+ <location filename="../src/project_support/DocumentFormatSelectorController.cpp" line="202"/>
<source>Format details for '%1' format</source>
<translation>Детали для формата '%1'</translation>
</message>
@@ -999,22 +1015,22 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::ExportProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="343"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="337"/>
<source>Export project task</source>
<translation>Export project task</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="371"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="365"/>
<source>One of the project documents has empty URL</source>
<translation>One of the project documents has empty URL</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="390"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="384"/>
<source>Error during coping documents: file already exist</source>
<translation>Error during coping documents: file already exist</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="392"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="386"/>
<source>Error during coping documents</source>
<translation>Error during coping documents</translation>
</message>
@@ -1048,17 +1064,17 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_ExportProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="494"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="488"/>
<source>GTest_ExportProject::prepare unable to clean directory for exporting</source>
<translation>GTest_ExportProject::prepare unable to clean directory for exporting</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="499"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="493"/>
<source>GTest_ExportProject::prepare unable to create directory for exporting</source>
<translation>GTest_ExportProject::prepare unable to create directory for exporting</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="519"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="513"/>
<source>GTest_ExportProject::cleanup unable to delete exported files</source>
<translation>GTest_ExportProject::cleanup unable to delete exported files</translation>
</message>
@@ -1066,17 +1082,17 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_LoadDocumentFromProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="580"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="574"/>
<source>No project loaded</source>
<translation>No project loaded</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="584"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="578"/>
<source>Document name to load is empty</source>
<translation>Document name to load is empty</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="599"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="593"/>
<source>File %1 not found in project</source>
<translation>File %1 not found in project</translation>
</message>
@@ -1084,7 +1100,7 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::GTest_LoadProject</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="441"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="435"/>
<source>Unload previous project, then load new</source>
<translation>Unload previous project, then load new</translation>
</message>
@@ -1092,27 +1108,27 @@ Note that reloading may cause closing of some views associated with objects from
<context>
<name>U2::LoadProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="317"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="311"/>
<source>Unable to detect parser for project</source>
<translation>Unable to detect parser for project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="297"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="291"/>
<source>Load project</source>
<translation>Load project</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="308"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="302"/>
<source>Loading project from: %1</source>
<translation>Читается файл проекта: %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="318"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="312"/>
<source>failed to parse project file %1</source>
<translation>failed to parse project file %1</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="323"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="317"/>
<source>Project loaded: %1</source>
<translation>Проект загружен: %1</translation>
</message>
@@ -1916,7 +1932,7 @@ Do you want view online documentation?</source>
<context>
<name>U2::RegisterProjectServiceTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="333"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="327"/>
<source>Register project</source>
<translation>Регистрация проекта</translation>
</message>
@@ -1932,12 +1948,12 @@ Do you want view online documentation?</source>
<context>
<name>U2::SaveOnlyProjectTask</name>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="220"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="214"/>
<source>Save project</source>
<translation>Сохранение проекта</translation>
</message>
<message>
- <location filename="../src/project_support/ProjectTasksGui.cpp" line="280"/>
+ <location filename="../src/project_support/ProjectTasksGui.cpp" line="274"/>
<source>Saving project %1</source>
<translation>Сохранение проекта: %1 </translation>
</message>
@@ -1951,14 +1967,18 @@ Do you want view online documentation?</source>
</message>
<message>
<location filename="../src/project_support/ProjectTasksGui.cpp" line="206"/>
+ <source>Save documents, remove phantom docs, save project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save documents, remove phantom docs, save project</source>
- <translation>Сохранение документов, удаление виртуальных документов, сохранение проекта</translation>
+ <translation type="vanished">Сохранение документов, удаление виртуальных документов, сохранение проекта</translation>
</message>
</context>
<context>
<name>U2::ShtirlitzStartupTask</name>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="317"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="318"/>
<source>Shtirlitz Startup Task</source>
<translation>Shtirlitz Startup Task</translation>
</message>
@@ -1966,32 +1986,32 @@ Do you want view online documentation?</source>
<context>
<name>U2::ShtirlitzTask</name>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="121"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="122"/>
<source>Shtirlitz is sending the first-time report</source>
<translation>Отправляется отчет о системе</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="133"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="134"/>
<source>%1 days passed passed since previous Shtirlitz's report. Shtirlitz is sending the new one.</source>
<translation>%1 дней прошло со времени отправки последнего отчета. Отправляется новый отчет.</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="275"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="276"/>
<source>Connecting to remote server</source>
<translation>Соединение с удаленным сервером</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="294"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="295"/>
<source>Cannot resolve destination path for statistical reports</source>
<translation>Невозможно определить адрес сервера статистики</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="298"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="299"/>
<source>Network error while resolving destination URL: </source>
<translation>Ошибка сети при определении адреса сервера статистики:</translation>
</message>
<message>
- <location filename="../src/shtirlitz/Shtirlitz.cpp" line="311"/>
+ <location filename="../src/shtirlitz/Shtirlitz.cpp" line="312"/>
<source>Network error while sending report: </source>
<translation>Ошибка сети при отправке отчета:</translation>
</message>
@@ -2004,22 +2024,22 @@ Do you want view online documentation?</source>
<translation>Завершение программы</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="128"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="230"/>
<source>Cancel active tasks</source>
<translation>Отмена активных задач</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="159"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="100"/>
<source>Starting shutdown process...</source>
<translation>Завершение программы...</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="179"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="120"/>
<source>Shutdown confirmation</source>
<translation>Подтверждение</translation>
</message>
<message>
- <location filename="../src/main_window/ShutdownTask.cpp" line="180"/>
+ <location filename="../src/main_window/ShutdownTask.cpp" line="121"/>
<source>There are active tasks. Stop them now?</source>
<translation>Имеются запущенные задачи. Остановить их?</translation>
</message>
--
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