Kexi -> KEXI globally, KEXI_APP_NAME -> QApplication::applicationDisp…

…layName()

Summary:
{F5727117}

FIXED-IN:3.2.0

Reviewers: piggz

Reviewed By: piggz

Tags: #kexi

Differential Revision: https://phabricator.kde.org/D10780

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM
 include(SetKexiCMakePolicies NO_POLICY_SCOPE)
 include(SetKexiVersionInfo)
 
-project(Kexi VERSION ${PROJECT_VERSION})
+project(KEXI VERSION ${PROJECT_VERSION})
 
 include(KexiAddTests)
 kexi_add_tests(OFF)
@@ -125,14 +125,14 @@ if(WIN32)
     find_package(KDEWin REQUIRED)
 endif()
 
-# set custom Kexi plugin installdir
+# set custom KEXI plugin installdir
 set(KEXI_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/${KEXI_BASE_PATH})
 
 simple_option(BUILD_EXAMPLES "Build and install examples" ON)
 
 macro_bool_to_01(BUILD_EXAMPLES COMPILING_EXAMPLES)
 
-# set custom Kexi examples installdir
+# set custom KEXI examples installdir
 set(KEXI_EXAMPLES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/${KEXI_BASE_PATH}/examples)
 
 # TEMPORARY: for initial Qt5/KF5 build porting phase deprecation warnings are only annoying noise
@@ -152,23 +152,23 @@ set(KEXI_LIBS_MIN_VERSION 3.0.95)
 ##
 ## Test for KDb
 ##
-simple_option(KEXI_DEBUG_GUI "Debugging GUI for Kexi (requires KDB_DEBUG_GUI to be set too)" OFF)
+simple_option(KEXI_DEBUG_GUI "Debugging GUI for KEXI (requires KDB_DEBUG_GUI to be set too)" OFF)
 if(KEXI_DEBUG_GUI)
     set(KDB_REQUIRED_COMPONENTS DEBUG_GUI)
 endif()
 find_package(KDb ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS ${KDB_REQUIRED_COMPONENTS})
 set_package_properties(KDb PROPERTIES TYPE REQUIRED
-                       PURPOSE "Required by Kexi for data handling")
+                       PURPOSE "Required by KEXI for data handling")
 
 ##
 ## Test for KReport
 ##
 find_package(KReport ${KEXI_LIBS_MIN_VERSION})
 set_package_properties(KReport PROPERTIES TYPE REQUIRED
-                       PURPOSE "Required by Kexi for report handling")
+                       PURPOSE "Required by KEXI for report handling")
 if (KReport_FOUND)
     if(NOT KREPORT_SCRIPTING)
-        message(FATAL_ERROR "Kexi requires KReport package with scripting support enabled (KREPORT_SCRIPTING)")
+        message(FATAL_ERROR "KEXI requires KReport package with scripting support enabled (KREPORT_SCRIPTING)")
     endif()
 endif()
 
@@ -178,11 +178,11 @@ endif()
 if(SHOULD_BUILD_KEXI_DESKTOP_APP)
     find_package(KPropertyWidgets ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS KF)
     set_package_properties(KPropertyWidgets PROPERTIES TYPE REQUIRED
-                           PURPOSE "Required by Kexi for handling properties")
+                           PURPOSE "Required by KEXI for handling properties")
 else() # only KPropertyCore
     find_package(KPropertyCore ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS KF)
     set_package_properties(KPropertyCore PROPERTIES TYPE REQUIRED
-                           PURPOSE "Required by Kexi for handling properties")
+                           PURPOSE "Required by KEXI for handling properties")
 endif()
 include(CheckIfQtGuiCanBeExecuted)
 
@@ -204,7 +204,7 @@ set_package_properties(KexiMarble PROPERTIES
     DESCRIPTION "KDE World Globe Widget library"
     URL "https://marble.kde.org"
     TYPE RECOMMENDED
-    PURPOSE "Required by Kexi form map widget"
+    PURPOSE "Required by KEXI form map widget"
 )
 if(NOT MARBLE_FOUND)
     set(MARBLE_INCLUDE_DIR "")
@@ -221,12 +221,12 @@ macro_bool_to_01(Qt5WebKitWidgets_FOUND HAVE_QTWEBKITWIDGETS)
 set_package_properties(Qt5WebKit PROPERTIES
                        DESCRIPTION "Webkit for Qt, the HTML engine."
                        URL "http://qt.io"
-                       TYPE RECOMMENDED PURPOSE "Required by Kexi web form widget"
+                       TYPE RECOMMENDED PURPOSE "Required by KEXI web form widget"
 )
 set_package_properties(Qt5WebKitWidgets PROPERTIES
                        DESCRIPTION "QWidgets module for Webkit, the HTML engine."
                        URL "http://qt.io"
-                       TYPE RECOMMENDED PURPOSE "Required by Kexi web form widget"
+                       TYPE RECOMMENDED PURPOSE "Required by KEXI web form widget"
 )
 
  ##################

KexiProducts.cmake

@@ -1,7 +1,7 @@
 ### DEFINITION OF PRODUCTS, FEATURES AND PRODUCTSETS
 ####################################################
 
-# When building Kexi a lot of different things are created and installed. To
+# When building KEXI a lot of different things are created and installed. To
 # describe them and their internal dependencies the concepts of "product",
 # "feature" and "product set" are used.
 
@@ -60,12 +60,13 @@
 # See APP_CONVERTER, FILEMANAGER_*
 
 # products
-calligra_define_product(KEXI_CORE_APP "Kexi core app" REQUIRES)
-calligra_define_product(KEXI_DESKTOP_APP "Kexi for desktop" REQUIRES KEXI_CORE_APP)
-calligra_define_product(KEXI_MOBILE_APP "Kexi for mobile" REQUIRES KEXI_CORE_APP)
+calligra_define_product(KEXI_CORE_APP "KEXI core app" REQUIRES)
+calligra_define_product(KEXI_DESKTOP_APP "KEXI for desktop" REQUIRES KEXI_CORE_APP)
+calligra_define_product(KEXI_MOBILE_APP "KEXI for mobile" REQUIRES KEXI_CORE_APP)
 
 # more plugins
-calligra_define_product(PLUGIN_KEXI_SPREADSHEETMIGRATION "Import from ODS plugin for Kexi" UNPORTED  REQUIRES KEXI_CORE_APP)
+calligra_define_product(PLUGIN_KEXI_SPREADSHEETMIGRATION "Import from ODS plugin for KEXI"
+                        UNPORTED REQUIRES KEXI_CORE_APP)
 
 #############################################
 ####      Product set definitions        ####

cmake/modules/KexiGenerateDependencyGraph.cmake

@@ -20,7 +20,7 @@ set(_graph_dir ${CMAKE_BINARY_DIR}/dependencies)
 set(_dot_file ${_graph_dir}/graph.dot)
 set(_image_file "dependency-graph-${CMAKE_PROJECT_NAME}.png")
 
-simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_KEXI_FRAMEWORKS "Include Kexi frameworks in the dependency graph" ON)
+simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_KEXI_FRAMEWORKS "Include KEXI frameworks in the dependency graph" ON)
 simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_ALL_LIBS "Include all libs in the dependency graph" OFF)
 
 configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeGraphVizOptions.cmake.in

cmake/modules/SetKexiVersionInfo.cmake

@@ -3,7 +3,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-# Define common versions of Kexi components used to generate KexiVersion.h
+# Define common versions of KEXI components used to generate KexiVersion.h
 # update these version for every release:
 set(PROJECT_VERSION_STRING "3.2 Alpha") # Custom name such as "3.1 Alpha"
 set(PROJECT_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc.
@@ -17,7 +17,7 @@ set(KEXI_YEAR 2018) # update every year
 # -- do not edit below this line --
 
 set(KEXI_CUSTOM_DISTRIBUTION_VERSION "" CACHE STRING
-    "Custom name of Kexi version useful to construct co-installabile releases. Any nonempty directory name is accepted. If specified it will be used in KEXI_DISTRIBUTION_VERSION. If not specified, KEXI_DISTRIBUTION_VERSION will be set to PROJECT_STABLE_VERSION_MAJOR.PROJECT_STABLE_VERSION_MINOR.")
+    "Custom name of KEXI version useful to construct co-installabile releases. Any nonempty directory name is accepted. If specified it will be used in KEXI_DISTRIBUTION_VERSION. If not specified, KEXI_DISTRIBUTION_VERSION will be set to PROJECT_STABLE_VERSION_MAJOR.PROJECT_STABLE_VERSION_MINOR.")
 
 if(KEXI_CUSTOM_DISTRIBUTION_VERSION STREQUAL "")
     set(KEXI_DISTRIBUTION_VERSION "${PROJECT_STABLE_VERSION_MAJOR}.${PROJECT_STABLE_VERSION_MINOR}")
@@ -61,11 +61,11 @@ endif()
 
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_RELEASE})
 
-message(STATUS "Kexi version \"${PROJECT_VERSION_STRING}\" (${PROJECT_VERSION}), distribution version \"${KEXI_DISTRIBUTION_VERSION}\"")
+message(STATUS "KEXI version \"${PROJECT_VERSION_STRING}\" (${PROJECT_VERSION}), distribution version \"${KEXI_DISTRIBUTION_VERSION}\"")
 
-# Define the generic version of the Kexi libraries here
-# This makes it easy to advance it when the next Kexi release comes.
-# 14 was the last GENERIC_PROJECT_LIB_VERSION_MAJOR of the previous Kexi series
+# Define the generic version of the KEXI libraries here
+# This makes it easy to advance it when the next KEXI release comes.
+# 14 was the last GENERIC_PROJECT_LIB_VERSION_MAJOR of the previous KEXI series
 # (2.x) so we're starting with 15 in 3.x series.
 if(PROJECT_STABLE_VERSION_MAJOR EQUAL 3)
     math(EXPR GENERIC_PROJECT_LIB_VERSION_MAJOR "${PROJECT_STABLE_VERSION_MINOR} + 15")

kundo2_aware_xgettext.sh

@@ -1,5 +1,5 @@
 #
-# Helper function for extracting translatable messages from Kexi source code.
+# Helper function for extracting translatable messages from KEXI source code.
 # Usage: kundo2_aware_xgettext <pot-filename-without-path> <source-files-list>
 # If there are no messages or the <source-files-list> is empty, the pot file is deleted.
 #

src/CMakeLists.txt

@@ -2,18 +2,20 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 check_function_exists("uname" HAVE_UNAME)
 
-simple_option(KEXI_SHOW_UNFINISHED "Show unfinished features in Kexi. Thus is useful for testing but may confuse end-user." OFF)
-simple_option(KEXI_SHOW_UNIMPLEMENTED "Forces to show menu entries and dialogs just to give impression about development plans for Kexi. Only recommended for test/development versions." OFF)
+simple_option(KEXI_SHOW_UNFINISHED "Show unfinished features in KEXI. Thus is useful for testing \
+but may confuse end-user." OFF)
+simple_option(KEXI_SHOW_UNIMPLEMENTED "Forces to show menu entries and dialogs just to give \
+impression about development plans for KEXI. Only recommended for test/development versions." OFF)
 
 # Extra GUI features
 if(NOT KEXI_MOBILE)
-    simple_option(KEXI_AUTORISE_TABBED_TOOLBAR "Experimental: Autorise the main tabbed toolbar in Kexi" OFF)
+    simple_option(KEXI_AUTORISE_TABBED_TOOLBAR "Experimental: Autorise the main tabbed toolbar in KEXI" OFF)
     if(WIN32 OR APPLE)
         set(_KEXI_USE_KFILEWIDGET_DEFAULT OFF)
     else()
         set(_KEXI_USE_KFILEWIDGET_DEFAULT ON)
     endif()
-    simple_option(KEXI_USE_KFILEWIDGET "Use KFileWidget-based inline file browser in Kexi. If OFF, a simple \
+    simple_option(KEXI_USE_KFILEWIDGET "Use KFileWidget-based inline file browser in KEXI. If OFF, a simple \
 replacement file widget with native file dialogs is used. ON by default on UNIX, OFF by default on Windows \
 and macOS. \
 Note: Non-plasma Linux desktops still default to the simple replacement at runtime."
@@ -22,36 +24,36 @@ Note: Non-plasma Linux desktops still default to the simple replacement at runti
 endif(NOT KEXI_MOBILE)
 
 # Experimental:
-simple_option(KEXI_SCRIPTS_SUPPORT "Experimental: Enable scripting in Kexi" OFF)
+simple_option(KEXI_SCRIPTS_SUPPORT "Experimental: Enable scripting in KEXI" OFF)
 if(KEXI_SCRIPTS_SUPPORT)
     set(REQUIRED_QTQML_VERSION 5.8.0) # >= 5.8 because of QJSEngine::newQMetaObject()
     find_package(Qt5Qml ${REQUIRED_QTQML_VERSION} REQUIRED)
     set_package_properties(Qt5Qml PROPERTIES
                         DESCRIPTION "A framework for developing applications and libraries with the QML and JavaScript language."
                         URL "http://qt.io"
-                        TYPE REQUIRED PURPOSE "Required by Kexi scripting (JavaScript)"
+                        TYPE REQUIRED PURPOSE "Required by KEXI scripting (JavaScript)"
     )
 endif()
 
 # Broken:
 simple_option(KEXI_FORM_CURSOR_PROPERTY_SUPPORT "Broken: Enable \"cursor\" property in the form designer" OFF)
-simple_option(KEXI_SHOW_CONTEXT_HELP "Broken: Enable context help in Kexi main window" OFF)
+simple_option(KEXI_SHOW_CONTEXT_HELP "Broken: Enable context help in KEXI main window" OFF)
 simple_option(KEXI_QUICK_PRINTING_SUPPORT "Broken: Enable print/print preview/print setup for tables/queries in the project navigator" OFF)
 simple_option(KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT "Broken: Enable \"auto field\" form widget in the form designer" OFF)
 # OFF because we need to replace it with QTreeWidget which uses very different API compared to Q3ListView. Re-add QTreeWidget?
 simple_option(KEXI_LIST_FORM_WIDGET_SUPPORT "Broken: Enable \"list\" form widget in the form designer" OFF)
 simple_option(KEXI_PIXMAP_COLLECTIONS_SUPPORT "Broken: Enable support for pixmap collections" OFF)
 
 # Not available:
-simple_option(KEXI_MACROS_SUPPORT "Experimental: Enable macros in Kexi" OFF)
+simple_option(KEXI_MACROS_SUPPORT "Experimental: Enable macros in KEXI" OFF)
 if(KEXI_MACROS_SUPPORT) # temp.
     message(FATAL_ERROR "Macros are not yet available.")
 endif()
-simple_option(KEXI_TABLE_PRINT_SUPPORT "Experimental: Enable printing of tabular view in Kexi" OFF) # broken since Kexi 2
+simple_option(KEXI_TABLE_PRINT_SUPPORT "Experimental: Enable printing of tabular view in KEXI" OFF) # broken since KEXI 2
 if(KEXI_TABLE_PRINT_SUPPORT) # temp.
     message(FATAL_ERROR "Table printing is not yet available.")
 endif()
-simple_option(KEXI_PROJECT_TEMPLATES "Experimental: Enable support for project templates in Kexi" OFF) # broken since Kexi 2
+simple_option(KEXI_PROJECT_TEMPLATES "Experimental: Enable support for project templates in KEXI" OFF) # broken since KEXI 2
 if(KEXI_PROJECT_TEMPLATES) # temp.
     message(FATAL_ERROR "Project templates are not yet available.")
 endif()