apply some code analyzer recommendations

work with icons - remove unused, organize and update to last oxygen
add BusyIcon widget

.clang-format

@@ -0,0 +1,224 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeComma
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     140
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: CurrentLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+  - piForeach
+  - piForeachC
+  - piForeachR
+  - piForeachRC
+  - piForeachCR
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: Wrapped
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   2
+ReferenceAlignment: Middle
+ReflowComments:  true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Both
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: After
+Standard:        c++11
+StatementAttributeLikeMacros:
+  - Q_EMIT
+  - PIMETA
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+  - PRIVATE_DECLARATION
+  - NO_COPY_CLASS
+  - FOREVER_WAIT
+  - WAIT_FOREVER
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+  - PIMETA
+...
+

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

CMakeLists.txt

@@ -3,8 +3,8 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
 project(QAD)
 set(QAD_MAJOR    2)
-set(QAD_MINOR    8)
-set(QAD_REVISION 1)
+set(QAD_MINOR    32)
+set(QAD_REVISION 0)
 set(QAD_SUFFIX   )
 set(QAD_COMPANY  SHS)
 set(QAD_DOMAIN   org.SHS)

cmake/FindQAD.cmake

@@ -6,9 +6,12 @@ Create imported targets:
   * QAD::Application
   * QAD::Blockview
   * QAD::Graphic
+  * QAD::GraphicAnalysis
+  * QAD::Graphic3D
   * QAD::SQLTable
   * QAD::TouchWidgets
   * QAD::Doc
+  * QAD::VirtualKeyboard
   * QAD::PIQt
   * QAD::PIQtUtils
 
@@ -44,21 +47,26 @@ if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION)
 	message(FATAL_ERROR "QAD version ${QAD_VERSION} is available, but ${QAD_FIND_VERSION} requested!")
 endif()
 
-set(__libs "utils;widgets;application;blockview;graphic;sql_table;touch_widgets;doc")
+set(__libs "utils;widgets;application;blockview;graphic;graphic_analysis;graphic3d;sql;sql_table;touch_widgets;doc;map;virtual_keyboard")
 if (PIP_FOUND OR BUILDING_PIP)
 	list(APPEND __libs "piqt;piqt_utils")
 endif()
 
-set(__module_utils          Utils        )
-set(__module_widgets        Widgets      )
-set(__module_application    Application  )
-set(__module_blockview      Blockview    )
-set(__module_graphic        Graphic      )
-set(__module_sql_table      SQLTable     )
-set(__module_touch_widgets  TouchWidgets )
-set(__module_doc            Doc          )
-set(__module_piqt           PIQt         )
-set(__module_piqt_utils     PIQtUtils    )
+set(__module_utils            Utils          )
+set(__module_widgets          Widgets        )
+set(__module_application      Application    )
+set(__module_blockview        Blockview      )
+set(__module_graphic          Graphic        )
+set(__module_graphic_analysis GraphicAnalysis)
+set(__module_graphic3d        Graphic3D      )
+set(__module_sql              SQL            )
+set(__module_sql_table        SQLTable       )
+set(__module_touch_widgets    TouchWidgets   )
+set(__module_doc              Doc            )
+set(__module_map              Map            )
+set(__module_piqt             PIQt           )
+set(__module_piqt_utils       PIQtUtils      )
+set(__module_virtual_keyboard VirtualKeyboard)
 
 foreach (_l ${__libs})
 	set( __inc_${_l} "")
@@ -66,13 +74,17 @@ foreach (_l ${__libs})
 	set(__libs_${_l} "")
 endforeach()
 
-set(__deps_widgets       "QAD::Utils")
-set(__deps_application   "QAD::Widgets")
-set(__deps_blockview     "QAD::Widgets")
-set(__deps_graphic       "QAD::Widgets")
-set(__deps_sql_table     "QAD::Widgets")
-set(__deps_piqt          "QAD::Widgets;PIP")
-set(__deps_piqt_utils    "QAD::Blockview;QAD::PIQt")
+set(__deps_widgets          "QAD::Utils")
+set(__deps_application      "QAD::Widgets")
+set(__deps_blockview        "QAD::Widgets")
+set(__deps_graphic          "QAD::Widgets")
+set(__deps_graphic_analysis "QAD::Graphic;PIP::FFTW")
+set(__deps_sql              "QAD::Utils")
+set(__deps_sql_table        "QAD::Widgets")
+set(__deps_map              "QAD::Utils;QAD::PIQt")
+set(__deps_piqt             "QAD::Widgets;PIP")
+set(__deps_piqt_utils       "QAD::Blockview;QAD::PIQt")
+set(__deps_virtual_keyboard "QAD::PIQt")
 
 #message("find QAD ${BUILDING_QAD}")
 

cmake/QtWraps.cmake

@@ -503,24 +503,24 @@ macro(qad_wrap)
 		get_filename_component(_EXT "${_i}" EXT)
 		#message("${_EXT}")
 		if (NOT ("x${_EXT}" STREQUAL "x"))
-			if (("x${_EXT}" STREQUAL "x.h") OR ("x${_EXT}" STREQUAL "x.hpp"))
+			if ("${_EXT}" MATCHES ".*\\.h(pp)?$")
 				list(APPEND H_LIST "${_i}")
 				#message("header")
 			endif()
-			if (("x${_EXT}" STREQUAL "x.c") OR ("x${_EXT}" STREQUAL "x.cpp") OR ("x${_EXT}" STREQUAL "x.cxx"))
+			if ("${_EXT}" MATCHES ".*\\.c((pp)|(xx))?$")
 				list(APPEND CPP_LIST "${_i}")
 				#message("source")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ui")
+			if ("${_EXT}" MATCHES ".*\\.ui$")
 				list(APPEND UI_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.qrc")
+			if ("${_EXT}" MATCHES ".*\\.qrc$")
 				list(APPEND RES_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.rc")
+			if ("${_EXT}" MATCHES ".*\\.rc$")
 				list(APPEND RC_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ts")
+			if ("${_EXT}" MATCHES ".*\\.ts$")
 				list(APPEND TS_LIST "${_i}")
 			endif()
 		endif()
@@ -923,6 +923,18 @@ macro(qad_install_lang _NAME)
 						string(SUBSTRING "${_libname}" 0 ${_sl} _libname)
 						string(REPLACE "::" "_" _libname "${_libname}")
 						string(TOLOWER "${_libname}" _libname )
+						if ("${_libname}" STREQUAL "qad_piqtutils")
+							set(_libname "qad_piqt_utils")
+						endif()
+						if ("${_libname}" STREQUAL "qad_sqltable")
+							set(_libname "qad_sql_table")
+						endif()
+						if ("${_libname}" STREQUAL "qad_touchwidgets")
+							set(_libname "qad_touch_widgets")
+						endif()
+						if ("${_libname}" STREQUAL "qad_graphicanalysis")
+							set(_libname "qad_graphic_analysis")
+						endif()
 						#message("imp lib \"${_libname}\"")
 						list(APPEND _qt_libs ${_libname})
 					endif()
@@ -932,6 +944,7 @@ macro(qad_install_lang _NAME)
 				list(APPEND _qt_libs "qtbase")
 				foreach (_i ${${PROJECT_NAME}_LANG})
 					foreach (_l ${_qt_libs})
+						#message("lib = \"${_l}\"")
 						unset(_qm_path CACHE)
 						find_file(_qm_path "${_l}_${_i}.qm" PATHS "${Qt${_v}_LANG_DIR}" ${_PATHS} NO_DEFAULT_PATH)
 						if (EXISTS "${_qm_path}")