.ci/build.sh

@@ -0,0 +1,10 @@
+set -ex
+
+source shared-ci/prepare-archlinux.sh
+
+# See *depends in https://github.com/archlinuxcn/repo/blob/master/archlinuxcn/qterminal-git/PKGBUILD
+pacman -S --noconfirm --needed git cmake lxqt-build-tools-git qt5-tools qtermwidget-git qt5-x11extras qt5-translations libcanberra
+
+cmake -B build -S .
+make -C build
+ARGS="-V" make -C build test

.github/workflows/test.yml

@@ -0,0 +1,18 @@
+name: Testing
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    container: archlinux:base-devel
+    steps:
+    - name: Checkout the repo
+      uses: actions/checkout@v2
+    - name: Checkout shared CI repo
+      uses: actions/checkout@v2
+      with:
+        repository: lxqt/ci
+        path: shared-ci
+    - name: Build
+      run: bash ./.ci/build.sh

CHANGELOG

@@ -1,3 +1,90 @@
+qterminal-2.1.0 / 2024-11-05
+=============================
+ * Added a hint on drop-down shortcut under Wayland.
+ * Resolved the conflicts when settings were changed by multiple instances.
+ * Prevent ordinary main windows under dropdown process.
+ * User-friendly texts for split menu-items.
+ * Fixed adding new tab from preset and fixed the disabled state of the context menu's collapse action.
+
+qterminal-2.0.1 / 2024-06-27
+=============================
+ * Single instance for drop-down mode.
+ * Used layer shell for the drop-down mode under Wayland.
+ * Prevented a crash on entering `exit` when bookmark dock is shown.
+ * Fixed the window height in drop-down mode.
+ * Set `QTERMWIDGET_MINIMUM_VERSION`, which was missing after Qt6 port.
+
+qterminal-2.0.0 / 2024-05-17
+=============================
+ * Ported to Qt6.
+ * Initialized some variables.
+ * Initialized some members in constructors.
+ * Removed a duplicated `#include`.
+ * Removed nullity test before deleting a pointer.
+ * Used `default` to define trivial constructors.
+ * Added word characters option to preferences.
+ * Fixed inactive tab text with Qt6.
+ * Dropped `qAsConst`.
+ * Improved Qt translations loading.
+ * Removes unused libraries.
+ * Dropped `USE_QTERMWIDGET5/6`.
+ * Silenced Qt6 compilation warnings.
+
+qterminal-1.4.0 / 2023-11-05
+=============================
+ * Handled bell (BEL, '\a') via libcanberra, and added an "Audible bell" option.
+ * Use `qWarning().noquote()`.
+ * Ported away from deprecated Qt::MidButton.
+ * Let the latest QTermWidget library set TERM.
+ * Corrected tab order in settings dialog.
+ * Removed an unused non POD variable.
+ * Supported Putty-style mouse button swap.
+ * Avoided a case of null pointer dereference.
+
+qterminal-1.3.0 / 2023-04-15
+=============================
+ * Specified the parent of the main context menu for correct positioning under Wayland.
+ * Improve UX by opening new terminals in current directory by default.
+ * Fixed a crash in the dropdown mode under Wayland.
+ * Corrected typos.
+ * Corrected the license in the meta-info.
+
+qterminal-1.2.0 / 2022-11-05
+=============================
+ * Add CI using GitHub Actions.
+ * Fixed command parsing with the `-e` option.
+ * Avoid segfault when using global menus.
+ * Improved documentation for the `--profile` option.
+
+qterminal-1.1.0 / 2022-04-15
+=============================
+ * Updated README.md.
+ * Fixed max. value of drop-down width/height spin-box.
+ * Use explicit QFlags default constructor instead of nullptr.
+ * Changed the relation between unlimited history and history size (selecting unlimited history now disables the history size spinbox).
+ * Activate bookmarks according to platform click behavior.
+ * Enabled bookmark filtering.
+ * Cleaned up bookmarks tree.
+ * No hidden parent for dropdown window (fixes several old issues).
+ * Fixed closing of last tab with prompt.
+ * Never show close prompt when explicitly ending session from terminal.
+ * Don't toggle drop-down terminal if it has modal dialog.
+ * Added bookmarks examples.
+ * Added a shortcut entry for drop-down shortcut.
+ * Fixed a minor problem in full-screening in drop-down mode.
+ * Improved the Bookmarks page of QTerminal's settings dialog.
+ * Fixed focus change on showing/hiding bookmarks dock.
+ * Fixed updating of shortcuts on tab switching/removal/creation.
+ * Fixed right clicking of an empty area of tabbar.
+
+qterminal-1.0.0 / 2021-11-04
+=============================
+ * Bumped minimum required Qt version to 5.15.
+ * Respect preset splitting on opening new window and double clicking tab-bar.
+ * Trim shell strings.
+ * Added an option for keeping drop-down window open.
+ * Don't try to move window under Wayland (fixes menu positions).
+
 qterminal-0.17.0 / 2021-04-15
 =============================
   * Some code cleanup and modernization.
@@ -22,7 +109,7 @@ qterminal-0.16.0 / 2020-11-01
   * Use the default constructor of QFlags.
   * Dropped qmake .pro file.
   * Made the color scheme dirs comply with XDG Base Directory Specification.
-  * Added an optopn for openning the new tab to the right of the active tab.
+  * Added an optopn for opening the new tab to the right of the active tab.
   * Added virtual destructor to a base class.
   * Let QStandardPaths::locateAll() handle application name.
   * Put drop-down QTerminal on screen with cursor.
@@ -83,7 +170,7 @@ qterminal-0.14.0 / 2019-01-25
     - Refactor STR_VERSION -> QTERMINAL_VERSION
   * Improved cmake scripting
     - Set cmake_minimum_required to 3.1.0
-    - Removed locale compile definitons
+    - Removed locale compile definitions
   * Moved translations from lxqt-l10n back to qterminal
    - Removed obsolete translation fuctionality
    - Added translation promo in README.md
@@ -337,7 +424,7 @@ qterminal-0.5.0 / 2014-05-27
   * fixed #51 Shortcuts broken after menu hiding
   * fixed #50 Bookmarks panel always shows, even if the bookmarks are disabled
   * fixed #49 Only show monospace fonts in the font picker
-  * save bookmars widget visibility; fix crash in some config circumstances
+  * save bookmarks widget visibility; fix crash in some config circumstances
   * Include QApplication where needed. Fixes #47
   * removed un-needed file
   * changes required for new qtermwidget build/structure; includes fixed for qtermwidget Qt5 port
@@ -368,7 +455,7 @@ qterminal-0.5.0 / 2014-05-27
   * fixed main window ui file (manually edited probably) to work with designr again. Use "Preferences..." instead of "Configure QTerminal"
   * compile also italian translations
   * added italian translations
-  * get rid of contraproductive Ctrl-W to close a tab. Replaced that   wieht Ctrl-Shift-W. Use nano in qterminal and try to search. You   will see, what i mean ... * it takes a horizontal ruler to tile a terminal vertically and   vice versa * make border of active terminal a litte bit thinner 3px -> 2px
+  * get rid of contraproductive Ctrl-W to close a tab. Replaced that   wieht Ctrl-Shift-W. Use nano in qterminal and try to search. You   will see, what i mean ... * it takes a horizontal ruler to tile a terminal vertically and   vice versa * make border of active terminal a little bit thinner 3px -> 2px
   * Added new action: "Paste Selection". Fixes #21
   * Handle migration "Paste Selection"->"Paste Clipboard" in settings
   * Rename PASTE_SELECTION to PASTE_CLIPBOARD which is what it does
@@ -396,7 +483,7 @@ qterminal-0.5.0 / 2014-05-27
   * yakuake mode compile fix for X11
   * build on mac
   * Switch to Qxt global shortcut
-  * "make lupdate" implemented; do ot delete ts files on "make clean"; fix translator loading
+  * "make lupdate" implemented; do not delete ts files on "make clean"; fix translator loading
   * DropDown mode
   * allow translations
   * tabs to spaces

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.0 FATAL_ERROR)
 # CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level
 # CMakeLists.txt file even before calling the project() command.
 # The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION)
@@ -9,9 +9,10 @@ project(qterminal)
 include(GNUInstallDirs)
 
 # qterminal version
-set(QTERMINAL_VERSION "0.17.0")
+set(QTERMINAL_VERSION "2.1.0")
 
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+option(BUILD_TESTS "Builds tests" ON)
 
 if(APPLE)
     option(APPLEBUNDLE "Build as qterminal.app bundle" ON)
@@ -20,33 +21,40 @@ endif()
 # we need qpa/qplatformnativeinterface.h for global shortcut
 
 # Minimum Versions
-set(LXQTBT_MINIMUM_VERSION "0.9.0")
-set(QTERMWIDGET_MINIMUM_VERSION "0.17.0")
-set(QT_MINIMUM_VERSION "5.15.0")
-
-find_package(Qt5Gui ${QT_MINIMUM_VERSION} REQUIRED)
-find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
-find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
+set(LXQTBT_MINIMUM_VERSION "2.1.0")
+set(QTERMWIDGET_MINIMUM_VERSION "2.1.0")
+set(QT_MINIMUM_VERSION "6.6.0")
+set(QT_MAJOR_VERSION "6")
+set(SHELLQT_MINIMUM_VERSION "6.0.0")
+
+find_package(Qt6Core ${QT_MINIMUM_VERSION} REQUIRED)
+find_package(Qt6Gui ${QT_MINIMUM_VERSION} REQUIRED)
+find_package(Qt6LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
+find_package(Qt6Widgets ${QT_MINIMUM_VERSION} REQUIRED)
+find_package(LayerShellQt ${SHELLQT_MINIMUM_VERSION} REQUIRED)
 if(UNIX)
-    find_package(Qt5DBus ${QT_MINIMUM_VERSION} REQUIRED)
-    if (NOT APPLE)
-        find_package(Qt5X11Extras ${QT_MINIMUM_VERSION} REQUIRED)
-    endif (NOT APPLE)
+    find_package(Qt6DBus ${QT_MINIMUM_VERSION} REQUIRED)
+    find_package(Qt6 COMPONENTS Core REQUIRED)
+endif()
+find_package(QTermWidget6 ${QTERMWIDGET_MINIMUM_VERSION} REQUIRED)
+find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+
+if (BUILD_TESTS)
+    find_package(Qt6 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Test)
 endif()
-find_package(QTermWidget5 ${QTERMWIDGET_MINIMUM_VERSION} REQUIRED)
-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
 
 include(LXQtPreventInSourceBuilds)
+include(FindPkgConfig)
+pkg_check_modules(LIBCANBERRA libcanberra)
 include(LXQtTranslateTs)
 include(LXQtTranslateDesktop)
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
-message(STATUS "Qt version: ${Qt5Core_VERSION}")
+message(STATUS "Qt version: ${Qt6Core_VERSION}")
 
 # TODO remove Qxt
 message(STATUS "Using bundled Qxt...")
 set(QXT_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/third-party")
 
-
 if(APPLE)
    find_library(CARBON_LIBRARY Carbon REQUIRED)
    message(STATUS "CARBON_LIBRARY: ${CARBON_LIBRARY}")
@@ -75,6 +83,7 @@ set(QTERM_SRC
     src/fontdialog.cpp
     src/dbusaddressable.cpp
     src/tab-switcher.cpp
+    src/qterminalutils.cpp
 )
 
 set(QTERM_MOC_SRC
@@ -90,14 +99,15 @@ set(QTERM_MOC_SRC
     src/tab-switcher.h
 )
 
-if (Qt5DBus_FOUND)
+if (Qt6DBus_FOUND)
     add_definitions(-DHAVE_QDBUS)
-    QT5_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Window.xml mainwindow.h MainWindow)
-    QT5_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Tab.xml termwidgetholder.h TermWidgetHolder)
-    QT5_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Terminal.xml termwidget.h TermWidget)
-    QT5_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Process.xml qterminalapp.h QTerminalApp)
+    QT6_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Window.xml mainwindow.h MainWindow)
+    QT6_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Tab.xml termwidgetholder.h TermWidgetHolder)
+    QT6_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Terminal.xml termwidget.h TermWidget)
+    QT6_ADD_DBUS_ADAPTOR(QTERM_SRC src/org.lxqt.QTerminal.Process.xml qterminalapp.h QTerminalApp)
+
     set(QTERM_MOC_SRC ${QTERM_MOC_SRC} src/dbusaddressable.h)
-    message(STATUS "Building with Qt5DBus support")
+    message(STATUS "Building with Qt6DBus support")
 endif()
 
 if(NOT QXT_FOUND)
@@ -124,9 +134,10 @@ set(QTERM_RCC_SRC
     src/icons.qrc
 )
 
-qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
-qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
-qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+qt6_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
+qt6_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
+qt6_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+
 lxqt_translate_ts(QTERM_QM
     UPDATE_TRANSLATIONS
         ${UPDATE_TRANSLATIONS}
@@ -194,37 +205,50 @@ add_executable(${EXE_NAME} ${GUI_TYPE}
 )
 
 target_link_libraries(${EXE_NAME}
-    Qt5::Gui
-    qtermwidget5
-    util
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
+    qtermwidget6
+    LayerShellQtInterface
 )
 if(QXT_FOUND)
     target_link_libraries(${EXE_NAME} ${QXT_CORE_LIB} ${QXT_GUI_LIB})
 endif()
 
-if (Qt5DBus_FOUND)
-    target_link_libraries(${EXE_NAME} ${Qt5DBus_LIBRARIES})
+if (Qt6DBus_FOUND)
+    target_link_libraries(${EXE_NAME} ${Qt6DBus_LIBRARIES})
 endif()
 
 if(APPLE)
     target_link_libraries(${EXE_NAME} ${CARBON_LIBRARY})
-elseif(UNIX)
-    target_link_libraries(${EXE_NAME} Qt5::X11Extras)
 endif()
 
 if(X11_FOUND)
     target_link_libraries(${EXE_NAME} ${X11_X11_LIB})
 endif()
 
+if(LIBCANBERRA_FOUND)
+    add_definitions(-DHAVE_LIBCANBERRA)
+    include_directories(${LIBCANBERRA_INCLUDE_DIRS})
+    target_link_libraries(${EXE_NAME} ${LIBCANBERRA_LIBRARIES})
+endif()
+
+set(APP_DIR "${CMAKE_INSTALL_FULL_DATADIR}/qterminal")
+add_definitions(-DAPP_DIR=\"${APP_DIR}\")
 
 install(FILES
     ${DESKTOP_FILES}
     DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
 )
 
 install(FILES
-    qterminal.appdata.xml
-    DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
+    qterminal.metainfo.xml
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
+)
+
+install(FILES
+    qterminal_bookmarks_example.xml
+    DESTINATION ${APP_DIR}
 )
 
 if(NOT APPLEBUNDLE)
@@ -258,3 +282,8 @@ else()
         COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.app/Contents/Resources/empty.lproj"
         COMMENT "Creating Resources/empty.lproj")
 endif()
+
+if(BUILD_TESTS)
+    enable_testing()
+    add_subdirectory(test)
+endif()

Doxyfile

@@ -279,7 +279,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
+# causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
 # a logarithmic scale so increasing the size by one will roughly double the
@@ -1050,7 +1050,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are
 # not supported properly for IE 6.0, but are supported on all modern browsers.
 # Note that when changing this option you need to delete any form_*.png files