Format project code

Signed-off-by: Andrea Ricchi <[email protected]>
amarula · Apr 30, 2024 · d28018d · d28018d
1 parent 6371090
commit d28018d
Show file tree

Hide file tree

Showing 19 changed files with 197 additions and 151 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
-project(cutekeyboardplugin VERSION 1.0 LANGUAGES C CXX)
+project(
+  cutekeyboardplugin
+  VERSION 1.0
+  LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -12,13 +15,13 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Qml Quick)
 set(BUILD_EXAMPLES OFF)
 
 if(QT_KNOWN_POLICY_QTP0001)
-    qt_policy(SET QTP0001 NEW)
+  qt_policy(SET QTP0001 NEW)
 endif()
 
 qt_standard_project_setup()
 
 add_subdirectory(src)
 
 if(BUILD_EXAMPLES)
-    add_subdirectory(example)
+  add_subdirectory(example)
 endif()
diff --git a/README.md b/README.md
@@ -16,13 +16,22 @@ make -j4
 make install
 ```
 
+### Custom Installation
+
+```bash
+mkdir build && cd build
+qmake .. INSTALL_PREFIX=/home/custom_dir/custom_root
+make -j4
+make install
+```
+
 ## Examples
 
 ```bash
 mkdir build && cd build
 qmake .. CONFIG+=BUILD_EXAMPLES
 make -j4
-make 
+make install
 ```
 
 ## Usage

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -1,35 +1,17 @@
-qt_add_executable(example WIN32 MACOSX_BUNDLE
-    main.cpp
-)
-target_compile_definitions(example PRIVATE
-    QT_DEPRECATED_WARNINGS
-)
+qt_add_executable(example WIN32 MACOSX_BUNDLE main.cpp)
+target_compile_definitions(example PRIVATE QT_DEPRECATED_WARNINGS)
 
-target_link_libraries(example PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Quick
-)
+target_link_libraries(example PRIVATE Qt::Core Qt::Gui Qt::Quick)
 
-set(qml_resource_files
-    "main.qml"
-)
+set(qml_resource_files "main.qml")
 
-qt_add_resources(example "qml"
-    PREFIX
-        "/"
-    FILES
-        ${qml_resource_files}
-)
+qt_add_resources(example "qml" PREFIX "/" FILES ${qml_resource_files})
 
-install(TARGETS example
-    BUNDLE DESTINATION .
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+install(
+  TARGETS example
+  BUNDLE DESTINATION .
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-qt_generate_deploy_app_script(
-    TARGET example
-    FILENAME_VARIABLE deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR
-)
+qt_generate_deploy_app_script(TARGET example FILENAME_VARIABLE deploy_script
+                              NO_UNSUPPORTED_PLATFORM_ERROR)
 install(SCRIPT ${deploy_script})
diff --git a/example/main.qml b/example/main.qml
@@ -101,6 +101,7 @@ Window {
         anchors.left: parent.left
         anchors.right: parent.right
         languageLayout: "It"
+        availableLanguageLayouts: ["It", "En"]
 
         states: State {
             name: "visible"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,20 +1,12 @@
 set(HEADERS
-    "EnterKeyAction.hpp"
-    "EnterKeyActionAttachedType.hpp"
-    "InputPanelIface.hpp"
-    "VirtualKeyboardInputContextPlugin.h"
-    "VirtualKeyboardInputContext.h"
-    "DeclarativeInputEngine.h"
-)
+    "EnterKeyAction.hpp" "EnterKeyActionAttachedType.hpp" "InputPanelIface.hpp"
+    "VirtualKeyboardInputContextPlugin.h" "VirtualKeyboardInputContext.h"
+    "DeclarativeInputEngine.h")
 
 set(SOURCES
-    "EnterKeyAction.cpp"
-    "EnterKeyActionAttachedType.cpp"
-    "InputPanelIface.cpp"
-    "VirtualKeyboardInputContextPlugin.cpp"
-    "VirtualKeyboardInputContext.cpp"
-    "DeclarativeInputEngine.cpp"
-)
+    "EnterKeyAction.cpp" "EnterKeyActionAttachedType.cpp" "InputPanelIface.cpp"
+    "VirtualKeyboardInputContextPlugin.cpp" "VirtualKeyboardInputContext.cpp"
+    "DeclarativeInputEngine.cpp")
 
 set(QML_FILES
     "qml/AlternativeKeysPopup.qml"
@@ -40,61 +32,49 @@ set(QML_FILES
     "qml/ShiftKey.qml"
     "qml/SpaceKey.qml"
     "qml/SymbolKey.qml"
-    "qml/SymbolLayout.qml"
-)
+    "qml/SymbolLayout.qml")
 
 foreach(_file IN_LISTS QML_FILES)
-    cmake_path(GET _file FILENAME _fileName)
-    set_source_files_properties(${_file} PROPERTIES
-        QT_RESOURCE_ALIAS ${_fileName}
-    )
+  cmake_path(GET _file FILENAME _fileName)
+  set_source_files_properties(${_file} PROPERTIES QT_RESOURCE_ALIAS
+                                                  ${_fileName})
 endforeach()
 
-qt_add_qml_module(${PROJECT_NAME}
-    URI
-        "QtQuick.CuteKeyboard"
-    VERSION
-        1.0
-    PLUGIN_TARGET
-        ${PROJECT_NAME}
-    OUTPUT_DIRECTORY
-        "QtQuick/CuteKeyboard"
-    RESOURCE_PREFIX
-        "/"
-    CLASS_NAME
-        "VirtualKeyboardInputContextPlugin"
-    SOURCES
-        ${HEADERS}
-        ${SOURCES}
-    QML_FILES
-        ${QML_FILES}
-    NO_GENERATE_PLUGIN_SOURCE
-)
+qt_add_qml_module(
+  ${PROJECT_NAME}
+  URI
+  "QtQuick.CuteKeyboard"
+  VERSION
+  1.0
+  PLUGIN_TARGET
+  ${PROJECT_NAME}
+  OUTPUT_DIRECTORY
+  "QtQuick/CuteKeyboard"
+  RESOURCE_PREFIX
+  "/"
+  CLASS_NAME
+  "VirtualKeyboardInputContextPlugin"
+  SOURCES
+  ${HEADERS}
+  ${SOURCES}
+  QML_FILES
+  ${QML_FILES}
+  NO_GENERATE_PLUGIN_SOURCE)
 
-qt_add_resources(${PROJECT_NAME} "icons"
-    PREFIX "/"
-    FILES
-        "resources.qrc"
-)
+qt_add_resources(${PROJECT_NAME} "icons" PREFIX "/" FILES "resources.qrc")
 
-target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::GuiPrivate
-    Qt::Qml
-    Qt::Quick
-    Qt::QuickPrivate
-)
+target_link_libraries(
+  ${PROJECT_NAME} PRIVATE Qt::Core Qt::Gui Qt::GuiPrivate Qt::Qml Qt::Quick
+                          Qt::QuickPrivate)
 
 if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME})
-    set(INSTALL_DIR ${QT_DIR}/../../../plugins/platforminputcontexts)
+  set(INSTALL_DIR ${QT_DIR}/../../../plugins/platforminputcontexts)
 else()
-    set(INSTALL_DIR ${CMAKE_INSTALL_BINDIR}/platforminputcontexts)
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>/platforminputcontexts"
-    )
+  set(INSTALL_DIR ${CMAKE_INSTALL_BINDIR}/platforminputcontexts)
+  set_target_properties(
+    ${PROJECT_NAME}
+    PROPERTIES LIBRARY_OUTPUT_DIRECTORY
+               "$<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>/platforminputcontexts")
 endif()
 
-install(TARGETS ${PROJECT_NAME}
-    LIBRARY DESTINATION ${INSTALL_DIR}
-)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_DIR})
diff --git a/src/InputPanelIface.hpp b/src/InputPanelIface.hpp
@@ -65,7 +65,8 @@ class InputPanelIface : public QObject {
     void setLanguageIcon(const QString &languageIcon);
 
     QStringList availableLanguageLayouts() const;
-    void setAvailableLanguageLayouts(const QStringList &availableLanguageLayouts);
+    void setAvailableLanguageLayouts(
+        const QStringList &availableLanguageLayouts);
 
     QString languageLayout() const;
     void setLanguageLayout(const QString &languageIcon);

diff --git a/src/qml/CsLayout.qml b/src/qml/CsLayout.qml
@@ -77,6 +77,7 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
@@ -150,12 +151,14 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {}
+        ShiftKey {
+        }
 
         Key {
             btnKey: Qt.Key_Y
@@ -217,6 +220,7 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
+
     }
 
     RowLayout {
@@ -246,5 +250,7 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
+
     }
+
 }
diff --git a/src/qml/DeLayout.qml b/src/qml/DeLayout.qml
@@ -76,6 +76,7 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
@@ -159,12 +160,14 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {}
+        ShiftKey {
+        }
 
         Key {
             btnKey: Qt.Key_Y
@@ -229,6 +232,7 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
+
     }
 
     RowLayout {
@@ -258,5 +262,7 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
+
     }
+
 }
diff --git a/src/qml/ElLayout.qml b/src/qml/ElLayout.qml
@@ -64,6 +64,7 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
@@ -127,12 +128,14 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {}
+        ShiftKey {
+        }
 
         Key {
             btnText: "ζ"
@@ -186,6 +189,7 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
+
     }
 
     RowLayout {
@@ -215,5 +219,7 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
+
     }
+
 }
diff --git a/src/qml/EnLayout.qml b/src/qml/EnLayout.qml
@@ -77,6 +77,7 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
@@ -152,12 +153,14 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
+
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {}
+        ShiftKey {
+        }
 
         Key {
             btnKey: Qt.Key_Z
@@ -219,6 +222,7 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
+
     }
 
     RowLayout {
@@ -248,5 +252,7 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
+
     }
+
 }