diff -Nru dtkwidget-5.6.8/archlinux/PKGBUILD dtkwidget-5.6.12/archlinux/PKGBUILD --- dtkwidget-5.6.8/archlinux/PKGBUILD 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/archlinux/PKGBUILD 2023-05-15 03:42:41.000000000 +0000 @@ -2,24 +2,26 @@ pkgname=dtkwidget-git pkgver=5.5.45.r1.gbc050fca pkgrel=1 +sourcename=dtkwidget +sourcetars=("$sourcename"_"$pkgver".tar.xz) +sourcedir="$sourcename" pkgdesc='Deepin graphical user interface library' arch=('x86_64' 'aarch64') url="https://github.com/linuxdeepin/dtkwidget" license=('LGPL3') -depends=('dtkcore-git' 'dtkgui-git' 'librsvg' 'qt5-svg' - 'qt5-x11extras' 'startup-notification') -makedepends=('git' 'qt5-tools' 'gtest' 'dtkcommon-git' 'dtkcore-git' 'dtkgui-git' 'ninja' 'cmake' 'doxygen') +depends=('dtkcore-git' 'dtkgui-git' 'qt5-svg' + 'qt5-x11extras' 'dtkcommon-git' 'startup-notification') +makedepends=('git' 'qt5-tools' 'gtest' 'ninja' 'cmake' 'doxygen') provides=('dtkwidget') conflicts=('dtkwidget') groups=('deepin-git') -source=('source.tar.gz') +source=("${sourcetars[@]}") sha512sums=('SKIP') build() { - cd $deepin_source_name - cmake -GNinja \ - -DHUNTER_ENABLED=OFF \ + cd $sourcedir + cmake . -GNinja \ -DMKSPECS_INSTALL_DIR=lib/qt/mkspecs/modules/\ -DBUILD_PLUGINS=OFF \ -DBUILD_DOCS=ON \ @@ -31,6 +33,6 @@ } package() { - cd $deepin_source_name + cd $sourcedir DESTDIR="$pkgdir" ninja install } diff -Nru dtkwidget-5.6.8/CMakeLists.txt dtkwidget-5.6.12/CMakeLists.txt --- dtkwidget-5.6.8/CMakeLists.txt 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/CMakeLists.txt 2023-05-15 03:42:41.000000000 +0000 @@ -14,6 +14,11 @@ set(LIB_NAME dtkwidget) +# Set install path +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX /usr) +endif() + include(GNUInstallDirs) include(CMakePackageConfigHelpers) @@ -33,15 +38,6 @@ CACHE BOOL "Build plugin and plugin example" ) -# Set install path -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX /usr) -endif() - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget" ) @@ -123,11 +119,14 @@ endif() set(BUILD_DOCS - ON + OFF CACHE BOOL "Generate doxygen-based documentation" ) if(BUILD_DOCS) + message("===================================") + message(" You can build docs now ") + message("===================================") add_subdirectory(docs) endif() diff -Nru dtkwidget-5.6.8/debian/changelog dtkwidget-5.6.12/debian/changelog --- dtkwidget-5.6.8/debian/changelog 2023-04-26 18:10:35.000000000 +0000 +++ dtkwidget-5.6.12/debian/changelog 2023-05-18 12:26:54.000000000 +0000 @@ -1,3 +1,9 @@ +dtkwidget (5.6.12-1) lunar; urgency=medium + + * New upstream release. + + -- Arun Kumar Pariyar Thu, 18 May 2023 18:11:54 +0545 + dtkwidget (5.6.8-1) lunar; urgency=medium * New upstream release. Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/chooseredit-example.png and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/chooseredit-example.png differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/dboxwidget-example.png and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/dboxwidget-example.png differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/dfeaturedisplaydialog.png and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/dfeaturedisplaydialog.png differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/dlineedit_example1.png and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/dlineedit_example1.png differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/dlineedit_example2.png and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/dlineedit_example2.png differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/docs/images/dspinner_example.gif and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/docs/images/dspinner_example.gif differ diff -Nru dtkwidget-5.6.8/docs/widgets/daboutdialog.zh_CN.dox dtkwidget-5.6.12/docs/widgets/daboutdialog.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/daboutdialog.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/daboutdialog.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -306,6 +306,9 @@ @brief 设置指定acknowledgementLink鸣谢连接 @sa 属性 [acknowledgementLink](@ref Dtk::Widget::DAboutDialog::acknowledgementLink) +@fn void Dtk::Widget::DAboutDialog::setAcknowledgementVisible(const QString &acknowledgementLink) +@brief 设置鸣谢是否可见 + @fn void Dtk::Widget::DAboutDialog::setAcknowledgementLink(bool visible) @brief 此函数用于设置指定的 visible 设置鸣谢链接是否显示 @sa 属性 [acknowledgementLink](@ref Dtk::Widget::DAboutDialog::acknowledgementLink) diff -Nru dtkwidget-5.6.8/docs/widgets/dboxwidget.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dboxwidget.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dboxwidget.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dboxwidget.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,165 @@ +/*! +@~chinese +@file dboxwidget.h +@ingroup dtkwidget +@class Dtk::Widget::DBoxWidget +@brief DBoxWidget提供了一个自适应子控件大小的Widget +@details +在Qt编程中，使用QBoxLayout设置控件是很常见的，DBoxWidget提供了方便的封装，会根据需要的大小自动 +设置DBoxWidget的宽高。 + +下面提供DBoxWidget的例子： + +项目目录结构在同一目录下 + +## CMakeLists.txt + +```cmake +cmake_minimum_required(VERSION 3.1.0) # 指定cmake最低版本 + +project(example VERSION 1.0.0 LANGUAGES CXX) # 指定项目名称, 版本, 语言 cxx就是c++ + +set(CMAKE_CXX_STANDARD 11) # 指定c++标准 +set(CMAKE_CXX_STANDARD_REQUIRED ON) # 指定c++标准要求,至少为11以上 + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # 支持 clangd + +if (CMAKE_VERSION VERSION_LESS "3.7.0") # 如果cmake版本小于3.7.0 + set(CMAKE_INCLUDE_CURRENT_DIR ON) # 设置包含当前目录 +endif() + +find_package(Qt5 REQUIRED COMPONENTS Widgets) # 寻找Qt5组件Widgets +find_package(Dtk REQUIRED COMPONENTS Widget) # 寻找Dtk组件Widget + +add_executable(${PROJECT_NAME} # 生成可执行文件 + main.cpp +) + +target_link_libraries(${PROJECT_NAME} PRIVATE # 添加需要链接的共享库 + Qt5::Widgets + ${DtkWidget_LIBRARIES} +) +``` + +## main.cpp + +```cpp +#include +#include +#include +#include +#include +#include +#include + +DWIDGET_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + DApplication a(argc, argv); + DMainWindow win; + + // 设置水平方向 从左到右排列 + QBoxLayout::Direction direction = QBoxLayout::LeftToRight; + + // 创建DBoxWidget对象 + DBoxWidget box(direction, &win); + + // 添加一个DLineEdit控件，和一个按钮，可以看到控件水平放置 + box.addWidget(new DLineEdit()); + box.addWidget(new DPushButton("按钮")); + + // 设置外边距为30px + box.layout()->setMargin(30); + + // widget放入主窗口 + win.setCentralWidget(&box); + + win.resize(300,200); + win.show(); + // 移动窗口到屏幕中心 + Dtk::Widget::moveToCenter(&win); + return a.exec(); +} +``` + +编译运行 +``` +cmake -Bbuild +cmake --build build +./build/example +``` + +结果如下图 +![example](/docs/images/dboxwidget-example.png) + +@sa DHBoxWidget +@sa DVBoxWidget + +@property QBoxLayout::Direction Dtk::Widget::DBoxWidget::direction +@brief 当前QBoxLayout使用的方向的属性 +@sa read方法 [direction](@ref Dtk::Widget::DBoxWidget::direction() const) +@sa write方法 [setDirection](@ref Dtk::Widget::DBoxWidget::setDirection(QBoxLayout::Direction direction)) + +@fn QBoxLayout::Direction DBoxWidget::direction() const +@brief 这个属性返回当前 QBoxLayout 使用的方向 +@return QBoxLayout::Direction 当前的方向 +@sa 属性 [direction](@ref Dtk::Widget::DBoxWidget::direction) + +@fn void Dtk::Widget::DBoxWidget::setDirection(QBoxLayout::Direction direction) +@brief 设置 QBoxLayout 当前的方向 +@param direction 方向 +@sa 属性 [direction](@ref Dtk::Widget::DBoxWidget::direction) + +@fn Dtk::Widget::DBoxWidget::DBoxWidget(QBoxLayout::Direction direction, QWidget *parent = 0) +@brief DBoxWidget的构造函数 +@param direction 是设置内部QBoxLayout使用的方向 +@param parent 传递给QFrame的构造函数 + +@fn QBoxLayout* Dtk::Widget::DBoxWidget::layout() const +@brief 这个属性会返回当前使用的布局对象 +@details 这个属性可以用来获取内部布局，所以你可以设置布局上的一些额外属性来匹配自定义需求。 +@return 返回 QBoxLayout 类型的指针 + +@fn void Dtk::Widget::DBoxWidget::addWidget(QWidget *widget) +@brief 调用QBoxLayout的addWidget方法将QWidget添加到布局中 +@param widget 要添加的QWidget对象 + +@fn void Dtk::Widget::DBoxWidget::updateSize(const QSize &size) +@brief 当方向是 QBoxLayout::TopToBottom 或者 QBoxLayout::BottomToTop 时设置大小 +@details 固定高度将使用传入的高度，并设置最小宽度为传入的宽度。否则将使用传入的宽度当做固定宽度，高度为最小高度。 +@param size 传入的大小 + +@fn QSize Dtk::Widget::DBoxWidget::sizeHint() const Q_DECL_OVERRIDE +@brief DBoxWidget::sizeHint 重写 QWidget::sizeHint(). +@return 该控件的推荐大小. + +@fn void Dtk::Widget::DBoxWidget::sizeChanged(QSize size) +@brief DBoxWidget 大小发生变化时的信号 + +@fn void Dtk::Widget::DBoxWidget::directionChanged(QBoxLayout::Direction direction) +@brief DBoxWidget 方向发生变化时的信号 + +*/ + +/*! +@~chinese +@class Dtk::Widget::DHBoxWidget +@brief 设置成水平方向的DBoxWidget + +@fn Dtk::Widget::DHBoxWidget::DHBoxWidget(QWidget *parent = 0) +@brief DHBoxWidget的构造函数 +@param parent 被传递给DBoxWidget构造函数 + +*/ + +/*! +@~chinese +@class Dtk::Widget::DVBoxWidget +@brief 设置成垂直方向的DBoxWidget + +@fn Dtk::Widget::DVBoxWidget::DVBoxWidget(QWidget *parent = 0) +@brief DVBoxWidget的构造函数 +@param parent 被传递给DBoxWidget构造函数 + +*/ diff -Nru dtkwidget-5.6.8/docs/widgets/dfeaturedisplaydialog.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dfeaturedisplaydialog.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dfeaturedisplaydialog.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dfeaturedisplaydialog.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -43,6 +43,9 @@ @class Dtk::Widget::DFeatureDisplayDialog @brief 特性介绍对话框，展示应用更新的新特性 +结果如下图 +![example](/docs/images/dfeaturedisplaydialog.png) + @fn Dtk::Widget::DFeatureDisplayDialog::DFeatureDisplayDialog(QWidget *parent) @brief 特性介绍对话框的构造函数 @param[in] parent 特性介绍对话框的父对象 @@ -75,7 +78,7 @@ @fn void Dtk::Widget::DFeatureDisplayDialog::setLinkUrl(const QString &url) @brief 设置链接按钮链接地址 -@param[in] isVisible 链接按钮的链接地址 +@param[in] url 链接按钮的链接地址 @fn void Dtk::Widget::DFeatureDisplayDialog::show() @brief 显示特性介绍对话框 diff -Nru dtkwidget-5.6.8/docs/widgets/dfilechooseredit.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dfilechooseredit.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dfilechooseredit.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dfilechooseredit.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -2,11 +2,172 @@ @~chinese @file dfilechooseredit.h @ingroup edit -@class -@brief +@class Dtk::Widget::DFileChooserEdit +@brief 带有选择文件按钮的文本编辑框 @details +本控件基本与 DLineEdit 相同，但同时在编辑框的右侧提供了一个按钮，点击按钮将会出现一个选择文件的对话框，当在对话框中选择完毕点击确定之后，选择的结果将会出现在文本编辑框中。 +另外还提供了设置对话框出现的位置，选择文件的类型，或设置文件名过滤器的方法以定制控件的功能。 -TODO: 添加类简介、示例代码、示例截图和函数使用说明等 +下面提供DFileChooserEdit的例子: +项目目录结构在同一目录下 + +## CMakeLists.txt +```cmake +cmake_minimum_required(VERSION 3.1.0) # 指定cmake最低版本 + +project(example VERSION 1.0.0 LANGUAGES CXX) # 指定项目名称, 版本, 语言 cxx就是c++ + +set(CMAKE_CXX_STANDARD 11) # 指定c++标准 +set(CMAKE_CXX_STANDARD_REQUIRED ON) # 指定c++标准要求,至少为11以上 + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # 支持 clangd + +if (CMAKE_VERSION VERSION_LESS "3.7.0") # 如果cmake版本小于3.7.0 + set(CMAKE_INCLUDE_CURRENT_DIR ON) # 设置包含当前目录 +endif() + +find_package(Qt5 REQUIRED COMPONENTS Widgets) # 寻找Qt5组件Widgets +find_package(Dtk REQUIRED COMPONENTS Widget) # 寻找Dtk组件Widget + +add_executable(${PROJECT_NAME} # 生成可执行文件 + main.cpp +) + +target_link_libraries(${PROJECT_NAME} PRIVATE # 添加需要链接的共享库 + Qt5::Widgets + ${DtkWidget_LIBRARIES} +) +``` + +## main.cpp +```cpp +#include +#include +#include +#include +#include +#include + +DWIDGET_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + DApplication a(argc, argv); + DMainWindow win; + + // 创建一个widget容器 + QWidget widget; + // 创建DFileChooserEdit对象 + DFileChooserEdit dialog; + + // 给widget设置水平布局 + QHBoxLayout hLayout(&widget); + + dialog.setFileMode(QFileDialog::Directory); // 指定选择的模式，选择目录。 + dialog.setDirectoryUrl(QUrl("file:///home")); // 设置文件选择器打开路径为home目录 + + // 将dialogn放入到widget中 + hLayout.addWidget(&dialog); + // widget放入主窗口 + win.setCentralWidget(&widget); + + win.resize(300,200); + win.show(); + // 移动窗口到屏幕中心 + Dtk::Widget::moveToCenter(&win); + return a.exec(); +} +``` + +编译运行 +``` +cmake -Bbuild +cmake --build build +./build/example +``` + +结果如下图 +![example](/docs/images/chooseredit-example.png) + +@sa DLineEdit QFileDialog + +@enum Dtk::Widget::DFileChooserEdit::DialogDisplayPosition +@brief 这个枚举保存了对话框可以出现的位置 +@var Dtk::Widget::DFileChooserEdit::DialogDisplayPosition Dtk::Widget::DFileChooserEdit::FollowParentWindow +@brief 跟随父窗口 +@var Dtk::Widget::DFileChooserEdit::DialogDisplayPosition Dtk::Widget::DFileChooserEdit::CurrentMonitorCenter +@brief 鼠标所在的显示器的中心 + +@fn void Dtk::Widget::DFileChooserEdit::fileChoosed(const QString &fileName) +@brief 这个信号在文件被选择且点击了对话框的确认按钮之后被调用 +@param fileName 被选中的文件名，包含其绝对路径。 + +@fn void Dtk::Widget::DFileChooserEdit::dialogOpened() +@brief 这个信号在对话框即将显示时被调用 +@note 注意，此时对话框并没有显示 + +@fn void Dtk::Widget::DFileChooserEdit::dialogClosed(int code) +@brief 这信号在对话框关闭时被调用，无论对话框是被点击了确认还是取消，都会调用本信号 +@param code 对话框的返回码，返回码表示了对话框是因为点击了取消还是确认而关闭的 +@sa QDialog::DialogCode + +@fn Dtk::Widget::DFileChooserEdit::DFileChooserEdit(QWidget *parent = nullptr) +@brief 获取 DFileChooserEdit 的一个实例 +@param parent 作为实例的父控件 + +@fn DFileChooserEdit::DialogDisplayPosition Dtk::Widget::DFileChooserEdit::dialogDisplayPosition() const +@brief 这个属性保存文件选择对话框将会出现的位置 +@details +可选值为枚举 DFileChooserEdit::DialogDisplayPosition 中的值 +Getter: DFileChooserEdit::dialogDisplayPosition , Setter: DFileChooserEdit::setDialogDisplayPosition +@sa DFileChooserEdit::DialogDisplayPosition + +@fn void Dtk::Widget::DFileChooserEdit::setDialogDisplayPosition(DialogDisplayPosition dialogDisplayPosition) +@brief 设置对话框显示位置 +@param dialogDisplayPosition 对话框的显示位置 +@sa DFileChooserEdit::dialogDisplayPosition + +@fn void Dtk::Widget::DFileChooserEdit::setFileDialog(QFileDialog *fileDialog) +@brief 设置 fileDialog + +@fn QFileDialog* Dtk::Widget::DFileChooserEdit::fileDialog() const +@brief 返回 fileDialog + +@fn void Dtk::Widget::DFileChooserEdit::initDialog() +@brief 初始化对话框 + +@fn void Dtk::Widget::DFileChooserEdit::setFileMode(QFileDialog::FileMode mode) +@brief 设置文件选择模式 +@param mode 要使用的模式 +@sa DFileChooserEdit::fileMode + +@fn QFileDialog::FileMode Dtk::Widget::DFileChooserEdit::fileMode() const +@brief 获取对话框选择文件模式 +@details 有多种类型的选择模式，也就是说对话框可以有多种显示或行为，例如选择单个文件，选择多个文件亦或选择一个目录等，详细可以查阅：QFileDialog::FileMode +@return 返回当前的选择模式 +@sa QFileDialog::FileMode +@note 目前本控件只支持选择单个文件，即便调用 DFileChooserEdit::setFileMode 设置了选择模式，当有多个文件在对话框中被选中时，取其第一个作为选择结果 + +@fn void Dtk::Widget::DFileChooserEdit::setNameFilters(const QStringList &filters) +@brief 设置文件名过滤器 +@param filters 要使用的文件名过滤器组成的列表 +@sa DFileChooserEdit::nameFilters + +@fn QStringList Dtk::Widget::DFileChooserEdit::nameFilters() const +@brief 文件名过滤器 +@details +默认此选项为空，即所有文件都可以被选择，当文件名过滤器被设置后，则只有文件名与过滤器匹配的文件可以被选择， +例如：设置了"*.txt"，则表示只有后缀名为"txt"的文件可以被选择， +或者同时设置了多个过滤器：QStringList() << "text file (*.txt)" << "picture file (*.png); +则会在文件选择对话框的下方出现设置的多个过滤选项，只是需要注意，一次只能使用一个过滤选项，也就是说不能同时即允许选择txt文件又允许选择png文件 +@return 返回当前的文件名过滤器组成的列表 +@sa DFileChooserEdit::setNameFilters + +@fn void Dtk::Widget::DFileChooserEdit::setDirectoryUrl(const QUrl &directory) +@brief 设置文件对话框打开时的路径 + +@fn QUrl Dtk::Widget::DFileChooserEdit::directoryUrl() +@brief 返回文件对话框打开时的路径 */ diff -Nru dtkwidget-5.6.8/docs/widgets/dlicensedialog.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dlicensedialog.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dlicensedialog.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dlicensedialog.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,35 @@ +/*! +@~chinese +@file dlicensedialog.h +@ingroup dtkwidget + +@class Dtk::Widget::DLicenseDialog +@brief 开源许可协议对话框，展示应用及组件所用的开源许可协议 + +@fn Dtk::Widget::DLicenseDialog::DLicenseDialog(QWidget *parent) +@brief 开源许可协议对话框的构造函数 +@param[in] parent 开源许可协议对话框的父对象 + +@fn explicit Dtk::Widget::DLicenseDialog::~DLicenseDialog() +@brief 开源许可协议对话框的析构函数 + +@fn void Dtk::Widget::DLicenseDialog::setContent(const QByteArray &content) +@brief 设置协议相关的内容 +@param[in] content 协议相关的内容 + +@fn void Dtk::Widget::DLicenseDialog::setFile(const QString &file) +@brief 设置协议文件 +@param[in] file 协议文件 + +@fn void Dtk::Widget::DLicenseDialog::setLicenseSearchPath(const QString &path) +@brief 自定义协议内容路径 +@param[in] path 协议内容路径 + +@fn bool Dtk::Widget::DLicenseDialog::load() +@brief 加载开源许可协议 +@return 开源许可协议是否加载成功 + +@fn bool Dtk::Widget::DLicenseDialog::isValid() const; +@brief 开源许可协议是否有效 +@return 开源许可协议是否有效 +*/ diff -Nru dtkwidget-5.6.8/docs/widgets/dlineedit.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dlineedit.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dlineedit.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dlineedit.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -2,11 +2,327 @@ @~chinese @file dlineedit.h @ingroup edit -@class -@brief +@class Dtk::Widget::DLineEdit +@brief DLineEdit一个聚合 QLineEdit 的输入框. @details -TODO: 添加类简介、示例代码、示例截图和函数使用说明等 +## 概述 +- DLineEdit提供了向输入框左右两端插入控件的函数 +- DLineEdit提供了带警告颜色的输入框 +- DLineEdit提供了带文本警告消息的输入框 -*/ +LineEdit 是一个单行输入文本框，为用户提供了比较多的编辑功能，除了QLineEdit默认的功能，DLineEdit还提供警告提示， +还可以通过 setLeftWidgets() 或者 setRightWidgets() 向编辑框左右侧添加额外控件 + +下面通过一个简单登录界面的程序来演示DLineEdit + +## CMakeLists.txt + +配置 CMakeLists.txt 文件 + +```cmake +cmake_minimum_required(VERSION 3.1.0) # 指定cmake最低版本 + +project(example1 VERSION 1.0.0 LANGUAGES CXX) # 指定项目名称, 版本, 语言 cxx就是c++ + +set(CMAKE_CXX_STANDARD 11) # 指定c++标准 +set(CMAKE_CXX_STANDARD_REQUIRED ON) # 指定c++标准要求,至少为11以上 +set(target example1) # 指定目标名称 + +set(CMAKE_AUTOMOC ON) # support qt moc # 支持qt moc +set(CMAKE_AUTORCC ON) # support qt resource file # 支持qt资源文件 +set(CMAKE_AUTOUIC ON) # support qt ui file # 支持qt ui文件(非必须) + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # support clangd 支持 clangd + +if (CMAKE_VERSION VERSION_LESS "3.7.0") # 如果cmake版本小于3.7.0 + set(CMAKE_INCLUDE_CURRENT_DIR ON) # 设置包含当前目录 +endif() + +find_package(Qt5 COMPONENTS Widgets REQUIRED) # 寻找Qt5组件Widgets +find_package(Qt5 COMPONENTS Gui REQUIRED) # 寻找Qt5组件Gui +find_package(Dtk COMPONENTS Widget REQUIRED) # 寻找Dtk组件Widget +find_package(Dtk COMPONENTS Core REQUIRED) # 寻找Dtk组件Core +find_package(Dtk COMPONENTS Gui) # 寻找Dtk组件Gui + +add_executable(example1 # 添加可执行文件 + main.cpp +) + +target_link_libraries(example1 PRIVATE + Qt5::Widgets + Qt5::Gui + ${DtkGui_LIBRARIES} + ${DtkCore_LIBRARIES} + ${DtkWidget_LIBRARIES} +) # 链接库 +``` + +## main.cpp + +```cpp +#include +#include +#include +#include +#include +#include +#include +#include + +DWIDGET_USE_NAMESPACE //使用DWidget命名空间 + +int main(int argc, char *argv[]) { + DApplication app(argc,argv); + + DMainWindow w; + //限制主程序窗口最小尺寸 + w.setMinimumSize(300,200); + //新建一个窗体，容纳所有控件 + DWidget *cw = new DWidget(&w); + //新建一个可以输入手机号的DLineEdit控件 + DLineEdit *phoneEdit = new DLineEdit(); + //设置占位符文本，用于提示输入信息 + phoneEdit->setPlaceholderText("输入手机号"); + //在右侧添加一个获取验证码的按钮，这里演示使用匿名对象 + phoneEdit->setRightWidgets({new DPushButton("获取验证码")}); + + //新建一个可以输入密码的 DPasswordEdit 控件，它从 DLineEdit 继承而来，一个方便键入密码的控件 + DPasswordEdit *pwdEdit = new DPasswordEdit(); + //设置占位符文本，用于提示输入信息 + pwdEdit->setPlaceholderText("输入密码"); + + //设置窗体的为垂直布局 + QVBoxLayout *mainLayout = new QVBoxLayout(cw); + + //将两个编辑框添加到布局 + mainLayout->addWidget(phoneEdit); + mainLayout->addWidget(pwdEdit); + + //新建两个按钮控件，用于取消和登录 + DPushButton *cancelBtn = new DPushButton("取消"); + DPushButton *loginBtn = new DPushButton("登录"); + + //将两个按钮放入一个水平布局中 + QHBoxLayout *btnLayout = new QHBoxLayout(); + btnLayout->addWidget(cancelBtn); + btnLayout->addWidget(loginBtn); + + //将水平布局添加到外层窗体的垂直布局中 + mainLayout->addLayout(btnLayout); + + //运用connect，实现登录按钮被按下后的一系列操作 + QObject::connect(loginBtn, &DPushButton::clicked, [&phoneEdit, &pwdEdit, &w](){ + //简单判断手机号是否输入，若为空，则输入手机号的编辑框发出警示信息 + if(phoneEdit->text().isEmpty()) { + //发出警示信息，显示五秒 + phoneEdit->showAlertMessage("手机号不能为空",5000); + return; + } + //判断输入的密码位数是否大于等于6位，若不满足，则发出警示信息 + if(pwdEdit->text().size() < 6) { + //发出警示信息，显示五秒 + pwdEdit->showAlertMessage("请输入至少6位密码",5000); + return; + } + //满足所有条件后，主窗口发出登录成功提示信息 + w.sendMessage(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), "登录成功！"); + }); + + //将cw加入到主窗口中 + w.setCentralWidget(cw); + w.show(); + return app.exec(); +} +``` +## 程序运行效果 + +![不输入信息效果图](/docs/images/dlineedit_example1.png)
+![发出警示信息效果图](/docs/images/dlineedit_example2.png) + +@property DLineEdit::alert +@brief 警告模式属性. +@details用于开启或者判断是否处于警告模式. + +@fn Dtk::Widget::DLineEdit::DLineEdit(QWidget *parent = nullptr) +@brief DLineEdit的构造函数 +@param parent 参数被发送到 QWidget 构造函数 + +@fn QLineEdit *Dtk::Widget::DLineEdit::lineEdit() const +@brief 返回 QLineEdit 对象 +@note 若 DLineEdit 不满足输入框的使用需求，请用此函数抛出的对象 +@return 返回 QLineEdit 对象 + +@fn void Dtk::Widget::DLineEdit::setAlert(bool isAlert) +@brief 设置警告状态，橙黄色提示 +@param isAlert true为设置为警告状态，反之不是 + +@fn bool Dtk::Widget::DLineEdit::isAlert() const +@brief 返回当前是否是警告状态 +@return 返当前的警告状态 + +@fn void Dtk::Widget::DLineEdit::showAlertMessage(const QString &text, int duration = 3000) +@brief 显示警告消息 +显示指定的文本消息，超过指定时间后警告消息消失 +@param text 警告的文本 +@param duration 显示的时间长度，单位毫秒 +@note 时间参数为-1时，警告消息将一直存在 + +@fn void Dtk::Widget::DLineEdit::showAlertMessage(const QString &text, QWidget *follower, int duration = 3000) +@brief 显示警告消息 +显示指定的文本消息，超过指定时间后警告消息消失 +@param text 警告的文本 +@param follower tooltip 跟随 +@param duration 显示的时间长度，单位毫秒 +@note 时间参数为-1时，警告消息将一直存在 + +@fn void Dtk::Widget::DLineEdit::setAlertMessageAlignment(Qt::Alignment alignment) +@brief 指定对齐方式 +现只支持(下)左，(下)右，(下水平)居中， 默认左对齐 +@note 参数为其他时，默认左对齐 +@param alignment 消息对齐方式 + +@fn Qt::Alignment Dtk::Widget::DLineEdit::alertMessageAlignment() const +@brief 获取警告消息的对齐方式 +@return 返回警告消息的对齐方式 + +@fn void Dtk::Widget::DLineEdit::hideAlertMessage() +@brief 隐藏警告消息框 + +@fn void Dtk::Widget::DLineEdit::setLeftWidgets(const QList &list) +@brief 向输入框左侧添加控件 +将 QList 里的控件插入到输入框的左侧 +@note 多次调用，只有最后一次调用生效 +@param list 存储控件的列表 + +@fn void Dtk::Widget::DLineEdit::setRightWidgets(const QList &list) +@brief 向输入框右侧添加控件 +将 QList 里的控件插入到输入框的右侧 +@note 多次调用，只有最后一次调用生效 +@param list 存储控件的列表 + +@fn void Dtk::Widget::DLineEdit::setLeftWidgetsVisible(bool visible) +@brief 是否隐藏输入框左侧控件. +@param visible 是否隐藏 + +@fn void Dtk::Widget::DLineEdit::setRightWidgetsVisible(bool visible) +@brief 是否隐藏输入框右侧控件. +@param visible 是否隐藏 + +@fn void Dtk::Widget::DLineEdit::setClearButtonEnabled(bool enable) +@brief 设置清除按钮是否可见. +@param enable true 按钮可见 false 按钮不可见 + +@fn bool Dtk::Widget::DLineEdit::isClearButtonEnabled() const +@brief 返回清除按钮是否可见. +@return true 清除按钮可见 false 清除按钮不可见 + +@fn void Dtk::Widget::DLineEdit::setText(const QString &text) +@brief 设置显示的文本. +@param text 显示的文本 + +@fn QString Dtk::Widget::DLineEdit::text() +@brief 返回当前显示的文本. +@return 返回显示的文本 + +@fn void Dtk::Widget::DLineEdit::clear(); +@brief 清空编辑的内容 + +@fn QLineEdit::EchoMode Dtk::Widget::DLineEdit::echoMode() const +@brief 返回输入框的回显模式 +@return 返回回显的模式 + +@fn void Dtk::Widget::DLineEdit::setEchoMode(QLineEdit::EchoMode mode) +@brief 设置回显的模式 +@param mode 回显的模式 + +@fn void Dtk::Widget::DLineEdit::setContextMenuPolicy(Qt::ContextMenuPolicy policy) +@brief 设置行编辑控件的文本菜单策略 +@param policy 显示右键菜单的方式 +转发实际变量 QLineEdit 的 ContextMenuEvent 消息 +@sa QLineEdit::setContextMenuPolicy + +@fn bool Dtk::Widget::DLineEdit::speechToTextIsEnabled() const +@brief 返回是否显示语音听写菜单项 +@return true 显示语音听写菜单项 false不显示 + +@fn void Dtk::Widget::DLineEdit::setSpeechToTextEnabled(bool enable) +@brief 设置是否显示语音听写菜单项 +@param enable true显示 flase不显示 + +@fn void Dtk::Widget::DLineEdit::setPlaceholderText(const QString &) +@brief 设置占位文本 +@param 参数1 占位文本 + +@fn bool Dtk::Widget::DLineEdit::textToSpeechIsEnabled() const +@brief 返回是否显示语音朗读菜单项 +@return true 显示语音朗读菜单项 false不显示 + +@fn void Dtk::Widget::DLineEdit::setTextToSpeechEnabled(bool enable) +@brief 设置是否显示语音朗读菜单项 +@param enable true显示 flase不显示 + +@fn bool Dtk::Widget::DLineEdit::textToTranslateIsEnabled() const +@brief 返回是否显示文本翻译菜单项 +@return true 显示文本翻译菜单项 false 不显示 + +@fn void Dtk::Widget::DLineEdit::setTextToTranslateEnabled(bool enable) +@brief 设置是否显示文本翻译菜单项 +@param enable true显示 flase不显示 + +@fn bool Dtk::Widget::DLineEdit::copyEnabled() const +@brief 返回文本是否可拷贝 +@return true文本可拷贝 false不可拷贝 + +@fn void Dtk::Widget::DLineEdit::setCopyEnabled(bool enable) +@brief 设置文本是否可拷贝 +@param enable true文本可拷贝 false不可拷贝 + +@fn bool Dtk::Widget::DLineEdit::cutEnabled() const +@brief 返回文本是否可裁切 +@return true文本可剪切 false不可剪切 + +@fn void Dtk::Widget::DLineEdit::setCutEnabled(bool enable) +@brief 设置输入文本是否可裁切 +@param enabled true输入文本可剪切 false不可剪切 + +@fn bool Dtk::Widget::DLineEdit::eventFilter(QObject *watched, QEvent *event) override +@brief 事件过滤器 +该过滤器不做任何过滤动作，但会监控输入框的焦点状态，并发送信号 focusChanged()。 +@param watched 被监听的子控件指针 +@param event 待过滤的事件 +@param event 实例 +@return 成功过滤返回 true，否则返回 false + +@fn void Dtk::Widget::DLineEdit::alertChanged(bool alert) const +@brief 警告状态改变发出此信号 +@param alert 是否在警告状态 + +@fn void Dtk::Widget::DLineEdit::focusChanged(bool onFocus) const +@brief 焦点状态改变发出此信号 +@param onFocus 是否获取到焦点 + +@fn void Dtk::Widget::DLineEdit::textChanged(const QString &) +@brief 文本发生改变发出此信号 +@param 参数1 当前文本 + +@fn void Dtk::Widget::DLineEdit::textEdited(const QString &) +@brief 每当编辑文本时会发出此信号 +@param 参数1 当前文本 + +@fn void Dtk::Widget::DLineEdit::cursorPositionChanged(int, int) +@brief 光标位置改变发出此信号 +@param 参数1 旧位置 +@param 参数2 新位置 + +@fn void Dtk::Widget::DLineEdit::returnPressed() +@brief 按下Return键或Enter键会发出此信号 + +@fn void Dtk::Widget::DLineEdit::editingFinished() +@brief 当按下Return或Enter键或文本字段失去焦点时会发出此信号 + +@fn void Dtk::Widget::DLineEdit::selectionChanged() +@brief 每当选择更改时会发出此信号 + +*/ \ No newline at end of file diff -Nru dtkwidget-5.6.8/docs/widgets/dprintpreviewdialog.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dprintpreviewdialog.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dprintpreviewdialog.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dprintpreviewdialog.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,34 @@ +/*! +@~chinese +@file dprintpreviewdialog.h +@ingroup dialog +@class Dtk::Widget::DPrintPreviewDialog +@brief Dtk 风格的打印预览页面. +@details 一个用于创建 Dtk 风格的打印预览页面，通常情况下，只需要构建一个 DPrintPreivewDialog 对象， +并将原始数据绘制到连接 `DPrintPreview::paintRequested` 信号的槽函数中,最后以模态的形式显示就可以正常使用。 + +TODO: 添加类简介、示例代码、示例截图和函数使用说明等 + +@fn DPrintPreviewSettingInfo *Dtk::Widget::DPrintPreviewDialog::createDialogSettingInfo(DPrintPreviewSettingInfo::SettingType type) +@brief 根据打印类型 `type` 创建打印界面设置对象，包含当前界面设置信息。 +@details 若不支持 `type` 类型的设置，将返回 nullptr ；打印插件可能过滤部分类型的设置，同样返回 nullptr 。 +使用示例 +```c++ +DPrintPreviewDialog dialog; +auto info = dialog.createDialogSettingInfo(DPrintPreviewSettingInfo::PS_Watermark); +if (info) { + // 设置打印参数 + ... + dialog.updateDialogSettingInfo(info); + delete info; +} +``` +@param[in] type 打印界面配置类型 +@return 打印设置对象指针 +@warning 创建的打印设置对象生命周期由调用方管理，需手动释放对象 + +@fn void Dtk::Widget::DPrintPreviewDialog::updateDialogSettingInfo(DPrintPreviewSettingInfo *info) +@brief 通过 `info` 配置信息更新打印界面配置，配置将更新界面控件，可调整的选项包括基础设置、打印方向、页面设置、水印等。 +@param[in] info 提供打印界面设置信息 + +*/ diff -Nru dtkwidget-5.6.8/docs/widgets/dspinner.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dspinner.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dspinner.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dspinner.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -2,11 +2,134 @@ @~chinese @file dspinner.h @ingroup spinner -@class -@brief -@details +@class Dtk::Widget::DSpinner +@brief 可以使用 DSpinner 类快速创建用于指示加载中状态的旋转等待图标动画控件. +@details DSpinner 提供了一个用于指示加载中状态的旋转等待图标动画控件。在创建图标后，使用 start() 即可开始图标旋转的动画。 +@image html DSpinner.gif -TODO: 添加类简介、示例代码、示例截图和函数使用说明等 +下面通过一个简单的实例来演示DSpinner +## CMakeLists.txt -*/ +配置 CMakeLists.txt 文件 + +```cmake +cmake_minimum_required(VERSION 3.1.0) # 指定cmake最低版本 + +project(example1 VERSION 1.0.0 LANGUAGES CXX) # 指定项目名称, 版本, 语言 cxx就是c++ + +set(CMAKE_CXX_STANDARD 11) # 指定c++标准 +set(CMAKE_CXX_STANDARD_REQUIRED ON) # 指定c++标准要求,至少为11以上 +set(target example1) # 指定目标名称 + +set(CMAKE_AUTOMOC ON) # support qt moc # 支持qt moc +set(CMAKE_AUTORCC ON) # support qt resource file # 支持qt资源文件 +set(CMAKE_AUTOUIC ON) # support qt ui file # 支持qt ui文件(非必须) + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # support clangd 支持 clangd + +if (CMAKE_VERSION VERSION_LESS "3.7.0") # 如果cmake版本小于3.7.0 + set(CMAKE_INCLUDE_CURRENT_DIR ON) # 设置包含当前目录 +endif() + +find_package(Qt5 COMPONENTS Widgets REQUIRED) # 寻找Qt5组件Widgets +find_package(Qt5 COMPONENTS Gui REQUIRED) # 寻找Qt5组件Gui +find_package(Dtk COMPONENTS Widget REQUIRED) # 寻找Dtk组件Widget +find_package(Dtk COMPONENTS Core REQUIRED) # 寻找Dtk组件Core +find_package(Dtk COMPONENTS Gui) # 寻找Dtk组件Gui + +add_executable(example1 # 添加可执行文件 + main.cpp +) + +target_link_libraries(example1 PRIVATE + Qt5::Widgets + Qt5::Gui + ${DtkGui_LIBRARIES} + ${DtkCore_LIBRARIES} + ${DtkWidget_LIBRARIES} +) # 链接库 +``` + +## main.cpp + +```cpp +#include +#include +#include +#include +#include + +DWIDGET_USE_NAMESPACE //使用DWidget命名空间 + +int main(int argc, char *argv[]) { + DApplication app(argc,argv); + + DMainWindow w; + //限制主程序窗口最小尺寸 + w.setMinimumSize(300,200); + //新建一个窗体，容纳所有控件 + DWidget *cw = new DWidget(&w); + //窗体使用水平布局 + QHBoxLayout *layout = new QHBoxLayout(cw); + //设置对齐方式，向右对齐，防止spinner被隐藏后按钮乱跳 + layout->setAlignment(Qt::AlignRight); + + //添加一个DSpinner + DSpinner *spinner = new DSpinner(); + spinner->setFixedSize(36,36); + //添加一个button，控制DSpinner + DPushButton *btn = new DPushButton("开始加载"); + btn->setFixedWidth(100); + //将DSpinner和DPushButton添加到布局中 + layout->addWidget(spinner); + layout->addWidget(btn); + //刚开始没有加载，隐藏spinner + spinner->hide(); + + //实现按钮被按下后的操作 + QObject::connect(btn, &DPushButton::clicked, [&btn, &spinner](){ + //如果spinner正在播放动画，按下按钮后切换到非加载模式，停止动画并隐藏spinner，反之开始动画并显示spinner + if(spinner->isPlaying()){ + spinner->stop(); + spinner->hide(); + btn->setText("开始加载"); + } + else { + spinner->show(); + spinner->start(); + btn->setText("取消加载"); + } + }); + //将cw放置在主窗口中 + w.setCentralWidget(cw); + w.show(); + return app.exec(); +} +``` + +## 程序运行效果 + +![运行效果图](/docs/images/dspinner_example.gif) + +@fn Dtk::Widget::DSpinner::DSpinner(QWidget *parent = 0) +@brief 创建一个 DSpinner 控件 +@param parent 父控件 + +@fn Dtk::Widget::DSpinner::~DSpinner(); +@brief 析构函数 + +@fn bool Dtk::Widget::DSpinner::isPlaying() const; +@brief DSpinner 是否正在播放旋转动画. +@return 正在播放返回 true，否则返回 false. + +@fn void Dtk::Widget::DSpinner::start(); +@brief DSpinner 开始旋转动画 + +@fn void Dtk::Widget::DSpinner::stop(); +@brief DSpinner 停止旋转动画 + +@fn void Dtk::Widget::DSpinner::setBackgroundColor(QColor color); +@brief 设置控件的背景颜色 +@param color 需要设置的背景颜色 +*/ \ No newline at end of file diff -Nru dtkwidget-5.6.8/docs/widgets/dswitchbutton.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dswitchbutton.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dswitchbutton.zh_CN.dox 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dswitchbutton.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -2,11 +2,28 @@ @~chinese @file dswitchbutton.h @ingroup button -@class -@brief -@details -TODO: 添加类简介、示例代码、示例截图和函数使用说明等 +@class Dtk::Widget::DSwitchButton +@brief DSwitchButton 实现一个开关按钮 +@fn Dtk::Widget::DSwitchButton::DSwitchButton(QWidget *parent) +@brief 构造 DSwitchButton 对象，传入父控件指针。 +@param parent 父控件指针 + +@fn QSize Dtk::Widget::DSwitchButton::sizeHint() const +@brief DSwitchButton::sizeHint 初始化控件矩形大小（在绘画之前） +@return 控件矩形大小 + +@fn void Dtk::Widget::DSwitchButton::paintEvent(QPaintEvent *e) +@brief DSwitchButton::paintEvent 绘画处理 +@param e 绘画事件 +@sa QWidget::paintEvent() + +@fn void Dtk::Widget::DSwitchButton::initStyleOption(DStyleOptionButton *option) const +@brief DSwitchButton::initStyleOption 初始化(用于继承的)抽象按钮对象,后面用于 DStylePainter 绘画 DStyle::CE_SwitchButton 枚举 +@param option 初始化了的的抽象风格按钮对象 + +@fn void Dtk::Widget::DSwitchButton::checkedChanged(bool arg) +@brief 选择状态的信号 */ diff -Nru dtkwidget-5.6.8/docs/widgets/dwatermarkhelper.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dwatermarkhelper.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dwatermarkhelper.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dwatermarkhelper.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,25 @@ +/*! +@~chinese +@file dwatermarkhelper.h + +@class Dtk::Widget::DWaterMaskHelper +@inmodule dtkwidget +@brief 不允许直接实例化此对象 +@param[in] parent +@sa DWaterMaskHelper::instance + +@fn DWaterMarkHelper::instance +@brief DWaterMarkHelper 的单例对象，使用 Q_GLOBAL_STATIC 定义，在第一次调用时实例化。 + +@fn void DWaterMarkHelper::registerWidget(QWidget *widget) +@brief 为指定窗口添加水印 +@param[in] widget 要添加水印的窗口 + +@property WaterMarkData DWaterMarkHelper::data() const +@brief 当前设置的水印信息 + +@fn void DWaterMarkHelper::setData(const WaterMarkData &data) +@brief 设置当前水印信息 +@param[in] data 需要设置的水印信息 + +*/ diff -Nru dtkwidget-5.6.8/docs/widgets/dwatermarkwidget.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dwatermarkwidget.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dwatermarkwidget.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dwatermarkwidget.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,108 @@ +/*! +@~chinese +@file dwatermarkwidget.h + +@class Dtk::Widget::WaterMarkData +@inmodule dtkwidget +@brief 水印信息结构 +@param[in] parent + +@property const Dtk::Widget::WaterMarkData::WaterMarkType &WaterMarkData::type() +@brief 当前设置的水印类型 + +@fn void Dtk::Widget::WaterMarkData::setType(WaterMarkType type) +@brief 设置当前水印的类型 +@param[in] type 需要设置的水印类型 + +@property const Dtk::Widget::WaterMarkData::WaterMarkLayout &WaterMarkData::layout() +@brief 当前设置的水印布局类型 + +@fn void WaterMarkData::setLayout(WaterMarkLayout layout) +@brief 设置的水印布局类型 +@param[in] layout 需要设置的水印布局类型 + +@property qreal WaterMarkData::scaleFactor() +@brief 当前设置的水印整体缩放系数 + +@fn void WaterMarkData::setScaleFactor(qreal scaleFactor) +@brief 设置当前水印的整体缩放系数 +@param[in] scaleFactor 需要设置的水印整体缩放系数 + +@property int WaterMarkData::spacing() +@brief 当前设置的水印间距 + +@fn void WaterMarkData::setSpacing(int spacing) +@brief 设置当前水印的间距 +@param[in] spacing 需要设置的水印的间距 + +@property int WaterMarkData::lineSpacing() +@brief 当前设置的水印行间距 + +@fn void WaterMarkData::setLineSpacing(int lineSpacing) +@brief 设置当前水印的行间距 +@param[in] lineSpacing 需要设置的水印行间距 + +@property const QString &WaterMarkData::text() +@brief 当前设置的水印文本内容 + +@fn void WaterMarkData::setText(const QString &text) +@brief 设置当前水印的文本内容 +@param[in] text 需要设置的水印文本内容 + +@property const QFont &WaterMarkData::font() +@brief 当前设置的水印字体 + +@fn void WaterMarkData::setFont(const QFont &font) +@brief 设置当前水印的字体 +@param[in] font 需要设置的水印字体 + +@property const QColor &WaterMarkData::color() +@brief 当前设置的水印颜色 + +@fn void WaterMarkData::setColor(const QColor &color) +@brief 设置当前水印的颜色 +@param[in] color 需要设置的水印颜色 + +@property qreal WaterMarkData::rotation() +@brief 当前设置的水印旋转角度(0~360) + +@fn void WaterMarkData::setRotation(qreal rotation) +@brief 设置当前水印的旋转角度(0~360) +@param[in] rotation 需要设置的水印旋转角度 + +@property qreal WaterMarkData::opacity() +@brief 当前设置的水印透明度(0~1.0) + +@fn void WaterMarkData::setOpacity(qreal opacity) +@brief 设置当前水印透明度(0~1.0) +@param[in] opacity 需要设置的水印透明度 + +@property const QImage &WaterMarkData::image() +@brief 当前设置的水印图片 + +@fn void WaterMarkData::setImage(const QImage &image) +@brief 设置当前水印图片 +@param[in] 需要设置的水印图片 + +@property bool WaterMarkData::grayScale() +@brief 当前设置的水印图片是否需要灰度化 + +@fn void WaterMarkData::setGrayScale(bool grayScale) +@brief 设置当前水印图片是否需要灰度化，默认为true +@param[in] grayScale 设置当前水印图片是否需要灰度化 + + + +@class Dtk::Widget::DWaterMarkWidget +@inmodule dtkwidget +@brief 水印类，将覆盖设置的父界面，并跟随父界面动态调整大小 +@param[in] parent + +@property const WaterMarkData &DWaterMarkWidget::data() +@brief 当前设置的水印信息 + +@fn void DWaterMarkWidget::setData(const WaterMarkData &data) +@brief 设置当前水印信息 +@param[in] data 需要设置的水印信息 + +*/ diff -Nru dtkwidget-5.6.8/docs/widgets/dwindowoptionbutton.zh_CN.dox dtkwidget-5.6.12/docs/widgets/dwindowoptionbutton.zh_CN.dox --- dtkwidget-5.6.8/docs/widgets/dwindowoptionbutton.zh_CN.dox 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/docs/widgets/dwindowoptionbutton.zh_CN.dox 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,24 @@ +/*! +@~chinese +@file dwindowoptionbutton.h +@ingroup dtkwidget + +@class Dtk::Widget::DWindowOptionButton +@brief DWindowOptionButton 类是 DTK 窗口统一的菜单按钮控件 + +@details 它实际上是一个特殊的DImageButton，它有着选项按钮的外观点击按钮后， +默认会显示程序主菜单，包含“关于”、“帮助”等项。 + +*/ + +/*! +@~chinese +@file dwindowoptionbutton.h +@ingroup dtkwidget + +@fn DWindowOptionButton::DWindowOptionButton(QWidget * parent) +@brief DWindowOptionButton::DWindowOptionButton 是 DWindowOptionButton 的构造 +函数，返回 DWindowOptionButton 对象，普通程序一般无需使用。 +'parent 为创建对象的父控件' +*/ + diff -Nru dtkwidget-5.6.8/examples/collections/buttonexample.cpp dtkwidget-5.6.12/examples/collections/buttonexample.cpp --- dtkwidget-5.6.8/examples/collections/buttonexample.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/buttonexample.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -292,6 +292,35 @@ showDialog("这是icon_Tooltip的图标"); }); + pToolBar->addAction(QIcon::fromTheme("icon_Dialog"), "", this, [] { + DDialog dialog("各种类型的ToolButton", "", nullptr); + dialog.setIcon(DStyle().standardIcon(DStyle::SP_MessageBoxInformation)); + auto toolBar = new DToolBar; + toolBar->addAction(QIcon::fromTheme("icon_button"), ""); + toolBar->addAction("文字"); + toolBar->addAction("长文字123456"); + { + auto action = toolBar->addAction("含菜单"); + auto menu = new QMenu(); + menu->addAction("Menu1"); + action->setMenu(menu); + } + { + auto action = toolBar->addAction(QIcon::fromTheme("icon_button"), ""); + auto menu = new QMenu(); + menu->addAction("Menu1"); + action->setMenu(menu); + } + { + auto action = toolBar->addAction(QIcon::fromTheme("icon_button"), "图标和文字"); + if (auto widget = qobject_cast(toolBar->widgetForAction(action))) + widget->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + } + dialog.addContent(toolBar); + dialog.exec(); + }); + + pHBoxLayout->addWidget(pToolBar); pVBoxLayout->addSpacing(20); diff -Nru dtkwidget-5.6.8/examples/collections/listviewexample.cpp dtkwidget-5.6.12/examples/collections/listviewexample.cpp --- dtkwidget-5.6.8/examples/collections/listviewexample.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/listviewexample.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -98,7 +98,6 @@ lv->setModel(model); lv->setItemSpacing(space); lv->setSpacing(0); - lv->setIconSize(QSize(32, 32)); lv->setFixedHeight(fixHeight); lv->setContentsMargins(0, 0, 0, 0); }; @@ -270,7 +269,6 @@ gbPicLabel->setPixmap(QPixmap(":/images/example/DGroupBox.png").scaled(568, 444, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); contentComboBox->addItems({"自动"}); contentComboBox->setMinimumWidth(213); - groupBoxWidget->setFixedHeight(48); contentLayout->setContentsMargins(10, 6, 10, 6); contentLayout->addWidget(contentTextLabel); diff -Nru dtkwidget-5.6.8/examples/collections/main.cpp dtkwidget-5.6.12/examples/collections/main.cpp --- dtkwidget-5.6.8/examples/collections/main.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/main.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -1,11 +1,10 @@ -// SPDX-FileCopyrightText: 2015 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2015 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later #include "mainwindow.h" #include -#include #include #include @@ -43,9 +42,8 @@ a->setApplicationDescription(QApplication::translate("main", "Collections provides the examples for dtk applications.")); a->setApplicationDisplayName(QObject::tr("Collections")); a->setApplicationLicense(QObject::tr("2023 UnionTech Software Technology Co., Ltd.")); - - DApplicationSettings as; - Q_UNUSED(as) + a->setApplicationCreditsFile(":/resources/data/example-license.json"); + a->setLicensePath(":/resources/data"); MainWindow w; w.show(); diff -Nru dtkwidget-5.6.8/examples/collections/mainwindow.cpp dtkwidget-5.6.12/examples/collections/mainwindow.cpp --- dtkwidget-5.6.8/examples/collections/mainwindow.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/mainwindow.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -26,6 +26,7 @@ #include #include "buttonexample.h" +#include "dlicensedialog.h" #include "editexample.h" #include "sliderexample.h" #include "menuexample.h" @@ -150,7 +151,7 @@ : DMainWindow(parent) { setWindowIcon(QIcon(":/images/logo_icon.svg")); - setMinimumSize(qApp->primaryScreen()->availableSize() / 5); + setMinimumSize(qApp->primaryScreen()->availableSize() / 5 * 3); QHBoxLayout *mainLayout = new QHBoxLayout(); mainLayout->setMargin(0); diff -Nru dtkwidget-5.6.8/examples/collections/resources/data/example-license.json dtkwidget-5.6.12/examples/collections/resources/data/example-license.json --- dtkwidget-5.6.8/examples/collections/resources/data/example-license.json 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/resources/data/example-license.json 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,32 @@ +[ + { + "name": "pkg-config", + "version": "", + "copyright": "NOASSERTION", + "license": "MIT" + }, + { + "name": "lshw", + "version": "", + "copyright": "NOASSERTION", + "license": "GPL-2" + }, + { + "name": "debhelper", + "version": "", + "copyright": "NOASSERTION", + "license": "GPL-2" + }, + { + "name": "pkg-config", + "version": "", + "copyright": "NOASSERTION", + "license": "MIT" + }, + { + "name": "debhelper", + "version": "", + "copyright": "NOASSERTION", + "license": "GPL-2" + } +] diff -Nru dtkwidget-5.6.8/examples/collections/resources/data/GPL-2.txt dtkwidget-5.6.12/examples/collections/resources/data/GPL-2.txt --- dtkwidget-5.6.8/examples/collections/resources/data/GPL-2.txt 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/resources/data/GPL-2.txt 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru dtkwidget-5.6.8/examples/collections/resources/data/MIT.txt dtkwidget-5.6.12/examples/collections/resources/data/MIT.txt --- dtkwidget-5.6.8/examples/collections/resources/data/MIT.txt 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/resources/data/MIT.txt 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2016-2022 TheAlgorithms and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -Nru dtkwidget-5.6.8/examples/collections/resources.qrc dtkwidget-5.6.12/examples/collections/resources.qrc --- dtkwidget-5.6.8/examples/collections/resources.qrc 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/resources.qrc 2023-05-15 03:42:41.000000000 +0000 @@ -3,5 +3,8 @@ resources/data/dfm-settings.json resources/data/dt-settings.json resources/data/titlebar-settings.json - + resources/data/example-license.json + resources/data/MIT.txt + resources/data/GPL-2.txt + diff -Nru dtkwidget-5.6.8/examples/collections/widgetexample.cpp dtkwidget-5.6.12/examples/collections/widgetexample.cpp --- dtkwidget-5.6.8/examples/collections/widgetexample.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/widgetexample.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -5,6 +5,7 @@ #include "widgetexample.h" #include +#include #include #include @@ -18,6 +19,7 @@ { addExampleWindow(new DCalendarWidgetExample(this)); addExampleWindow(new DTableWidgetExample(this)); + addExampleWindow(new DMPRISControlWidgetExample(this)); } DCalendarWidgetExample::DCalendarWidgetExample(QWidget *parent) @@ -180,3 +182,28 @@ return QVariant(); } } + +DMPRISControlWidgetExample::DMPRISControlWidgetExample(QWidget *parent) + : ExampleWindowInterface(parent) +{ + QVBoxLayout *layout = new QVBoxLayout(this); + + DMPRISControl *control = new DMPRISControl(this); + layout->addWidget(control, 0, Qt::AlignCenter); + control->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); +} + +QString DMPRISControlWidgetExample::getTitleName() const +{ + return QStringLiteral("DMPRISControl"); +} + +QString DMPRISControlWidgetExample::getDescriptionInfo() const +{ + return QStringLiteral("支持MPRIS协议的媒体控制控件。"); +} + +int DMPRISControlWidgetExample::getFixedHeight() const +{ + return 200; +} diff -Nru dtkwidget-5.6.8/examples/collections/widgetexample.h dtkwidget-5.6.12/examples/collections/widgetexample.h --- dtkwidget-5.6.8/examples/collections/widgetexample.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/widgetexample.h 2023-05-15 03:42:41.000000000 +0000 @@ -56,6 +56,18 @@ QTableView *tableView; }; +class DMPRISControlWidgetExample : public ExampleWindowInterface +{ + Q_OBJECT + +public: + explicit DMPRISControlWidgetExample(QWidget *parent = nullptr); + + QString getTitleName() const override; + QString getDescriptionInfo() const override; + int getFixedHeight() const override; +}; + class CalendarModel : public QAbstractTableModel { Q_OBJECT diff -Nru dtkwidget-5.6.8/examples/collections/windowexample.cpp dtkwidget-5.6.12/examples/collections/windowexample.cpp --- dtkwidget-5.6.8/examples/collections/windowexample.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/examples/collections/windowexample.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -15,6 +15,7 @@ #include #include #include +#include #include "windowexample.h" @@ -24,9 +25,10 @@ { public: ExampTitlebar(QIcon icon) + : m_clipWidget(new DClipEffectWidget(this)) { setIcon(icon); - setFixedSize(530, 50); + setFixedWidth(530); } private: @@ -37,11 +39,23 @@ const DPalette &dp = DPaletteHelper::instance()->palette(this); p.save(); - p.setPen(QPen(dp.frameBorder(), 2)); - DDrawUtils::drawRoundedRect(&p, rect().adjusted(0 , 0, -1 , -1), 16, 16, + p.setPen(QPen(dp.frameBorder(), 1)); + int radius = 18; + if (auto window = qobject_cast(topLevelWidget()->window())) + radius = window->windowRadius(); + DDrawUtils::drawRoundedRect(&p, rect().adjusted(0 , 0, -1 , -1), radius, radius, DDrawUtils::Corner::TopLeftCorner | DDrawUtils::Corner::TopRightCorner); p.restore(); + + // clip `closeButton` + QPainterPath path; + path.addRect(rect().adjusted(0, radius, 0, 0)); + QPainterPath path2; + path2.addRoundedRect(rect(), radius, radius); + path += path2; + m_clipWidget->setClipPath(path); } + DClipEffectWidget *m_clipWidget; }; class ExampWindow : public DMainWindow diff -Nru dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/config.yml dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/config.yml --- dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/config.yml 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/config.yml 2023-05-15 03:42:41.000000000 +0000 @@ -1 +1,20 @@ -blank_issues_enabled: true +blank_issues_enabled: false +contact_links: + - name: BUG Report | 缺陷报告 + url: https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=bug-report.yml + about: Please create bug reports to the issue board in our dtk repo. + + - name: docs-update | 文档补充 + url: https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=docs-update.yml + about: Please create docs-update to the issue board in our dtk repo. + + - name: unit-test-report | 单元测试报告 + url: https://github.com/linuxdeepin/dtk/issues/new?assignees=&labels=&template=unit-test-report.yml + about: Please create unit-test-report to the issue board in our dtk repo. + + - name: Feature Request | 特性请求 + url: https://github.com/linuxdeepin/developer-center/discussions/new?category=features-request-ideas-%E7%89%B9%E6%80%A7%E8%AF%B7%E6%B1%82-%E5%A4%B4%E8%84%91%E9%A3%8E%E6%9A%B4 + about: Please create feature requests to the discussion board in our developer-center repo. + - name: General Discussion & Questions | 常规讨论与问答 + url: https://github.com/linuxdeepin/developer-center/discussions/categories/q-a-%E9%97%AE%E7%AD%94%E6%9D%BF%E5%9D%97 + about: Please use the discussion board in our developer-center repo. diff -Nru dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/empty-issue.md dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/empty-issue.md --- dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/empty-issue.md 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/empty-issue.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ ---- -name: Empty issue -about: File a Empty issue -title: '' -labels: '' -assignees: '' - ---- diff -Nru dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/unit-test-report.md dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/unit-test-report.md --- dtkwidget-5.6.8/.github/ISSUE_TEMPLATE/unit-test-report.md 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/ISSUE_TEMPLATE/unit-test-report.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- -name: Unit test report -about: File a unit test report. -title: 'Test: [class name]' -labels: '' -assignees: '' - ---- - -Path: [class file path] -Interface: [class interface name] - diff -Nru dtkwidget-5.6.8/.github/workflows/call-build-deb.yml dtkwidget-5.6.12/.github/workflows/call-build-deb.yml --- dtkwidget-5.6.8/.github/workflows/call-build-deb.yml 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/workflows/call-build-deb.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -name: Call build-deb -on: - pull_request_target: - paths-ignore: - - ".github/workflows/**" - types: [ opened, closed, synchronize ] - -concurrency: - group: ${{ github.workflow }}-pull/${{ github.event.number }} - cancel-in-progress: true - -jobs: - check_job: - if: github.event.action != 'closed' || github.event.pull_request.merged - uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master - secrets: - BridgeToken: ${{ secrets.BridgeToken }} diff -Nru dtkwidget-5.6.8/.github/workflows/call-chatOps.yml dtkwidget-5.6.12/.github/workflows/call-chatOps.yml --- dtkwidget-5.6.8/.github/workflows/call-chatOps.yml 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/workflows/call-chatOps.yml 2023-05-15 03:42:41.000000000 +0000 @@ -6,5 +6,4 @@ jobs: chatopt: uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master - secrets: - APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} + secrets: inherit diff -Nru dtkwidget-5.6.8/.github/workflows/call-tag-build.yml dtkwidget-5.6.12/.github/workflows/call-tag-build.yml --- dtkwidget-5.6.8/.github/workflows/call-tag-build.yml 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.github/workflows/call-tag-build.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -name: tag build -on: - push: - tags: "*" - -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true - -jobs: - build: - uses: linuxdeepin/.github/.github/workflows/tag-build.yml@master - secrets: inherit diff -Nru dtkwidget-5.6.8/include/DWidget/DLicenseDialog dtkwidget-5.6.12/include/DWidget/DLicenseDialog --- dtkwidget-5.6.8/include/DWidget/DLicenseDialog 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/include/DWidget/DLicenseDialog 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1 @@ +#include "dlicensedialog.h" diff -Nru dtkwidget-5.6.8/include/DWidget/DWaterMarkHelper dtkwidget-5.6.12/include/DWidget/DWaterMarkHelper --- dtkwidget-5.6.8/include/DWidget/DWaterMarkHelper 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/include/DWidget/DWaterMarkHelper 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1 @@ +#include "dwatermarkhelper.h" diff -Nru dtkwidget-5.6.8/include/util/dapplicationsettings.h dtkwidget-5.6.12/include/util/dapplicationsettings.h --- dtkwidget-5.6.8/include/util/dapplicationsettings.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/util/dapplicationsettings.h 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -17,6 +17,7 @@ D_DECLARE_PRIVATE(DApplicationSettings) public: + Q_DECL_DEPRECATED_X("The feature has been moved to DGuiApplicationHelper, We can disable it by setting DGuiApplicationHelper::DontSaveApplicationTheme enum with setAttribute.") explicit DApplicationSettings(QObject *parent = nullptr); private: diff -Nru dtkwidget-5.6.8/include/util/dwidgetutil.h dtkwidget-5.6.12/include/util/dwidgetutil.h --- dtkwidget-5.6.8/include/util/dwidgetutil.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/util/dwidgetutil.h 2023-05-15 03:42:41.000000000 +0000 @@ -29,6 +29,7 @@ QIcon getCircleIcon(const QPixmap &pixmap, int diameter = 36); QIcon getCircleIcon(const QIcon &icon, int diameter = 36); +void grayScale(const QImage &image, QImage &dest, const QRect &rect = QRect()); void moveToCenter(QWidget *w); DWIDGET_END_NAMESPACE diff -Nru dtkwidget-5.6.8/include/widgets/daboutdialog.h dtkwidget-5.6.12/include/widgets/daboutdialog.h --- dtkwidget-5.6.8/include/widgets/daboutdialog.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/daboutdialog.h 2023-05-15 03:42:41.000000000 +0000 @@ -33,11 +33,13 @@ const QPixmap *companyLogo() const; QString websiteName() const; QString websiteLink() const; - QString acknowledgementLink() const; + D_DECL_DEPRECATED_X("acknowledgement is no longer used") QString acknowledgementLink() const; QString license() const; + void setLicenseEnabled(bool enabled); Q_SIGNALS: void featureActivated(); + void licenseActivated(); public Q_SLOTS: void setWindowTitle(const QString &windowTitle); @@ -48,7 +50,7 @@ void setCompanyLogo(const QPixmap &companyLogo); void setWebsiteName(const QString &websiteName); void setWebsiteLink(const QString &websiteLink); - void setAcknowledgementLink(const QString &acknowledgementLink); + D_DECL_DEPRECATED_X("acknowledgement is no longer used") void setAcknowledgementLink(const QString &acknowledgementLink); void setAcknowledgementVisible(bool visible); void setLicense(const QString &license); @@ -59,6 +61,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_onLinkActivated(const QString &link)) Q_PRIVATE_SLOT(d_func(), void _q_onFeatureActivated(const QString &link)) + Q_PRIVATE_SLOT(d_func(), void _q_onLicenseActivated(const QString &link)) Q_DISABLE_COPY(DAboutDialog) D_DECLARE_PRIVATE(DAboutDialog) diff -Nru dtkwidget-5.6.8/include/widgets/dapplication.h dtkwidget-5.6.12/include/widgets/dapplication.h --- dtkwidget-5.6.8/include/widgets/dapplication.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dapplication.h 2023-05-15 03:42:41.000000000 +0000 @@ -21,6 +21,7 @@ class DApplicationPrivate; class DAboutDialog; class DFeatureDisplayDialog; +class DLicenseDialog; class DAppHandler; #if defined(qApp) @@ -120,6 +121,15 @@ void ignoreVirtualKeyboard(QWidget *window); bool isAcclimatizedVirtualKeyboard(QWidget *window) const; + QString applicationCreditsFile() const; + void setApplicationCreditsFile(const QString &file); + + QByteArray applicationCreditsContent() const; + void setApplicationCreditsContent(const QByteArray &content); + + QString licensePath() const; + void setLicensePath(const QString &path); + #ifdef VERSION static inline QString buildVersion(const QString &fallbackVersion) { diff -Nru dtkwidget-5.6.8/include/widgets/dlicensedialog.h dtkwidget-5.6.12/include/widgets/dlicensedialog.h --- dtkwidget-5.6.8/include/widgets/dlicensedialog.h 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dlicensedialog.h 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,35 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef DLICENSEDIALOG_H +#define DLICENSEDIALOG_H + +#include + +DWIDGET_BEGIN_NAMESPACE + +class DLicenseDialogPrivate; +class DLicenseDialog : public DAbstractDialog +{ + Q_OBJECT +public: + explicit DLicenseDialog(QWidget *parent = nullptr); + ~DLicenseDialog() override; + + void setContent(const QByteArray &content); + void setFile(const QString &file); + void setLicenseSearchPath(const QString &path); + bool load(); + bool isValid() const; + +protected: + void hideEvent(QHideEvent *) override; + +private: + D_DECLARE_PRIVATE(DLicenseDialog) +}; + +DWIDGET_END_NAMESPACE + +#endif // DLICENSEDIALOG_H diff -Nru dtkwidget-5.6.8/include/widgets/dprintpreviewdialog.h dtkwidget-5.6.12/include/widgets/dprintpreviewdialog.h --- dtkwidget-5.6.8/include/widgets/dprintpreviewdialog.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dprintpreviewdialog.h 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -9,6 +9,7 @@ #endif #include +#include #include DWIDGET_BEGIN_NAMESPACE @@ -63,6 +64,9 @@ bool setAsynPreview(int totalPage); bool isAsynPreview() const; + DPrintPreviewSettingInfo *createDialogSettingInfo(DPrintPreviewSettingInfo::SettingType type); + void updateDialogSettingInfo(DPrintPreviewSettingInfo *info); + // QWidget interface protected: virtual void resizeEvent(QResizeEvent *event) override; diff -Nru dtkwidget-5.6.8/include/widgets/dstyle.h dtkwidget-5.6.12/include/widgets/dstyle.h --- dtkwidget-5.6.8/include/widgets/dstyle.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dstyle.h 2023-05-15 03:42:41.000000000 +0000 @@ -137,6 +137,7 @@ PM_ContentsSpacing, //内容的间距（可用于列表项中每一项的距离） PM_ButtonMinimizedSize, //按钮控件的最小大小 PM_ToolTipLabelWidth, // Maximum width that a ToolTip label can reach + PM_FloatingButtonFrameMargin, // Frame margin that a floatingbutton has PM_CustomBase = QStyle::PM_CustomBase + 0xf00000 }; diff -Nru dtkwidget-5.6.8/include/widgets/dwatermarkhelper.h dtkwidget-5.6.12/include/widgets/dwatermarkhelper.h --- dtkwidget-5.6.8/include/widgets/dwatermarkhelper.h 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dwatermarkhelper.h 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,36 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef DWATERMARKHELPER_H +#define DWATERMARKHELPER_H +#include "dwatermarkwidget.h" + +#include +#include + +#include + +DTK_USE_NAMESPACE +DWIDGET_BEGIN_NAMESPACE +class DWaterMarkHelperPrivate; +class DWaterMarkHelper : public QObject, public DTK_CORE_NAMESPACE::DObject +{ + Q_OBJECT +public: + static DWaterMarkHelper *instance(); + void registerWidget(QWidget *w); + + WaterMarkData data() const; + void setData(const WaterMarkData &data); + +protected: + explicit DWaterMarkHelper(QObject *parent = nullptr); + +private: + D_DECLARE_PRIVATE(DWaterMarkHelper) +}; + +DWIDGET_END_NAMESPACE + +#endif // DWATERMARKHELPER_H diff -Nru dtkwidget-5.6.8/include/widgets/dwatermarkwidget.h dtkwidget-5.6.12/include/widgets/dwatermarkwidget.h --- dtkwidget-5.6.8/include/widgets/dwatermarkwidget.h 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/include/widgets/dwatermarkwidget.h 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,94 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef WATERMARKWIDGET_H +#define WATERMARKWIDGET_H + +#include + +#include +#include + +DWIDGET_BEGIN_NAMESPACE + +class WaterMarkDataPrivate; +class WaterMarkData : public DTK_CORE_NAMESPACE::DObject +{ +public: + enum WaterMarkType { + None, /*!<@~chinese 不会绘制水印 */ + Text, /*!<@~chinese 绘制文字水印 */ + Image /*!<@~chinese 绘制图片水印 */ + }; + enum WaterMarkLayout { + Center, /*!<@~chinese 居中 */ + Tiled /*!<@~chinese 平铺 */ + }; + + explicit WaterMarkData(); + + WaterMarkData(const WaterMarkData& p); + WaterMarkData& operator=(const WaterMarkData& p); + + WaterMarkType type() const; + void setType(WaterMarkType type); + + WaterMarkLayout layout() const; + void setLayout(WaterMarkLayout layout); + + qreal scaleFactor() const; + void setScaleFactor(qreal scaleFactor); + + int spacing() const; + void setSpacing(int spacing); + + int lineSpacing() const; + void setLineSpacing(int lineSpacing); + + QString text() const; + void setText(const QString &text); + + QFont font() const; + void setFont(const QFont &font); + + QColor color() const; + void setColor(const QColor &color); + + qreal rotation() const; + void setRotation(qreal rotation); + + qreal opacity() const; + void setOpacity(qreal opacity); + + QImage image() const; + void setImage(const QImage &image); + + bool grayScale() const; + void setGrayScale(bool grayScale); + +private: + D_DECLARE_PRIVATE(WaterMarkData) +}; + +class DWaterMarkWidgetPrivate; +class DWaterMarkWidget : public QWidget, public DTK_CORE_NAMESPACE::DObject +{ + Q_OBJECT +public: + explicit DWaterMarkWidget(QWidget *parent = nullptr); + + const WaterMarkData &data(); + void setData(const WaterMarkData &data); + +protected: + void paintEvent(QPaintEvent *) override; + bool eventFilter(QObject *watched, QEvent *event) override; + +private: + D_DECLARE_PRIVATE(DWaterMarkWidget) +}; + +DWIDGET_END_NAMESPACE + +#endif // WATERMARKWIDGET_H diff -Nru dtkwidget-5.6.8/.obs/workflows.yml dtkwidget-5.6.12/.obs/workflows.yml --- dtkwidget-5.6.8/.obs/workflows.yml 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/.obs/workflows.yml 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,51 @@ +test_build: + steps: + - link_package: + source_project: deepin:Develop:dde + source_package: %{SCM_REPOSITORY_NAME} + target_project: deepin:CI + + - configure_repositories: + project: deepin:CI + repositories: + - name: deepin_develop + paths: + - target_project: deepin:CI + target_repository: deepin_develop + architectures: + - x86_64 + - aarch64 + + - name: debian + paths: + - target_project: deepin:CI + target_repository: debian_sid + architectures: + - x86_64 + + - name: archlinux + paths: + - target_project: deepin:CI + target_repository: archlinux + architectures: + - x86_64 + + filters: + event: pull_request + +tag_build: + steps: + - branch_package: + source_project: deepin:Develop:dde + source_package: %{SCM_REPOSITORY_NAME} + target_project: deepin:Unstable:dde + filters: + event: tag_push + +commit_build: + steps: + - trigger_services: + project: deepin:Develop:dde + package: %{SCM_REPOSITORY_NAME} + filters: + event: push diff -Nru dtkwidget-5.6.8/README.md dtkwidget-5.6.12/README.md --- dtkwidget-5.6.8/README.md 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/README.md 2023-05-15 03:42:41.000000000 +0000 @@ -1,7 +1,13 @@ -# Deepin Tool Kit Widget {#mainpage} +# Deepin Tool Kit Widget Deepin Tool Kit Widget(DtkWidget) provides the base widgets on Deepin. +中文说明：[README_zh_CN.md](./README.zh_CN.md) + +## Documentation + +中文文档：[dtkwidget文档](https://linuxdeepin.github.io/dtkwidget/index.html) + ## Dependencies ### Build dependencies @@ -13,10 +19,13 @@ ### Build from source code 1. Make sure you have installed all dependencies. + ```bash -$ sudo apt build-dep ./ +sudo apt build-dep ./ ``` + If you need to use the designer plugin, you can: + ```bash $ sudo apt install qttools5-dev @@ -28,18 +37,19 @@ $ cd build $ sudo make install ``` + 2. Build: ```bash -$ cmake -B build -$ cmake --build build -j$(nproc) +cmake -B build +cmake --build build -j$(nproc) ``` 3. Install: ```bash -$ cd build -$ sudo make install +cd build +sudo make install ``` ## Getting help @@ -61,13 +71,13 @@ List of some open source projects using dtkwidget: (Contact us or open a pull request to add yours) - - **[DMarked](https://github.com/DMarked/DMarked)**: Markdown Editor with dtkwidget - - **[DtkTimer](https://github.com/gfdgd-xi/timer)**: Clock with dtkwidget - - **[simple-image-filter](https://github.com/dependon/simple-image-filter)**: Image Process with dtkwidget - - **[SparkStore](https://github.com/Spark-Store/Spark-Store)**: SparkStore - - **[WingHexExplorer](https://github.com/Wing-summer/WingHexExplorer)**: Powerful Hexadecimal Editor with dtkwidget - - **[WingTool](https://github.com/Wing-summer/WingTool)**: A Productivity Plugin-based Toolbox with dtkwidget - - **[ScreenLight](https://github.com/Wing-summer/ScreenLight)**: A small tool to ajust the brightness of the screen with dtkwidget +* **[DMarked](https://github.com/DMarked/DMarked)**: Markdown Editor with dtkwidget +* **[DtkTimer](https://github.com/gfdgd-xi/timer)**: Clock with dtkwidget +* **[simple-image-filter](https://github.com/dependon/simple-image-filter)**: Image Process with dtkwidget +* **[SparkStore](https://github.com/Spark-Store/Spark-Store)**: SparkStore +* **[WingHexExplorer](https://github.com/Wing-summer/WingHexExplorer)**: Powerful Hexadecimal Editor with dtkwidget +* **[WingTool](https://github.com/Wing-summer/WingTool)**: A Productivity Plugin-based Toolbox with dtkwidget +* **[ScreenLight](https://github.com/Wing-summer/ScreenLight)**: A small tool to ajust the brightness of the screen with dtkwidget ## License diff -Nru dtkwidget-5.6.8/README.zh_CN.md dtkwidget-5.6.12/README.zh_CN.md --- dtkwidget-5.6.8/README.zh_CN.md 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/README.zh_CN.md 2023-05-15 03:42:41.000000000 +0000 @@ -1,8 +1,10 @@ ## Deepin Tool Kit Widget -Deepint Tool Kit Core(DtkWidget) 提供各种UOS风格dtk基础控件. +Deepin Tool Kit Widget(DtkWidget) 提供各种UOS风格dtk基础控件. -您应该首先阅读 [Deepin应用程序规范](\ref doc/Specification). +## 文档 + +中文文档：[dtkwidget文档](https://linuxdeepin.github.io/dtkwidget/index.html) ## 依赖 @@ -15,10 +17,13 @@ ### 从源代码构建 1. 确保已经安装了所有的编译依赖. + ```bash -$ sudo apt build-dep ./ +sudo apt build-dep ./ ``` + 如果需要使用 `qtcreator` 的设计功能，可以 ： + ```bash $ sudo apt install qttools5-dev @@ -30,18 +35,19 @@ $ cd build $ sudo make install ``` + 2. 构建 `dtkwidget` : ```bash -$ cmake -B build -$ cmake --build build -j$(nproc) +cmake -B build +cmake --build build -j$(nproc) ``` 3. 安装: ```bash -$ cd build -$ sudo make install +cd build +sudo make install ``` ## 帮助 @@ -63,13 +69,13 @@ 下面是使用dtkwidget的开源项目:(如果您想添加属于自己的开源项目请给我们提交PR) - - **[DMarked](https://github.com/DMarked/DMarked)**: 使用Dtk构建的Markdown编辑器 - - **[DtkTimer](https://github.com/gfdgd-xi/timer)**: 使用DtkWidget构建的时钟 - - **[simple-image-filter](https://github.com/dependon/simple-image-filter)**: 使用DtkWidget构建的图像处理软件 - - **[SparkStore](https://github.com/Spark-Store/Spark-Store)**: 星火商店 - - **[WingHexExplorer](https://github.com/Wing-summer/WingHexExplorer)**: 使用DtkWidget构建的强大的十六进制编辑器 - - **[WingTool](https://github.com/Wing-summer/WingTool)**: 使用DtkWidget构建的基于插件的工具箱 - - **[ScreenLight](https://github.com/Wing-summer/ScreenLight)**: 使用DtkWidget构建的用于调节屏幕亮度的小工具 +* **[DMarked](https://github.com/DMarked/DMarked)**: 使用Dtk构建的Markdown编辑器 +* **[DtkTimer](https://github.com/gfdgd-xi/timer)**: 使用DtkWidget构建的时钟 +* **[simple-image-filter](https://github.com/dependon/simple-image-filter)**: 使用DtkWidget构建的图像处理软件 +* **[SparkStore](https://github.com/Spark-Store/Spark-Store)**: 星火商店 +* **[WingHexExplorer](https://github.com/Wing-summer/WingHexExplorer)**: 使用DtkWidget构建的强大的十六进制编辑器 +* **[WingTool](https://github.com/Wing-summer/WingTool)**: 使用DtkWidget构建的基于插件的工具箱 +* **[ScreenLight](https://github.com/Wing-summer/ScreenLight)**: 使用DtkWidget构建的用于调节屏幕亮度的小工具 ## 协议 diff -Nru dtkwidget-5.6.8/.reuse/dep5 dtkwidget-5.6.12/.reuse/dep5 --- dtkwidget-5.6.8/.reuse/dep5 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.reuse/dep5 2023-05-15 03:42:41.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/linuxdeepin/dtkwidget # ci -Files: .github/* .gitlab-ci.yml output/results.txt +Files: .github/* .gitlab-ci.yml output/results.txt .obs/* Copyright: None License: CC0-1.0 @@ -63,6 +63,11 @@ Copyright: None License: CC0-1.0 +# others +Files: examples/collections/resources/data/*.txt +Copyright: None +License: CC0-1.0 + # imag Files: doc/images/* src/widgets/assets/images/* plugin/dtkuiplugin/images/* Copyright: UnionTech Software Technology Co., Ltd. @@ -79,7 +84,7 @@ License: LGPL-3.0-or-later #icon -Files: src/widgets/assets/icons/* +Files: src/widgets/assets/icons/* src/widgets/assets/built-in-icons/* Copyright: UnionTech Software Technology Co., Ltd. License: LGPL-3.0-or-later diff -Nru dtkwidget-5.6.8/rpm/dtkwidget.spec dtkwidget-5.6.12/rpm/dtkwidget.spec --- dtkwidget-5.6.8/rpm/dtkwidget.spec 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/rpm/dtkwidget.spec 2023-05-15 03:42:41.000000000 +0000 @@ -28,7 +28,6 @@ BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(x11) diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ady.ts dtkwidget-5.6.12/src/translations/dtkwidget_ady.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ady.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ady.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_af.ts dtkwidget-5.6.12/src/translations/dtkwidget_af.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_af.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_af.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_am_ET.ts dtkwidget-5.6.12/src/translations/dtkwidget_am_ET.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_am_ET.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_am_ET.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - ምስጋና ለ ተርጓሚው ሳምሶን በለጠ በላይነህ - - - - Version: %1 - እትም: %1 - - - + %1 is released under %2 %1 የ ተለቀቀው በዚህ መሰረት ነው %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black ጥቁር - + White ነጭ - + Dark Gray ጥቁር ግራጫ - + Gray ግራጫ - + Light Gray ነጣ ያለ ግራጫ - + Red ቀይ - + Green አረንጓዴ - + Blue ሰማያዊ - + Cyan ሲያን - + Magenta ማጄንታ - + Yellow ቢጫ - + Dark Red ጥቁር ቀይ - + Dark Green ጥቁር አረንጓዴ - + Dark Blue ጥቁር ሰማያዊ - + Dark Cyan ጥቁር ሲያን - + Dark Magenta ጥቁር ማጄንታ - + Dark Yellow ጥቁር ቢጫ @@ -117,12 +105,12 @@ DInputDialog - + Cancel መሰረዣ - + Confirm ማረጋገጫ @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - መሰረዣ + መሰረዣ - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel መሰረዣ - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut እባክዎን አዲስ አቋራጭ ያስገቡ - + None ምንም - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + ማረጋገጫ PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result ምንም ውጤት አልተገኘም - + Restore Defaults ነባር እንደ ነበር መመለሻ + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + ምስጋና ለ ተርጓሚው ሳምሶን በለጠ በላይነህ + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut እባክዎን አዲስ አቋራጭ ያስገቡ @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help እርዳታ - + Feedback - + + + + + Custom toolbar + - + About ስለ - + Exit መውጫ - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ar.ts dtkwidget-5.6.12/src/translations/dtkwidget_ar.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ar.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ar.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - شكر وتقدير - - - - Version: %1 - اﻹصدار : %1 - - - + %1 is released under %2 %1 أصدر تحت رخصة %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black أسود - + White أبيض - + Dark Gray رمادي غامق - + Gray رمادي - + Light Gray رمادي فاتح - + Red أحمر - + Green أخضر - + Blue أزرق - + Cyan سماوي - + Magenta أرجواني - + Yellow أصفر - + Dark Red أحمر غامق - + Dark Green أخضر غامق - + Dark Blue أزرق غامق - + Dark Cyan سماوي غامق - + Dark Magenta أرجواني غامق - + Dark Yellow أصفر غامق @@ -117,12 +105,12 @@ DInputDialog - + Cancel إلغاء - + Confirm تأكيد @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut إدخل اختصار جديد @@ -138,22 +126,22 @@ DLineEdit - + Stop reading التوقف عن القراءة - + Text to Speech النص الى الكلام - + Translate ترجم - + Speech To Text الكلام الى النص @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - إلغاء + إلغاء - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search بحث @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel إلغاء - + Replace إستبدال - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately يتعارض هذا الاختصار مع 1%، انقر فوق "إضافة" لجعل هذا الاختصار فعالاً على الفور @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut الرجاء إدخال اختصاراّ جديداً - + None غير موجود - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + التوقف عن القراءة - - Maximize - + + Text to Speech + النص الى الكلام - - Tile window to left of screen - + + Translate + ترجم - - Tile window to right of screen - + + Speech To Text + الكلام الى النص - DTextEdit + DToolbarEditPanel - - Stop reading - التوقف عن القراءة + + Default toolset + - - Text to Speech - النص الى الكلام + + Drag your favorite items into the toolbar + - - Translate - ترجم + + Drag below items into the toolbar to restore defaults + - - Speech To Text - الكلام الى النص + + Confirm + تأكيد PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result لا توجد نتائج بحث - + Restore Defaults استعادة الإعدادت الإفتراضية + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + شكر وتقدير + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut يرجى إدخال اختصار جديد @@ -711,44 +756,49 @@ TitleBarMenu - + Theme الموضوع - + Light Theme موضوع فاتح - + Dark Theme موضوع غامق - + System Theme موضوع النظام - + Help مساعدة - + Feedback - + + + + + Custom toolbar + - + About حول - + Exit خروج - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ast.ts dtkwidget-5.6.12/src/translations/dtkwidget_ast.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ast.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ast.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Agradecimientos - - - - Version: %1 - Versión: %1 - - - + %1 is released under %2 %1 llánzase so %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Prietu - + White Blancu - + Dark Gray Buxu escuro - + Gray Buxu - + Light Gray Buxu claro - + Red Bermeyu - + Green Verde - + Blue Azul - + Cyan Cianu - + Magenta Maxenta - + Yellow Mariellu - + Dark Red Bermeyu escuro - + Dark Green Verde escuro - + Dark Blue Azul escuro - + Dark Cyan Cianu escuro - + Dark Magenta Maxenta escuro - + Dark Yellow Mariellu escuro @@ -117,593 +105,650 @@ DInputDialog - + Cancel Encaboxar - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Encaboxar + Encaboxar - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Encaboxar - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Introduz un atayu nuevu - + None Nada - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Nun hai resultaos de la gueta - + Restore Defaults Reafitar valores + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Agradecimientos + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Introduz un atayu nuevu @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Estilu - + Light Theme Estilu claru - + Dark Theme Estilu escuru - + System Theme Estilu del sistema - + Help Ayuda - + Feedback - + + + + + Custom toolbar + - + About Tocante a - + Exit Colar - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_az.ts dtkwidget-5.6.12/src/translations/dtkwidget_az.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_az.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_az.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Təşəkkürlər - - - - Version: %1 - Versiya: %1 - - - + %1 is released under %2 %1,%2 altında buraxılır @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Oxumanı dayandırın - + Text to Speech Mətndən nitqə - + Translate Tərcümə - + Speech To Text Mətndən nitqə @@ -172,7 +162,7 @@ - + Print button Çap @@ -239,19 +229,17 @@ - - - - - + + + + Color Rəng - - - + + Grayscale Boz çalarlı @@ -472,13 +460,13 @@ - + Print to PDF PDF kimi saxlamaq - + Save as Image Şəkil kimi saxlamaq @@ -521,33 +509,33 @@ Bu şəkildə səhifə nömrələri daxil edin: 1,3,5-7,11-15,18,21 - + Save button Saxlayın - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Nümunə üçün, 1,3,5-7,11-15,18,21 - + Save as PDF PDF kimi saxlayın - + Save as image Şəkil kimi saxlayın - + Images Şəkillər @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Məxfi - - + + Draft Qaralama - - + + Sample Nümunə @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Standart alətlər dəsti + + + + Drag your favorite items into the toolbar + Seçilmiş elementi alətlər panelinə at + + + + Drag below items into the toolbar to restore defaults + Varsayılanları bərpa etmək üçün elementləri alətlər panelinə at + + + + Confirm + Təsdiq edin + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopyalayın - + Cu&t Kəsi&n - + Select All Hamısını seçin @@ -674,34 +685,56 @@ Standartları bərpa edin - + Version - + Versiya - + Features - + Funksiyalar - + Homepage - + Ev səhifəsi - + Description - + Təsviri + + + + Acknowledgements + Təşəkkürlər - + + + + Sincerely appreciate the open-source software used. + İstifadə olunan bütün açıq mənbə proqram təminatını səmimiyyətlə qiymətləndiririk. + + + + open-source software + açıq-qaynaq proqram tıminatı + + + Continue - + Davamı - + Learn More - + Daha çox öyrənin + + + + Credits + Müəlliflər @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Mövzu - + Light Theme İşıqlı mövzu - + Dark Theme Tutqun mövzu - + System Theme Sistem mövzusu - + Help Kömək - + Feedback Rəy bildirişi - + + Custom toolbar + Xüsusi alətlər paneli + + + About Haqqında - + Exit Çıxış diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_bg.ts dtkwidget-5.6.12/src/translations/dtkwidget_bg.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_bg.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_bg.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Благодарности - - - - Version: %1 - Версия: %1 - - - + %1 is released under %2 %1 е реализиран под %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Черно - + White Бяло - + Dark Gray Тъмно сиво - + Gray Сиво - + Light Gray Светло сиво - + Red Червено - + Green Зелено - + Blue Синьо - + Cyan Циан - + Magenta Пурпурен - + Yellow Жълт - + Dark Red Тъмно червен - + Dark Green Тъмно зелен - + Dark Blue Тъмно син - + Dark Cyan Тъмен циан - + Dark Magenta Тъмно пурпурно - + Dark Yellow Тъмно жълто @@ -117,12 +105,12 @@ DInputDialog - + Cancel Отказ - + Confirm Потвърждавам @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Отказ + Отказ - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Отказ - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Моля въведете нов пряк път - + None Нищо - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Потвърждавам PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Търсенето е без резултат - + Restore Defaults Възстановяване на настройките + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Благодарности + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Моля въведете нов пряк път @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help Помощ - + Feedback - + + + + + Custom toolbar + - + About Относно - + Exit Изход - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_bn.ts dtkwidget-5.6.12/src/translations/dtkwidget_bn.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_bn.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_bn.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - প্রাপ্তি স্বীকার - - - - Version: %1 - ভার্সন: %1 - - - + %1 is released under %2 %1 রিলিজ হয়েছে %2 এর অধীনে @@ -29,87 +17,87 @@ DCrumbEdit - + Black কালো - + White সাদা - + Dark Gray গাঢ় ধূসর - + Gray ধূসর - + Light Gray হালকা ধূসর - + Red লাল - + Green সবুজ - + Blue নীল - + Cyan সবজে নীল - + Magenta ম্যাজেন্টা - + Yellow হলুদ - + Dark Red গাঢ় লাল - + Dark Green গাঢ় সবুজ - + Dark Blue গাঢ় নীল - + Dark Cyan গাঢ় সবজে নীল - + Dark Magenta গাঢ় ম্যাজেন্টা - + Dark Yellow গাঢ় হলুদ @@ -117,12 +105,12 @@ DInputDialog - + Cancel বাতিল করুন - + Confirm নিশ্চিত করুন @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - বাতিল করুন + বাতিল করুন - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel বাতিল করুন - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut দয়াকরে নতুন শর্টকাট চাপুন - + None কোনোটিই নয় - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + নিশ্চিত করুন PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result অনুসন্ধানের কোনো ফলাফল নেই - + Restore Defaults পূর্বনির্ধারিত জিনিসে ফিরে যান + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + প্রাপ্তি স্বীকার + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut দয়াকরে নতুন শর্টকাট চাপুন @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help সাহায্য - + Feedback - + + + + + Custom toolbar + - + About সম্পর্কে - + Exit বের হয়ে যান - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_bo.ts dtkwidget-5.6.12/src/translations/dtkwidget_bo.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_bo.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_bo.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - ཐུགས་རྗེ་ཞུ་བ། - - - - Version: %1 - པར་གཞི། %1 - - - + %1 is released under %2 %1ཡིས་%2ཡི་གྲོས་དོན་བརྩི་སྲུང་བྱས་ནས་ཁྱབ་བསྒྲགས་བྱ་རྒྱུ། @@ -136,22 +126,22 @@ DLineEdit - + Stop reading ཀློག་འདོན་བྱེད་མཚམས་འཇོག་རྒྱུ། - + Text to Speech སྐད་སྒྲའི་ཀློག་འདོན། - + Translate ཡིག་སྒྱུར། - + Speech To Text སྐད་སྒྲའི་དཔོད་བྲིས། @@ -172,7 +162,7 @@ - + Print button པར་འདེབས། @@ -239,19 +229,17 @@ - - - - - + + + + Color ཚོན་ཁྲ། - - - + + Grayscale ཚོན་མེད། @@ -472,13 +460,13 @@ - + Print to PDF PDFལ་ཉར་བ། - + Save as Image པར་རིས་གཞན་ཉར། @@ -521,33 +509,33 @@ ཡང་དག་པའི་རྣམ་གཞག་ནང་འཇུག་བྱེད། དཔེར་ན། 1,3,5-7,11-15,18,21 - + Save button ཉར་བ། - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 རྣམ་གཞག་ནང་འཇུག་བྱོས། 1,3,5-7,11-15,18,21 - + Save as PDF PDFལྟར་ཉར་བ། - + Save as image པར་རིས་ལ་ཉར་བ། - + Images པར་རིས་ཡིག་ཆ། @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential གསང་ཆེན། - - + + Draft ཟིན་བྲིས། - - + + Sample མ་དཔེ། @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + སོར་བཞག་རྣམ་གྲངས། + + + + Drag your favorite items into the toolbar + དགའ་པོ་ཡོད་པའི་རྣམ་གྲངས་ཡོ་བྱད་བསྟར་བྱང་དུ་དྲུད། + + + + Drag below items into the toolbar to restore defaults + ཚོ་པ་འདིའི་རྣམ་གྲངས་ཡོ་བྱད་བསྟར་བྱང་དུ་འདྲུད་དེ་སོར་བལག་སླར་གསོ་བྱེད་པ། + + + + Confirm + གཏན་འཁེལ། + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy པར་སློག(&C) - + Cu&t དྲས་པ།(&T) - + Select All ཡོངས་འདེམས། @@ -674,33 +685,55 @@ སོར་བཞག་སླར་གསོ། - + Version - + པར་གཞི། - + Features - + པར་གཞིའི་ཁྱད་ཆོས། - + Homepage - + གཙོ་ངོས། - + Description + ཞིབ་བརྗོད། + + + + Acknowledgements + ཐུགས་རྗེ་ཞུ་བ། + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + མུ་མཐུད། + + + Learn More + དེ་བས་མང་བར་རྒྱུས་ལོན། + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme བརྗོད་བྱ་གཙོ་བོ། - + Light Theme ཁ་དཀར་པོ། - + Dark Theme ཁ་སྨུག་པོ། - + System Theme མ་ལག་གི་རྗེས་འབྲངས་བ། - + Help རོགས་པ། - + Feedback ཕྱིར་འདྲེན། - + + Custom toolbar + + + + About སྐོར། - + Exit ཕྱིར་འབུད། diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_bqi.ts dtkwidget-5.6.12/src/translations/dtkwidget_bqi.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_bqi.ts 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_bqi.ts 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,804 @@ + + + + + + DAboutDialog + + + %1 is released under %2 + + + + + DCrumbEdit + + + Black + + + + + White + + + + + Dark Gray + + + + + Gray + + + + + Light Gray + + + + + Red + + + + + Green + + + + + Blue + + + + + Cyan + + + + + Magenta + + + + + Yellow + + + + + Dark Red + + + + + Dark Green + + + + + Dark Blue + + + + + Dark Cyan + + + + + Dark Magenta + + + + + Dark Yellow + + + + + DInputDialog + + + Cancel + + + + + Confirm + + + + + DKeySequenceEdit + + + Enter a new shortcut + + + + + DLineEdit + + + Stop reading + + + + + Text to Speech + + + + + Translate + + + + + Speech To Text + + + + + DPrintPreviewDialogPrivate + + + + Advanced + + + + + Cancel + button + + + + + + Print + button + + + + + Basic + + + + + Printer + + + + + Copies + + + + + Page range + + + + + All + + + + + Current page + + + + + Select pages + + + + + Orientation + + + + + Portrait + + + + + Landscape + + + + + Pages + + + + + Color mode + + + + + + + + + Color + + + + + + + Grayscale + + + + + Margins + + + + + Narrow (mm) + + + + + Normal (mm) + + + + + Moderate (mm) + + + + + Customize (mm) + + + + + Top + + + + + Left + + + + + Bottom + + + + + Right + + + + + Scaling + + + + + Actual size + + + + + Scale + + + + + Paper + + + + + Paper size + + + + + Print Layout + + + + + Duplex + + + + + N-up printing + + + + + 2 pages/sheet, 1×2 + + + + + 4 pages/sheet, 2×2 + + + + + 6 pages/sheet, 2×3 + + + + + 9 pages/sheet, 3×3 + + + + + 16 pages/sheet, 4×4 + + + + + Layout direction + + + + + Page Order + + + + + Collate pages + + + + + Print pages in order + + + + + Front to back + + + + + Back to front + + + + + Watermark + + + + + Add watermark + + + + + Text watermark + + + + + Confidential + + + + + Draft + + + + + Sample + + + + + Custom + + + + + Input your text + + + + + Picture watermark + + + + + Layout + + + + + Tile + + + + + Center + + + + + Angle + + + + + Size + + + + + Transparency + + + + + + Print to PDF + + + + + + Save as Image + + + + + Collapse + + + + + + Flip on short edge + + + + + + + Flip on long edge + + + + + Input page numbers please + + + + + Maximum page number reached + + + + + Input English comma please + + + + + Input page numbers like this: 1,3,5-7,11-15,18,21 + + + + + Save + button + + + + + *.pdf + + + + + For example, 1,3,5-7,11-15,18,21 + + + + + Save as PDF + + + + + Save as image + + + + + Images + + + + + DPrintPreviewWidget + + + + Confidential + + + + + + Draft + + + + + + Sample + + + + + DSearchEdit + + + Search + + + + + DSettingsDialog + + + Cancel + + + + + Replace + + + + + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately + + + + + DShortcutEdit + + + Please input a new shortcut + + + + + None + + + + + DTextEdit + + + Stop reading + + + + + Text to Speech + + + + + Translate + + + + + Speech To Text + + + + + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + + + + + PickColorWidget + + + Color + + + + + QLineEdit + + + &Copy + + + + + Cu&t + + + + + Select All + + + + + QObject + + + No search result + + + + + Restore Defaults + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + + + + QWidgetTextControl + + + Select All + + + + + ShortcutEdit + + + Please enter a new shortcut + + + + + TitleBarMenu + + + Theme + + + + + Light Theme + + + + + Dark Theme + + + + + System Theme + + + + + Help + + + + + Feedback + + + + + Custom toolbar + + + + + About + + + + + Exit + + + + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_br.ts dtkwidget-5.6.12/src/translations/dtkwidget_br.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_br.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_br.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Trugarekadennoù - - - - Version: %1 - Stumm: %1 - - - + %1 is released under %2 %1 a zo embannet dindan %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Du - + White Gwenn - + Dark Gray Gris teñval - + Gray Gris - + Light Gray Gris sklaer - + Red Ruz - + Green Gwer - + Blue Glas - + Cyan Sian - + Magenta Majenta - + Yellow Melen - + Dark Red Ruz teñval - + Dark Green Gwer teñval - + Dark Blue Glas teñval - + Dark Cyan Sian teñval - + Dark Magenta Majenta teñval - + Dark Yellow Melen teñval @@ -117,12 +105,12 @@ DInputDialog - + Cancel Nullañ - + Confirm Kadarnaat @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Ebarzhiñ ur berradur nevez @@ -138,22 +126,22 @@ DLineEdit - + Stop reading Paouez da lenn - + Text to Speech Testenn e mouezh - + Translate Treiñ - + Speech To Text Mouezh e testenn @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Nullañ + Nullañ - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search Klask @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel Nullañ - + Replace Erlec'hiañ - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Ar berradur-mañ a zo e dizemglev gant %1, klikit war Ouzhpennañ evit ma vefe oberiant ar berradur-mañ kerkent @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut Ebarzhit ur berradur nevez mar plij - + None Hini ebet - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Paouez da lenn - - Maximize - + + Text to Speech + Testenn e mouezh - - Tile window to left of screen - + + Translate + Treiñ - - Tile window to right of screen - + + Speech To Text + Mouezh e testenn - DTextEdit + DToolbarEditPanel - - Stop reading - Paouez da lenn + + Default toolset + - - Text to Speech - Testenn e mouezh + + Drag your favorite items into the toolbar + - - Translate - Treiñ + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Mouezh e testenn + + Confirm + Kadarnaat PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Disoc'h ebet kavet - + Restore Defaults Adderaouiñ + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Trugarekadennoù + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Ebarzhit ur berradur nevez mar plij @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Tem - + Light Theme Tem sklaer - + Dark Theme Tem teñval - + System Theme Tem ar sistem - + Help Skoazell - + Feedback - + + + + + Custom toolbar + - + About Diwar-benn - + Exit Kuitaat - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ca.ts dtkwidget-5.6.12/src/translations/dtkwidget_ca.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ca.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ca.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Agraïments - - - - Version: %1 - Versió: %1 - - - + %1 is released under %2 %1 està publicada d'acord amb %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Atura la lectura - + Text to Speech Text a veu - + Translate Tradueix - + Speech To Text Veu a text @@ -172,7 +162,7 @@ - + Print button Imprimeix @@ -239,19 +229,17 @@ - - - - - + + + + Color Color - - - + + Grayscale Escala de grisos @@ -472,13 +460,13 @@ - + Print to PDF Imprimeix en un PDF - + Save as Image Desa-ho com a imatge @@ -521,33 +509,33 @@ Escriviu els números de pàgina així: 1,3,5-7,11-15,18,21 - + Save button Desa - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Per exemple: 1,3,5-7,11-15,18,21 - + Save as PDF Desa-ho com a PDF - + Save as image Desa-ho com a imatge - + Images Imatges @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidencial - - + + Draft Esborrany - - + + Sample Exemple @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Conjunt d'eines per defecte + + + + Drag your favorite items into the toolbar + Arrossegueu els elements preferits a la barra d'eines + + + + Drag below items into the toolbar to restore defaults + Arrossegueu els elements de sota a la barra d'eines per restaurar els valors per defecte. + + + + Confirm + Confirmeu-ho + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copia - + Cu&t Re&talla - + Select All Selecciona-ho tot @@ -674,34 +685,56 @@ Restableix els valors per defecte - + Version - + Versió - + Features - + Característiques - + Homepage - + Pàgina inicial - + Description - + Descripció + + + + Acknowledgements + Agraïments - + + + + Sincerely appreciate the open-source software used. + Agraïm sincerament tot el programari de codi obert usat. + + + + open-source software + programari de codi obert + + + Continue - + Continua - + Learn More - + Més informació + + + + Credits + Crèdits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Tema clar - + Dark Theme Tema fosc - + System Theme Tema del sistema - + Help Ajuda - + Feedback Retroacció - + + Custom toolbar + Barra d'eines personalitzada + + + About Quant a - + Exit Surt diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_cs.ts dtkwidget-5.6.12/src/translations/dtkwidget_cs.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_cs.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_cs.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Poděkování - - - - Version: %1 - Verze: %1 - - - + %1 is released under %2 %1 je vydáno pod %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Přestat předčítat - + Text to Speech Text na řeč - + Translate Přeložit - + Speech To Text Řeč na text @@ -172,7 +162,7 @@ - + Print button Tisk @@ -239,19 +229,17 @@ - - - - - + + + + Color Barva - - - + + Grayscale Stupně šedé @@ -472,13 +460,13 @@ - + Print to PDF Vytisknout do PDF - + Save as Image Uložit jako obrázek @@ -521,33 +509,33 @@ Zadejte čísla stránek jako např.: 1,3,5-7,11-15,18,21 - + Save button Uložit - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Například, 1,3,5-7,11-15,18,21 - + Save as PDF Uložit jako PDF - + Save as image Uložit jako obrázek - + Images Obrázky @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Důvěrné - - + + Draft Koncept - - + + Sample Ukázka @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Výchozí sada nástrojů + + + + Drag your favorite items into the toolbar + Přetáhněte oblíbené položky na panel nástrojů + + + + Drag below items into the toolbar to restore defaults + Přetažením níže uvedených položek na panel nástrojů obnovíte výchozí nastavení. + + + + Confirm + Potvrdit + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopírovat - + Cu&t Vyjmou&t - + Select All Vybrat vše @@ -674,33 +685,55 @@ Vráti na výchozí hodnoty - + Version - + Verze - + Features - + Funkce - + Homepage - + Hlavní stránka - + Description + Popisek + + + + Acknowledgements + Poděkování + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Další + + + Learn More + Zjistit více + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Vzhled - + Light Theme Světlý vzhled - + Dark Theme Tmavý vzhled - + System Theme Systémový vzhled - + Help Nápověda - + Feedback Zpětná vazba - + + Custom toolbar + Vlastní panel nástrojů + + + About O aplikaci - + Exit Ukončit diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_da.ts dtkwidget-5.6.12/src/translations/dtkwidget_da.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_da.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_da.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Tilkendegivelser - - - - Version: %1 - Version: %1 - - - + %1 is released under %2 %1 er udgivet under %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Sort - + White Hvid - + Dark Gray Mørkegrå - + Gray Grå - + Light Gray Lysegrå - + Red Rød - + Green Grøn - + Blue Blå - + Cyan Cyan - + Magenta Magenta - + Yellow Gul - + Dark Red Mørkerød - + Dark Green Mørkegrøn - + Dark Blue Mørkeblå - + Dark Cyan Mørkecyan - + Dark Magenta Mørkemagenta - + Dark Yellow Mørkegul @@ -117,12 +105,12 @@ DInputDialog - + Cancel Annuller - + Confirm Bekræft @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Indtast en ny genvej @@ -138,22 +126,22 @@ DLineEdit - + Stop reading Stop læsning - + Text to Speech Tekst til tale - + Translate Oversæt - + Speech To Text Tale til tekst @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Annuller + Annuller - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search Søg @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel Annuller - + Replace Erstat - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Genvejen er i konflikt med %1. Klik på Tilføj for øjeblikkeligt at gøre genvejen gældende @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut Input venligst en ny genvej - + None Ingen - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Stop læsning - - Maximize - + + Text to Speech + Tekst til tale - - Tile window to left of screen - + + Translate + Oversæt - - Tile window to right of screen - + + Speech To Text + Tale til tekst - DTextEdit + DToolbarEditPanel - - Stop reading - Stop læsning + + Default toolset + - - Text to Speech - Tekst til tale + + Drag your favorite items into the toolbar + - - Translate - Oversæt + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Tale til tekst + + Confirm + Bekræft PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Intet søgeresultat - + Restore Defaults Gendan standarder + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Tilkendegivelser + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Indtast venligst en ny genvej @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Tema - + Light Theme Lyst tema - + Dark Theme Mørkt tema - + System Theme Systemets tema - + Help Hjælp - + Feedback - + + + + + Custom toolbar + - + About Om - + Exit Afslut - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_de.ts dtkwidget-5.6.12/src/translations/dtkwidget_de.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_de.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_de.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Anerkennungen - - - - Version: %1 - Version: %1 - - - + %1 is released under %2 %1 wurde unter %2 veröffentlicht. @@ -136,24 +126,24 @@ DLineEdit - + Stop reading Lesen beenden - + Text to Speech Text zu Sprache - + Translate Übersetzen - + Speech To Text - Text zu Sprache + Sprache zu Text @@ -172,7 +162,7 @@ - + Print button Drucken @@ -239,19 +229,17 @@ - - - - - + + + + Color Farbe - - - + + Grayscale Graustufen @@ -472,13 +460,13 @@ - + Print to PDF In PDF drucken - + Save as Image Als Bild speichern @@ -521,33 +509,33 @@ Seitenzahlen wie folgt eingeben: 1,3,5-7,11-15,18,21 - + Save button Speichern - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Zum Beispiel 1,3,5-7,11-15,18,21 - + Save as PDF Als PDF speichern - + Save as image Als Bild speichern - + Images Bilder @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Vertraulich - - + + Draft Entwurf - - + + Sample Muster @@ -632,7 +620,30 @@ Speech To Text - Text zu Sprache + Sprache zu Text + + + + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Bestätigen @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopieren - + Cu&t &Ausschneiden - + Select All Alles auswählen @@ -674,33 +685,55 @@ Standardeinstellungen wiederherstellen - + Version - + Version - + Features - + Funktionen - + Homepage - + Description + Beschreibung + + + + Acknowledgements + Anerkennungen + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Fortsetzen + + + Learn More + Mehr erfahren + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Thema - + Light Theme Helles Thema - + Dark Theme Dunkles Thema - + System Theme Systemthema - + Help Hilfe - + Feedback + Rückmeldung + + + + Custom toolbar - + About Über - + Exit Beenden diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_el.ts dtkwidget-5.6.12/src/translations/dtkwidget_el.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_el.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_el.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - αναγνωρισμοί - - - - Version: %1 - Έκδοση: %1 - - - + %1 is released under %2 Το %1 έχει δημοσιοποιηθεί ύπο %2 @@ -29,100 +17,100 @@ DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel Ακύρωση - + Confirm Επικύρωση @@ -130,625 +118,687 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Ακύρωση + Ακύρωση - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Ακύρωση - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Παρακαλώ εισάγετε ένα νέο σύνδεσμο - + None Κανένα - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Επικύρωση PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + αναγνωρισμοί + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help Βοήθεια - + Feedback - + + + + + Custom toolbar + - + About Περί - + Exit Έξοδος - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_en_AU.ts dtkwidget-5.6.12/src/translations/dtkwidget_en_AU.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_en_AU.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_en_AU.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_eo.ts dtkwidget-5.6.12/src/translations/dtkwidget_eo.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_eo.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_eo.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_es.ts dtkwidget-5.6.12/src/translations/dtkwidget_es.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_es.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_es.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Agradecimientos - - - - Version: %1 - Versión %1 - - - + %1 is released under %2 %1 está lanzado bajo %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Detener lectura - + Text to Speech Texto a voz - + Translate Traducir - + Speech To Text Voz a texto @@ -172,7 +162,7 @@ - + Print button Imprimir @@ -239,19 +229,17 @@ - - - - - + + + + Color Color - - - + + Grayscale Escala de grises @@ -472,13 +460,13 @@ - + Print to PDF Imprimir en PDF - + Save as Image Guardar como imagen @@ -521,33 +509,33 @@ Ingrese números de página tales como: 1,3,5-7,11-15,18,21 - + Save button Guardar - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 1-%1. Por ejemplo, 1,3,5-7,11-15,18,21 - + Save as PDF Guardar como PDF - + Save as image Guardar como imagen - + Images Imágenes @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidencial - - + + Draft Borrador - - + + Sample Muestra @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Herramientas por defecto + + + + Drag your favorite items into the toolbar + Arrastre sus elementos favoritos a la barra de herramientas + + + + Drag below items into the toolbar to restore defaults + Arrastre los siguientes elementos a la barra de herramientas para restaurar los valores predeterminados + + + + Confirm + Confirmar + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copiar - + Cu&t Cor&tar - + Select All Seleccionar todo @@ -674,33 +685,55 @@ Restaurar valores predeterminados - + Version - + Versión - + Features - + Características - + Homepage - + Página web - + Description + Descripción + + + + Acknowledgements + Agradecimientos + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Continuar + + + Learn More + Saber más + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Tema claro - + Dark Theme Tema oscuro - + System Theme Tema del sistema - + Help Ayuda - + Feedback Comentarios - + + Custom toolbar + Barra de herramientas personalizada + + + About Acerca de - + Exit Salir diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_eu.ts dtkwidget-5.6.12/src/translations/dtkwidget_eu.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_eu.ts 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_eu.ts 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,804 @@ + + + + + + DAboutDialog + + + %1 is released under %2 + %1 %2 pean argitaratu da + + + + DCrumbEdit + + + Black + Beltza + + + + White + Zuria + + + + Dark Gray + Gris iluna + + + + Gray + Grisa + + + + Light Gray + Gris argia + + + + Red + Gorria + + + + Green + Berdea + + + + Blue + Urdina + + + + Cyan + Zian + + + + Magenta + Magenta + + + + Yellow + Horia + + + + Dark Red + Gorri iluna + + + + Dark Green + Berde iluna + + + + Dark Blue + Urdin iluna + + + + Dark Cyan + Zian iluna + + + + Dark Magenta + Magenta iluna + + + + Dark Yellow + Hori iluna + + + + DInputDialog + + + Cancel + Utzi + + + + Confirm + Berretsi + + + + DKeySequenceEdit + + + Enter a new shortcut + Sartu lasterbide berri bat + + + + DLineEdit + + + Stop reading + Utzi irakurtzeari + + + + Text to Speech + Testutik hizketara + + + + Translate + Itzuli + + + + Speech To Text + Hizketatik testura + + + + DPrintPreviewDialogPrivate + + + + Advanced + Aurreratua + + + + Cancel + button + Utzi + + + + + Print + button + Inprimatu + + + + Basic + Oinarrizkoa + + + + Printer + Inprimagailua + + + + Copies + Kopiak + + + + Page range + Orri tartea + + + + All + Denak + + + + Current page + Uneko orria + + + + Select pages + Hautatu orriak + + + + Orientation + Orientazioa + + + + Portrait + + + + + Landscape + + + + + Pages + + + + + Color mode + + + + + + + + + Color + + + + + + + Grayscale + + + + + Margins + + + + + Narrow (mm) + + + + + Normal (mm) + + + + + Moderate (mm) + + + + + Customize (mm) + + + + + Top + + + + + Left + + + + + Bottom + + + + + Right + + + + + Scaling + + + + + Actual size + + + + + Scale + + + + + Paper + + + + + Paper size + + + + + Print Layout + + + + + Duplex + + + + + N-up printing + + + + + 2 pages/sheet, 1×2 + + + + + 4 pages/sheet, 2×2 + + + + + 6 pages/sheet, 2×3 + + + + + 9 pages/sheet, 3×3 + + + + + 16 pages/sheet, 4×4 + + + + + Layout direction + + + + + Page Order + + + + + Collate pages + + + + + Print pages in order + + + + + Front to back + + + + + Back to front + + + + + Watermark + + + + + Add watermark + + + + + Text watermark + + + + + Confidential + + + + + Draft + + + + + Sample + + + + + Custom + + + + + Input your text + + + + + Picture watermark + + + + + Layout + + + + + Tile + + + + + Center + + + + + Angle + + + + + Size + + + + + Transparency + + + + + + Print to PDF + + + + + + Save as Image + + + + + Collapse + + + + + + Flip on short edge + + + + + + + Flip on long edge + + + + + Input page numbers please + + + + + Maximum page number reached + + + + + Input English comma please + + + + + Input page numbers like this: 1,3,5-7,11-15,18,21 + + + + + Save + button + + + + + *.pdf + + + + + For example, 1,3,5-7,11-15,18,21 + + + + + Save as PDF + + + + + Save as image + + + + + Images + + + + + DPrintPreviewWidget + + + + Confidential + + + + + + Draft + + + + + + Sample + + + + + DSearchEdit + + + Search + Bilatu + + + + DSettingsDialog + + + Cancel + Utzi + + + + Replace + + + + + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately + + + + + DShortcutEdit + + + Please input a new shortcut + + + + + None + + + + + DTextEdit + + + Stop reading + Utzi irakurtzeari + + + + Text to Speech + Testutik hizketara + + + + Translate + Itzuli + + + + Speech To Text + Hizketatik testura + + + + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Berretsi + + + + PickColorWidget + + + Color + + + + + QLineEdit + + + &Copy + + + + + Cu&t + + + + + Select All + + + + + QObject + + + No search result + + + + + Restore Defaults + Leheneratu lehenetsiak + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Eskertzeak + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + + + + QWidgetTextControl + + + Select All + + + + + ShortcutEdit + + + Please enter a new shortcut + + + + + TitleBarMenu + + + Theme + Gaia + + + + Light Theme + Gai argia + + + + Dark Theme + Gai iluna + + + + System Theme + Sistemaren gaia + + + + Help + Irten + + + + Feedback + + + + + Custom toolbar + + + + + About + Honi buruz + + + + Exit + Irten + + + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_fa.ts dtkwidget-5.6.12/src/translations/dtkwidget_fa.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_fa.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_fa.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - سپاسگزاریها - - - - Version: %1 - نسخه:%1 - - - + %1 is released under %2 %1 زیر %2 منتشر می شود @@ -29,87 +17,87 @@ DCrumbEdit - + Black مشکی - + White سفید - + Dark Gray خاکستری تیره - + Gray خاکستری - + Light Gray خاکستری روشن - + Red قرمز - + Green سبز - + Blue آبی - + Cyan فیروزه ای - + Magenta ارغوانی - + Yellow زرد - + Dark Red قرمز تیره - + Dark Green سبز تیره - + Dark Blue آبی تیره - + Dark Cyan فیروزه ای تیره - + Dark Magenta ارغوانی تیره - + Dark Yellow زرد تیره @@ -117,12 +105,12 @@ DInputDialog - + Cancel لغو - + Confirm تائید @@ -130,448 +118,453 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - لغو + لغو - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search جستجو @@ -579,131 +572,183 @@ DSettingsDialog - + Cancel لغو - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut لطفا میانبر جدید وارد کنید - + None هیچ کدام - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + تائید PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result جستجو نتیجه ایی نداشت - + Restore Defaults بازیابی پیش فرض + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + سپاسگزاریها + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut لطفا میانبر جدید وارد کنید @@ -711,44 +756,49 @@ TitleBarMenu - + Theme تم - + Light Theme تم روشن - + Dark Theme تم تیره - + System Theme تم سیستم - + Help راهنما - + Feedback - + + + + + Custom toolbar + - + About درباره - + Exit خروج - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_fil.ts dtkwidget-5.6.12/src/translations/dtkwidget_fil.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_fil.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_fil.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_fi.ts dtkwidget-5.6.12/src/translations/dtkwidget_fi.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_fi.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_fi.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Kiitokset - - - - Version: %1 - Versio: %1 - - - + %1 is released under %2 %1 on julkaistu %2 -lisenssin alla @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Lopeta lukeminen - + Text to Speech Teksti puheeksi - + Translate Käännös - + Speech To Text Puhe tekstiksi @@ -172,7 +162,7 @@ - + Print button Tulosta @@ -239,19 +229,17 @@ - - - - - + + + + Color Väri - - - + + Grayscale Harmaasävy @@ -472,13 +460,13 @@ - + Print to PDF Tulosta PDF - + Save as Image Tallenna kuvana @@ -521,33 +509,33 @@ Syötä sivunumerot näin: 1,3,5-7,11-15,18,21 - + Save button Tallenna - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Esimerkki, 1,3,5-7,11-15,18,21 - + Save as PDF Tallenna PDF - + Save as image Tallenna kuvana - + Images Kuvat @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Salassapito - - + + Draft Vedos - - + + Sample Näyte @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Oletus työkalut + + + + Drag your favorite items into the toolbar + Vedä sinun suosikit työkalupalkkiin + + + + Drag below items into the toolbar to restore defaults + Palauta oletukset vetämällä alla olevat työkalupalkkiin + + + + Confirm + Vahvista + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopioi - + Cu&t &Leikkaa - + Select All Valitse kaikki @@ -674,34 +685,56 @@ Palauta oletukset - + Version - + Versio - + Features - + Ominaisuuksia - + Homepage - + Kotisivu - + Description - + Kuvaus + + + + Acknowledgements + Kiitokset - + + + + Sincerely appreciate the open-source software used. + Arvostamme avoimen lähdekoodin ohjelmistoa. + + + + open-source software + avoimen lähdekoodin ohjelmisto + + + Continue - + Jatka - + Learn More - + Lisätietoja + + + + Credits + Tekijät @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Teema - + Light Theme Vaalea - + Dark Theme Tumma - + System Theme Järjestelmän - + Help Apua - + Feedback Palaute - + + Custom toolbar + Mukautettu työkalupalkki + + + About Tietoja - + Exit Poistu diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_fr.ts dtkwidget-5.6.12/src/translations/dtkwidget_fr.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_fr.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_fr.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Remerciements - - - - Version: %1 - Version : %1 - - - + %1 is released under %2 %1 est publié sous %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Arrêter la lecture - + Text to Speech Texte vers voix - + Translate Traduire - + Speech To Text Voix vers texte @@ -172,7 +162,7 @@ - + Print button Impression @@ -239,19 +229,17 @@ - - - - - + + + + Color Couleur - - - + + Grayscale Niveaux de gris @@ -472,13 +460,13 @@ - + Print to PDF Imprimer au format PDF - + Save as Image Enregistrer comme image @@ -521,33 +509,33 @@ Entrez les numéros de page comme ceci : 1,3,5-7,11-15,18,21 - + Save button Sauvegarder - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Par exemple, 1,3,5-7,11-15,18,21 - + Save as PDF Enregistrer au format PDF - + Save as image Enregistrer comme image - + Images Images @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidentiel - - + + Draft Brouillon - - + + Sample Échantillon @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Confirmer + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy - &Copier + Copier - + Cu&t - Cou&per + Couper - + Select All Tout sélectionner @@ -674,33 +685,55 @@ Réinitialiser par défaut - + Version - + Version - + Features - + Fonctionnalités - + Homepage - + Page d’accueil - + Description + Description + + + + Acknowledgements + Remerciements + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Continuer + + + Learn More + En apprendre plus + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Thème - + Light Theme Thème clair - + Dark Theme Thème sombre - + System Theme Thème du système - + Help Aide - + Feedback Retour d'information - + + Custom toolbar + + + + About À propos - + Exit Quitter diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_gl_ES.ts dtkwidget-5.6.12/src/translations/dtkwidget_gl_ES.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_gl_ES.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_gl_ES.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Recoñecementos - - - - Version: %1 - Versión: %1 - - - + %1 is released under %2 %1 está liberada baixo %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Negro - + White Branco - + Dark Gray Gris escuro - + Gray Gris - + Light Gray Gris claro - + Red Vermello - + Green Verde - + Blue Azul - + Cyan Ciano - + Magenta Maxenta - + Yellow Amarelo - + Dark Red Vermello escuro - + Dark Green Verde escuro - + Dark Blue Azul escuro - + Dark Cyan Ciano escuro - + Dark Magenta Maxenta escuro - + Dark Yellow Amarelo escuro @@ -117,12 +105,12 @@ DInputDialog - + Cancel Cancelar - + Confirm Confirmar @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Inserir atallo novo @@ -138,22 +126,22 @@ DLineEdit - + Stop reading Parar de ler - + Text to Speech De texto a voz - + Translate Traducir - + Speech To Text Da voz ao texto @@ -161,388 +149,393 @@ DPrintPreviewDialogPrivate - - + + Advanced Avanzado - + Cancel button - Cancelar + Cancelar - - + + Print button - Imprimir + Imprimir - + Basic Básico - + Printer Impresora - + Copies Copias - + Page range Rangos de páxina - + All Todo - + Current page Páxina actual - + Select pages Seleccionar páxinas - + Orientation Orientación - + Portrait Vertical - + Landscape Horizontal - + Pages Páxinas - + Color mode Modo de cor - - - + + + + + Color Cor - - - + + + Grayscale Escala de grises - + Margins Marxes - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top Superior - + Left Esquerda - + Bottom Inferior - + Right Dereita - + Scaling Escalado - + Actual size Tamaño actual - + Scale Escala - + Paper Papel - + Paper size Tamaño do papel - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 2 páxinas/folla, 1×2 - + 4 pages/sheet, 2×2 4 páxinas/folla, 2×2 - + 6 pages/sheet, 2×3 6 páxinas/folla, 2×3 - + 9 pages/sheet, 3×3 9 páxinas/folla, 3×3 - + 16 pages/sheet, 4×4 16 páxinas/folla, 4×4 - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order Imprimir páxinas en orde - + Front to back - + - + Back to front - + - + Watermark Marca de auga - + Add watermark Engadir marca de auga - + Text watermark Texto da marca de auga - + Confidential Confidencial - + Draft - + - + Sample Exemplo - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF Gardar como PDF - + Save as image Gardar como imaxe - + Images Imaxes @@ -550,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidencial - - + + Draft - + - - + + Sample Exemplo @@ -571,7 +564,7 @@ DSearchEdit - + Search Buscar @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel Cancelar - + Replace Substituír - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Este atallo entra en conflito con 1%, prema en Engadir para facer efectivo este atallo inmediatamente @@ -597,66 +590,66 @@ DShortcutEdit - + Please input a new shortcut Por favor, inserte un novo atallo - + None Ningún - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Parar de ler - - Maximize - + + Text to Speech + De texto a voz - - Tile window to left of screen - + + Translate + Traducir - - Tile window to right of screen - + + Speech To Text + Da voz ao texto - DTextEdit + DToolbarEditPanel - - Stop reading - Parar de ler + + Default toolset + - - Text to Speech - De texto a voz + + Drag your favorite items into the toolbar + - - Translate - Traducir + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Da voz ao texto + + Confirm + Confirmar PickColorWidget - + Color Cor @@ -664,17 +657,17 @@ QLineEdit - + &Copy - + - + Cu&t - + - + Select All Seleccionar todo @@ -682,20 +675,72 @@ QObject - + No search result Sen resultados - + Restore Defaults Restaurar predefinidos + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Recoñecementos + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All Seleccionar todo @@ -703,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut Por favor, insire un novo atallo @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Tema - + Light Theme Tema claro - + Dark Theme Tema escuro - + System Theme Tema do sistema - + Help Axuda - + Feedback - + + + + + Custom toolbar + - + About Sobre - + Exit Saír - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_he.ts dtkwidget-5.6.12/src/translations/dtkwidget_he.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_he.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_he.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - הוקרת תודה - - - - Version: %1 - גרסה: %1 - - - + %1 is released under %2 %1 מופץ תחת הרשיון %2 @@ -29,100 +17,100 @@ DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel ביטול - + Confirm אישור @@ -130,625 +118,687 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - ביטול + ביטול - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel ביטול - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut נא להקליד צירוף מקשים חדש - + None ללא - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + אישור PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + הוקרת תודה + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help עזרה - + Feedback - + + + + + Custom toolbar + - + About על אודות - + Exit יציאה - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_hi_IN.ts dtkwidget-5.6.12/src/translations/dtkwidget_hi_IN.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_hi_IN.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_hi_IN.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - आभार - - - - Version: %1 - संस्करण : %1 - - - + %1 is released under %2 %1, %2 के अंतर्गत विमोचित @@ -27,87 +17,87 @@ DCrumbEdit - + Black श्याम - + White श्वेत - + Dark Gray गहरा स्लेटी - + Gray स्लेटी - + Light Gray हल्का स्लेटी - + Red लाल - + Green हरा - + Blue नीला - + Cyan हरिनील - + Magenta गुलाबी - + Yellow पीला - + Dark Red गहरा लाल - + Dark Green गहरा हरा - + Dark Blue गहरा नीला - + Dark Cyan गहरा हरिनील - + Dark Magenta गहरा गुलाबी - + Dark Yellow गहरा पीला @@ -115,12 +105,12 @@ DInputDialog - + Cancel रद्द करें - + Confirm पुष्टि करें @@ -128,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut नया शॉर्टकट दर्ज़ करें @@ -136,22 +126,22 @@ DLineEdit - + Stop reading पढ़ना बंद करें - + Text to Speech टेक्स्ट से वाणी - + Translate अनुवाद करें - + Speech To Text वाणी से टेक्स्ट @@ -159,388 +149,393 @@ DPrintPreviewDialogPrivate - - + + Advanced विस्तृत - + Cancel button रद्द करें - - + + Print button प्रिंट - + Basic सामान्य - + Printer प्रिंटर - + Copies प्रतिलिपियाँ - + Page range पृष्ठ सीमा - + All सभी - + Current page वर्तमान पृष्ठ - + Select pages पृष्ठ चयन - + Orientation अभिविन्यास - + Portrait लंबवत अभिविन्यास - + Landscape क्षैतिज अभिविन्यास - + Pages पृष्ठ - + Color mode रंगीन मोड - - - + + + + + Color रंग - - - + + + Grayscale श्वेत-श्याम - + Margins सीमांत - + Narrow (mm) संकीर्ण (मि॰ मी॰) - + Normal (mm) सामान्य (मि॰ मी॰) - + Moderate (mm) औसत (मि॰ मी॰) - + Customize (mm) अनुकूलित (मि॰ मी॰) - + Top शीर्ष - + Left बायां - + Bottom तल - + Right दायां - + Scaling अनुमाप परिवर्तन - + Actual size वास्तविक आकार - + Scale अनुमाप परिवर्तन - + Paper पृष्ठ - + Paper size पृष्ठ आकार - + Print Layout प्रिंट का अभिन्यास - + Duplex दोहरा प्रिंट - + N-up printing एकल पृष्ठ पर एकाधिक पृष्ठ संयोजन - + 2 pages/sheet, 1×2 2 पृष्ठ/कागज़, 1x2 - + 4 pages/sheet, 2×2 4 पृष्ठ/कागज़, 2x2 - + 6 pages/sheet, 2×3 6 पृष्ठ/कागज़, 2x3 - + 9 pages/sheet, 3×3 9 पृष्ठ/कागज़, 3x3 - + 16 pages/sheet, 4×4 16 पृष्ठ/कागज़, 4x4 - + Layout direction अभिन्यास दिशा - + Page Order पृष्ठ क्रम - + Collate pages पृष्ठ संयोजन - + Print pages in order पृष्ठों को क्रमानुसार प्रिंट करें - + Front to back प्रथम से अंतिम - + Back to front अंतिम से प्रथम - + Watermark वॉटरमार्क - + Add watermark वॉटरमार्क जोड़ें - + Text watermark शब्द युक्त वॉटरमार्क - + Confidential गोपनीय - + Draft प्रारूप - + Sample नमूना - + Custom अनुकूलित - + Input your text शब्द दर्ज करें - + Picture watermark चित्र युक्त वॉटरमार्क - + Layout अभिन्यास - + Tile एकाधिक अनुभाग - + Center केंद्रित - + Angle कोण - + Size आकार - + Transparency पारदर्शिता - + + Print to PDF PDF रूप में प्रिंट - + + Save as Image चित्र के रूप में संचित करें - + Collapse संक्षिप्त करें - - + + Flip on short edge क्षैतिज पृष्ठ क्रम - - + + + Flip on long edge लंबवत पृष्ठ क्रम - + Input page numbers please कृपया पृष्ठ संख्या दर्ज करें - + Maximum page number reached यह पृष्ठ हेतु अधिकतम संख्या है - + Input English comma please कृपया अल्पविराम दर्ज करें - + Input page numbers like this: 1,3,5-7,11-15,18,21 इस प्रकार अल्पविराम दर्ज करें : 1,3,5-7,11-15,18,21 - + Save button संचित करें - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 उदाहरण, 1,3,5-7,11-15,18,21 - + Save as PDF PDF रूप में संचित - + Save as image चित्र के रूप में संचित - + Images चित्र @@ -548,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential गोपनीय - - + + Draft प्रारूप - - + + Sample नमूना @@ -569,7 +564,7 @@ DSearchEdit - + Search खोजें @@ -577,17 +572,17 @@ DSettingsDialog - + Cancel रद्द करें - + Replace से बदलें - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately यह शॉर्टकट %1 के विरुद्ध है, जोड़ें पर क्लिक कर इसे तुरंत प्रभाव से लागू करें @@ -595,66 +590,66 @@ DShortcutEdit - + Please input a new shortcut कृपया नया इनपुट करें - + None कुछ नहीं - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + पढ़ना बंद करें - - Maximize - + + Text to Speech + टेक्स्ट से वाणी - - Tile window to left of screen - + + Translate + अनुवाद करें - - Tile window to right of screen - + + Speech To Text + वाणी से टेक्स्ट - DTextEdit + DToolbarEditPanel - - Stop reading - पढ़ना बंद करें + + Default toolset + - - Text to Speech - टेक्स्ट से वाणी + + Drag your favorite items into the toolbar + - - Translate - अनुवाद करें + + Drag below items into the toolbar to restore defaults + - - Speech To Text - वाणी से टेक्स्ट + + Confirm + पुष्टि करें PickColorWidget - + Color रंग @@ -662,17 +657,17 @@ QLineEdit - + &Copy - + Cu&t - + Select All सारा चयनित @@ -680,20 +675,72 @@ QObject - + No search result खोज का परिणाम नहीं मिला - + Restore Defaults मूल स्वरूप पुनः स्थापित करें + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + आभार + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All सारा चयनित @@ -701,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut कृपया नया शॉर्टकट दर्ज़ करें @@ -709,42 +756,47 @@ TitleBarMenu - + Theme थीम - + Light Theme हल्की थीम - + Dark Theme गहरी थीम - + System Theme सिस्टम थीम - + Help मदद - + Feedback - + + Custom toolbar + + + + About बारे में - + Exit बंद करें diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_hr.ts dtkwidget-5.6.12/src/translations/dtkwidget_hr.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_hr.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_hr.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Priznanja - - - - Version: %1 - Inačica: %1 - - - + %1 is released under %2 %1 je objavljeno pod %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Crno - + White Bijelo - + Dark Gray Tamno sivo - + Gray Sivo - + Light Gray Svijetlo sivo - + Red Crveno - + Green Zeleno - + Blue Plavo - + Cyan - + - + Magenta - + Magenta - + Yellow Žuto - + Dark Red Tamnocrveno - + Dark Green Tamno zeleno - + Dark Blue Tamnoplavo - + Dark Cyan - + - + Dark Magenta - + Tamna magenta - + Dark Yellow Tamnožuto @@ -117,12 +105,12 @@ DInputDialog - + Cancel Odustani - + Confirm Potvrdi @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Unesi novi prečac @@ -138,22 +126,22 @@ DLineEdit - + Stop reading - + Prestani čitati - + Text to Speech Tekst u govor - + Translate Prevedi - + Speech To Text Govor u tekst @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced Napredno - + Cancel button - Odustani + Otkaži - - + + Print button - Ispis + Ispis - + Basic Osnovno - + Printer Pisač - + Copies Kopije - + Page range - + - + All Sve - + Current page Trenutna stranica - + Select pages Odaberite stranice - + Orientation Orijentacija - + Portrait Portret - + Landscape Krajobraz - + Pages Stranice - + Color mode - + - - - + + + + + Color Boja - - - + + + Grayscale - + - + Margins - + Margine - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + Prilagodi (mm) - + Top Gore - + Left Lijevo - + Bottom Dolje - + Right Desno - + Scaling - + - + Actual size - + Stvarna veličina - + Scale - + - + Paper Papir - + Paper size Veličina papira - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + Redoslijed stranica - + Collate pages - + - + Print pages in order - + Ispis stranica redom - + Front to back - + Naprijed prema natrag - + Back to front - + Natrag prema naprijed - + Watermark - + Vodeni žig - + Add watermark - + Dodaj vodeni žig - + Text watermark - + - + Confidential - + Povjerljivo - + Draft - + Skica - + Sample - + - + Custom - + Prilagođeno - + Input your text - + Unesite vaš tekst - + Picture watermark - + - + Layout - Rasporet + Raspored - + Tile - + - + Center - + Centar - + Angle - + Kut - + Size - + Veličina - + Transparency - + Prozirnost - + + Print to PDF - + - + + Save as Image - + Spremi kao sliku - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - Spremi + Spremi - + *.pdf - + *.pdf - + For example, 1,3,5-7,11-15,18,21 - + Na primjer, 1,3,5-7,11-15,18,21 - + Save as PDF - + Spremi kao PDF - + Save as image - + Spremi kao sliku - + Images - + Slike DPrintPreviewWidget - - + + Confidential - + Povjerljivo - - + + Draft - + Skica - - + + Sample - + DSearchEdit - + Search Traži @@ -579,84 +572,84 @@ DSettingsDialog - + Cancel Odustani - + Replace Zamijeni - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Molimo Vas da unesete novi prečac - + None Niti jedan - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Prestani čitati - - Maximize - + + Text to Speech + Tekst u govor - - Tile window to left of screen - + + Translate + Prevedi - - Tile window to right of screen - + + Speech To Text + Govor u tekst - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - Tekst u govor + + Drag your favorite items into the toolbar + - - Translate - Prevedi + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Govor u tekst + + Confirm + Potvrdi PickColorWidget - + Color Boja @@ -664,17 +657,17 @@ QLineEdit - + &Copy - + - + Cu&t - + - + Select All Odaberi sve @@ -682,20 +675,72 @@ QObject - + No search result Nema rezultata pretrage - + Restore Defaults - + Obnovi zadano + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Priznanja + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All Odaberi sve @@ -703,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut Molim unesite novi prečac @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Tema - + Light Theme Svijetla tema - + Dark Theme Tamna tema - + System Theme Tema sustava - + Help Pomoć - + Feedback - + + + + + Custom toolbar + - + About O programu - + Exit Izlaz - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_hu.ts dtkwidget-5.6.12/src/translations/dtkwidget_hu.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_hu.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_hu.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Köszönetnyilvánítás - - - - Version: %1 - Verzió: %1 - - - + %1 is released under %2 A %1 a %2 alatti kiadás @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Olvasás leállítása - + Text to Speech Szöveg felolvasása - + Translate Fordítás - + Speech To Text Beszéd szöveggé alakítása @@ -172,7 +162,7 @@ - + Print button Nyomtatás @@ -239,19 +229,17 @@ - - - - - + + + + Color Szín - - - + + Grayscale Szürkeárnyalatos @@ -472,13 +460,13 @@ - + Print to PDF Nyomtatás PDF fájlba - + Save as Image Mentés kép fájlként @@ -521,33 +509,33 @@ Adja meg az oldalszámokat, mint például: 1,3,5-7,11-15,18,21 - + Save button Mentés - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Például: 1,3,5-7,11-15,18,21 - + Save as PDF Mentés PDF fájlként - + Save as image Mentés képként - + Images Képek @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Bizalmas - - + + Draft Piszkozat - - + + Sample Minta @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Alapértelmezett eszközkészlet + + + + Drag your favorite items into the toolbar + Húzza kedvenc elemeit az eszköztárba + + + + Drag below items into the toolbar to restore defaults + Az alapértelmezett értékek visszaállításához húzza az alábbi elemeket az eszköztárba + + + + Confirm + Megerősítés + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy Másolás - + Cu&t Kivágás - + Select All Összes kijelölése @@ -674,34 +685,56 @@ Alapértelmezések visszaállítása - + Version - + Verzió - + Features - + Tulajdonságok - + Homepage - + Kezdőoldal - + Description - + Leírás + + + + Acknowledgements + Köszönetnyilvánítás - + + + + Sincerely appreciate the open-source software used. + Őszintén köszönjük, hogy nyílt forráskódú szoftvert használ. + + + + open-source software + Nyílt forráskódú szoftver + + + Continue - + Folytatás - + Learn More - + Tudjon meg többet + + + + Credits + Elismerés @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Téma - + Light Theme Világos mód - + Dark Theme Sötét mód - + System Theme Rendszer téma - + Help Segítség - + Feedback Visszajelzés - + + Custom toolbar + Egyéni eszköztár + + + About Az alkalmazásról - + Exit Kilépés diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_hy.ts dtkwidget-5.6.12/src/translations/dtkwidget_hy.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_hy.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_hy.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_id.ts dtkwidget-5.6.12/src/translations/dtkwidget_id.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_id.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_id.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Ucapan terima kasih - - - - Version: %1 - Versi: %1 - - - + %1 is released under %2 %1 dirilis dalam %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Hitam - + White Putih - + Dark Gray Abu-abu hitam - + Gray Abu-abu - + Light Gray Abu-abu Terang - + Red Merah - + Green Hijau - + Blue Biru - + Cyan Cyan - + Magenta Magenta - + Yellow Kuning - + Dark Red - Merah Gelap  + Merah Gelap  - + Dark Green Hijau Gelap - + Dark Blue Biru Gelap - + Dark Cyan Cyan Gelap - + Dark Magenta Magenta Gelap - + Dark Yellow Kuning Gelap @@ -117,12 +105,12 @@ DInputDialog - + Cancel Batal - + Confirm Konfirmasi @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + Masukan jalan pintas baru DLineEdit - + Stop reading - + Berhenti membaca - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Batal + Batal - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Batal - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Silakan masukan pintasan baru - + None Tidak ada - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Berhenti membaca - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Konfirmasi PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Tidak ada hasil pencarian - + Restore Defaults Pulihkan ke baku + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Ucapan terima kasih + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Mohon masukan sebuah jalan pintas yang baru @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help Bantuan - + Feedback - + + + + + Custom toolbar + - + About Tentang - + Exit Keluar - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_it.ts dtkwidget-5.6.12/src/translations/dtkwidget_it.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_it.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_it.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Ringraziamenti - - - - Version: %1 - Versione: %1 - - - + %1 is released under %2 %1 è rilasciato secondo %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Interrompi lettura - + Text to Speech Da testo ad audio - + Translate Traduci - + Speech To Text Da audio a testo @@ -172,7 +162,7 @@ - + Print button Stampa @@ -239,19 +229,17 @@ - - - - - + + + + Color Colori - - - + + Grayscale Scala di griglio @@ -472,13 +460,13 @@ - + Print to PDF Stampa su PDF - + Save as Image Salva come immagine @@ -521,33 +509,33 @@ Inserisci il numero di pagine come: 1,3,5-7,11-15,18,21 - + Save button Salva - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Ad esempio, 1,3,5-7,11-15,18,21 - + Save as PDF Salva come PDF - + Save as image Salva come immagine - + Images Immagini @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidenziale - - + + Draft Bozza - - + + Sample Esempio @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Conferma + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copy - + Cu&t Cu&t - + Select All Seleziona tutto @@ -674,35 +685,57 @@ Ripristina valori predefiniti - + Version - + Features - + Homepage - + Description - + + Acknowledgements + Ringraziamenti + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + Continue - + Learn More + + + Credits + + QWidgetTextControl @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Tema chiaro - + Dark Theme Tema scuro - + System Theme Tema di Sistema - + Help Aiuto - + Feedback Feedback - + + Custom toolbar + + + + About Info - + Exit Esci diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ja.ts dtkwidget-5.6.12/src/translations/dtkwidget_ja.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ja.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ja.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - 謝辞 - - - - Version: %1 - バージョン: %1 - - - + %1 is released under %2 %1 は %2 の下でリリースされています @@ -29,87 +17,87 @@ DCrumbEdit - + Black ブラック - + White ホワイト - + Dark Gray ダークグレー - + Gray グレー - + Light Gray ライトグレー - + Red レッド - + Green グリーン - + Blue ブルー - + Cyan シアン - + Magenta マゼンタ - + Yellow イエロー - + Dark Red ダークレッド - + Dark Green ダークグリーン - + Dark Blue ダークブルー - + Dark Cyan ダークシアン - + Dark Magenta ダークマゼンタ - + Dark Yellow ダークイエロー @@ -117,12 +105,12 @@ DInputDialog - + Cancel キャンセル - + Confirm 確認 @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - キャンセル + キャンセル - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel キャンセル - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut 新しいショートカットを入力してください - + None なし - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + 確認 PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result 検索結果が見つかりませんでした - + Restore Defaults デフォルトに戻す + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + 謝辞 + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut 新しいショートカットを入力してください @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help ヘルプ - + Feedback - + + + + + Custom toolbar + - + About このアプリケーションについて - + Exit 終了 - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ka.ts dtkwidget-5.6.12/src/translations/dtkwidget_ka.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ka.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ka.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_km_KH.ts dtkwidget-5.6.12/src/translations/dtkwidget_km_KH.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_km_KH.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_km_KH.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_kn_IN.ts dtkwidget-5.6.12/src/translations/dtkwidget_kn_IN.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_kn_IN.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_kn_IN.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ko.ts dtkwidget-5.6.12/src/translations/dtkwidget_ko.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ko.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ko.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - 감사의 말 - - - - Version: %1 - 버전: %1 - - - + %1 is released under %2 %1은(는) %2에 따라 배포됩니다 @@ -29,87 +17,87 @@ DCrumbEdit - + Black 검은색 - + White 흰색 - + Dark Gray 진한 회색 - + Gray 회색 - + Light Gray 밝은 회색 - + Red 빨간색 - + Green 녹색 - + Blue 파란색 - + Cyan 청록색 - + Magenta 자홍색 - + Yellow 노란색 - + Dark Red 진한 빨간색 - + Dark Green 진한 녹색 - + Dark Blue 진한 파란색 - + Dark Cyan 진한 청록색 - + Dark Magenta 진한 자홍색 - + Dark Yellow 진한 노란색 @@ -117,12 +105,12 @@ DInputDialog - + Cancel 취소 - + Confirm 확인 @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut 새 단축키를 입력하십시오 @@ -138,22 +126,22 @@ DLineEdit - + Stop reading 읽기 중지 - + Text to Speech 텍스트 음성 변환 - + Translate 번역하기 - + Speech To Text 음성 텍스트 변환 @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - 취소 + 취소 - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + 페이지 번호를 입력하세요 - + Maximum page number reached - + 최대 페이지 수에 도달했습니다. - + Input English comma please - + 영어 쉼표를 입력하세요 - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + PDF로 저장 - + Save as image - + 이미지로 저장 - + Images - + 이미지 DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search 검색 @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel 취소 - + Replace 바꾸기 - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately 이 단축키는 %1과 충돌합니다. 추가를 클릭하여이 단축키를 즉시 적용하십시오 @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut 새 단축키를 입력하십시오 - + None 없음 - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + 읽기 중지 - - Maximize - + + Text to Speech + 텍스트 음성 변환 - - Tile window to left of screen - + + Translate + 번역하기 - - Tile window to right of screen - + + Speech To Text + 음성 텍스트 변환 - DTextEdit + DToolbarEditPanel - - Stop reading - 읽기 중지 + + Default toolset + - - Text to Speech - 텍스트 음성 변환 + + Drag your favorite items into the toolbar + - - Translate - 번역하기 + + Drag below items into the toolbar to restore defaults + - - Speech To Text - 음성 텍스트 변환 + + Confirm + 확인 PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result 검색 결과 없음 - + Restore Defaults 기본값 복원 + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + 감사의 말 + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut 새 단축키를 입력하십시오 @@ -711,44 +756,49 @@ TitleBarMenu - + Theme 테마 - + Light Theme 밝은 색상 테마 - + Dark Theme 어두운 색상 테마 - + System Theme 시스템 테마 - + Help 도움말 - + Feedback - + + + + + Custom toolbar + - + About 프로그램 정보 - + Exit 종료 - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ku_IQ.ts dtkwidget-5.6.12/src/translations/dtkwidget_ku_IQ.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ku_IQ.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ku_IQ.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ku.ts dtkwidget-5.6.12/src/translations/dtkwidget_ku.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ku.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ku.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ky@Arab.ts dtkwidget-5.6.12/src/translations/dtkwidget_ky@Arab.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ky@Arab.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ky@Arab.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ky.ts dtkwidget-5.6.12/src/translations/dtkwidget_ky.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ky.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ky.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_lt.ts dtkwidget-5.6.12/src/translations/dtkwidget_lt.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_lt.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_lt.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Padėkos - - - - Version: %1 - Versija: %1 - - - + %1 is released under %2 %1 yra išleista pagal %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Juoda - + White Balta - + Dark Gray Tamsiai pilka - + Gray Pilka - + Light Gray Šviesiai pilka - + Red Raudona - + Green Žalia - + Blue Mėlyna - + Cyan Žydra - + Magenta Purpurinė - + Yellow Geltona - + Dark Red Tamsiai raudona - + Dark Green Tamsiai žalia - + Dark Blue Tamsiai mėlyna - + Dark Cyan Tamsiai žydra - + Dark Magenta Tamsiai purpurinė - + Dark Yellow Tamsiai geltona @@ -117,12 +105,12 @@ DInputDialog - + Cancel Atsisakyti - + Confirm Patvirtinti @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Įveskite naują trumpinį @@ -138,440 +126,445 @@ DLineEdit - + Stop reading Stabdyti skaitymą - + Text to Speech Garsinis teksto atkūrimas - + Translate Išversti - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Atsisakyti + Atsisakyti - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search Ieškoti @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel Atsisakyti - + Replace Pakeisti - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Šis trumpinys konfliktuoja su %1. Spustelėkite ant mygtuko "Pridėti" norėdami nedelsiant įjungti trumpinį @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut Įveskite naują trumpinį - + None Nėra - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Stabdyti skaitymą - - Maximize - + + Text to Speech + Garsinis teksto atkūrimas - - Tile window to left of screen - + + Translate + Išversti - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - Stabdyti skaitymą + + Default toolset + - - Text to Speech - Garsinis teksto atkūrimas + + Drag your favorite items into the toolbar + - - Translate - Išversti + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Patvirtinti PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Nėra paieškos rezultatų - + Restore Defaults Atkurti numatytuosius + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Padėkos + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Įveskite naują trumpinį @@ -711,44 +756,49 @@ TitleBarMenu - + Theme Tema - + Light Theme Šviesi tema - + Dark Theme Tamsi tema - + System Theme Sistemos tema - + Help Žinynas - + Feedback - + + + + + Custom toolbar + - + About Apie - + Exit Išeiti - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ml.ts dtkwidget-5.6.12/src/translations/dtkwidget_ml.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ml.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ml.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_mn.ts dtkwidget-5.6.12/src/translations/dtkwidget_mn.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_mn.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_mn.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_mr.ts dtkwidget-5.6.12/src/translations/dtkwidget_mr.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_mr.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_mr.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ms.ts dtkwidget-5.6.12/src/translations/dtkwidget_ms.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ms.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ms.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Penghargaan - - - - Version: %1 - Versi: %1 - - - + %1 is released under %2 %1 dikeluarkan bawah %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Henti membaca - + Text to Speech Teks ke Pertuturan - + Translate Terjemah - + Speech To Text Pertuturan Ke Teks @@ -172,7 +162,7 @@ - + Print button Cetak @@ -239,19 +229,17 @@ - - - - - + + + + Color Warna - - - + + Grayscale Skala kelabu @@ -472,13 +460,13 @@ - + Print to PDF Cetak ke PDF - + Save as Image Simpan sebagai Imej @@ -521,33 +509,33 @@ Masukkan nombor halaman seperti berikut: 1,3,5-7,11-15,18,21 - + Save button Simpan - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Contohnya, 1,3,5-7,11-15,18,21 - + Save as PDF Simpan sebagai PDF - + Save as image Simpan sebagai imej - + Images Imej @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Sulit - - + + Draft Draf - - + + Sample Sampel @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Sahkan + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy Sa&lin - + Cu&t Po&tong - + Select All Pilih Semua @@ -674,33 +685,55 @@ Pulih Lalai - + Version - + Versi - + Features - + Ciri-ciri - + Homepage - + Laman Utama - + Description + Keterangan + + + + Acknowledgements + Penghargaan + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Teruskan + + + Learn More + Ketahui Lagi + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Tema Cerah - + Dark Theme Tema Gelap - + System Theme Tema Sistem - + Help Bantuan - + Feedback Maklum balas - + + Custom toolbar + + + + About Perihal - + Exit Keluar diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_nb.ts dtkwidget-5.6.12/src/translations/dtkwidget_nb.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_nb.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_nb.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Anerkjennelser - - - - Version: %1 - Versjon: %1 - - - + %1 is released under %2 %1 er utgitt under %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Svart - + White Hvit - + Dark Gray Mørk Grå - + Gray Grå - + Light Gray Lys Grå - + Red Rød - + Green Grønn - + Blue Blå - + Cyan Cyan - + Magenta Magenta - + Yellow Gul - + Dark Red Mørk Rød - + Dark Green Mørk Grønn - + Dark Blue Mørk Blå - + Dark Cyan Mørk Cyan - + Dark Magenta Mørk Magenta - + Dark Yellow Mørk Gul @@ -117,12 +105,12 @@ DInputDialog - + Cancel Avbryt - + Confirm Bekreft @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Avbryt + Avbryt - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Avbryt - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Sett inn en ny snarvei - + None Ingen - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Bekreft PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Søk gav ingen resultat - + Restore Defaults Gjenopprett Standard + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Anerkjennelser + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Skriv inn en ny snarvei @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help Hjelp - + Feedback - + + + + + Custom toolbar + - + About Om - + Exit Avslutt - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ne.ts dtkwidget-5.6.12/src/translations/dtkwidget_ne.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ne.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ne.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - स्वीकृतिहरू - - - - Version: %1 - संस्करण:% 1 - - - + %1 is released under %2 % 1% 2 अन्तर्गत रिलीज गरिएको छ @@ -29,87 +17,87 @@ DCrumbEdit - + Black कालो - + White सेतो - + Dark Gray गाढा खैरो - + Gray खैरो - + Light Gray हल्का खैरो - + Red रातो - + Green हरियो - + Blue नीलो - + Cyan सायन - + Magenta म्याजेन्टा - + Yellow पहेंलो - + Dark Red गाढा रातो - + Dark Green गाढा हरियो - + Dark Blue गाढा निलो - + Dark Cyan गाढा सियान - + Dark Magenta डार्क म्याजेन्टा - + Dark Yellow गाढा पहेंलो @@ -117,12 +105,12 @@ DInputDialog - + Cancel रद्द गर्नुहोस् - + Confirm निश्चित गर्नुहोस् @@ -130,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut नयाँ सर्टकट प्रविष्ट गर्नुहोस् @@ -138,22 +126,22 @@ DLineEdit - + Stop reading पढ्न रोक्नुहोस् - + Text to Speech टेक्स्ट तु स्पीच - + Translate अनुवाद - + Speech To Text स्पीच तु टेक्स्ट @@ -161,417 +149,422 @@ DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - रद्द गर्नुहोस् + रद्द गर्नुहोस् - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search खोज्नुहोस् @@ -579,17 +572,17 @@ DSettingsDialog - + Cancel रद्द गर्नुहोस् - + Replace बदल्नुहोस् - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately यो सर्टकट% 1 सँग टकराव हुन्छ, यस सर्टकटलाई तुरून्त प्रभावकारी बनाउनको लागि Add मा क्लिक गर्नुहोस् @@ -597,113 +590,165 @@ DShortcutEdit - + Please input a new shortcut कृपया नयाँ सर्टकट इनपुट गर्नुहोस् - + None कुनै पनि होइन - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + पढ्न रोक्नुहोस् - - Maximize - + + Text to Speech + टेक्स्ट तु स्पीच - - Tile window to left of screen - + + Translate + अनुवाद - - Tile window to right of screen - + + Speech To Text + स्पीच तु टेक्स्ट - DTextEdit + DToolbarEditPanel - - Stop reading - पढ्न रोक्नुहोस् + + Default toolset + - - Text to Speech - टेक्स्ट तु स्पीच + + Drag your favorite items into the toolbar + - - Translate - अनुवाद + + Drag below items into the toolbar to restore defaults + - - Speech To Text - स्पीच तु टेक्स्ट + + Confirm + निश्चित गर्नुहोस् PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result कुनै खोजी परिणाम छैन - + Restore Defaults फेरी पहिलाकै अवस्था मा लैजाऊ + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + स्वीकृतिहरू + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut कृपया नयाँ सर्टकट प्रविष्ट गर्नुहोस् @@ -711,44 +756,49 @@ TitleBarMenu - + Theme थेम - + Light Theme लाईट थेम - + Dark Theme दर्क थेम - + System Theme सिस्टम थेम - + Help मद्दत - + Feedback - + + + + + Custom toolbar + - + About बारेमा - + Exit बाहिर निस्कनुहोस् - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_nl.ts dtkwidget-5.6.12/src/translations/dtkwidget_nl.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_nl.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_nl.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Erkenningen - - - - Version: %1 - Versie: %1 - - - + %1 is released under %2 %1 is uitgebracht onder de %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Stoppen met voorlezen - + Text to Speech Tekst-naar-spraak - + Translate Vertalen - + Speech To Text Spraak-naar-tekst @@ -172,7 +162,7 @@ - + Print button Afdrukken @@ -239,19 +229,17 @@ - - - - - + + + + Color Kleur - - - + + Grayscale Grijswaarden @@ -472,13 +460,13 @@ - + Print to PDF Afdrukken naar pdf - + Save as Image Opslaan als afbeelding @@ -521,33 +509,33 @@ Voer de paginanummers als volgt in: 1,3,5-7,11-15,18,21 - + Save button Opslaan - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Voorbeeld: 1,3,5-7,11-15,18,21 - + Save as PDF Opslaan als pdf-bestand - + Save as image Opslaan als afbeelding - + Images Afbeeldingen @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Vertrouwelijk - - + + Draft Concept - - + + Sample Voorbeeld @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Standaard gereedschapsset + + + + Drag your favorite items into the toolbar + Sleep je favoriete items naar de werkbalk + + + + Drag below items into the toolbar to restore defaults + Sleep onderstaande items naar de werkbalk om de standaardwaarden te herstellen + + + + Confirm + Bevestigen + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopiëren - + Cu&t Kni&ppen - + Select All Alles selecteren @@ -674,34 +685,56 @@ Standaardwaarden herstellen - + Version - + Versie - + Features - + Kenmerken - + Homepage - + Website - + Description - + Beschrijving - + + Acknowledgements + Kennisgeving + + + + + + Sincerely appreciate the open-source software used. + Maak dankbaar gebruik van opensourcesoftware. + + + + open-source software + opensourcesoftware + + + Continue - + Doorgaan - + Learn More - + Meer informatie + + + + Credits + Met dank aan @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Thema - + Light Theme Licht thema - + Dark Theme Donker thema - + System Theme Systeemthema - + Help Hulp - + Feedback Feedback - + + Custom toolbar + Aangepaset werkbalk + + + About Over - + Exit Afsluiten diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_pam.ts dtkwidget-5.6.12/src/translations/dtkwidget_pam.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_pam.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_pam.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_pl.ts dtkwidget-5.6.12/src/translations/dtkwidget_pl.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_pl.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_pl.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Podziękowania - - - - Version: %1 - Wersja: %1 - - - + %1 is released under %2 %1 został wydany na licencji %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Przestań czytać - + Text to Speech Tekst na mowę - + Translate Przetłumacz - + Speech To Text Mowa na tekst @@ -172,7 +162,7 @@ - + Print button Drukuj @@ -239,19 +229,17 @@ - - - - - + + + + Color Kolor - - - + + Grayscale Odcienie szarości @@ -418,7 +406,7 @@ Draft - Wersja Robocza + Wersja robocza @@ -472,13 +460,13 @@ - + Print to PDF Drukuj do PDF - + Save as Image Zapisz jako obraz @@ -491,14 +479,14 @@ Flip on short edge - Odwróć krótszą krawędź + Odwróć wzdłuż krótszej krawędzi Flip on long edge - Przerzuć wzdłuż długiej krawędzi + Odwróć wzdłuż dłuższej krawędzi @@ -508,7 +496,7 @@ Maximum page number reached - Maksymalna liczba stron osiągnięta + Osiągnięto maksymalną liczbę stron @@ -521,33 +509,33 @@ Wprowadź numery stron w ten sposób: 1,3,5-7,11-15,18,21 - + Save button Zapisz - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Na przykład, 1,3,5-7,11-15,18,21 - + Save as PDF Zapisz jako PDF - + Save as image Zapisz jako obraz - + Images Obrazy @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Poufne - - + + Draft - Wersja Robocza + Wersja robocza - - + + Sample Próbka @@ -596,7 +584,7 @@ This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - Ten skrót powoduje konflikt z %1, kliknij Dodaj, aby skrót zadziałał od razu + Ten skrót jest w konflikcie z %1, kliknij Dodaj, aby go nadpisać @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Domyślny pasek narzędzi + + + + Drag your favorite items into the toolbar + Przeciągnij ulubione przedmioty na pasek narzędzi + + + + Drag below items into the toolbar to restore defaults + Przeciągnij przedmioty poniżej na pasek narzędzi, aby przywrócić ustawienie domyślne + + + + Confirm + Potwierdź + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopiuj - + Cu&t Cu&t - + Select All Zaznacz wszystko @@ -674,34 +685,56 @@ Przywróć domyślne - + Version - + Wersja - + Features - + Funkcje - + Homepage - + Strona główna - + Description - + Opis + + + + Acknowledgements + Podziękowania - + + + + Sincerely appreciate the open-source software used. + Szczere podziękowania dla użytego oprogramowania open-source. + + + + open-source software + oprogramowanie open-source + + + Continue - + Kontynuuj - + Learn More - + Dowiedz się więcej + + + + Credits + Zasługi @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Motyw - + Light Theme Jasny - + Dark Theme Ciemny - + System Theme Systemowy - + Help Pomoc - + Feedback Opinia użytkownika - + + Custom toolbar + Niestandardowy pasek narzędzi + + + About O programie - + Exit Wyjdź diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_pt_BR.ts dtkwidget-5.6.12/src/translations/dtkwidget_pt_BR.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_pt_BR.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_pt_BR.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Agradecimentos - - - - Version: %1 - Versão: %1 - - - + %1 is released under %2 %1 é lançado em %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Parar de ler - + Text to Speech Texto em Voz - + Translate Traduzir - + Speech To Text Voz em Texto @@ -172,7 +162,7 @@ - + Print button Imprimir @@ -239,19 +229,17 @@ - - - - - + + + + Color Cor - - - + + Grayscale Escala cinza @@ -472,13 +460,13 @@ - + Print to PDF Imprimir em PDF - + Save as Image Salvar como Imagem @@ -521,33 +509,33 @@ Insira os números das páginas assim: 1, 3, 5-7, 11-15, 18, 21 - + Save button Salvar - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Por exemplo: 1, 3, 5-7, 11-15, 18, 21 - + Save as PDF Salvar como PDF - + Save as image Salvar como imagem - + Images Imagens @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidencial - - + + Draft Rascunho - - + + Sample Amostra @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Confirmar + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copiar - + Cu&t Recor&tar - + Select All Selecionar Tudo @@ -674,33 +685,55 @@ Restaurar Padrões - + Version - + Versão - + Features - + Recursos - + Homepage - + Página na Internet - + Description + Descrição + + + + Acknowledgements + Agradecimentos + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Continuar + + + Learn More + Aprenda Mais + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Claro - + Dark Theme Escuro - + System Theme Padrão - + Help Ajuda - + Feedback Opinião - + + Custom toolbar + + + + About Sobre - + Exit Sair diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_pt.ts dtkwidget-5.6.12/src/translations/dtkwidget_pt.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_pt.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_pt.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Agradecimentos - - - - Version: %1 - Versão: %1 - - - + %1 is released under %2 %1 é lançado sob %2 @@ -39,7 +29,7 @@ Dark Gray - Cinzento Escuro + Cinzento escuro @@ -49,7 +39,7 @@ Light Gray - Cinzento Claro + Cinzento claro @@ -84,32 +74,32 @@ Dark Red - Vermelho Escuro + Vermelho escuro Dark Green - Verde Escuro + Verde escuro Dark Blue - Azul Escuro + Azul escuro Dark Cyan - Ciano Escuro + Ciano escuro Dark Magenta - Magenta Escuro + Magenta escuro Dark Yellow - Amarelo Escuro + Amarelo escuro @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Parar a leitura - + Text to Speech Texto para Voz - + Translate Traduzir - + Speech To Text Voz para Texto @@ -172,7 +162,7 @@ - + Print button Imprimir @@ -239,19 +229,17 @@ - - - - - + + + + Color Cor - - - + + Grayscale Escala de cinzentos @@ -472,13 +460,13 @@ - + Print to PDF Imprimir para PDF - + Save as Image Guardar como imagem @@ -521,33 +509,33 @@ Introduza números de páginas assim: 1,3,5-7,11-15,18,21 - + Save button Guardar - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Por exemplo, 1,3,5-7,11-15,18,21 - + Save as PDF Guardar como PDF - + Save as image Guardar como imagem - + Images Imagens @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidencial - - + + Draft Rascunho - - + + Sample Exemplo @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Confirmar + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copiar - + Cu&t Cor&tar - + Select All Selecionar tudo @@ -671,36 +682,58 @@ Restore Defaults - Restaurar Predefinições + Restaurar predefinições - + Version - + Versão - + Features - + Funcionalidades - + Homepage - + Página inicial - + Description + Descrição + + + + Acknowledgements + Agradecimentos + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Continuar + + + Learn More + Saiba mais + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme - Tema Claro + Tema claro - + Dark Theme - Tema Escuro + Tema escuro - + System Theme - Tema do Sistema + Tema do sistema - + Help Ajuda - + Feedback Feedback - + + Custom toolbar + + + + About Sobre - + Exit Sair diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ro.ts dtkwidget-5.6.12/src/translations/dtkwidget_ro.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ro.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ro.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Mulțumiri - - - - Version: %1 - Versiunea: %1 - - - + %1 is released under %2 %1 este lansat ca %2 @@ -27,87 +17,87 @@ DCrumbEdit - + Black Negru - + White Alb - + Dark Gray Gri închis - + Gray Gri - + Light Gray Gri deschis - + Red Roșu - + Green Verde - + Blue Albastru - + Cyan Cyan - + Magenta Purpuriu - + Yellow Galben - + Dark Red Roșu închis - + Dark Green Verde închis - + Dark Blue Albastru închis - + Dark Cyan Cyan închis - + Dark Magenta Purpuriu închis - + Dark Yellow Galben închis @@ -115,12 +105,12 @@ DInputDialog - + Cancel Anulare - + Confirm Confirmare @@ -128,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Introduceți o nouă comandă scurtă @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Stopare citire - + Text to Speech Pronunțare text - + Translate Traducere - + Speech To Text Transformare vocei în text @@ -159,388 +149,393 @@ DPrintPreviewDialogPrivate - - + + Advanced Avansat - + Cancel button Anulare - - + + Print button Printare - + Basic De bază - + Printer Imprimantă - + Copies Copii - + Page range Interval de pagini - + All Tot - + Current page Pagina curentă - + Select pages Selectați paginile - + Orientation Orientare - + Portrait Portret - + Landscape Peisaj - + Pages Paginile - + Color mode Mod culoare - - - + + + + + Color Culoare - - - + + + Grayscale Balanța gri - + Margins Margini - + Narrow (mm) Îngust (mm) - + Normal (mm) Normal (mm) - + Moderate (mm) Moderat (mm) - + Customize (mm) Personalizat (mm) - + Top Sus - + Left Stânga - + Bottom Jos - + Right Dreapta - + Scaling Scalare - + Actual size Mărimea actuală - + Scale Scară - + Paper Foaie - + Paper size Mărimea foii - + Print Layout Aspect imprimare - + Duplex Duplex - + N-up printing N-up printare - + 2 pages/sheet, 1×2 2 pagini/foaie, 1×2 - + 4 pages/sheet, 2×2 4 pagini/foaie, 2×2 - + 6 pages/sheet, 2×3 6 pagini/foaie, 2×3 - + 9 pages/sheet, 3×3 9 pagini/foaie, 3×3 - + 16 pages/sheet, 4×4 16 pagini/foaie, 4×4 - + Layout direction Direcție aspect - + Page Order Ordonarea paginii - + Collate pages Pagini asociate - + Print pages in order Imprimarea paginilor în ordinea - + Front to back Față - spate - + Back to front Spate - față - + Watermark Filigran - + Add watermark Adăugare filigran - + Text watermark Filigran în text - + Confidential Confidențial - + Draft Schiță - + Sample Probă - + Custom Personalizat - + Input your text Introduceți textul dvs. - + Picture watermark Filigran desen - + Layout Aspect - + Tile Acoperire - + Center Centru - + Angle Unghi - + Size Mărime - + Transparency Transparență - + + Print to PDF Imprimare în PDF - + + Save as Image Salvați ca imagine - + Collapse Micșorare - - + + Flip on short edge De-a lungul marginii scurte - - + + + Flip on long edge De-a lungul marginii lungi - + Input page numbers please Introduceți numere de pagini - + Maximum page number reached A fost atins numărul maxim de pagini - + Input English comma please Introduceți, vă rog, virgula englezească - + Input page numbers like this: 1,3,5-7,11-15,18,21 Introduceți numere de pagini în acest mod: 1,3,5-7,11-15,18,21 - + Save button Salvare - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 De exemplu, 1,3,5-7,11-15,18,21 - + Save as PDF Salvați în format PDF - + Save as image Salvați ca imagine - + Images Imagini @@ -548,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidențial - - + + Draft Schiță - - + + Sample Exemplar @@ -569,7 +564,7 @@ DSearchEdit - + Search Căutare @@ -577,17 +572,17 @@ DSettingsDialog - + Cancel Anulare - + Replace Substituire - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Această comandă rapidă intră în conflict cu %1, apăsați Adăugare pentru a face această comandă rapidă una efectivă în mod imediat @@ -595,66 +590,66 @@ DShortcutEdit - + Please input a new shortcut Introduceți, vă rog, o nouă comandă rapidă - + None Nici unul - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Stopare citire - - Maximize - + + Text to Speech + Pronunțare text - - Tile window to left of screen - + + Translate + Traducere - - Tile window to right of screen - + + Speech To Text + Transformare vocei în text - DTextEdit + DToolbarEditPanel - - Stop reading - Stopare citire + + Default toolset + - - Text to Speech - Pronunțare text + + Drag your favorite items into the toolbar + - - Translate - Traducere + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Transformare vocei în text + + Confirm + Confirmare PickColorWidget - + Color Culoare @@ -662,17 +657,17 @@ QLineEdit - + &Copy - + Cu&t - + Select All Selectați tot @@ -680,20 +675,72 @@ QObject - + No search result Căutare nu a dat rezultat - + Restore Defaults Restabilirea sătărilor de bază + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Mulțumiri + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All Selectați tot @@ -701,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut Introduceți o nouă comandă rapidă @@ -709,42 +756,47 @@ TitleBarMenu - + Theme Temă - + Light Theme Temă culoare deschisă - + Dark Theme Temă culoare întunecată - + System Theme Temă de sistem - + Help Ajutor - + Feedback - + + Custom toolbar + + + + About Despre - + Exit Ieșire diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ru.ts dtkwidget-5.6.12/src/translations/dtkwidget_ru.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ru.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ru.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Выражение признательности - - - - Version: %1 - Версия: %1 - - - + %1 is released under %2 %1 выпущен под %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Прекращение чтения - + Text to Speech Преобразование текста в речь - + Translate Перевод - + Speech To Text Преобразование речи в текст @@ -172,7 +162,7 @@ - + Print button Печать @@ -239,19 +229,17 @@ - - - - - + + + + Color Цвет - - - + + Grayscale Градация серого @@ -472,13 +460,13 @@ - + Print to PDF Печать в PDF - + Save as Image Сохранить как изображение @@ -521,33 +509,33 @@ Введите номера страниц следующим образом: 1,3,5-7,11-15,18,21 - + Save button Сохранить - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Например, 1,3,5-7,11-15,18,21 - + Save as PDF Сохранить в PDF - + Save as image Сохранить как изображение - + Images Изображения @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Конфиденциально - - + + Draft Черновик - - + + Sample Пример @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Подтвердить + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Копировать - + Cu&t В&ырезать - + Select All Выбрать все @@ -674,33 +685,55 @@ Восстановить значения По-умолчанию - + Version - + Версия - + Features - + Функции - + Homepage - + Домашняя страница - + Description + Описание + + + + Acknowledgements + Выражение признательности + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + Продолжить + + + Learn More + Узнать больше + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Тема - + Light Theme Светлая Тема - + Dark Theme Темная Тема - + System Theme Тема Системы - + Help Помощь - + Feedback Отправить отзыв - + + Custom toolbar + + + + About О программе - + Exit Выход diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sc.ts dtkwidget-5.6.12/src/translations/dtkwidget_sc.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sc.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sc.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_si.ts dtkwidget-5.6.12/src/translations/dtkwidget_si.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_si.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_si.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + කළු - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sk.ts dtkwidget-5.6.12/src/translations/dtkwidget_sk.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sk.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sk.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - Poďakovanie - - - - Version: %1 - Verzia: %1 - - - + %1 is released under %2 %1 je vydaná pod %2 @@ -29,87 +17,87 @@ DCrumbEdit - + Black Čierna - + White Biela - + Dark Gray Tmavosivá - + Gray Sivá - + Light Gray Svetlosivá - + Red Červená - + Green Zelená - + Blue Modrá - + Cyan Tyrkysová - + Magenta Purpurová - + Yellow Žltá - + Dark Red Tmavočervená - + Dark Green Tmavozelená - + Dark Blue Tmavomodrá - + Dark Cyan Tmavotyrkysová - + Dark Magenta Tmavopurpurová - + Dark Yellow Tmavožltá @@ -117,12 +105,12 @@ DInputDialog - + Cancel Zrušiť - + Confirm Potvrdiť @@ -130,580 +118,637 @@ DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - Zrušiť + Zrušiť - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel Zrušiť - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut Prosím zadajte novú skratku - + None Nič - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + Potvrdiť PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result Žiadny výsledok vyhľadávania - + Restore Defaults Obnoviť predvolené nastavenia + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Poďakovanie + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut Zadajte novú skratku @@ -711,44 +756,49 @@ TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help Pomoc - + Feedback - + + + + + Custom toolbar + - + About O - + Exit Ukončiť - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sl.ts dtkwidget-5.6.12/src/translations/dtkwidget_sl.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sl.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sl.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Zasluge - - - - Version: %1 - Različica: %1 - - - + %1 is released under %2 %1 je izdana pod %2 @@ -27,87 +17,87 @@ DCrumbEdit - + Black Črna - + White Bela - + Dark Gray Temno siva - + Gray Siva - + Light Gray Svetlo siva - + Red Rdeča - + Green Zelena - + Blue Modra - + Cyan Cian - + Magenta Škrlatna - + Yellow Rumena - + Dark Red Temno rdeča - + Dark Green Temno zelena - + Dark Blue Temno modra - + Dark Cyan Temna cijan - + Dark Magenta Temna škrlatna - + Dark Yellow Temno rumena @@ -115,12 +105,12 @@ DInputDialog - + Cancel Prekliči - + Confirm Potrdi @@ -128,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Določite novo bližnjico @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Zaustavi branje - + Text to Speech Besedilo v govor - + Translate Prevedi - + Speech To Text Govor v besedilo @@ -159,388 +149,393 @@ DPrintPreviewDialogPrivate - - + + Advanced Napredno - + Cancel button Prekliči - - + + Print button Tiskaj - + Basic Osnovno - + Printer Tiskalnik - + Copies Kopije - + Page range Obseg strani - + All vse - + Current page trenutna stran - + Select pages izbor strani - + Orientation Orientacija - + Portrait pokončno - + Landscape ležeče - + Pages Strani - + Color mode Barvni način - - - + + + + + Color Barvno - - - + + + Grayscale Sivo - + Margins Robovi - + Narrow (mm) Ozko (mm) - + Normal (mm) Navadno (mm) - + Moderate (mm) Zmerno (mm) - + Customize (mm) Prilagodi (mm) - + Top Zgoraj - + Left Levo - + Bottom Spodaj - + Right Desno - + Scaling Povečava - + Actual size Dejanska velikost - + Scale Merilo - + Paper paipr - + Paper size Velikost papirja - + Print Layout Razporeditev tiskanja - + Duplex Dvostransko - + N-up printing N-na list - + 2 pages/sheet, 1×2 2 strani/list, 1×2 - + 4 pages/sheet, 2×2 4 strani/list, 2×2 - + 6 pages/sheet, 2×3 6 strani/list, 2×3 - + 9 pages/sheet, 3×3 9 strani/list, 3×3 - + 16 pages/sheet, 4×4 16 strani/list, 4×4 - + Layout direction Smer razporejanja - + Page Order Vrstni red strani - + Collate pages Zbiraj strani - + Print pages in order natisni strani po vrstnem redu - + Front to back od prve do zadnje - + Back to front od zadnje do prve - + Watermark Vodni žig - + Add watermark Dodaj vodni žig - + Text watermark Besedilni vodni žig - + Confidential Zaupno - + Draft Osnutek - + Sample Vzorec - + Custom Prilagojeno - + Input your text Vnesite besedilo - + Picture watermark Slikovni vodni žig - + Layout Razpored - + Tile Razpostavi - + Center Sredina - + Angle Kot - + Size Velikost - + Transparency Prosojnost - + + Print to PDF Tiskaj v PDF - + + Save as Image Shrani kot sliko - + Collapse Zloži - - + + Flip on short edge Prelom na kratki stranici - - + + + Flip on long edge Prelom na dolgi stranici - + Input page numbers please Vnesite strani - + Maximum page number reached Doseženo je največje število strani - + Input English comma please Vnesite angleško vejico - + Input page numbers like this: 1,3,5-7,11-15,18,21 Vnesite strani kot: 1,3,5-7,11-15,18,21 - + Save button Shrani - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Na primer 1,3,5-7,11-15,18,21 - + Save as PDF Shrani kot PDF - + Save as image Shrani kot sliko - + Images Slike @@ -548,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Zaupno - - + + Draft Osnutek - - + + Sample Vzorec @@ -569,7 +564,7 @@ DSearchEdit - + Search iskanje @@ -577,17 +572,17 @@ DSettingsDialog - + Cancel Prekliči - + Replace Zamenjaj - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Bližnjica je enaka kot %1. Kliknite na Dodaj, ta postane takoj aktivna @@ -595,66 +590,66 @@ DShortcutEdit - + Please input a new shortcut Prosim, vnesite novo bližnjico - + None Nič - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + zaustavi branje - - Maximize - + + Text to Speech + Besedilo v govor - - Tile window to left of screen - + + Translate + Prevedi - - Tile window to right of screen - + + Speech To Text + Govor v besedilo - DTextEdit + DToolbarEditPanel - - Stop reading - zaustavi branje + + Default toolset + - - Text to Speech - Besedilo v govor + + Drag your favorite items into the toolbar + - - Translate - Prevedi + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Govor v besedilo + + Confirm + Potrdi PickColorWidget - + Color Barvno @@ -662,17 +657,17 @@ QLineEdit - + &Copy - + Cu&t - + Select All Izberi vse @@ -680,20 +675,72 @@ QObject - + No search result Ni rezultatov iskanja - + Restore Defaults Obnovi privzeto + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Zasluge + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All Izberi vse @@ -701,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut Prosim, vnesite novo bližnjico @@ -709,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Svetla tema - + Dark Theme Temna tema - + System Theme Sistemska tema - + Help Pomoč - + Feedback - + + Custom toolbar + + + + About O tem - + Exit Izhod diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sq.ts dtkwidget-5.6.12/src/translations/dtkwidget_sq.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sq.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sq.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Falënderime - - - - Version: %1 - Version: %1 - - - + %1 is released under %2 %1 hidhet në qarkullim sipas %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Ndale leximin - + Text to Speech Nga Tekst Në të Folur - + Translate Përktheni - + Speech To Text Nga e Folur Në Tekst @@ -172,7 +162,7 @@ - + Print button Shtype @@ -239,19 +229,17 @@ - - - - - + + + + Color Ngjyrë - - - + + Grayscale Shkallë e grisë @@ -472,13 +460,13 @@ - + Print to PDF Shtype si PDF - + Save as Image Ruaje si Figurë @@ -521,33 +509,33 @@ Jepni numra faqesh si: 1,3,5-7,11-15,18,21 - + Save button Ruaje - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Për shembull, 1,3,5-7,11-15,18,21 - + Save as PDF Ruaje si PDF - + Save as image Ruaje si figurë - + Images Figura @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Rezervat - - + + Draft Skicë - - + + Sample Shembull @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Grup parazgjedhje mjetesh + + + + Drag your favorite items into the toolbar + Tërhiqini deri te paneli objektet tuaj të parapëlqyer + + + + Drag below items into the toolbar to restore defaults + Që të rikthehen parazgjedhjet, tërhiqini objektet më poshtë deri te paneli + + + + Confirm + Ripohojeni + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopjoje - + Cu&t &Prije - + Select All Përzgjidhi Krejt @@ -674,33 +685,55 @@ Rikthe Parazgjedhjet - + Version - + Version - + Features - + Veçori - + Homepage - + Faqe hyrëse - + Description - + Përshkrim + + + + Acknowledgements + Falënderime - + + + + Sincerely appreciate the open-source software used. + Vlerësoni sinqerisht software-in me burim të hapët të përdorur. + + + + open-source software + software me burim të hapët + + + Continue - + Vazhdoni - + Learn More + Mësoni Më Tepër + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Temë - + Light Theme Temë e Çelët - + Dark Theme Temë e Errët - + System Theme Temë Sistemi - + Help Ndihmë - + Feedback Përshtypje - + + Custom toolbar + Panel vetjak + + + About Mbi - + Exit Dil diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sr.ts dtkwidget-5.6.12/src/translations/dtkwidget_sr.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sr.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sr.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Заслуге - - - - Version: %1 - Верзија: %1 - - - + %1 is released under %2 %1 је објављен под %2 @@ -27,87 +17,87 @@ DCrumbEdit - + Black Црна - + White Бела - + Dark Gray Тамно сива - + Gray Сива - + Light Gray Светло сива - + Red Црвена - + Green Зелена - + Blue Плава - + Cyan Цијан - + Magenta Магента - + Yellow Жута - + Dark Red Тамно црвена - + Dark Green Тамно зелена - + Dark Blue Тамно плава - + Dark Cyan Тамно цијан - + Dark Magenta Тамно магента - + Dark Yellow Тамно жута @@ -115,12 +105,12 @@ DInputDialog - + Cancel Откажи - + Confirm Потврди @@ -128,7 +118,7 @@ DKeySequenceEdit - + Enter a new shortcut Унесите нову пречицу @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Заустави читање - + Text to Speech Текст у говор - + Translate Преведи - + Speech To Text Говор у текст @@ -159,388 +149,393 @@ DPrintPreviewDialogPrivate - - + + Advanced Напредно - + Cancel button Откажи - - + + Print button Штампај - + Basic Основно - + Printer Штампач - + Copies Копије - + Page range Опсег странице - + All Све - + Current page Тренутна страница - + Select pages Изабери странице - + Orientation Усмерење - + Portrait Усправно - + Landscape Положено - + Pages Странице - + Color mode Режим боја - - - + + + + + Color Боја - - - + + + Grayscale Сиве нијансе - + Margins Маргине - + Narrow (mm) Уско (mm) - + Normal (mm) Нормално (mm) - + Moderate (mm) Умерено (mm) - + Customize (mm) Прилагоди (mm) - + Top Врх - + Left Лево - + Bottom Дно - + Right Десно - + Scaling Скалирање - + Actual size Стварна величина - + Scale Скалирај - + Paper Папир - + Paper size Величина папира - + Print Layout Приказ пре штампања - + Duplex Двострано - + N-up printing Страница по листу - + 2 pages/sheet, 1×2 2 странице/лист, 1×2 - + 4 pages/sheet, 2×2 4 странице/лист, 2×2 - + 6 pages/sheet, 2×3 6 страница/лист, 2×3 - + 9 pages/sheet, 3×3 9 страница/лист, 3×3 - + 16 pages/sheet, 4×4 16 страница/лист, 4×4 - + Layout direction Усмерење распореда - + Page Order Редослед страница - + Collate pages Поређај странице - + Print pages in order Штампај странице по реду - + Front to back Напред ка назад - + Back to front Назад ка напред - + Watermark Водени жиг - + Add watermark Додај водени жиг - + Text watermark Текстуални водени жиг - + Confidential Поверљиво - + Draft Нацрт - + Sample Узорак - + Custom Прилагођено - + Input your text Унесите текст - + Picture watermark Сликовни водени жиг - + Layout Распоред - + Tile Поплочано - + Center Центрирано - + Angle Угао - + Size Величина - + Transparency Провидност - + + Print to PDF Испис у ПДФ - + + Save as Image Сачувај као слику - + Collapse Скупи - - + + Flip on short edge Oкрећи по краћој ивици - - + + + Flip on long edge Окрећи по дужој ивици - + Input page numbers please Унесите бројеве страница - + Maximum page number reached Достигнут је максималан број страница - + Input English comma please Молимо унесите енглеску запету - + Input page numbers like this: 1,3,5-7,11-15,18,21 Унеси бројеве страница овако: 1,3,5-7,11-15,18,21 - + Save button Сачувај - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 На пример, 1,3,5-7,11-15,18,21 - + Save as PDF Сачувај као ПДФ - + Save as image Сачувај као слику - + Images Слике @@ -548,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Поверљиво - - + + Draft Нацрт - - + + Sample Узорак @@ -569,7 +564,7 @@ DSearchEdit - + Search Претражи @@ -577,17 +572,17 @@ DSettingsDialog - + Cancel Откажи - + Replace Замени - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately Ова пречица је у сукобу са %1, кликните на Додај да пречица ступи на снагу @@ -595,66 +590,66 @@ DShortcutEdit - + Please input a new shortcut Унесите нову пречицу - + None Ништа - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + Заустави читање - - Maximize - + + Text to Speech + Текст у говор - - Tile window to left of screen - + + Translate + Преведи - - Tile window to right of screen - + + Speech To Text + Говор у текст - DTextEdit + DToolbarEditPanel - - Stop reading - Заустави читање + + Default toolset + - - Text to Speech - Текст у говор + + Drag your favorite items into the toolbar + - - Translate - Преведи + + Drag below items into the toolbar to restore defaults + - - Speech To Text - Говор у текст + + Confirm + Потврди PickColorWidget - + Color Боја @@ -662,17 +657,17 @@ QLineEdit - + &Copy - + Cu&t - + Select All Изабери све @@ -680,20 +675,72 @@ QObject - + No search result Нема резултата претраге - + Restore Defaults Врати Подразумевано + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + Заслуге + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + + QWidgetTextControl - + Select All Изабери све @@ -701,7 +748,7 @@ ShortcutEdit - + Please enter a new shortcut Унесите нову пречицу @@ -709,42 +756,47 @@ TitleBarMenu - + Theme Тема - + Light Theme Светла тема - + Dark Theme Тамна тема - + System Theme Системска тема - + Help Помоћ - + Feedback - + + Custom toolbar + + + + About О програму - + Exit Изађи diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sv.ts dtkwidget-5.6.12/src/translations/dtkwidget_sv.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sv.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sv.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_sw.ts dtkwidget-5.6.12/src/translations/dtkwidget_sw.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_sw.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_sw.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ta.ts dtkwidget-5.6.12/src/translations/dtkwidget_ta.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ta.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ta.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_th.ts dtkwidget-5.6.12/src/translations/dtkwidget_th.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_th.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_th.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_tr.ts dtkwidget-5.6.12/src/translations/dtkwidget_tr.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_tr.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_tr.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Teşekkürler - - - - Version: %1 - Sürüm: %1 - - - + %1 is released under %2 %1, %2 koşulları altında yayınlanmıştır @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Okumayı bırak - + Text to Speech Metni Sese Dönüştür - + Translate Çeviri - + Speech To Text Sesten Metne Dönüştür @@ -172,7 +162,7 @@ - + Print button Yazdır @@ -239,19 +229,17 @@ - - - - - + + + + Color Renk - - - + + Grayscale Gri tonlamalı @@ -472,13 +460,13 @@ - + Print to PDF PDF olarak yazdır - + Save as Image Görüntü olarak kaydet @@ -521,33 +509,33 @@ Bunun gibi sayfa numaralarını girin: 1,3,5-7,11-15,18,21 - + Save button Kaydet - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Örneğin, 1,3,5-7,11-15,18,21 - + Save as PDF PDF olarak kaydet - + Save as image Görüntü olarak kaydet - + Images Resimler @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Gizli - - + + Draft Taslak - - + + Sample Örnek @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + + + + + Drag your favorite items into the toolbar + + + + + Drag below items into the toolbar to restore defaults + + + + + Confirm + Onayla + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Kopyala - + Cu&t Ke&s - + Select All Tümünü Seç @@ -674,35 +685,57 @@ Varsayılanları Geri Yükle - + Version - + Features - + Homepage - + Description - + + Acknowledgements + Teşekkürler + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + Continue - + Learn More + + + Credits + + QWidgetTextControl @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Tema - + Light Theme Açık Tema - + Dark Theme Koyu Tema - + System Theme Sistem Teması - + Help Yardım - + Feedback Geri bildirim - + + Custom toolbar + + + + About Hakkında - + Exit Çıkış diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget.ts dtkwidget-5.6.12/src/translations/dtkwidget.ts --- dtkwidget-5.6.8/src/translations/dtkwidget.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Acknowledgements - - - - Version: %1 - Version: %1 - - - + %1 is released under %2 %1 is released under %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Stop reading - + Text to Speech Text to Speech - + Translate Translate - + Speech To Text Speech To Text @@ -172,7 +162,7 @@ - + Print button Print @@ -239,19 +229,17 @@ - - - - - + + + + Color Color - - - + + Grayscale Grayscale @@ -472,13 +460,13 @@ - + Print to PDF Print to PDF - + Save as Image Save as Image @@ -521,33 +509,33 @@ Input page numbers like this: 1,3,5-7,11-15,18,21 - + Save button Save - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 For example, 1,3,5-7,11-15,18,21 - + Save as PDF Save as PDF - + Save as image Save as image - + Images Images @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Confidential - - + + Draft Draft - - + + Sample Sample @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Default toolset + + + + Drag your favorite items into the toolbar + Drag your favorite items into the toolbar + + + + Drag below items into the toolbar to restore defaults + Drag below items into the toolbar to restore defaults + + + + Confirm + Confirm + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Copy - + Cu&t Cu&t - + Select All Select All @@ -674,35 +685,57 @@ Restore Defaults - + Version Version - + Features Features - + Homepage Homepage - + Description Description - + + Acknowledgements + Acknowledgements + + + + + + Sincerely appreciate the open-source software used. + Sincerely appreciate the open-source software used. + + + + open-source software + open-source software + + + Continue Continue - + Learn More Learn More + + + Credits + Credits + QWidgetTextControl @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Theme - + Light Theme Light Theme - + Dark Theme Dark Theme - + System Theme System Theme - + Help Help - + Feedback Feedback - + + Custom toolbar + Custom toolbar + + + About About - + Exit Exit diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ug.ts dtkwidget-5.6.12/src/translations/dtkwidget_ug.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ug.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ug.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - مۇقىملاشتۇرۇش - - - - Version: %1 - نەشرى : %1 - - - + %1 is released under %2 %1 قۇيۇپ بېرىش ئاستىداi %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading ئوقۇشنى توختىتىش - + Text to Speech تېكىستنى ئاۋازغا ئايلاندۇرۇش - + Translate تەرجىمە - + Speech To Text ئاۋازنى تېكىستكە ئايلاندۇرۇش @@ -172,7 +162,7 @@ - + Print button بېسىش @@ -239,19 +229,17 @@ - - - - - + + + + Color رەڭلىك - - - + + Grayscale رەڭسىز @@ -472,13 +460,13 @@ - + Print to PDF PDF شەكلىدە باشقا ساقلاش - + Save as Image رەسىم شەكلىدە ساقلاش @@ -521,33 +509,33 @@ توغرا فورماتتا كىرگۈزۈڭ، مەسىلەن: 1,3,5-7,11-15,18,21 - + Save button ساقلاش - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 كىرگۈزگىلى بولىدىغان فورمات: 1,3,5-7,11-15,18,21 - + Save as PDF PDF شەكلىدە ساقلاش - + Save as image رەسىم شەكلىدە ساقلاش - + Images رەسىم @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential مۇتلەق مەخپىي - - + + Draft كۇپىيە - - + + Sample نۇسخا @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + سۈكۈتتىكى تۈر گۇرۇپپىسى + + + + Drag your favorite items into the toolbar + ياخشى كۆرىدىغان تۈرنى قورال ئىستونىغا كىرگۈزۈش + + + + Drag below items into the toolbar to restore defaults + بۇ گۇرۇپپىنى ياخشى كۆرىدىغان تۈرنى قورال ئىستونىغا كىرگۈزۈپ سۈكۈتتىكى قىلىش + + + + Confirm + مۇقىملاش + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy كۆچۈرۈش (C&) - + Cu&t چاپلاش (T&) - + Select All ھەممە @@ -674,33 +685,55 @@ ئەسلىدىكى تەڭشەك ھالىتىگە قايتۇرۇش - + Version - + نەشرى - + Features - + نەشر ئالاھىدىلىكى - + Homepage - + باش بەت - + Description + تەسۋىر + + + + Acknowledgements + مۇقىملاشتۇرۇش + + + + + + Sincerely appreciate the open-source software used. - - Continue + + open-source software - + + Continue + داۋاملاشتۇرۇش + + + Learn More + تېخىمۇ كۆپ چۈشىنىش + + + + Credits @@ -723,42 +756,47 @@ TitleBarMenu - + Theme ئۇسلۇب - + Light Theme يورۇق ئۇسلۇب - + Dark Theme قارا ئۇسلۇب - + System Theme سېستىما ئۇسلۇبى - + Help ياردەم - + Feedback ئىنكاس يېزىش - + + Custom toolbar + + + + About ھەققىدە - + Exit چېكىنىش diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_uk.ts dtkwidget-5.6.12/src/translations/dtkwidget_uk.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_uk.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_uk.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - Подяки - - - - Version: %1 - Версія: %1 - - - + %1 is released under %2 %1 випущено за умов дотримання %2 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading Припинити читання - + Text to Speech Озвучення тексту - + Translate Перекласти - + Speech To Text Промовити текст @@ -172,7 +162,7 @@ - + Print button Друк @@ -239,19 +229,17 @@ - - - - - + + + + Color Кольоровий - - - + + Grayscale Відтінки сірого @@ -472,13 +460,13 @@ - + Print to PDF Друкувати до PDF - + Save as Image Зберегти як зображення @@ -521,33 +509,33 @@ Введіть номери сторінок, ось так: 1,3,5-7,11-15,18,21 - + Save button Зберегти - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 Приклад: 1,3,5-7,11-15,18,21 - + Save as PDF Зберегти як PDF - + Save as image Зберегти як зображення - + Images Зображення @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential Секретно - - + + Draft Чернетка - - + + Sample Зразок @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + Типовий набір інструментів + + + + Drag your favorite items into the toolbar + Перетягніть ваші улюблені пункти на панель інструментів + + + + Drag below items into the toolbar to restore defaults + Перетягніть наведені нижче пункти на панель інструментів, щоб відновити типові параметри + + + + Confirm + Підтвердити + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy &Копіювати - + Cu&t Ви&різати - + Select All Вибрати усі @@ -674,34 +685,56 @@ Відновити значення за замовчуванням - + Version - + Версія - + Features - + Можливості - + Homepage - + Домашня сторінка - + Description - + Опис - + + Acknowledgements + Подяки + + + + + + Sincerely appreciate the open-source software used. + Щиро вдячні за використане програмне забезпечення з відкритим кодом. + + + + open-source software + програмне забезпечення з відкритим кодом + + + Continue - + Продовжити - + Learn More - + Дізнатися більше + + + + Credits + Подяки @@ -723,42 +756,47 @@ TitleBarMenu - + Theme Тема - + Light Theme Світла тема - + Dark Theme Темна тема - + System Theme Тема системи - + Help Довідка - + Feedback Відгуки - + + Custom toolbar + Нетипова панель інструментів + + + About Про програму - + Exit Вийти diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_ur.ts dtkwidget-5.6.12/src/translations/dtkwidget_ur.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_ur.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_ur.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_vi.ts dtkwidget-5.6.12/src/translations/dtkwidget_vi.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_vi.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_vi.ts 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ - + - - DAboutDialog - - Acknowledgements - - - - - Version: %1 - - - - + %1 is released under %2 - + DCrumbEdit - + Black - + - + White - + - + Dark Gray - + - + Gray - + - + Light Gray - + - + Red - + - + Green - + - + Blue - + - + Cyan - + - + Magenta - + - + Yellow - + - + Dark Red - + - + Dark Green - + - + Dark Blue - + - + Dark Cyan - + - + Dark Magenta - + - + Dark Yellow - + DInputDialog - + Cancel - + - + Confirm - + DKeySequenceEdit - + Enter a new shortcut - + DLineEdit - + Stop reading - + - + Text to Speech - + - + Translate - + - + Speech To Text - + DPrintPreviewDialogPrivate - - + + Advanced - + - + Cancel button - + - - + + Print button - + - + Basic - + - + Printer - + - + Copies - + - + Page range - + - + All - + - + Current page - + - + Select pages - + - + Orientation - + - + Portrait - + - + Landscape - + - + Pages - + - + Color mode - + - - - + + + + + Color - + - - - + + + Grayscale - + - + Margins - + - + Narrow (mm) - + - + Normal (mm) - + - + Moderate (mm) - + - + Customize (mm) - + - + Top - + - + Left - + - + Bottom - + - + Right - + - + Scaling - + - + Actual size - + - + Scale - + - + Paper - + - + Paper size - + - + Print Layout - + - + Duplex - + - + N-up printing - + - + 2 pages/sheet, 1×2 - + - + 4 pages/sheet, 2×2 - + - + 6 pages/sheet, 2×3 - + - + 9 pages/sheet, 3×3 - + - + 16 pages/sheet, 4×4 - + - + Layout direction - + - + Page Order - + - + Collate pages - + - + Print pages in order - + - + Front to back - + - + Back to front - + - + Watermark - + - + Add watermark - + - + Text watermark - + - + Confidential - + - + Draft - + - + Sample - + - + Custom - + - + Input your text - + - + Picture watermark - + - + Layout - + - + Tile - + - + Center - + - + Angle - + - + Size - + - + Transparency - + - + + Print to PDF - + - + + Save as Image - + - + Collapse - + - - + + Flip on short edge - + - - + + + Flip on long edge - + - + Input page numbers please - + - + Maximum page number reached - + - + Input English comma please - + - + Input page numbers like this: 1,3,5-7,11-15,18,21 - + - + Save button - + - + *.pdf - + - + For example, 1,3,5-7,11-15,18,21 - + - + Save as PDF - + - + Save as image - + - + Images - + DPrintPreviewWidget - - + + Confidential - + - - + + Draft - + - - + + Sample - + DSearchEdit - + Search - + DSettingsDialog - + Cancel - + - + Replace - + - + This shortcut conflicts with %1, click on Add to make this shortcut effective immediately - + DShortcutEdit - + Please input a new shortcut - + - + None - + - DSplitScreenWidget + DTextEdit - - Unmaximize - + + Stop reading + - - Maximize - + + Text to Speech + - - Tile window to left of screen - + + Translate + - - Tile window to right of screen - + + Speech To Text + - DTextEdit + DToolbarEditPanel - - Stop reading - + + Default toolset + - - Text to Speech - + + Drag your favorite items into the toolbar + - - Translate - + + Drag below items into the toolbar to restore defaults + - - Speech To Text - + + Confirm + PickColorWidget - + Color - + QLineEdit - + &Copy - + - + Cu&t - + - + Select All - + QObject - + No search result - + - + Restore Defaults - + + + + + Version + + + + + Features + + + + + Homepage + + + + + Description + + + + + Acknowledgements + + + + + + + Sincerely appreciate the open-source software used. + + + + + open-source software + + + + + Continue + + + + + Learn More + + + + + Credits + QWidgetTextControl - + Select All - + ShortcutEdit - + Please enter a new shortcut - + TitleBarMenu - + Theme - + - + Light Theme - + - + Dark Theme - + - + System Theme - + - + Help - + - + Feedback - + + + + + Custom toolbar + - + About - + - + Exit - + - + \ No newline at end of file diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_zh_CN.ts dtkwidget-5.6.12/src/translations/dtkwidget_zh_CN.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_zh_CN.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_zh_CN.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - 鸣谢 - - - - Version: %1 - 版本：%1 - - - + %1 is released under %2 %1遵循%2协议发布 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading 停止朗读 - + Text to Speech 语音朗读 - + Translate 翻译 - + Speech To Text 语音听写 @@ -172,7 +162,7 @@ - + Print button 打 印 @@ -239,19 +229,17 @@ - - - - - + + + + Color 彩色 - - - + + Grayscale 黑白 @@ -472,13 +460,13 @@ - + Print to PDF 存为PDF - + Save as Image 另存为图片 @@ -521,33 +509,33 @@ 请输入正确格式，例：1,3,5-7,11-15,18,21 - + Save button 保 存 - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 可输入格式：1,3,5-7,11-15,18,21 - + Save as PDF 保存为PDF - + Save as image 保存为图片 - + Images 图片文件 @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential 绝密 - - + + Draft 草稿 - - + + Sample 样本 @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + 默认项目组 + + + + Drag your favorite items into the toolbar + 将喜爱的项目拖入工具栏 + + + + Drag below items into the toolbar to restore defaults + 将该组项目拖入工具栏以恢复默认 + + + + Confirm + 确定 + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy 复制(&C) - + Cu&t 剪切(&T) - + Select All 全选 @@ -674,35 +685,57 @@ 恢复默认 - + Version 版本 - + Features 版本特性 - + Homepage 主页 - + Description 描述 - + + Acknowledgements + 致谢 + + + + + + Sincerely appreciate the open-source software used. + 致谢所使用的开源软件 + + + + open-source software + 开源软件 + + + Continue 继续 - + Learn More 了解更多 + + + Credits + 许可 + QWidgetTextControl @@ -723,44 +756,49 @@ TitleBarMenu - + Theme 主题 - + Light Theme 浅色 - + Dark Theme 深色 - + System Theme 跟随系统 - + Help 帮助 - + Feedback 反馈 - + + Custom toolbar + 自定义工具栏 + + + About 关于 - + Exit 退出 - \ No newline at end of file + diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_zh_HK.ts dtkwidget-5.6.12/src/translations/dtkwidget_zh_HK.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_zh_HK.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_zh_HK.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - 鳴謝 - - - - Version: %1 - 版本：%1 - - - + %1 is released under %2 %1遵循%2協議發佈 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading 停止朗讀 - + Text to Speech 語音朗讀 - + Translate 翻譯 - + Speech To Text 語音聽寫 @@ -172,7 +162,7 @@ - + Print button 打 印 @@ -239,19 +229,17 @@ - - - - - + + + + Color 彩色 - - - + + Grayscale 黑白 @@ -472,13 +460,13 @@ - + Print to PDF 存為PDF - + Save as Image 另存為圖片 @@ -521,33 +509,33 @@ 請輸入正確格式，例：1,3,5-7,11-15,18,21 - + Save button 保 存 - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 可輸入格式：1,3,5-7,11-15,18,21 - + Save as PDF 保存為PDF - + Save as image 保存為圖片 - + Images 圖片文件 @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential 絕密 - - + + Draft 草稿 - - + + Sample 樣本 @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + 默認項目組 + + + + Drag your favorite items into the toolbar + 將喜愛的項目拖入工具欄 + + + + Drag below items into the toolbar to restore defaults + 將該組項目拖入工具欄以恢復默認 + + + + Confirm + 確定 + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy 複製(&C) - + Cu&t 剪切(&T) - + Select All 全選 @@ -674,35 +685,57 @@ 恢復默認 - + Version 版本 - + Features 版本特性 - + Homepage 主頁 - + Description 描述 - + + Acknowledgements + 致謝 + + + + + + Sincerely appreciate the open-source software used. + 致謝所使用的開源軟件 + + + + open-source software + 開源軟件 + + + Continue 繼續 - + Learn More 了解更多 + + + Credits + 許可 + QWidgetTextControl @@ -723,44 +756,49 @@ TitleBarMenu - + Theme 主題 - + Light Theme 淺色 - + Dark Theme 深色 - + System Theme 跟隨系統 - + Help 幫助 - + Feedback 反饋 - + + Custom toolbar + 自定義工具欄 + + + About 關於 - + Exit 退出 - \ No newline at end of file + diff -Nru dtkwidget-5.6.8/src/translations/dtkwidget_zh_TW.ts dtkwidget-5.6.12/src/translations/dtkwidget_zh_TW.ts --- dtkwidget-5.6.8/src/translations/dtkwidget_zh_TW.ts 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/translations/dtkwidget_zh_TW.ts 2023-05-15 03:42:41.000000000 +0000 @@ -9,17 +9,7 @@ DAboutDialog - - Acknowledgements - 鳴謝 - - - - Version: %1 - 版本：%1 - - - + %1 is released under %2 %1遵循%2協議發布 @@ -136,22 +126,22 @@ DLineEdit - + Stop reading 停止朗讀 - + Text to Speech 語音朗讀 - + Translate 翻譯 - + Speech To Text 語音聽寫 @@ -172,7 +162,7 @@ - + Print button 打 印 @@ -239,19 +229,17 @@ - - - - - + + + + Color 彩色 - - - + + Grayscale 黑白 @@ -472,13 +460,13 @@ - + Print to PDF 存為PDF - + Save as Image 另存為圖片 @@ -521,33 +509,33 @@ 請輸入正確格式，例：1,3,5-7,11-15,18,21 - + Save button 儲 存 - + *.pdf *.pdf - + For example, 1,3,5-7,11-15,18,21 可輸入格式：1,3,5-7,11-15,18,21 - + Save as PDF 儲存為PDF - + Save as image 儲存為圖片 - + Images 圖片文件 @@ -555,20 +543,20 @@ DPrintPreviewWidget - - + + Confidential 機密 - - + + Draft 草稿 - - + + Sample 樣本 @@ -636,6 +624,29 @@ + DToolbarEditPanel + + + Default toolset + 預設項目組 + + + + Drag your favorite items into the toolbar + 將喜愛的項目拖入工具列 + + + + Drag below items into the toolbar to restore defaults + 將該組項目拖入工具列以復原預設 + + + + Confirm + 確定 + + + PickColorWidget @@ -646,17 +657,17 @@ QLineEdit - + &Copy 複製(&C) - + Cu&t 剪下(&T) - + Select All 全選 @@ -674,35 +685,57 @@ 復原預設 - + Version 版本 - + Features 版本特性 - + Homepage 首頁 - + Description 描述 - + + Acknowledgements + 致謝 + + + + + + Sincerely appreciate the open-source software used. + 致謝所使用的開源軟體 + + + + open-source software + 開源軟體 + + + Continue 繼續 - + Learn More 了解更多 + + + Credits + 許可 + QWidgetTextControl @@ -723,44 +756,49 @@ TitleBarMenu - + Theme 主題 - + Light Theme 淺色 - + Dark Theme 深色 - + System Theme 跟隨系統 - + Help 幫助 - + Feedback 回饋 - + + Custom toolbar + 自訂工具列 + + + About 關於 - + Exit 退出 - \ No newline at end of file + diff -Nru dtkwidget-5.6.8/src/util/dapplicationsettings.cpp dtkwidget-5.6.12/src/util/dapplicationsettings.cpp --- dtkwidget-5.6.8/src/util/dapplicationsettings.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/util/dapplicationsettings.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -5,31 +5,17 @@ #include "dapplicationsettings.h" -#include #include -#ifdef Q_OS_LINUX -#include -#endif -#include - -#define PALETTE_TYPE_KEY "paletteType" - -DGUI_USE_NAMESPACE DWIDGET_BEGIN_NAMESPACE class DApplicationSettingsPrivate : public DCORE_NAMESPACE::DObjectPrivate { public: DApplicationSettingsPrivate(DApplicationSettings *qq); - void init(); void _q_onChanged(const QString &key); void _q_onPaletteTypeChanged(); -#ifdef Q_OS_LINUX - QGSettings *genericSettings; -#endif - D_DECLARE_PUBLIC(DApplicationSettings) }; @@ -39,71 +25,20 @@ } -void DApplicationSettingsPrivate::init() -{ -#ifdef Q_OS_LINUX - D_Q(DApplicationSettings); - - const QString &on = qApp->organizationName(); - const QString &name = qApp->applicationName(); - - if (on.isEmpty() || name.isEmpty()) { - qFatal("%s\n", "Must set organizationName & applicationName"); - std::abort(); - } - - if (!QGSettings::isSchemaInstalled("com.deepin.dtk")) - return; - - genericSettings = new QGSettings("com.deepin.dtk", QString("/dtk/%2/%3/").arg(on, name).toLocal8Bit(), q); - // 初始化设置 - _q_onChanged(PALETTE_TYPE_KEY); - - q->connect(genericSettings, SIGNAL(changed(const QString &)), q, SLOT(_q_onChanged(const QString &))); - q->connect(DGuiApplicationHelper::instance(), SIGNAL(paletteTypeChanged(ColorType)), - q, SLOT(_q_onPaletteTypeChanged())); -#endif -} - -void DApplicationSettingsPrivate::_q_onChanged(const QString &key) +void DApplicationSettingsPrivate::_q_onChanged(const QString &) { -#ifdef Q_OS_LINUX - if (key != PALETTE_TYPE_KEY) - return; - - const QString &palette_type = genericSettings->get(PALETTE_TYPE_KEY).toString(); - - if (palette_type == "LightType") { - DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::LightType); - } else if (palette_type == "DarkType") { - DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::DarkType); - } else if (palette_type == "UnknownType") { - DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::UnknownType); - } -#endif } void DApplicationSettingsPrivate::_q_onPaletteTypeChanged() { -#ifdef Q_OS_LINUX - switch (DGuiApplicationHelper::instance()->paletteType()) { - case DGuiApplicationHelper::LightType: - genericSettings->set(PALETTE_TYPE_KEY, "LightType"); - break; - case DGuiApplicationHelper::DarkType: - genericSettings->set(PALETTE_TYPE_KEY, "DarkType"); - break; - default: - genericSettings->set(PALETTE_TYPE_KEY, "UnknownType"); - break; - } -#endif } /*! \class Dtk::Widget::DApplicationSettings \inmodule dtkwidget + \deprecated The feature has been moved to DGuiApplicationHelper, + We can disable it by setting DGuiApplicationHelper::DontSaveApplicationTheme enum with setAttribute. \brief DApplicationSettings保存应用程序的设置. DApplicationSettings存储程序的通用性设置的信息，如当前选择的主题 @@ -118,7 +53,6 @@ : QObject(parent) , DObject(*new DApplicationSettingsPrivate(this)) { - d_func()->init(); } DWIDGET_END_NAMESPACE diff -Nru dtkwidget-5.6.8/src/util/ddesktopservices_linux.cpp dtkwidget-5.6.12/src/util/ddesktopservices_linux.cpp --- dtkwidget-5.6.8/src/util/ddesktopservices_linux.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/util/ddesktopservices_linux.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -212,11 +212,16 @@ return false; } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) const auto& infc = QDBusConnection::sessionBus().interface(); - bool isNewRegistered = infc->isServiceRegistered(QLatin1String("org.deepin.dde.SoundEffect1")); - const QLatin1String service(isNewRegistered ? "org.deepin.dde.SoundEffect1" :"com.deepin.daemon.SoundEffect"); - const QLatin1String path(isNewRegistered ? "/org/deepin/dde/SoundEffect1" : "/com/deepin/daemon/SoundEffect"); - const QLatin1String interface(isNewRegistered ? "org.deepin.dde.SoundEffect1" :"com.deepin.daemon.SoundEffect"); + QStringList activatableServiceNames = infc->activatableServiceNames(); + bool isNewInterface = activatableServiceNames.contains(QLatin1String("org.deepin.dde.SoundEffect1")); +#else + bool isNewInterface = false; // Qt 5.14 以下就直接用旧的接口 +#endif + const QLatin1String service(isNewInterface ? "org.deepin.dde.SoundEffect1" :"com.deepin.daemon.SoundEffect"); + const QLatin1String path(isNewInterface ? "/org/deepin/dde/SoundEffect1" : "/com/deepin/daemon/SoundEffect"); + const QLatin1String interface(isNewInterface ? "org.deepin.dde.SoundEffect1" :"com.deepin.daemon.SoundEffect"); // 使用后端 dbus 接口播放系统音频，音频存放目录： /usr/share/sounds/deepin/stereo/ return QDBusInterface(service, path, interface).call("PlaySound", name).type() != QDBusMessage::ErrorMessage; diff -Nru dtkwidget-5.6.8/src/util/dwidgetutil.cpp dtkwidget-5.6.12/src/util/dwidgetutil.cpp --- dtkwidget-5.6.8/src/util/dwidgetutil.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/util/dwidgetutil.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -92,4 +92,41 @@ return getCircleIcon(pixmap, diameter); } +// 取自Qt源码qpixmapfilter.cpp 945行 +void grayScale(const QImage &image, QImage &dest, const QRect &rect) +{ + QRect destRect = rect; + QRect srcRect = rect; + if (rect.isNull()) { + srcRect = dest.rect(); + destRect = dest.rect(); + } + if (&image != &dest) { + destRect.moveTo(QPoint(0, 0)); + } + + const unsigned int *data = reinterpret_cast(image.bits()); + unsigned int *outData = reinterpret_cast(dest.bits()); + + if (dest.size() == image.size() && image.rect() == srcRect) { + // a bit faster loop for grayscaling everything + int pixels = dest.width() * dest.height(); + for (int i = 0; i < pixels; ++i) { + int val = qGray(data[i]); + outData[i] = qRgba(val, val, val, qAlpha(data[i])); + } + } else { + int yd = destRect.top(); + for (int y = srcRect.top(); y <= srcRect.bottom() && y < image.height(); y++) { + data = reinterpret_cast(image.scanLine(y)); + outData = reinterpret_cast(dest.scanLine(yd++)); + int xd = destRect.left(); + for (int x = srcRect.left(); x <= srcRect.right() && x < image.width(); x++) { + int val = qGray(data[x]); + outData[xd++] = qRgba(val, val, val, qAlpha(data[x])); + } + } + } +} + DWIDGET_END_NAMESPACE Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/src/widgets/assets/icons/bloom/play_next.dci and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/src/widgets/assets/icons/bloom/play_next.dci differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/src/widgets/assets/icons/bloom/play_pause.dci and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/src/widgets/assets/icons/bloom/play_pause.dci differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/src/widgets/assets/icons/bloom/play_previous.dci and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/src/widgets/assets/icons/bloom/play_previous.dci differ Binary files /tmp/tmpvqxe3tr2/UxdPnQEhlN/dtkwidget-5.6.8/src/widgets/assets/icons/bloom/play_start.dci and /tmp/tmpvqxe3tr2/PC8AGsYTCU/dtkwidget-5.6.12/src/widgets/assets/icons/bloom/play_start.dci differ diff -Nru dtkwidget-5.6.8/src/widgets/assets/icons/dtk-icon-theme.qrc dtkwidget-5.6.12/src/widgets/assets/icons/dtk-icon-theme.qrc --- dtkwidget-5.6.8/src/widgets/assets/icons/dtk-icon-theme.qrc 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/assets/icons/dtk-icon-theme.qrc 2023-05-15 03:42:41.000000000 +0000 @@ -63,8 +63,10 @@ bloom/window_menu.dci - - - bloom/window_sidebar.dci + bloom/window_sidebar.dci + bloom/play_start.dci + bloom/play_pause.dci + bloom/play_previous.dci + bloom/play_next.dci diff -Nru dtkwidget-5.6.8/src/widgets/assets/images/play_next.svg dtkwidget-5.6.12/src/widgets/assets/images/play_next.svg --- dtkwidget-5.6.8/src/widgets/assets/images/play_next.svg 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/assets/images/play_next.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - - - diff -Nru dtkwidget-5.6.8/src/widgets/assets/images/play_pause.svg dtkwidget-5.6.12/src/widgets/assets/images/play_pause.svg --- dtkwidget-5.6.8/src/widgets/assets/images/play_pause.svg 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/assets/images/play_pause.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - - - diff -Nru dtkwidget-5.6.8/src/widgets/assets/images/play_previous.svg dtkwidget-5.6.12/src/widgets/assets/images/play_previous.svg --- dtkwidget-5.6.8/src/widgets/assets/images/play_previous.svg 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/assets/images/play_previous.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - - - diff -Nru dtkwidget-5.6.8/src/widgets/assets/images/play_start.svg dtkwidget-5.6.12/src/widgets/assets/images/play_start.svg --- dtkwidget-5.6.8/src/widgets/assets/images/play_start.svg 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/assets/images/play_start.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - - - diff -Nru dtkwidget-5.6.8/src/widgets/daboutdialog.cpp dtkwidget-5.6.12/src/widgets/daboutdialog.cpp --- dtkwidget-5.6.8/src/widgets/daboutdialog.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/daboutdialog.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -62,7 +62,7 @@ { D_Q(DAboutDialog); - q->setMinimumWidth(360); + q->setMaximumWidth(540); // overwrite default info if distribution config file existed. loadDistributionInfo(); @@ -88,13 +88,8 @@ websiteLabel->setOpenExternalLinks(false); updateWebsiteLabel(); - acknowledgementLabel = new QLabel(); - acknowledgementLabel->setObjectName("AcknowledgementLabel"); - acknowledgementLabel->setContextMenuPolicy(Qt::NoContextMenu); - acknowledgementLabel->setOpenExternalLinks(false); - updateAcknowledgementLabel(); - descriptionLabel = new QLabel(); + descriptionLabel->setFixedWidth(280); descriptionLabel->setObjectName("DescriptionLabel"); descriptionLabel->setAlignment(Qt::AlignLeft); descriptionLabel->setWordWrap(true); @@ -102,6 +97,7 @@ fontManager->bind(descriptionLabel, DFontSizeManager::T8, QFont::DemiBold); licenseLabel = new QLabel(); + licenseLabel->setFixedWidth(180); licenseLabel->setObjectName("LicenseLabel"); licenseLabel->setAlignment(Qt::AlignHCenter); licenseLabel->setWordWrap(true); @@ -127,27 +123,34 @@ fontManager->bind(homePageTipLabel, DFontSizeManager::T10, QFont::Normal); QLabel *descriptionTipLabel = new QLabel(QObject::tr("Description")); fontManager->bind(descriptionTipLabel, DFontSizeManager::T10, QFont::Normal); + acknowledgementTipLabel = new QLabel(QObject::tr("Acknowledgements")); + fontManager->bind(acknowledgementTipLabel, DFontSizeManager::T10, QFont::Normal); + acknowledgementLabel = new QLabel(QObject::tr("Sincerely appreciate the open-source software used.")); + acknowledgementLabel->setFixedWidth(280); + acknowledgementLabel->setWordWrap(true); + acknowledgementLabel->setContextMenuPolicy(Qt::NoContextMenu); + acknowledgementLabel->setOpenExternalLinks(false); + fontManager->bind(acknowledgementLabel, DFontSizeManager::T8, QFont::DemiBold); q->connect(websiteLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onLinkActivated(QString))); q->connect(featureLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onFeatureActivated(QString))); - q->connect(acknowledgementLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onLinkActivated(QString))); q->connect(descriptionLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onLinkActivated(QString))); q->connect(licenseLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onLinkActivated(QString))); + q->connect(acknowledgementLabel, SIGNAL(linkActivated(QString)), q, SLOT(_q_onLicenseActivated(QString))); QVBoxLayout *leftVLayout = new QVBoxLayout; - leftVLayout->setContentsMargins(30, 3, 0, 20); + leftVLayout->setContentsMargins(10, 3, 0, 10); leftVLayout->setSpacing(0); leftVLayout->addWidget(logoLabel, 0, Qt::AlignCenter); leftVLayout->addSpacing(8); leftVLayout->addWidget(productNameLabel, 0, Qt::AlignCenter); - leftVLayout->addSpacing(31); + leftVLayout->addStretch(0); leftVLayout->addWidget(companyLogoLabel, 0, Qt::AlignCenter); leftVLayout->addSpacing(3); leftVLayout->addWidget(licenseLabel, 0, Qt::AlignHCenter); - leftVLayout->addStretch(0); QVBoxLayout *rightVLayout = new QVBoxLayout; - rightVLayout->setContentsMargins(0, 3, 30, 20); + rightVLayout->setContentsMargins(0, 3, 20, 10); rightVLayout->setSpacing(0); rightVLayout->addWidget(versionTipLabel, 0, Qt::AlignLeft); rightVLayout->addWidget(versionLabel, 0, Qt::AlignLeft); @@ -158,12 +161,16 @@ rightVLayout->addSpacing(10); rightVLayout->addWidget(descriptionTipLabel, 0, Qt::AlignLeft); rightVLayout->addWidget(descriptionLabel, 0, Qt::AlignLeft); + rightVLayout->addSpacing(10); + rightVLayout->addWidget(acknowledgementTipLabel, 0, Qt::AlignLeft); + rightVLayout->addWidget(acknowledgementLabel, 0, Qt::AlignLeft); rightVLayout->addStretch(0); QHBoxLayout *mainLayout = new QHBoxLayout; mainLayout->setSpacing(0); mainLayout->setMargin(0); mainLayout->addLayout(leftVLayout); + mainLayout->addSpacing(29); mainLayout->addLayout(rightVLayout); QScrollArea *mainScrollArea = new QScrollArea; @@ -200,12 +207,6 @@ websiteLabel->setText(websiteText); } -void DAboutDialogPrivate::updateAcknowledgementLabel() -{ - QString acknowledgementText = QString(websiteLinkTemplate).arg(acknowledgementLink).arg(QApplication::translate("DAboutDialog", "Acknowledgements")); - acknowledgementLabel->setText(acknowledgementText); -} - void DAboutDialogPrivate::_q_onLinkActivated(const QString &link) { DGUI_NAMESPACE::DGuiApplicationHelper::openUrl(link); @@ -222,6 +223,12 @@ Q_EMIT q->featureActivated(); } +void DAboutDialogPrivate::_q_onLicenseActivated(const QString &) +{ + D_Q(DAboutDialog); + Q_EMIT q->licenseActivated(); +} + QPixmap DAboutDialogPrivate::loadPixmap(const QString &file) { D_Q(DAboutDialog); @@ -365,9 +372,7 @@ */ QString DAboutDialog::acknowledgementLink() const { - D_DC(DAboutDialog); - - return d->acknowledgementLink; + return QString(); } /*! @@ -382,6 +387,17 @@ return d->licenseLabel->text(); } +void DAboutDialog::setLicenseEnabled(bool enabled) +{ + D_D(DAboutDialog); + QString ack = QObject::tr("Sincerely appreciate the open-source software used."); + if (enabled) { + QString tmp = QObject::tr("open-source software"); + ack = ack.replace(tmp, d->websiteLinkTemplate.arg(d->websiteLink).arg(tmp)); + } + d->acknowledgementLabel->setText(ack); +} + /*! @~english @brief Set the title of the dialog box window. @@ -485,23 +501,19 @@ @~english @brief This function is used to set the specified ACKNOWLEDGEMENTLINK Link */ -void DAboutDialog::setAcknowledgementLink(const QString &acknowledgementLink) +void DAboutDialog::setAcknowledgementLink(const QString &) { - D_D(DAboutDialog); - - d->acknowledgementLink = acknowledgementLink; - d->updateAcknowledgementLabel(); } /*! @~english @brief This function is used to set the specified Visible settings to set the gratitude link to display */ -void DAboutDialog::setAcknowledgementVisible(bool visible) +void DAboutDialog::setAcknowledgementVisible(bool isVisible) { - Q_UNUSED(visible) D_D(DAboutDialog); -// d->acknowledgementLabel->setVisible(visible); + d->acknowledgementTipLabel->setVisible(isVisible); + d->acknowledgementLabel->setVisible(isVisible); } /*! diff -Nru dtkwidget-5.6.8/src/widgets/dabstractdialog.cpp dtkwidget-5.6.12/src/widgets/dabstractdialog.cpp --- dtkwidget-5.6.8/src/widgets/dabstractdialog.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dabstractdialog.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -58,10 +58,9 @@ bgBlurWidget->setMaskColor(DBlurEffectWidget::AutoColor); bgBlurWidget->setMaskAlpha(204); // 80% - if (!DWindowManagerHelper::instance()->hasBlurWindow() - && DGuiApplicationHelper::instance()->isTabletEnvironment()) { + // blur if possible(wm support blur window)... + if (!DWindowManagerHelper::instance()->hasBlurWindow()) blurIfPossible = false; - } bgBlurWidget->setBlurEnabled(blurIfPossible); q->setAttribute(Qt::WA_TranslucentBackground, blurIfPossible); diff -Nru dtkwidget-5.6.8/src/widgets/dapplication.cpp dtkwidget-5.6.12/src/widgets/dapplication.cpp --- dtkwidget-5.6.8/src/widgets/dapplication.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dapplication.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -48,6 +48,7 @@ #include #include #include +#include #ifdef Q_OS_LINUX #include "private/startupnotifications/startupnotificationmonitor.h" @@ -1321,6 +1322,42 @@ return d->acclimatizeVirtualKeyboardWindows.contains(window); } +QString DApplication::applicationCreditsFile() const +{ + D_DC(DApplication); + return d->applicationCreditsFile; +} + +void DApplication::setApplicationCreditsFile(const QString &file) +{ + D_D(DApplication); + d->applicationCreditsFile = file; +} + +QByteArray DApplication::applicationCreditsContent() const +{ + D_DC(DApplication); + return d->applicationCreditsContent; +} + +void DApplication::setApplicationCreditsContent(const QByteArray &content) +{ + D_D(DApplication); + d->applicationCreditsContent = content; +} + +QString DApplication::licensePath() const +{ + D_DC(DApplication); + return d->licensePath; +} + +void DApplication::setLicensePath(const QString &path) +{ + D_D(DApplication); + d->licensePath = path; +} + /*! \brief 设置 app 的处理程序. @@ -1383,10 +1420,22 @@ d->appHandler->handleAboutAction(); return; } - + if (d->licenseDialog == nullptr) { + d->licenseDialog = new DLicenseDialog(); + d->licenseDialog->setFile(d->applicationCreditsFile); + d->licenseDialog->setContent(d->applicationCreditsContent); + d->licenseDialog->setLicenseSearchPath(d->licensePath); + d->licenseDialog->load(); + connect(this, &DApplication::aboutToQuit, this, [this]{ + D_D(DApplication); + d->licenseDialog->deleteLater(); + d->licenseDialog = nullptr; + }); + } if (d->aboutDialog) { d->aboutDialog->activateWindow(); d->aboutDialog->raise(); + d->aboutDialog->setLicenseEnabled(d->licenseDialog->isValid()); if (DGuiApplicationHelper::isTabletEnvironment()) { d->aboutDialog->exec(); } else { @@ -1398,7 +1447,7 @@ DAboutDialog *aboutDialog = new DAboutDialog(activeWindow()); aboutDialog->setProductName(productName()); aboutDialog->setProductIcon(productIcon()); - aboutDialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion())); + aboutDialog->setVersion(applicationVersion()); aboutDialog->setDescription(applicationDescription()); if (!applicationLicense().isEmpty()) { @@ -1414,12 +1463,17 @@ // 不能使用aboutToClose信号 应用能够打开多个的情况下 打开关于后直接关闭程序 // 此时aboutToColose信号不会触发 再次打开程序并打开关于会出现访问野指针 程序崩溃的情况 d->aboutDialog = aboutDialog; + d->aboutDialog->setLicenseEnabled(d->licenseDialog->isValid()); connect(d->aboutDialog, &DAboutDialog::destroyed, this, [=] { d->aboutDialog = nullptr; }); connect(d->aboutDialog, &DAboutDialog::featureActivated, this, [this] { featureDisplayDialog()->show(); }); + connect(d->aboutDialog, &DAboutDialog::licenseActivated, this, [d] { + d->licenseDialog->activateWindow(); + d->licenseDialog->show(); + }); if (DGuiApplicationHelper::isTabletEnvironment()) { aboutDialog->exec(); } else { diff -Nru dtkwidget-5.6.8/src/widgets/darrowrectangle.cpp dtkwidget-5.6.12/src/widgets/darrowrectangle.cpp --- dtkwidget-5.6.8/src/widgets/darrowrectangle.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/darrowrectangle.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -256,6 +256,13 @@ const QRect DArrowRectanglePrivate::currentScreenRect(const int x, const int y) { + if (floatMode == DArrowRectangle::FloatWidget) { + D_Q(DArrowRectangle); + if (q->parentWidget()) { + return q->parentWidget()->rect(); + } + } + for (QScreen *screen : qApp->screens()) if (screen->geometry().contains(x, y)) { return screen->geometry(); diff -Nru dtkwidget-5.6.8/src/widgets/dboxwidget.cpp dtkwidget-5.6.12/src/widgets/dboxwidget.cpp --- dtkwidget-5.6.8/src/widgets/dboxwidget.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dboxwidget.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -33,14 +33,11 @@ } /*! - \class Dtk::Widget::DBoxWidget +@~english + @class Dtk::Widget::DBoxWidget \inmodule dtkwidget - \brief The DBoxWidget class provides widget born with QBoxLayout set. - \brief DBoxWidget提供了一个自适应子控件大小的Widget. - - 在Qt编程中，使用QBoxLayout设置控件是很常见的，DBoxWidget提供了方便的封装，会根据需要的大小自动 - 设置DBoxWidget的宽高。 + @brief The DBoxWidget class provides widget born with QBoxLayout set. Since an widget with QBoxLayout set is very common use case in Qt programming, yet very tedious, DBoxWidget is built to ease that pain. @@ -48,15 +45,13 @@ Also, DBoxWidget will calculate the size it needs automatically, so you don't need to set width for DHBoxWidget or height for DVBoxLayout. - \sa DHBoxWidget and DVBoxWidget + @sa DHBoxWidget and DVBoxWidget */ /*! - \brief DBoxWidget的构造函数. - \brief DBoxWidget::DBoxWidget constructs an instance of DBoxWidget. +@~english + @brief DBoxWidget::DBoxWidget constructs an instance of DBoxWidget. - \a direction 是设置内部QBoxLayout使用的方向 - \a parent 传递给QFrame的构造函数 \a direction is the direction used by the internal QBoxLayout. \a parent is passed to QFrame constructor. */ @@ -69,12 +64,12 @@ } /*! - \property DBoxWidget::direction +@~english + @property DBoxWidget::direction - 这个属性返回当前QBoxLayout使用的方向 - \brief This property holds the direction of the internal QBoxLayout. + @brief This property holds the direction of the internal QBoxLayout. - \return QBoxLayout::Direction 当前的方向 + @return QBoxLayout::Direction Current direction */ QBoxLayout::Direction DBoxWidget::direction() const { @@ -84,13 +79,13 @@ } /*! - \brief 这个属性会返回当前使用的布局对象 - \brief This property holds the internal layout object. +@~english + @brief This property holds the internal layout object. This property can be used to get the internal layout, so you can set some extra properties on the layout to match the custom needs. - \return QBoxLayout* + @return QBoxLayout* */ QBoxLayout *DBoxWidget::layout() const { @@ -100,10 +95,9 @@ } /*! - \brief 调用QBoxLayout的addWidget方法将QWidget添加到布局中 - \brief DBoxWidget::addWidget adds widget to the internal layout. +@~english + @brief DBoxWidget::addWidget adds widget to the internal layout. - \a widget 要添加的QWidget对象 \a widget is the widget to be added. */ void DBoxWidget::addWidget(QWidget *widget) @@ -112,7 +106,8 @@ } /*! - \brief 设置QBoxLayout当前的方向 +@~english + @brief Sets the current direction of QBoxLayout \a direction */ @@ -128,9 +123,10 @@ } /*! - \brief 当方向是QBoxLayout::TopToBottom或者QBoxLayout::BottomToTop时， - 固定高度将使用传入的高度，并设置最小宽度为传入的宽度。 - 否则将使用传入的宽度当做固定宽度，高度为最小高度。 +@~english + @brief When the direction is QBoxLayout::TopToBottom or QBoxLayout::BottomToTop, + the fixed height will use the passed height and set the minimum width to the passed width. + Otherwise, the passed width is used as the fixed width and the height is the minimum height. \a size */ void DBoxWidget::updateSize(const QSize &size) @@ -172,9 +168,10 @@ } /*! +@~english \reimp - \brief DBoxWidget::sizeHint reimplemented from QWidget::sizeHint(). - \return the recommended size of this widget. + @brief DBoxWidget::sizeHint reimplemented from QWidget::sizeHint(). + @return the recommended size of this widget. */ QSize DBoxWidget::sizeHint() const { @@ -184,17 +181,17 @@ } /*! - \class Dtk::Widget::DHBoxWidget +@~english + @class Dtk::Widget::DHBoxWidget \inmodule dtkwidget - \brief The DHBoxWidget class is DBoxWidget with DBoxWidget::direction set to + @brief The DHBoxWidget class is DBoxWidget with DBoxWidget::direction set to QBoxLayout::LeftToRight. - \brief 是设置成水平方向的DBoxWidget */ /*! - \brief DHBoxWidget的构造函数 - \brief DHBoxWidget::DHBoxWidget constructs an instance of DHBoxWidget. +@~english + @brief DHBoxWidget::DHBoxWidget constructs an instance of DHBoxWidget. \a parent is passed to DBoxWidget constructor. */ @@ -205,17 +202,17 @@ } /*! - \class Dtk::Widget::DVBoxWidget +@~english + @class Dtk::Widget::DVBoxWidget \inmodule dtkwidget - \brief The DVBoxWidget class is DBoxWidget with DBoxWidget::direction set to + @brief The DVBoxWidget class is DBoxWidget with DBoxWidget::direction set to QBoxLayout::TopToBottom. - \brief 是设置成垂直方向的DBoxWidget */ /*! - \brief DVBoxWidget的构造函数 - \brief DVBoxWidget::DVBoxWidget constructs an instance of DVBoxWidget. +@~english + @brief DVBoxWidget::DVBoxWidget constructs an instance of DVBoxWidget. \a parent is passed to DBoxWidget constructor. */ diff -Nru dtkwidget-5.6.8/src/widgets/dfilechooseredit.cpp dtkwidget-5.6.12/src/widgets/dfilechooseredit.cpp --- dtkwidget-5.6.8/src/widgets/dfilechooseredit.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dfilechooseredit.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -15,51 +15,57 @@ DWIDGET_BEGIN_NAMESPACE /*! - \class Dtk::Widget::DFileChooserEdit +@~english + @class Dtk::Widget::DFileChooserEdit \inmodule dtkwidget - \brief 带有选择文件按钮的文本编辑框. + @brief A text editing box with a button to select a file. - 本控件基本与 DLineEdit 相同，但同时在编辑框的右侧提供了一个按钮，点击按钮将会出现一个选择文件的对话框，当在对话框中选择完毕点击确定之后，选择的结果将会出现在文本编辑框中。 - 另外还提供了设置对话框出现的位置，选择文件的类型，或设置文件名过滤器的方法以定制控件的功能。 + This control is basically the same as DLineEdit, but at the same time provides a button on the right side of the edit box, click the button will appear a select file dialog box, when the selection is completed in the dialog box click OK, the selection result will appear in the text edit box. + There are also ways to customize the functionality of the control by setting where the dialog box appears, selecting the type of file, or setting a filename filter. - \sa DLineEdit QFileDialog + @sa DLineEdit QFileDialog */ /*! - \enum Dtk::Widget::DFileChooserEdit::DialogDisplayPosition - \brief 这个枚举保存了对话框可以出现的位置 +@~english + @enum Dtk::Widget::DFileChooserEdit::DialogDisplayPosition + @brief This enum holds the locations where the dialog box can appear \value FollowParentWindow - 跟随父窗口 + Following the parent window \value CurrentMonitorCenter - 鼠标所在的显示器的中心 + The center of the display where the mouse is located */ // =========================Signals begin========================= /*! - \fn void DFileChooserEdit::fileChoosed(const QString &fileName) - \brief 这个信号在文件被选择且点击了对话框的确认按钮之后被调用 - \a fileName 被选中的文件名，包含其绝对路径 +@~english + @fn void DFileChooserEdit::fileChoosed(const QString &fileName) + @brief This signal is called after the file is selected and the Confirm button of the dialog box is clicked + \a fileName The name of the selected file, including its absolute path. */ /*! - \fn void DFileChooserEdit::dialogOpened() - \brief 这个信号在对话框即将显示时被调用 - \note 注意，此时对话框并没有显示 +@~english + @fn void DFileChooserEdit::dialogOpened() + @brief This signal is called when the dialog box is about to be displayed + @note Notice that the dialog box is not displayed */ /*! - \fn void DFileChooserEdit::dialogClosed(int code) - \brief 这信号在对话框关闭时被调用，无论对话框是被点击了确认还是取消，都会调用本信号 - \a code 对话框的返回码，返回码表示了对话框是因为点击了取消还是确认而关闭的 - \sa QDialog::DialogCode +@~english + @fn void DFileChooserEdit::dialogClosed(int code) + @brief This signal is called when the dialog box is closed, whether the dialog box is clicked to confirm or cancel, this signal is called + \a code The return code of the dialog box, which indicates whether the dialog box was closed by clicking Cancel or Confirm + @sa QDialog::DialogCode */ // =========================Signals end========================= /*! - \brief 获取 DFileChooserEdit 的一个实例 - \a parent 作为实例的父控件 +@~english + @brief Gets an instance of DFileChooserEdit + \a parent As the parent control of the instance */ DFileChooserEdit::DFileChooserEdit(QWidget *parent) : DLineEdit(*new DFileChooserEditPrivate(this), parent) @@ -70,13 +76,14 @@ } /*! - \brief 这个属性保存文件选择对话框将会出现的位置 +@~english + @brief This property holds the location where the file selection dialog box will appear - 可选值为枚举 DFileChooserEdit::DialogDisplayPosition 中的值 + Optional values for the enumeration DFileChooserEdit: : DialogDisplayPosition of values Getter: DFileChooserEdit::dialogDisplayPosition , Setter: DFileChooserEdit::setDialogDisplayPosition - \sa DFileChooserEdit::DialogDisplayPosition + @sa DFileChooserEdit::DialogDisplayPosition */ DFileChooserEdit::DialogDisplayPosition DFileChooserEdit::dialogDisplayPosition() const { @@ -86,11 +93,12 @@ } /*! - \brief 设置对话框显示位置. +@~english + @brief Set the position of the dialog box display. - \a dialogDisplayPosition 对话框的显示位置. + \a dialogDisplayPosition The position of the dialog box to display. - \sa DFileChooserEdit::dialogDisplayPosition + @sa DFileChooserEdit::dialogDisplayPosition */ void DFileChooserEdit::setDialogDisplayPosition(DFileChooserEdit::DialogDisplayPosition dialogDisplayPosition) { @@ -127,9 +135,10 @@ } /*! - \brief 设置文件选择模式 - \a mode 要使用的模式 - \sa DFileChooserEdit::fileMode +@~english + @brief Set the file selection mode + \a mode Pattern to use + @sa DFileChooserEdit::fileMode */ void DFileChooserEdit::setFileMode(QFileDialog::FileMode mode) { @@ -142,12 +151,15 @@ } /*! - \brief 获取对话框选择文件模式 +@~english + @brief Get dialog box to select file mode - 有多种类型的选择模式，也就是说对话框可以有多种显示或行为，例如选择单个文件，选择多个文件亦或选择一个目录等，详细可以查阅：QFileDialog::FileMode - \return 返回但前的选择模式 - \sa QFileDialog::FileMode - \note 目前本控件只支持选择单个文件，即便调用 DFileChooserEdit::setFileMode 设置了选择模式，当有多个文件在对话框中被选中时，取其第一个作为选择结果 + There are multiple selection modes, which means that the dialog box can have multiple displays or behaviors, + such as selecting a single file, selecting multiple files, or selecting a directory, etc. See QFileDialog::FileMode for details + @return Returns the current selection mode + @sa QFileDialog::FileMode + @note Currently only support this control to choose a single file, even call DFileChooserEdit: : setFileMode set selection mode, + when there are multiple files in the dialog box is selected, take its first as a choice */ QFileDialog::FileMode DFileChooserEdit::fileMode() const { @@ -160,9 +172,10 @@ } /*! - \brief 设置文件名过滤器 - \a filters 要使用的文件名过滤器组成的列表 - \sa DFileChooserEdit::nameFilters +@~english + @brief Set the filename filter + \a filters A list of filename filters to use + @sa DFileChooserEdit::nameFilters */ void DFileChooserEdit::setNameFilters(const QStringList &filters) { @@ -175,14 +188,17 @@ } /*! - \brief 文件名过滤器 +@~english + @brief Filename filter - 默认此选项为空，即所有文件都可以被选择，当文件名过滤器被设置后，则只有文件名与过滤器匹配的文件可以被选择， - 例如：设置了"*.txt"，则表示只有后缀名为"txt"的文件可以被选择， - 或者同时设置了多个过滤器：QStringList() << "text file (*.txt)" << "picture file (*.png); - 则会在文件选择对话框的下方出现设置的多个过滤选项，只是需要注意，一次只能使用一个过滤选项，也就是说不能同时即允许选择txt文件又允许选择png文件 - \return 返回当前的文件名过滤器组成的列表 - \sa DFileChooserEdit::setNameFilters + By default, all files are selected.When the filename filter is set, + only files with a filename matching the filename filter can be selected. + For example, if "*.txt" is set, only files with the suffix "txt" can be selected, + or if multiple filters are set: QStringList() << "text file (*.txt)" << "picture file (*.png); + You will see a list of options at the bottom of the file selection dialog, + but note that only one option can be used at a time, which means you can't select both txt and png files at the same time + @return Returns a list of the current filename filters + @sa DFileChooserEdit::setNameFilters */ QStringList DFileChooserEdit::nameFilters() const { @@ -228,7 +244,13 @@ DSuggestButton *btn = new DSuggestButton(nullptr); btn->setAccessibleName("DFileChooserEditSuggestButton"); btn->setIcon(DStyleHelper(q->style()).standardIcon(DStyle::SP_SelectElement, nullptr)); - btn->setIconSize(QSize(24, 24)); + + btn->setFixedWidth(defaultButtonWidth()); + btn->setIconSize(defaultIconSize()); + QObject::connect(DGUI_NAMESPACE::DGuiApplicationHelper::instance(), &DGUI_NAMESPACE::DGuiApplicationHelper::sizeModeChanged, btn, [btn]() { + btn->setFixedWidth(defaultButtonWidth()); + btn->setIconSize(defaultIconSize()); + }); q->setDialogDisplayPosition(DFileChooserEdit::DialogDisplayPosition::CurrentMonitorCenter); diff -Nru dtkwidget-5.6.8/src/widgets/dfloatingbutton.cpp dtkwidget-5.6.12/src/widgets/dfloatingbutton.cpp --- dtkwidget-5.6.8/src/widgets/dfloatingbutton.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dfloatingbutton.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -67,7 +67,6 @@ void DFloatingButton::initStyleOption(DStyleOptionButton *option) const { DIconButton::initStyleOption(option); - option->features = QStyleOptionButton::ButtonFeature(DStyleOptionButton::FloatingButton); } DWIDGET_END_NAMESPACE diff -Nru dtkwidget-5.6.8/src/widgets/diconbutton.cpp dtkwidget-5.6.12/src/widgets/diconbutton.cpp --- dtkwidget-5.6.8/src/widgets/diconbutton.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/diconbutton.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -217,6 +217,7 @@ { D_DC(DIconButton); + *option = baseStyleOption(); option->initFrom(this); option->init(this); diff -Nru dtkwidget-5.6.8/src/widgets/dlicensedialog.cpp dtkwidget-5.6.12/src/widgets/dlicensedialog.cpp --- dtkwidget-5.6.8/src/widgets/dlicensedialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dlicensedialog.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,237 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#include "dlicensedialog.h" +#include "private/dabstractdialogprivate_p.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +DCORE_USE_NAMESPACE + +DWIDGET_BEGIN_NAMESPACE + +class DLicenseDialogPrivate : public DAbstractDialogPrivate +{ +public: + explicit DLicenseDialogPrivate(DLicenseDialog *qq); + +private: + void init(); + void addComponentItem(const DLicenseInfo::DComponentInfo *DComponentInfo); + bool loadLicense(); + + DTitlebar *titleBar = nullptr; + DIconButton *backwardBtn = nullptr; + DListView *listView = nullptr; + QStandardItemModel *listModel = nullptr; + QStackedLayout *stackedLayout = nullptr; + QLabel *componentNameLabel = nullptr; + QLabel *componentVersionLabel = nullptr; + QLabel *copyRightLabel = nullptr; + QLabel *licenseContentLabel = nullptr; + QScrollArea *scrollArea = nullptr; + QByteArray content; + QString path; + DLicenseInfo licenseInfo; + bool isValid = false; + +private: + Q_DECLARE_PUBLIC(DLicenseDialog) +}; + +DLicenseDialogPrivate::DLicenseDialogPrivate(DLicenseDialog *qq) + : DAbstractDialogPrivate(qq) + , backwardBtn(new DIconButton(QStyle::SP_ArrowBack)) + , listView(new DListView) + , listModel(new QStandardItemModel) + , stackedLayout(new QStackedLayout) + , componentNameLabel(new QLabel) + , componentVersionLabel(new QLabel) + , copyRightLabel(new QLabel) + , licenseContentLabel(new QLabel) + , scrollArea(new QScrollArea) +{ +} + +void DLicenseDialogPrivate::init() +{ + D_Q(DLicenseDialog); + q->setFixedSize(900, 800); + + titleBar = new DTitlebar(); + titleBar->setAccessibleName("DLicenseDialogTitleBar"); + titleBar->setMenuVisible(false); + titleBar->setBackgroundTransparent(true); + titleBar->setTitle(QObject::tr("Credits")); + titleBar->addWidget(backwardBtn, Qt::AlignLeft | Qt::AlignVCenter); + + backwardBtn->setVisible(false); + + listView->setEditTriggers(QAbstractItemView::NoEditTriggers); + listView->setSelectionMode(QAbstractItemView::NoSelection); + listView->setSpacing(0); + listView->setItemSpacing(0); + listView->setModel(listModel); + listView->setAlternatingRowColors(true); + + DFontSizeManager *fontManager = DFontSizeManager::instance(); + fontManager->bind(componentNameLabel, DFontSizeManager::T4, QFont::Bold); + fontManager->bind(componentVersionLabel, DFontSizeManager::T6, QFont::DemiBold); + fontManager->bind(copyRightLabel, DFontSizeManager::T6, QFont::DemiBold); + + licenseContentLabel->setWordWrap(true); + + QWidget *licenseWidget = new QWidget; + QVBoxLayout *licenseLayout = new QVBoxLayout(licenseWidget); + licenseLayout->setSpacing(0); + licenseLayout->setMargin(20); + licenseLayout->addWidget(componentNameLabel); + licenseLayout->addSpacing(16); + licenseLayout->addWidget(new DHorizontalLine); + licenseLayout->addSpacing(16); + licenseLayout->addWidget(componentVersionLabel); + licenseLayout->addWidget(copyRightLabel); + licenseLayout->addSpacing(40); + licenseLayout->addWidget(licenseContentLabel); + licenseLayout->addStretch(0); + + scrollArea->setFrameStyle(QFrame::NoFrame); + scrollArea->viewport()->setAutoFillBackground(false); + scrollArea->setContentsMargins(QMargins(0,0,0,0)); + scrollArea->viewport()->setContentsMargins(QMargins(0,0,0,0)); + scrollArea->setWidget(licenseWidget); + scrollArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + scrollArea->setWidgetResizable(true); + licenseWidget->setAutoFillBackground(false); + + stackedLayout->addWidget(listView); + stackedLayout->addWidget(scrollArea); + + QVBoxLayout *mainLayout = new QVBoxLayout; + mainLayout->setContentsMargins(10, 0, 10, 0); + mainLayout->addWidget(titleBar, 0, Qt::AlignTop); + mainLayout->addLayout(stackedLayout); + + q->setLayout(mainLayout); + q->setFocusPolicy(Qt::ClickFocus); + q->setFocus(); + + QObject::connect(stackedLayout, &QStackedLayout::currentChanged, q, [this](int index) { + backwardBtn->setVisible(index != 0); + }); + QObject::connect(backwardBtn, &QAbstractButton::clicked, q, [this]{ + scrollArea->horizontalScrollBar()->setValue(0); + scrollArea->verticalScrollBar()->setValue(0); + stackedLayout->setCurrentIndex(0); + }); + QObject::connect(listView, &QAbstractItemView::clicked, q, [this](const QModelIndex &index) { + const auto &components = licenseInfo.componentInfos(); + if (components.size() <= index.row() || index.row() < 0) + return; + + auto componentInfo = components.at(index.row()); + + componentNameLabel->setText(componentInfo->name()); + componentVersionLabel->setText(componentInfo->version()); + copyRightLabel->setText(componentInfo->copyRight()); + licenseContentLabel->setText(licenseInfo.licenseContent(componentInfo->licenseName())); + stackedLayout->setCurrentIndex(1); + }); +} + +void DLicenseDialogPrivate::addComponentItem(const DLicenseInfo::DComponentInfo *componentInfo) +{ + D_Q(DLicenseDialog); + auto pItem = new DStandardItem(componentInfo->name()); + pItem->setEditable(false); + QSize size(12, 12); + DViewItemAction *enterAction = new DViewItemAction(Qt::AlignVCenter, size, size, true); + enterAction->setIcon(DStyle::standardIcon(q->style(), DStyle::SP_ArrowEnter)); + pItem->setActionList(Qt::RightEdge, DViewItemActionList() << enterAction); + listModel->appendRow(pItem); + const auto index = pItem->index(); + QObject::connect(enterAction, &DViewItemAction::triggered, enterAction, [this, index] { + Q_EMIT listView->clicked(index); + }); +} + +bool DLicenseDialogPrivate::loadLicense() +{ + if (!content.isEmpty()) { + isValid = licenseInfo.loadContent(content); + } else if (!path.isEmpty()) { + isValid = licenseInfo.loadFile(path); + } + if (isValid) { + listModel->clear(); + for (auto component : licenseInfo.componentInfos()) { + addComponentItem(component); + } + } + return isValid; +} + +DLicenseDialog::DLicenseDialog(QWidget *parent) + : DAbstractDialog(*new DLicenseDialogPrivate(this), parent) +{ + Q_D(DLicenseDialog); + d->init(); +} + +DLicenseDialog::~DLicenseDialog() +{ +} + +void DLicenseDialog::setContent(const QByteArray &content) +{ + D_D(DLicenseDialog); + d->content = content; +} + +void DLicenseDialog::setFile(const QString &file) +{ + D_D(DLicenseDialog); + d->path = file; +} + +void DLicenseDialog::setLicenseSearchPath(const QString &path) +{ + D_D(DLicenseDialog); + d->licenseInfo.setLicenseSearchPath(path); +} + +bool DLicenseDialog::load() +{ + D_D(DLicenseDialog); + return d->loadLicense(); +} + +bool DLicenseDialog::isValid() const +{ + D_DC(DLicenseDialog); + return d->isValid; +} + +void DLicenseDialog::hideEvent(QHideEvent *) +{ + D_D(DLicenseDialog); + d->backwardBtn->setVisible(false); + d->stackedLayout->setCurrentIndex(0); + d->scrollArea->horizontalScrollBar()->setValue(0); + d->scrollArea->verticalScrollBar()->setValue(0); +} +DWIDGET_END_NAMESPACE +#include "moc_dlicensedialog.cpp" diff -Nru dtkwidget-5.6.8/src/widgets/dlineedit.cpp dtkwidget-5.6.12/src/widgets/dlineedit.cpp --- dtkwidget-5.6.8/src/widgets/dlineedit.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dlineedit.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -26,28 +26,31 @@ DWIDGET_BEGIN_NAMESPACE /*! +@~english \class Dtk::Widget::DLineEdit \inmodule dtkwidget - \brief DLineEdit一个聚合 QLineEdit 的输入框. + \brief DLineEdit is an input box for aggregating QLineEdit. \list - \li DLineEdit提供了向输入框左右两端插入控件的函数 - \li DLineEdit提供了带警告颜色的输入框 - \li DLineEdit提供了带文本警告消息的输入框 + \li DLineEdit provides the function of inserting controls into the left and right ends of the input box + \li DLineEdit provides an input box with warning color + \li DLineEdit provides an input box with a text warning message \endlist */ /*! +@~english \property DLineEdit::alert - \brief 警告模式属性. + \brief Warning Mode Properties. - 用于开启或者判断是否处于警告模式. + Used to turn on or judge whether it is in warning mode. */ /*! - \brief DLineEdit的构造函数 - \a parent 参数被发送到 QWidget 构造函数。 +@~english + \brief Constructor of DLineEdit + \a parent The parameter is sent to the QWidget constructor. */ DLineEdit::DLineEdit(QWidget *parent) : QWidget(parent) @@ -63,9 +66,11 @@ } /*! - \brief 返回 QLineEdit 对象. +@~english + \brief Returns the QLineEdit object. - 若 DLineEdit 不满足输入框的使用需求，请用此函数抛出的对象 + If DLineEdit does not meet the use requirements of the input box, + please use the object thrown by this function \return */ QLineEdit *DLineEdit::lineEdit() const @@ -101,13 +106,14 @@ } /*! - \brief 显示警告消息. +@~english + \brief Display warning message. - 显示指定的文本消息，超过指定时间后警告消息消失. - \note 时间参数为-1时，警告消息将一直存在 - \a text 警告的文本 - \a duration 显示的时间长度，单位毫秒 - \a follower tooltip跟随 + Display the specified text message, and the warning message disappears after the specified time. + \note When the time parameter is - 1, the warning message will always exist + \a text Warning text + \a duration The length of time displayed in milliseconds + \a follower Tooltip follow */ void DLineEdit::showAlertMessage(const QString &text, QWidget *follower, int duration) { @@ -116,11 +122,12 @@ } /*! - \brief 指定对齐方式. +@~english + \brief Specify alignment. - 现只支持(下)左，(下)右，(下水平)居中， 默认左对齐. - \note 参数为其他时，默认左对齐 - \a alignment 消息对齐方式 + Now only (bottom) left, (bottom) right, (bottom horizontal) center are supported, and left alignment is the default. + \note When the parameter is other, the default left alignment + \a alignment Message alignment */ void DLineEdit::setAlertMessageAlignment(Qt::Alignment alignment) { @@ -135,7 +142,8 @@ } /*! - \brief 隐藏警告消息框. +@~english + \brief Hide warning message box. */ @@ -155,11 +163,12 @@ } /*! - \brief 向输入框左侧添加控件. +@~english + \brief Add a control to the left of the input box. - 将 QList 里的控件插入到输入框的左侧 - \note 多次调用，只有最后一次调用生效 - \a list 存储控件的列表 + Insert the control in QList to the left of the input box + \note Call this function several times, and only the last call will take effect + \a list Stores the list of controls */ void DLineEdit::setLeftWidgets(const QList &list) @@ -190,11 +199,12 @@ } /*! - \brief 向输入框右侧添加控件. +@~english + \brief Add a control to the right of the input box. - 将 QList 里的控件插入到输入框的右侧 - \note 多次调用，只有最后一次调用生效 - \a list 存储控件的列表 + Insert the control in QList to the right of the input box + \note Call this function several times, and only the last call will take effect + \a list Stores the list of controls */ void DLineEdit::setRightWidgets(const QList &list) @@ -225,9 +235,10 @@ } /*! - \brief 是否隐藏输入框左侧控件. +@~english + \brief Whether to hide the control on the left side of the input box. - \a visible 是否隐藏 + \a visible Whether to hide */ void DLineEdit::setLeftWidgetsVisible(bool visible) { @@ -235,9 +246,10 @@ d->leftWidget->setVisible(visible); } /*! - \brief 是否隐藏输入框右侧控件. +@~english + \brief Whether to hide the control on the right of the input box. - \a visible 是否隐藏 + \a visible Whether to hide */ void DLineEdit::setRightWidgetsVisible(bool visible) { @@ -246,9 +258,10 @@ } /*! - \brief 设置清除按钮是否可见. +@~english + \brief Set whether the clear button is visible. - \a enable true 按钮可见 false 按钮不可见 + \a enable True means the button is visible, false means the button is not visible */ void DLineEdit::setClearButtonEnabled(bool enable) { @@ -261,9 +274,10 @@ } /*! - \brief 返回清除按钮是否可见. +@~english + \brief Whether the return clear button is visible. - \return true 清除按钮可见 false 清除按钮不可见 + \return True means the clear button is visible, false means the clear button is not visible */ bool DLineEdit::isClearButtonEnabled() const { @@ -272,9 +286,10 @@ } /*! - \brief 设置显示的文本. +@~english + \brief Set the displayed text. - \a text 显示的文本 + \a text Displayed text */ void DLineEdit::setText(const QString &text) { @@ -283,9 +298,10 @@ } /*! - \brief 返回当前显示的文本. +@~english + \brief Returns the currently displayed text. - \return 返回显示的文本 + \return Return the displayed text */ QString DLineEdit::text() { @@ -294,7 +310,8 @@ } /*! - \brief 清空编辑的内容. +@~english + \brief Empty the edited content. */ void DLineEdit::clear() { @@ -303,9 +320,10 @@ } /*! - \brief 返回输入框的回显模式. +@~english + \brief Returns the echo mode of the input box. - \return 返回回显的模式 + \return Returns the mode of echo */ QLineEdit::EchoMode DLineEdit::echoMode() const { @@ -314,9 +332,10 @@ } /*! - \brief 设置回显的模式. +@~english + \brief Set the mode of echo. - \a mode 回显的模式 + \a mode Echoed mode */ void DLineEdit::setEchoMode(QLineEdit::EchoMode mode) { @@ -325,10 +344,11 @@ } /*! - \brief 设置行编辑控件的文本菜单策略. +@~english + \brief Set the text menu policy of the line edit control. - \a policy 显示右键菜单的方式 - 转发实际变量 QLineEdit 的 ContextMenuEvent 消息 + \a policy How to display the right-click menu + Forwards the ContextMenuEvent message of the actual variable QLineEdit \sa QLineEdit::setContextMenuPolicy */ void DLineEdit::setContextMenuPolicy(Qt::ContextMenuPolicy policy) @@ -338,9 +358,10 @@ } /*! - \brief 返回是否显示语音听写菜单项. +@~english + \brief Return to whether the voice dictation menu item is displayed. - \return true 显示语音听写菜单项 false不显示 + \return True to display voice dictation menu items, false to not display */ bool DLineEdit::speechToTextIsEnabled() const { @@ -355,9 +376,10 @@ } /*! - \brief 设置是否显示语音听写菜单项. +@~english + \brief Set whether to display voice dictation menu items. - \a enable true显示 flase不显示 + \a enable True is displayed, and the flash is not displayed */ void DLineEdit::setSpeechToTextEnabled(bool enable) { @@ -366,9 +388,10 @@ } /*! - \brief 返回是否显示语音朗读菜单项. +@~english + \brief Return to whether to display voice reading menu item. - \return true 显示语音朗读菜单项 false不显示 + \return True to display voice reading menu items, false to not display */ bool DLineEdit::textToSpeechIsEnabled() const { @@ -377,9 +400,10 @@ } /*! - \brief 设置是否显示语音朗读菜单项. +@~english + \brief Set whether to display voice reading menu items. - \a enable true显示 flase不显示 + \a enable True is displayed, and the flash is not displayed */ void DLineEdit::setTextToSpeechEnabled(bool enable) { @@ -388,9 +412,10 @@ } /*! - \brief 返回是否显示文本翻译菜单项. +@~english + \brief Returns whether to display the text translation menu item. - \return true 显示文本翻译菜单项 false 不显示 + \return True to display the text translation menu item, false to not display */ bool DLineEdit::textToTranslateIsEnabled() const { @@ -399,9 +424,10 @@ } /*! - \brief 设置是否显示文本翻译菜单项 +@~english + \brief Set whether to display the text translation menu item - \a enable true显示 flase不显示 + \a enable True to display, false to not display */ void DLineEdit::setTextToTranslateEnabled(bool enable) { @@ -410,8 +436,9 @@ } /*! - \brief DLineEdit::cutEnabled - \return true文本可剪切　false不可剪切 +@~english + \brief Returns whether the input text can be cut + \return True means the text can be cut, false means it cannot be cut */ bool DLineEdit::cutEnabled() const { @@ -420,8 +447,9 @@ } /*! - \brief DLineEdit::setCutEnabled 设置输入文本是否可拷贝 - \a enabled　true输入文本可剪切　false不可剪切 +@~english + \brief Set whether the input text can be cut + \a enabled　True means the input text can be cut, false means it cannot be cut */ void DLineEdit::setCutEnabled(bool enable) { @@ -430,8 +458,9 @@ } /*! - \brief DLineEdit::copyEnabled - \return true文本可拷贝　false不可拷贝 +@~english + \brief Returns whether the input text can be copied + \return True means that the text can be copied, and false means that it cannot be copied */ bool DLineEdit::copyEnabled() const { @@ -440,8 +469,9 @@ } /*! - \brief DLineEdit::setCopyEnabled 设置输入文本是否可拷贝 - \a enabled　true输入文本可拷贝　false不可拷贝 +@~english + \brief Set whether the input text can be copied + \a enabled　True means the input text can be copied, false means it cannot be copied */ void DLineEdit::setCopyEnabled(bool enable) { @@ -450,13 +480,14 @@ } /*! - \brief 事件过滤器 +@~english + \brief Event filter - \a watched 被监听的子控件指针， \a event 待过滤的事件 \a event 实例. + \a watched Listened child control pointer， \a event Events to be filtered \a event example. - 该过滤器不做任何过滤动作，但会监控输入框的焦点状态，并发送信号 focusChanged()。 + The filter does not perform any filtering action, but will monitor the focus status of the input box and send the signal focusChanged () - \return 成功过滤返回 true，否则返回 false . + \return If filtering is successful, return true; otherwise, return false . */ bool DLineEdit::eventFilter(QObject *watched, QEvent *event) { @@ -687,6 +718,8 @@ q->connect(control, &DAlertControl::alertChanged, q, &DLineEdit::alertChanged); hLayout->setContentsMargins(0, 0, 0, 0); + // Set spacing to 10 for between widget. + hLayout->setSpacing(10); hLayout->addWidget(lineEdit); lineEdit->installEventFilter(q); diff -Nru dtkwidget-5.6.8/src/widgets/dmainwindow.cpp dtkwidget-5.6.12/src/widgets/dmainwindow.cpp --- dtkwidget-5.6.8/src/widgets/dmainwindow.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dmainwindow.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -10,6 +10,7 @@ #include "DBlurEffectWidget" #include "dsizemode.h" #include "dfeaturedisplaydialog.h" +#include "denhancedwidget.h" #include "private/dmainwindow_p.h" #include "private/dapplication_p.h" @@ -176,6 +177,12 @@ connect(this->windowHandle(), SIGNAL(activeChanged()), this, SLOT(_q_autoShowFeatureDialog())); config.setValue("autoDisplayFeature", false); } + + D_D(DMainWindow); + DEnhancedWidget *hanceedWidget = new DEnhancedWidget(d->titlebar, parent); + connect(hanceedWidget, &DEnhancedWidget::heightChanged, hanceedWidget, [d]() { + d->updateTitleShadowGeometry(); + }); } /*! @@ -208,9 +215,8 @@ contentAction->setVisible(false); addToolBar(Qt::LeftToolBarArea, tb); widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - QWidgetAction *action = static_cast(tb->addWidget(widget)); + tb->addWidget(widget); widget->resize(tb->size()); - qInfo() << "actionGeometry" << tb->actionGeometry(action); connect(d->sidebarHelper, &DSidebarHelper::widthChanged, tb, &QToolBar::setFixedWidth); connect(d->sidebarHelper, &DSidebarHelper::expandChanged, this, [tb, d] (bool expanded) { @@ -805,7 +811,6 @@ if (sidebarWidget()) { sidebarWidget()->resize(d->tb->size()); - qInfo() << "sidebarWidget()->height" << sidebarWidget()->height() << d->tb->size(); } return QMainWindow::resizeEvent(event); } diff -Nru dtkwidget-5.6.8/src/widgets/dmpriscontrol.cpp dtkwidget-5.6.12/src/widgets/dmpriscontrol.cpp --- dtkwidget-5.6.8/src/widgets/dmpriscontrol.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dmpriscontrol.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -11,6 +11,13 @@ #include #include #include +#include +#include + +static const QSize ButtonSize = {52, 52}; +static const QSize CompactButtonSize = {44, 44}; +static const QSize IconSize = {36, 36}; +static constexpr int ButtonSpacing = 80; DWIDGET_BEGIN_NAMESPACE @@ -110,12 +117,27 @@ m_nextBtn = new DFloatingButton(m_controlWidget); m_tickEffect = new DTickEffect(m_title, m_title); - m_prevBtn->setIcon(QIcon::fromTheme(":/assets/images/play_previous.svg")); + auto setButtonSize = [this] { + const QSize ActualButtonSize = DSizeModeHelper::element(CompactButtonSize, ButtonSize); + m_prevBtn->setFixedSize(ActualButtonSize); + m_playBtn->setFixedSize(ActualButtonSize); + m_nextBtn->setFixedSize(ActualButtonSize); + }; + + QObject::connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, q, [setButtonSize] { + setButtonSize(); + }); + + setButtonSize(); + m_prevBtn->setIcon(DDciIcon::fromTheme("play_previous")); m_prevBtn->setAccessibleName("DMPRISControlPrevFloatingButton"); - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/play_start.svg")); + m_playBtn->setIcon(DDciIcon::fromTheme("play_start")); m_playBtn->setAccessibleName("DMPRISControlPlayFloatingButton"); - m_nextBtn->setIcon(QIcon::fromTheme(":/assets/images/play_next.svg")); + m_nextBtn->setIcon(DDciIcon::fromTheme("play_next")); m_nextBtn->setAccessibleName("DMPRISControlNextFloatingButton"); + m_prevBtn->setIconSize(IconSize); + m_playBtn->setIconSize(IconSize); + m_nextBtn->setIconSize(IconSize); m_prevBtn->setBackgroundRole(DPalette::Button); m_playBtn->setBackgroundRole(DPalette::Button); m_nextBtn->setBackgroundRole(DPalette::Button); @@ -149,17 +171,12 @@ #ifdef QT_DEBUG m_title->setText("MPRIS Title"); - - m_nextBtn->setIcon(QIcon::fromTheme(":/assets/images/arrow_right_normal.png")); - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/arrow_right_white.png")); - m_prevBtn->setIcon(QIcon::fromTheme(":/assets/images/arrow_left_normal.png")); #endif QHBoxLayout *controlLayout = new QHBoxLayout; + controlLayout->setSpacing(ButtonSpacing); controlLayout->addWidget(m_prevBtn); - controlLayout->addStretch(); controlLayout->addWidget(m_playBtn); - controlLayout->addStretch(); controlLayout->addWidget(m_nextBtn); controlLayout->setContentsMargins(0, 5, 0, 0); m_controlWidget->setLayout(controlLayout); @@ -169,7 +186,6 @@ centralLayout->addWidget(m_titleScrollArea); centralLayout->addWidget(m_picture); centralLayout->setAlignment(m_picture, Qt::AlignCenter); -// centralLayout->addLayout(controlLayout); centralLayout->addWidget(m_controlWidget); centralLayout->setMargin(0); @@ -266,23 +282,13 @@ return; const QString stat = m_mprisInter->playbackStatus(); -#ifdef QT_DEBUG if (stat == "Playing") { m_playStatus = true; - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/arrow_right_white.png")); + m_playBtn->setIcon(DDciIcon::fromTheme("play_pause")); } else { m_playStatus = false; - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/arrow_left_white.png")); + m_playBtn->setIcon(DDciIcon::fromTheme("play_start")); } -#else - if (stat == "Playing") { - m_playStatus = true; - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/play_pause.svg")); - } else { - m_playStatus = false; - m_playBtn->setIcon(QIcon::fromTheme(":/assets/images/play_start.svg")); - } -#endif } void DMPRISControlPrivate::_q_loadMPRISPath(const QString &path) diff -Nru dtkwidget-5.6.8/src/widgets/dpasswordedit.cpp dtkwidget-5.6.12/src/widgets/dpasswordedit.cpp --- dtkwidget-5.6.8/src/widgets/dpasswordedit.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dpasswordedit.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -104,7 +104,8 @@ { if (event->type() == QEvent::StyleChange) { D_D(DPasswordEdit); - d->togglePasswordVisibleButton->setIconSize(DSizeModeHelper::element(QSize(18, 18), QSize(24, 24))); + d->togglePasswordVisibleButton->setFixedWidth(d->defaultButtonWidth()); + d->togglePasswordVisibleButton->setIconSize(d->defaultIconSize()); } return DLineEdit::changeEvent(event); } @@ -126,7 +127,8 @@ togglePasswordVisibleButton = new DSuggestButton; togglePasswordVisibleButton->setAccessibleName("DPasswordEditPasswordVisibleButton"); togglePasswordVisibleButton->setIcon(DStyle::standardIcon(q->style(), DStyle::SP_ShowPassword)); - togglePasswordVisibleButton->setIconSize(DSizeModeHelper::element(QSize(18, 18), QSize(24, 24))); + togglePasswordVisibleButton->setFixedWidth(defaultButtonWidth()); + togglePasswordVisibleButton->setIconSize(defaultIconSize()); list.append(togglePasswordVisibleButton); q->setRightWidgets(list); diff -Nru dtkwidget-5.6.8/src/widgets/dprintpreviewdialog.cpp dtkwidget-5.6.12/src/widgets/dprintpreviewdialog.cpp --- dtkwidget-5.6.8/src/widgets/dprintpreviewdialog.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dprintpreviewdialog.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -1042,7 +1042,7 @@ QObject::connect(advanceBtn, &QPushButton::clicked, q, [this] { this->showadvancesetting(); }); QObject::connect(printDeviceCombo, SIGNAL(currentIndexChanged(int)), q, SLOT(_q_printerChanged(int))); - QObject::connect(cancelBtn, &DPushButton::clicked, q, &DPrintPreviewDialog::close); + QObject::connect(cancelBtn, &DPushButton::clicked, q, &DPrintPreviewDialog::reject); QObject::connect(pageRangeCombo, SIGNAL(currentIndexChanged(int)), q, SLOT(_q_pageRangeChanged(int))); QObject::connect(marginsCombo, SIGNAL(currentIndexChanged(int)), q, SLOT(_q_pageMarginChanged(int))); QObject::connect(printBtn, SIGNAL(clicked(bool)), q, SLOT(_q_startPrint(bool))); @@ -1510,6 +1510,9 @@ { DPrintPreviewSettingInfo *info = settingHelper->loadInfo(setting); settingHelper->updateSettingInfo(info); + if (info) { + delete info; + } } /*! @@ -1626,10 +1629,8 @@ { Q_Q(DPrintPreviewDialog); QString lastPaperSize = paperSizeCombo->currentText(); - QString lastColormode = colorModeCombo->currentText(); paperSizeCombo->clear(); paperSizeCombo->blockSignals(true); - colorModeCombo->blockSignals(true); QString currentName = printDeviceCombo->itemText(index); if (isActualPrinter(currentName)) { //actual printer @@ -1650,36 +1651,36 @@ QPlatformPrinterSupport *ps = QPlatformPrinterSupportPlugin::get(); QPrintDevice currentDevice = ps->createPrintDevice(printDeviceCombo->currentText()); colorModeCombo->clear(); - if (!currentDevice.supportedColorModes().contains(QPrint::Color)) { - colorModeCombo->blockSignals(false); - colorModeCombo->addItem(qApp->translate("DPrintPreviewDialogPrivate", "Grayscale")); - updateSubControlSettings(DPrintPreviewSettingInfo::PS_ColorMode); - supportedColorMode = false; - settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_Watermark_TextColor, false); - waterColor = QColor("#6f6f6f"); - _q_selectColorButton(waterColor); - pickColorWidget->convertColor(waterColor); - pickColorWidget->setRgbEdit(waterColor); - } else { + supportedColorMode = false; + if (currentDevice.supportedColorModes().contains(QPrint::Color)) { if (!isInited) { waterColor = QColor("#6f6f6f"); _q_selectColorButton(waterColor); pickColorWidget->convertColor(waterColor); pickColorWidget->setRgbEdit(waterColor); } - - colorModeCombo->addItems(QStringList() << qApp->translate("DPrintPreviewDialogPrivate", "Color") << qApp->translate("DPrintPreviewDialogPrivate", "Grayscale")); + colorModeCombo->blockSignals(true); + colorModeCombo->addItem(qApp->translate("DPrintPreviewDialogPrivate", "Color")); + colorModeCombo->blockSignals(false); updateSubControlSettings(DPrintPreviewSettingInfo::PS_ColorMode); + supportedColorMode = true; + } + if (currentDevice.supportedColorModes().contains(QPrint::GrayScale)) { + colorModeCombo->blockSignals(true); + colorModeCombo->addItem(qApp->translate("DPrintPreviewDialogPrivate", "Grayscale")); colorModeCombo->blockSignals(false); - if (colorModeCombo->currentText() == lastColormode) { - colorModeCombo->setCurrentText(qApp->translate("DPrintPreviewDialogPrivate", "Color")); - supportedColorMode = true; - } else { - colorModeCombo->setCurrentText(qApp->translate("DPrintPreviewDialogPrivate", "Grayscale")); - supportedColorMode = false; - } - if (colorModeCombo->currentText() == qApp->translate("DPrintPreviewDialogPrivate", "Color")) - settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_Watermark_TextColor, true); + updateSubControlSettings(DPrintPreviewSettingInfo::PS_ColorMode); + waterColor = QColor("#6f6f6f"); + _q_selectColorButton(waterColor); + pickColorWidget->convertColor(waterColor); + pickColorWidget->setRgbEdit(waterColor); + } + if (supportedColorMode) { + colorModeCombo->setCurrentText(qApp->translate("DPrintPreviewDialogPrivate", "Color")); + settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_Watermark_TextColor, true); + } else { + colorModeCombo->setCurrentText(qApp->translate("DPrintPreviewDialogPrivate", "Grayscale")); + settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_Watermark_TextColor, false); } } else { //pdf @@ -2370,7 +2371,7 @@ pview->print(); - q->done(0); + q->accept(); } void DPrintPreviewDialogPrivate::pageRangeError(TipsNum tipNum) @@ -2645,6 +2646,18 @@ return d->pview->isAsynPreview(); } +DPrintPreviewSettingInfo *DPrintPreviewDialog::createDialogSettingInfo(DPrintPreviewSettingInfo::SettingType type) +{ + Q_D(DPrintPreviewDialog); + return d->settingHelper->loadInfo(type, true); +} + +void DPrintPreviewDialog::updateDialogSettingInfo(DPrintPreviewSettingInfo *info) +{ + Q_D(DPrintPreviewDialog); + d->settingHelper->updateSettingInfo(info); +} + void DPrintPreviewDialog::resizeEvent(QResizeEvent *event) { Q_UNUSED(event); @@ -2682,10 +2695,12 @@ { } -DPrintPreviewSettingInfo *PreviewSettingsPluginHelper::loadInfo(DPrintPreviewSettingInfo::SettingType type) +DPrintPreviewSettingInfo *PreviewSettingsPluginHelper::loadInfo(DPrintPreviewSettingInfo::SettingType type, bool manual) { - if (!m_currentInterface) + // Apps can manually get the current print dialog settings. + if (!manual && !m_currentInterface) { return nullptr; + } DPrintPreviewSettingInfo *info = nullptr; switch (type) { @@ -2841,7 +2856,8 @@ break; } - if (!info) + // Apps can get setting info without the print plugin, otherwise need to be filter by plugin. + if (!info || !m_currentInterface) return info; if (m_currentInterface->settingFilter(d->settingHelper->m_printSettingData, info)) diff -Nru dtkwidget-5.6.8/src/widgets/dprintpreviewwidget.cpp dtkwidget-5.6.12/src/widgets/dprintpreviewwidget.cpp --- dtkwidget-5.6.8/src/widgets/dprintpreviewwidget.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dprintpreviewwidget.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -10,6 +10,8 @@ #include #include +#include + #include #include @@ -27,42 +29,6 @@ #define WATER_TEXTSPACE WATER_DEFAULTFONTSIZE DWIDGET_BEGIN_NAMESPACE -// 取自Qt源码qpixmapfilter.cpp 945行 -static void grayscale(const QImage &image, QImage &dest, const QRect &rect = QRect()) -{ - QRect destRect = rect; - QRect srcRect = rect; - if (rect.isNull()) { - srcRect = dest.rect(); - destRect = dest.rect(); - } - if (&image != &dest) { - destRect.moveTo(QPoint(0, 0)); - } - - const unsigned int *data = reinterpret_cast(image.bits()); - unsigned int *outData = reinterpret_cast(dest.bits()); - - if (dest.size() == image.size() && image.rect() == srcRect) { - // a bit faster loop for grayscaling everything - int pixels = dest.width() * dest.height(); - for (int i = 0; i < pixels; ++i) { - int val = qGray(data[i]); - outData[i] = qRgba(val, val, val, qAlpha(data[i])); - } - } else { - int yd = destRect.top(); - for (int y = srcRect.top(); y <= srcRect.bottom() && y < image.height(); y++) { - data = reinterpret_cast(image.scanLine(y)); - outData = reinterpret_cast(dest.scanLine(yd++)); - int xd = destRect.left(); - for (int x = srcRect.left(); x <= srcRect.right() && x < image.width(); x++) { - int val = qGray(data[x]); - outData[xd++] = qRgba(val, val, val, qAlpha(data[x])); - } - } - } -} static void saveImageToFile(int index, const QString &outPutFileName, const QString &suffix, bool isJpegImage, const QImage &srcImage) { @@ -2230,7 +2196,7 @@ type = Image; sourceImage = img; graySourceImage = img; - grayscale(img, graySourceImage, img.rect()); + DWIDGET_NAMESPACE::grayScale(img, graySourceImage, img.rect()); } void WaterMark::paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) diff -Nru dtkwidget-5.6.8/src/widgets/dsearchedit.cpp dtkwidget-5.6.12/src/widgets/dsearchedit.cpp --- dtkwidget-5.6.8/src/widgets/dsearchedit.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dsearchedit.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -287,10 +287,10 @@ action = new QAction(q); action->setObjectName("_d_search_leftAction"); - action->setIcon(QIcon::fromTheme("search_action")); + action->setIcon(QIcon::fromTheme("search_indicator")); q->lineEdit()->addAction(action, QLineEdit::LeadingPosition); action->setVisible(false); - iconbtn->setIconSize(QSize(32, 32)); + iconbtn->setIconSize(QSize(20, 20)); DPalette pe; QStyleOption opt; @@ -314,7 +314,7 @@ iconWidget->setAccessibleName("DSearchEditIconWidget"); QHBoxLayout *center_layout = new QHBoxLayout(iconWidget); center_layout->setMargin(0); - center_layout->setSpacing(0); + center_layout->setSpacing(6); layout->setMargin(0); layout->setSpacing(0); diff -Nru dtkwidget-5.6.8/src/widgets/dspinner.cpp dtkwidget-5.6.12/src/widgets/dspinner.cpp --- dtkwidget-5.6.8/src/widgets/dspinner.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dspinner.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -39,12 +39,10 @@ } /*! +@~english \class Dtk::Widget::DSpinner \inmodule dtkwidget - \brief 可以使用 DSpinner 类快速创建用于指示加载中状态的旋转等待图标动画控件. - - DSpinner 提供了一个用于指示加载中状态的旋转等待图标动画控件。在创建图标后，使用 start() 即可开始图标旋转的动画。 \brief Use DSpinner to create a widget with spinning animation for display a waiting state. DSpinner provide a spinning animation widget to indicate a waiting state. Call start() to start the spinning animation. @@ -53,11 +51,10 @@ */ /*! +@~english \brief Create a DSpinner widget - \brief 创建一个 DSpinner 控件 \a parent Parent widget. - \a parent 父控件 */ DSpinner::DSpinner(QWidget *parent) : QWidget(parent), DObject(*new DSpinnerPrivate(this)) @@ -80,10 +77,10 @@ } /*! +@~english \brief Is the DSpinner spinning or not. - \brief DSpinner 是否正在播放旋转动画. - \return 正在播放返回 true，否则返回 false. + \return DSpinner is spinning and returns true, otherwise returns false */ bool DSpinner::isPlaying() const { @@ -92,8 +89,8 @@ } /*! +@~english \brief Start spinning - \brief 开始旋转动画 */ void DSpinner::start() { @@ -102,8 +99,8 @@ } /*! +@~english \brief Stop spinning - \brief 停止旋转动画 */ void DSpinner::stop() { @@ -112,8 +109,8 @@ } /*! - \brief Set background \a color - \brief 设置背景颜色 +@~english + \brief Set background \a color Color to be set */ void DSpinner::setBackgroundColor(QColor color) { diff -Nru dtkwidget-5.6.8/src/widgets/dstyle.cpp dtkwidget-5.6.12/src/widgets/dstyle.cpp --- dtkwidget-5.6.8/src/widgets/dstyle.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dstyle.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -1125,7 +1125,7 @@ DStyleHelper dstyle(style); if (btn->features & DStyleOptionButton::FloatingButton) { - int frame_margins = 3; + int frame_margins = dstyle.pixelMetric(DStyle::PM_FloatingButtonFrameMargin, opt, w); const QMargins margins(frame_margins, frame_margins, frame_margins, frame_margins); QRect shadow_rect = opt->rect + margins; const QRect content_rect = opt->rect - margins; @@ -1612,7 +1612,7 @@ return 12; } case PM_SwitchButtonHandleWidth: - return 30; + return DSizeModeHelper::element(24, 30); case PM_SwithcButtonHandleHeight: return DSizeModeHelper::element(20, 24); case PM_FloatingWidgetRadius: { @@ -1683,9 +1683,8 @@ } case SE_SwitchButtonHandle: { if (const DStyleOptionButton *btn = qstyleoption_cast(opt)) { - DStyleHelper dstyle(style); - int handleWidth = dstyle.pixelMetric(PM_SwitchButtonHandleWidth, opt, widget); - int handleHeight = dstyle.pixelMetric(PM_SwithcButtonHandleHeight, opt, widget); + int handleWidth = btn->rect.width() / 2.0; + int handleHeight = btn->rect.height(); //这里的borderWidth为2,间隙宽度为2, 所以为4 QRect rectHandle(4, 4, handleWidth, handleHeight); @@ -1738,7 +1737,10 @@ case CT_IconButton: if (const DStyleOptionButton *btn = qstyleoption_cast(opt)) { if (btn->features & DStyleOptionButton::FloatingButton) { - return DSizeModeHelper::element(btn->iconSize * 1.8, btn->iconSize * 2.5); + DStyleHelper dstyle(style); + int frame_margin = dstyle.pixelMetric(DStyle::PM_FloatingButtonFrameMargin, opt, widget); + QSize marginSize(2 * frame_margin, 2 * frame_margin); + return DSizeModeHelper::element(QSize(36, 36) + marginSize, QSize(48, 48) + marginSize); } if (btn->features & DStyleOptionButton::Flat) { @@ -2142,8 +2144,9 @@ case PM_MenuDesktopFrameWidth: return 0; case PM_ButtonMargin: + return 8; case PM_DefaultChildMargin: - return DSizeModeHelper::element(pixelMetric(PM_FrameRadius, opt, widget) / 2, pixelMetric(PM_FrameRadius, opt, widget)); + return DSizeModeHelper::element(pixelMetric(PM_FrameRadius, opt, widget), pixelMetric(PM_FrameRadius, opt, widget)); case PM_DefaultFrameWidth: return 1; case PM_DefaultLayoutSpacing: @@ -2181,11 +2184,17 @@ return 16; case PM_ListViewIconSize: case PM_LargeIconSize: - return DSizeModeHelper::element(16, 24); + return 24; case PM_IconViewIconSize: return 32; case PM_ScrollView_ScrollBarOverlap: return true; + case PM_ToolBarIconSize: + return 16; + case PM_MenuButtonIndicator: + return DSizeModeHelper::element(8, QCommonStyle::pixelMetric(m, opt, widget)); + case PM_FloatingButtonFrameMargin: + return 3; default: break; } @@ -2197,7 +2206,7 @@ #endif if (Q_UNLIKELY(LineEditIconSize == m)) { - return widget ? (widget->height() < 34 ? 16 : 32) : 24; + return DSizeModeHelper::element(20, 20); } if (Q_UNLIKELY(m < QStyle::PM_CustomBase)) { diff -Nru dtkwidget-5.6.8/src/widgets/dstyleditemdelegate.cpp dtkwidget-5.6.12/src/widgets/dstyleditemdelegate.cpp --- dtkwidget-5.6.8/src/widgets/dstyleditemdelegate.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dstyleditemdelegate.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -195,6 +195,25 @@ return DStyle::viewItemSize(style, &item, Qt::DisplayRole); } + // get rect in AlignVCenter layout for text. + static QRect textAndTextActionsLayout(const QRect &textRect, const QStyle *style, const QStyleOptionViewItem &option, const QModelIndex &index) + { + QStyleOptionViewItem opt = option; + opt.displayAlignment |= Qt::AlignVCenter; + QSize size; + + if (!opt.text.isEmpty()) + size = DStyle::viewItemSize(style, &opt, Qt::DisplayRole); + + for (const DViewItemAction *action : qvariantToActionList(index.data(Dtk::TextActionListRole))) { + const QSize &action_size = displayActionSize(action, style, opt); + size.setWidth(qMax(size.width(), action_size.width())); + size.setHeight(size.height() + action_size.height()); + } + + return QStyle::alignedRect(opt.direction , opt.displayAlignment, size, textRect); + } + static QList doActionsLayout(QRect base, const DViewItemActionList &list, Qt::Orientation orientation, Qt::LayoutDirection direction, const QSize &fallbackIconSize, QSize *bounding) { @@ -1015,7 +1034,12 @@ opt.displayAlignment &= ~Qt::AlignVCenter; opt.displayAlignment &= ~Qt::AlignBottom; - QRect bounding = DStyle::viewItemDrawText(style, painter, &opt, textRect); + QRect textRectbounding = d->textAndTextActionsLayout(textRect, style, opt, index); + + QRect bounding(textRectbounding.topLeft(), QSize()); + if (!opt.text.isEmpty()) { + bounding = DStyle::viewItemDrawText(style, painter, &opt, textRectbounding); + } // draw action text for (const DViewItemAction *action : text_action_list) { @@ -1247,7 +1271,8 @@ } int frame_margin = style->pixelMetric(static_cast(DStyle::PM_FrameRadius)); - d->margins += DSizeModeHelper::element(frame_margin / 2, frame_margin); + int left_right_margin = style->pixelMetric(static_cast(DStyle::PM_ContentsMargins)); + d->margins += QMargins(left_right_margin, frame_margin, left_right_margin, frame_margin); } } @@ -1404,7 +1429,8 @@ break; int frame_margin = DStyle::pixelMetric(view->style(), DStyle::PM_FrameRadius); - d->margins = QMargins() + DSizeModeHelper::element(frame_margin / 2, frame_margin); + int left_right_margin = DStyle::pixelMetric(view->style(), DStyle::PM_ContentsMargins); + d->margins = QMargins(left_right_margin, frame_margin, left_right_margin, frame_margin); // relayout to calculate size. view->doItemsLayout(); @@ -1416,7 +1442,11 @@ if (event->type() == QEvent::Paint) { D_D(DStyledItemDelegate); - if (d->readyRecordVisibleWidgetOfCurrentFrame()) { + const QPaintEvent *pe = static_cast(event); + // We only hide widgets when updating all area, it maybe also to be paint when hover, + // and it's area is a specific part. + if (pe->rect() == view->viewport()->rect() && + d->readyRecordVisibleWidgetOfCurrentFrame()) { auto updateEvent = new QEvent(UpdateWidgetVisibleEvent); qApp->postEvent(view->viewport(), updateEvent); } diff -Nru dtkwidget-5.6.8/src/widgets/dswitchbutton.cpp dtkwidget-5.6.12/src/widgets/dswitchbutton.cpp --- dtkwidget-5.6.8/src/widgets/dswitchbutton.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dswitchbutton.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -13,7 +13,8 @@ DWIDGET_BEGIN_NAMESPACE /*! - \brief DSwitchButton::DSwitchButton　实现一个开关按钮 +@~english + @brief DSwitchButton::DSwitchButton implements a switch button \a parent */ DSwitchButton::DSwitchButton(QWidget *parent) @@ -26,8 +27,9 @@ } /*! - \brief DSwitchButton::sizeHint 初始化控件矩形大小（在绘画之前） - \return 控件举行大小 +@~english + @brief DSwitchButton::sizeHint initializes the control rectangle size (before drawing) + @return Control rectangle size */ QSize DSwitchButton::sizeHint() const { @@ -39,9 +41,10 @@ } /*! - \brief DSwitchButton::paintEvent 绘画处理 - \a e 绘画事件 - \sa QWidget::paintEvent() +@~english + @brief DSwitchButton::paintEvent Painting treatment + \a e Painting event + @sa QWidget::paintEvent() */ void DSwitchButton::paintEvent(QPaintEvent *e) { @@ -54,8 +57,9 @@ } /*! - \brief DSwitchButton::initStyleOption 初始化(用于继承的)抽象按钮对象,后面用于 DStylePainter 绘画 DStyle::CE_SwitchButton 枚举 - \a option 初始化了的的抽象风格按钮对象 +@~english + @brief DSwitchButton::initStyleOption Initializes the abstract button object (for inheritance), which is later used for DStylePainter painting DStyle::CE_SwitchButton enumeration + \a option The abstract style button object is initialized */ void DSwitchButton::initStyleOption(DStyleOptionButton *option) const { diff -Nru dtkwidget-5.6.8/src/widgets/dtitlebar.cpp dtkwidget-5.6.12/src/widgets/dtitlebar.cpp --- dtkwidget-5.6.8/src/widgets/dtitlebar.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dtitlebar.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -51,7 +51,6 @@ #define CHANGESPLITWINDOW_VAR "_d_splitWindowOnScreen" #define GETSUPPORTSPLITWINDOW_VAR "_d_supportForSplittingWindow" -static inline int DefaultTitlebarHeight() { return DSizeModeHelper::element(40, 50); } static inline int DefaultIconHeight() { return DSizeModeHelper::element(24, 32); } static inline int DefaultExpandButtonHeight() { return DSizeModeHelper::element(30, 48); } @@ -94,30 +93,32 @@ void updateTabOrder(); void showSplitScreenWidget(); void hideSplitScreenWidget(); - void updateSizeBySizeMode() + void updateTitleBarSize() { if (optionButton) - optionButton->setIconSize(QSize(DefaultTitlebarHeight(), DefaultTitlebarHeight())); + optionButton->setIconSize(QSize(titlebarHeight, titlebarHeight)); if (minButton) - minButton->setIconSize(QSize(DefaultTitlebarHeight(), DefaultTitlebarHeight())); + minButton->setIconSize(QSize(titlebarHeight, titlebarHeight)); if (maxButton) - maxButton->setIconSize(QSize(DefaultTitlebarHeight(), DefaultTitlebarHeight())); + maxButton->setIconSize(QSize(titlebarHeight, titlebarHeight)); if (closeButton) - closeButton->setIconSize(QSize(DefaultTitlebarHeight(), DefaultTitlebarHeight())); + closeButton->setIconSize(QSize(titlebarHeight, titlebarHeight)); if (quitFullButton) - quitFullButton->setIconSize(QSize(DefaultTitlebarHeight(), DefaultTitlebarHeight())); + quitFullButton->setIconSize(QSize(titlebarHeight, titlebarHeight)); if (expandButton) expandButton->setIconSize(QSize(DefaultExpandButtonHeight(), DefaultExpandButtonHeight())); if (iconLabel) iconLabel->setIconSize(QSize(DefaultIconHeight(), DefaultIconHeight())); D_Q(DTitlebar); - q->setFixedHeight(DefaultTitlebarHeight()); - q->setMinimumHeight(DefaultTitlebarHeight()); + q->setFixedHeight(titlebarHeight); + q->setMinimumHeight(titlebarHeight); } void setFixedButtonsEnabled(bool isEnabled); + void updateTitlebarHeight(); + QHBoxLayout *mainLayout; QWidget *leftArea; QHBoxLayout *leftLayout; @@ -143,6 +144,9 @@ DSidebarHelper *sidebarHelper = nullptr; DIconButton *expandButton = nullptr; + int titlebarHeight = 50; + DConfig *uiPreferDonfig = nullptr; + #ifndef QT_NO_MENU QMenu *menu = Q_NULLPTR; QAction *helpAction = Q_NULLPTR; @@ -208,6 +212,9 @@ bool isUpdated = config->value("featureUpdated", false).toBool(); DStyle::setRedPointVisible(optionButton, isUpdated); + uiPreferDonfig = new DConfig("org.deepin.dtk.ui.preference", "", q); + updateTitlebarHeight(); + separatorTop = new DHorizontalLine(q); separator = new DHorizontalLine(q); titleLabel = centerArea; @@ -328,6 +335,12 @@ } }); } + q->connect(uiPreferDonfig, &DConfig::valueChanged, q, [this](const QString &key){ + if (key == "titlebarHeight") { + updateTitlebarHeight(); + updateTitleBarSize(); + } + }); // 默认需要构造一个空的选项菜单 q->setMenu(new QMenu(q)); @@ -347,7 +360,7 @@ // fix wayland 下显示了两个应用图标，系统标题栏 和 dtk标题栏 均显示应用图标 q->setEmbedMode(!(DApplication::isDXcbPlatform()|| noTitlebarEnabled())); - updateSizeBySizeMode(); + updateTitleBarSize(); } QWidget *DTitlebarPrivate::targetWindow() @@ -667,7 +680,7 @@ // add toolbarAction menu item for deepin or uos application if (titlebarSettingsImpl && titlebarSettingsImpl->isValid() && !toolbarAction) { - toolbarAction = new QAction(qApp->translate("TitleBarMenu", "TitlebarSettings"), menu); + toolbarAction = new QAction(qApp->translate("TitleBarMenu", "Custom toolbar"), menu); toolbarAction->setObjectName("TitlebarSettings"); QObject::connect(toolbarAction, SIGNAL(triggered(bool)), q, SLOT(_q_toolBarActionTriggerd())); menu->addAction(toolbarAction); @@ -865,6 +878,14 @@ optionButton->setEnabled(isEnabled); } +void DTitlebarPrivate::updateTitlebarHeight() +{ + titlebarHeight = uiPreferDonfig->value("titlebarHeight").toInt(); + // 配置项默认值是-1，从配置读取进来的值超出0-100的范围，通过模式获取值，否则使用获取的配置值 + if (titlebarHeight <= 0 || titlebarHeight > 100) + titlebarHeight = DSizeModeHelper::element(40, 50); +} + /*! @~english \class Dtk::Widget::DTitlebar @@ -1143,7 +1164,8 @@ } } else if (e->type() == QEvent::StyleChange) { D_D(DTitlebar); - d->updateSizeBySizeMode(); + d->updateTitlebarHeight(); + d->updateTitleBarSize(); } return QFrame::event(e); @@ -1261,9 +1283,6 @@ int x = isExpanded ? d->sidebarHelper->width() : 0; d->separator->move(x, height() - d->separator->height()); }); - connect(d->sidebarHelper, &DSidebarHelper::widthChanged, this, [d] (int width) { - d->sidebarBackgroundWidget->setFixedWidth(width); - }); } connect(helper, &DSidebarHelper::visibleChanged, this, [this](bool visible){ @@ -1272,11 +1291,8 @@ connect(helper, &DSidebarHelper::expandChanged, this, [this](bool isExpanded){ d_func()->sidebarBackgroundWidget->setVisible(isExpanded); }); - connect(helper, &DSidebarHelper::backgroundColorChanged, this, [](QColor backgroundColor){ - qInfo() << "backgroundColorChanged" << backgroundColor.name(QColor::NameFormat::HexArgb); - }); - connect(helper, &DSidebarHelper::widthChanged, this, [](int width){ - qInfo() << "widthChanged" << width; + connect(helper, &DSidebarHelper::widthChanged, this, [this](int width){ + d_func()->sidebarBackgroundWidget->setFixedWidth(width); }); } @@ -1677,7 +1693,7 @@ int padding = qMax(d->leftArea->sizeHint().width(), d->rightArea->sizeHint().width()); int width = d->centerArea->sizeHint().width() + 2 * d->mainLayout->spacing() + 2 * padding; - return QSize(width, DefaultTitlebarHeight()); + return QSize(width, d->titlebarHeight); } QSize DTitlebar::minimumSizeHint() const diff -Nru dtkwidget-5.6.8/src/widgets/dtoolbutton.cpp dtkwidget-5.6.12/src/widgets/dtoolbutton.cpp --- dtkwidget-5.6.8/src/widgets/dtoolbutton.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dtoolbutton.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -27,11 +27,6 @@ void DToolButton::initStyleOption(QStyleOptionToolButton *option) const { QToolButton::initStyleOption(option); - //判断条件不用Qt::ToolButtonTextBesideIcon原因 - //会强制居中，大小不受sizeHint（）控制 - if (!option->icon.isNull() && !option->text.isEmpty()) { - option->toolButtonStyle = Qt::ToolButtonTextBesideIcon; - } } QSize DToolButton::sizeHint() const diff -Nru dtkwidget-5.6.8/src/widgets/dwatermarkhelper.cpp dtkwidget-5.6.12/src/widgets/dwatermarkhelper.cpp --- dtkwidget-5.6.8/src/widgets/dwatermarkhelper.cpp 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dwatermarkhelper.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,120 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#include "dwatermarkhelper.h" + +#include +#include +#include + +#include + +DWIDGET_BEGIN_NAMESPACE + +DTK_USE_NAMESPACE +DWIDGET_USE_NAMESPACE + +#define WATER_TEXTSPACE 65 +#define DEFAULT_FONTSIZE WATER_TEXTSPACE + +class DWaterMaskHelper_ : public DWaterMarkHelper {}; +Q_GLOBAL_STATIC(DWaterMaskHelper_, wmhGlobal) + +class DWaterMarkHelperPrivate: public DTK_CORE_NAMESPACE::DObjectPrivate +{ +public: + explicit DWaterMarkHelperPrivate(DWaterMarkHelper *parent) + : DObjectPrivate(parent) + { + + } + + void init(); + static void clean() { + auto helper = DWaterMarkHelper::instance(); + helper->d_func()->widgetMap.clear(); + helper->deleteLater(); + } + + WaterMarkData data; + static QMap widgetMap; +}; + +void DWaterMarkHelperPrivate::init() +{ // 进程退出时销毁资源 + qAddPostRoutine(clean); +} + +QMapDWaterMarkHelperPrivate::widgetMap; + +/*! + \brief DWaterMarkHelper::instance + The singleton object of DWaterMarkHelper is instantiated at the first call using the Q _ GLOBAL _ STATIC definition. + \return + */ +DWaterMarkHelper *DWaterMarkHelper::instance() +{ + return wmhGlobal; +} + +/*! + \class Dtk::Widget::DWaterMaskHelper + \inmodule dtkwidget + \brief Direct instantiation of this object is not allowed + \a parent + \sa DWaterMaskHelper::instance + */ +DWaterMarkHelper::DWaterMarkHelper(QObject *parent) + : QObject(parent) + , DObject(*new DWaterMarkHelperPrivate(this)) +{ + D_D(DWaterMarkHelper); + d->init(); +} + +/*! + \brief DWaterMarkHelper::registerWidget + \a widget + */ +void DWaterMarkHelper::registerWidget(QWidget *widget) +{ + D_D(DWaterMarkHelper); + + if (widget && !d->widgetMap.contains(widget)) { + DWaterMarkWidget *mark = new DWaterMarkWidget(widget); + mark->setData(d->data); + mark->setVisible(true); + d->widgetMap.insert(widget, mark); + + connect(widget, &QObject::destroyed, this, [widget] { + DWaterMarkHelper::instance()->d_func()->widgetMap.remove(widget); + }); + } +} + +/*! + \brief get the current setting + */ +WaterMarkData DWaterMarkHelper::data() const +{ + D_DC(DWaterMarkHelper); + return d->data; +} + +/*! + \brief set the current setting + \a data + */ +void DWaterMarkHelper::setData(const WaterMarkData &data) +{ + D_D(DWaterMarkHelper); + d->data = data; + + auto helper = DWaterMarkHelper::instance(); + for (auto w : helper->d_func()->widgetMap.values()) { + w->setData(data); + } +} + +DWIDGET_END_NAMESPACE diff -Nru dtkwidget-5.6.8/src/widgets/dwatermarkwidget.cpp dtkwidget-5.6.12/src/widgets/dwatermarkwidget.cpp --- dtkwidget-5.6.8/src/widgets/dwatermarkwidget.cpp 1970-01-01 00:00:00.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dwatermarkwidget.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -0,0 +1,568 @@ +// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#include "dwatermarkwidget.h" + +#include +#include + +#include +#include +#include + +#include + +DCORE_USE_NAMESPACE +DTK_USE_NAMESPACE +DWIDGET_BEGIN_NAMESPACE + +DWIDGET_USE_NAMESPACE + +class WaterMarkDataPrivate: public DTK_CORE_NAMESPACE::DObjectPrivate +{ +protected: + explicit WaterMarkDataPrivate(WaterMarkData *parent) + : DObjectPrivate(parent) + { + } + +private: + WaterMarkData::WaterMarkType type = WaterMarkData::None; // 水印类型 + WaterMarkData::WaterMarkLayout layout = WaterMarkData::Center; // 水印布局 + qreal scaleFactor = 1.0; // 整体大小缩放系数 + int spacing = 0; // 间距 + int lineSpacing = 0; // 行间距 + QString text; // 文本水印内容 + QFont font; // 文本水印字体 + QColor color; // 文本水印颜色 + qreal rotation = 0; // 水印旋转角度(0~360) + qreal opacity = 1; // 水印透明度(0~1) + QImage image; // 图片水印中的图片 + bool grayScale = true; // 是否灰度化图片 + + D_DECLARE_PUBLIC(WaterMarkData) +}; + +/*! + \class Dtk::Widget::WaterMarkData + \inmodule dtkwidget + \brief Watermark information structure + \a parent + */ +WaterMarkData::WaterMarkData() + : DObject(*new WaterMarkDataPrivate(this)) +{ + +} + +/*! + \class Dtk::Widget::WaterMarkData + \inmodule dtkwidget + \brief coping constructing function + \a parent + */ +WaterMarkData::WaterMarkData(const WaterMarkData &p) + : DObject(*new WaterMarkDataPrivate(this)) +{ + D_D(WaterMarkData); + auto pd = p.d_func(); + + d->type = pd->type; + d->layout = pd->layout; + d->scaleFactor = pd->scaleFactor; + d->spacing = pd->spacing; + d->lineSpacing = pd->lineSpacing; + d->text = pd->text; + d->font = pd->font; + d->color = pd->color; + d->rotation = pd->rotation; + d->opacity = pd->opacity; + d->image = pd->image; + d->grayScale = pd->grayScale; +} + +/*! + \class Dtk::Widget::WaterMarkData + \inmodule dtkwidget + \brief Assignment constructor + \a parent + */ +WaterMarkData &WaterMarkData::operator=(const WaterMarkData &p) +{ + D_D(WaterMarkData); + + if (&p == this) + return *this; + + auto pd = p.d_func(); + d->type = pd->type; + d->layout = pd->layout; + d->scaleFactor = pd->scaleFactor; + d->spacing = pd->spacing; + d->lineSpacing = pd->lineSpacing; + d->text = pd->text; + d->font = pd->font; + d->color = pd->color; + d->rotation = pd->rotation; + d->opacity = pd->opacity; + d->image = pd->image; + d->grayScale = pd->grayScale; + + return *this; +} + +/*! + \brief get the current watermark type + */ +WaterMarkData::WaterMarkType WaterMarkData::type() const +{ + D_DC(WaterMarkData); + return d->type; +} + +/*! + \brief set the current waternark + \a type + */ +void WaterMarkData::setType(WaterMarkType type) +{ + D_D(WaterMarkData); + d->type = type; +} + +/*! + \brief get the current watermark layout + */ +WaterMarkData::WaterMarkLayout WaterMarkData::layout() const +{ + D_DC(WaterMarkData); + return d->layout; +} + +/*! + \brief set the current waternark + \a layout + */ +void WaterMarkData::setLayout(WaterMarkLayout layout) +{ + D_D(WaterMarkData); + d->layout = layout; +} + +/*! + \brief get the current watermark scale factor + */ +qreal WaterMarkData::scaleFactor() const +{ + D_DC(WaterMarkData); + return d->scaleFactor; +} + +/*! + \brief set the current waternark + \a scaleFactor + */ +void WaterMarkData::setScaleFactor(qreal scaleFactor) +{ + D_D(WaterMarkData); + d->scaleFactor = scaleFactor; +} + +/*! + \brief get the current watermark spacing + */ +int WaterMarkData::spacing() const +{ + D_DC(WaterMarkData); + return d->spacing; +} + +/*! + \brief set the current waternark \a spacing + */ +void WaterMarkData::setSpacing(int spacing) +{ + D_D(WaterMarkData); + d->spacing = spacing; +} + +/*! + \brief get the current watermark line spacing + */ +int WaterMarkData::lineSpacing() const +{ + D_DC(WaterMarkData); + return d->lineSpacing; +} + +/*! + \brief set the current waternark + \a lineSpacing + */ +void WaterMarkData::setLineSpacing(int lineSpacing) +{ + D_D(WaterMarkData); + d->lineSpacing = lineSpacing; +} + +/*! + \brief get the current watermark text + */ +QString WaterMarkData::text() const +{ + D_DC(WaterMarkData); + return d->text; +} + +/*! + \brief set the current waternark + \a text + */ +void WaterMarkData::setText(const QString &text) +{ + D_D(WaterMarkData); + d->text = text; +} + +/*! + \brief get the current watermark font + */ +QFont WaterMarkData::font() const +{ + D_DC(WaterMarkData); + return d->font; +} + +/*! + \brief set the current waternark + \a font + */ +void WaterMarkData::setFont(const QFont &font) +{ + D_D(WaterMarkData); + d->font = font; +} + +/*! + \brief get the current watermark color + */ +QColor WaterMarkData::color() const +{ + D_DC(WaterMarkData); + return d->color; +} + +/*! + \brief set the current waternark + \a color + */ +void WaterMarkData::setColor(const QColor &color) +{ + D_D(WaterMarkData); + d->color = color; +} + +/*! + \brief get the current watermark rotation(0~360) + */ +qreal WaterMarkData::rotation() const +{ + D_DC(WaterMarkData); + return d->rotation; +} + +/*! + \brief set the current waternark (0~360) + \a rotation + */ +void WaterMarkData::setRotation(qreal rotation) +{ + D_D(WaterMarkData); + d->rotation = rotation; +} + +/*! + \brief get the current watermark opacity(0~1.0) + */ +qreal WaterMarkData::opacity() const +{ + D_DC(WaterMarkData); + return d->opacity; +} + +/*! + \brief set the current waternark (0~1.0) + \a opacity + */ +void WaterMarkData::setOpacity(qreal opacity) +{ + D_D(WaterMarkData); + d->opacity = opacity; +} + +/*! + \brief get the current watermark image + */ +QImage WaterMarkData::image() const +{ + D_DC(WaterMarkData); + return d->image; +} + +/*! + \brief set the current waternark \a image + */ +void WaterMarkData::setImage(const QImage &image) +{ + D_D(WaterMarkData); + d->image = image; +} + +/*! + \brief get the current watermark grayscale of image + */ +bool WaterMarkData::grayScale() const +{ + D_DC(WaterMarkData); + return d->grayScale; +} + +/*! + \brief set the current waternark \a grayScale of image,default value is true + */ +void WaterMarkData::setGrayScale(bool grayScale) +{ + D_D(WaterMarkData); + d->grayScale = grayScale; +} + +static QImage createTextureImage(const WaterMarkData &data, qreal deviceScale) +{ + QImage texture; + + switch (data.type()) { + case WaterMarkData::WaterMarkType::None: + return texture; + case WaterMarkData::WaterMarkType::Text: + { + // 缩放处理 + QFont font = data.font(); + if (!(font.styleStrategy() & QFont::PreferAntialias)) + font.setStyleStrategy(QFont::PreferAntialias); + font.setPointSize(qRound(font.pointSize() * data.scaleFactor() * deviceScale)); + + // 边距计算 + QFontMetrics fm(font); + QSize textSize = fm.size(Qt::TextSingleLine, data.text()); + int realLineSpacing = qMax(qMin(textSize.width(), textSize.height()), data.lineSpacing()); + QSize spaceSize = QSize(qMax(0, data.spacing()), realLineSpacing) * deviceScale; + + // 绘制纹理 + texture = QImage(textSize + spaceSize, QImage::Format_ARGB32); + texture.fill(Qt::transparent); + QPainter tp; + tp.begin(&texture); + tp.setFont(font); + tp.setPen(data.color()); + tp.setBrush(Qt::NoBrush); + tp.setRenderHint(QPainter::TextAntialiasing); + tp.drawText(texture.rect(), Qt::AlignCenter, data.text()); + tp.end(); + } + break; + case WaterMarkData::WaterMarkType::Image: + { + // 缩放处理 + QImage img = data.image(); + if (data.grayScale()) { + DWIDGET_NAMESPACE::grayScale(data.image(), img, data.image().rect()); + } + + img = img.scaledToWidth(qRound(img.width() * data.scaleFactor() * deviceScale)); + int realLineSpacing = qMax(qMin(img.width(), img.height()), data.lineSpacing()); + texture = QImage(img.size() + QSize(qMax(0, data.spacing()), data.lineSpacing() < 0 ? realLineSpacing : data.lineSpacing()) + , QImage::Format_ARGB32); + texture.fill(Qt::transparent); + + // 拷贝所有像素到一张添加了边距和行间距的图中 + for (int i = 0; i < img.width(); ++i) { + for (int j = 0; j < img.height(); ++j) { + texture.setPixelColor(i, j, img.pixelColor(i, j)); + } + } + } + break; + } + return texture; +} + +void drawWaterTexture(QPainter &painter, const QImage &texture, qreal rotation, const QRect &paintRect) +{ + painter.save(); + painter.setRenderHint(QPainter::SmoothPixmapTransform); + painter.setRenderHint(QPainter::Antialiasing); + + // 旋转画刷,避免调整父界面大小时水印内容有移动 + QBrush b; + b.setTextureImage(texture); + QPoint center = texture.rect().center(); + QTransform t = QTransform() + .translate(center.x(), center.y()) + .rotate(rotation) + .translate(-center.x(), -center.y()); + b.setTransform(t); + +// painter.setPen(Qt::NoPen); + painter.setBrush(b); + painter.drawRect(paintRect); + painter.restore(); +} + +class DWaterMarkWidgetPrivate: public DTK_CORE_NAMESPACE::DObjectPrivate +{ +protected: + explicit DWaterMarkWidgetPrivate(DWaterMarkWidget *parent) + : DObjectPrivate(parent) + { + + } + +private: + void init(); + + WaterMarkData data; + QImage textureImage; + + D_DECLARE_PUBLIC(DWaterMarkWidget) +}; + +void DWaterMarkWidgetPrivate::init() +{ + D_Q(DWaterMarkWidget); + + q->setObjectName("DWaterMarkWidget"); + q->setAttribute(Qt::WA_TransparentForMouseEvents, true); + q->setFocusPolicy(Qt::NoFocus); +} + +/*! + \class Dtk::Widget::DWaterMarkWidget + \inmodule dtkwidget + \brief The watermark class will cover the set parent interface and dynamically adjust the size following the parent interface. + \a parent + */ +DWaterMarkWidget::DWaterMarkWidget(QWidget *parent) + : QWidget(parent) + , DObject(*new DWaterMarkWidgetPrivate(this)) +{ + D_D(DWaterMarkWidget); + d->init(); + + if (parent) + parent->installEventFilter(this); +} + +/*! + \brief get the current setting + */ +const WaterMarkData &DWaterMarkWidget::data() +{ + D_DC(DWaterMarkWidget); + return d->data; +} + +/*! + \brief set the current setting \a data + */ +void DWaterMarkWidget::setData(const WaterMarkData &data) +{ + D_D(DWaterMarkWidget); + + d->data = data; + d->textureImage = createTextureImage(d->data, devicePixelRatioF()); + + update(); +} + +void DWaterMarkWidget::paintEvent(QPaintEvent *) +{ + D_D(DWaterMarkWidget); + + qreal deviceScale = devicePixelRatioF(); + + QPainter painter(this); + painter.setOpacity(d->data.opacity()); + + switch (d->data.type()) { + case WaterMarkData::WaterMarkType::None: + return; + case WaterMarkData::WaterMarkType::Text: { + // 居中处理 + if (d->data.layout() == WaterMarkData::Center) { + // 缩放处理 + QFont font = d->data.font(); + if (!(font.styleStrategy() & QFont::PreferAntialias)) + font.setStyleStrategy(QFont::PreferAntialias); + font.setPointSize(qRound(d->data.font().pointSize() * d->data.scaleFactor() * deviceScale)); + + auto center = rect().center(); + painter.translate(center.x(), center.y()); + painter.rotate(d->data.rotation()); + painter.translate(-center.x(), -center.y()); + + painter.save(); + painter.setRenderHint(QPainter::TextAntialiasing); + painter.setFont(font); + painter.setPen(d->data.color()); + painter.drawText(rect(), Qt::AlignCenter, d->data.text()); + painter.restore(); + } else { + drawWaterTexture(painter, d->textureImage, d->data.rotation(), rect()); + } + } + case WaterMarkData::WaterMarkType::Image: + { + if (d->data.image().isNull() || qFuzzyCompare(d->data.scaleFactor(), 0)) + return; + + // 居中处理 + if (d->data.layout() == WaterMarkData::Center) { + // 缩放处理 + QImage img = d->data.image(); + if (d->data.grayScale()) + DWIDGET_NAMESPACE::grayScale(d->data.image(), img, d->data.image().rect()); + img = img.scaledToWidth(qRound(img.width() * d->data.scaleFactor() * deviceScale)); + QSize size = img.size() / img.devicePixelRatio(); + int imgWidth = size.width(); + int imgHeight = size.height(); + + auto center = rect().center(); + painter.translate(center.x(), center.y()); + painter.rotate(d->data.rotation()); + painter.translate(-center.x(), -center.y()); + + QPointF leftTop(rect().center().x() - imgWidth / 2.0, rect().center().y() - imgHeight / 2.0); + painter.drawImage(leftTop, img); + } else { + drawWaterTexture(painter, d->textureImage, d->data.rotation(), rect()); + } + } + } +} + +bool DWaterMarkWidget::eventFilter(QObject *watched, QEvent *event) +{ + if (watched != parent()) + return false; + + // 保持和父界面尺寸一致 + if (event->type() == QEvent::Resize) { + QResizeEvent *e = static_cast(event); + resize(e->size()); + } + + return QWidget::eventFilter(watched, event); +} + +DWIDGET_END_NAMESPACE diff -Nru dtkwidget-5.6.8/src/widgets/dwindowoptionbutton.cpp dtkwidget-5.6.12/src/widgets/dwindowoptionbutton.cpp --- dtkwidget-5.6.8/src/widgets/dwindowoptionbutton.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/dwindowoptionbutton.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -8,19 +8,23 @@ DWIDGET_BEGIN_NAMESPACE /*! - \class Dtk::Widget::DWindowOptionButton +@~english + @class Dtk::Widget::DWindowOptionButton \inmodule dtkwidget - \brief The DWindowOptionButton class is used as the unified window option button. - \brief DWindowOptionButton 类是 DTK 窗口统一的菜单按钮控件. + @brief The DWindowOptionButton class is used as the unified window option button. + It's actually a special DImageButton which has the appearance of option button. - 点击按钮后，默认会显示程序主菜单，包含“关于”、“帮助”等项。 + After clicking the button, the main menu of the program will be displayed by default, which contains items such as “About” and “Help”. + */ /*! - \brief DWindowOptionButton::DWindowOptionButton 是 DWindowOptionButton 的构造 - 函数，返回 DWindowOptionButton 对象，普通程序一般无需使用。 - \a parent 为创建对象的父控件。 +@~english + @fn DWindowOptionButton::DWindowOptionButton(QWidget * parent) + @brief DWindowOptionButton::DWindowOptionButton is the constructor of DWindowOptionButton, which returns a DWindowOptionButton object. + Normal programs do not need to use it. + \a parent is the parent widget of the created object. */ DWindowOptionButton::DWindowOptionButton(QWidget * parent) : DIconButton(parent) diff -Nru dtkwidget-5.6.8/src/widgets/icons.qrc dtkwidget-5.6.12/src/widgets/icons.qrc --- dtkwidget-5.6.8/src/widgets/icons.qrc 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/icons.qrc 2023-05-15 03:42:41.000000000 +0000 @@ -15,10 +15,6 @@ assets/images/dialog_close_round_normal@2x.png assets/images/dialog_close_round_normal.png assets/images/dialog_close_round_press.png - assets/images/play_pause.svg - assets/images/play_start.svg - assets/images/play_previous.svg - assets/images/play_next.svg assets/images/water_back.svg assets/images/water_front.svg assets/images/uos.svg diff -Nru dtkwidget-5.6.8/src/widgets/private/daboutdialog_p.h dtkwidget-5.6.12/src/widgets/private/daboutdialog_p.h --- dtkwidget-5.6.8/src/widgets/private/daboutdialog_p.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/private/daboutdialog_p.h 2023-05-15 03:42:41.000000000 +0000 @@ -28,9 +28,9 @@ void init(); void loadDistributionInfo(); void updateWebsiteLabel(); - void updateAcknowledgementLabel(); void _q_onLinkActivated(const QString &link); void _q_onFeatureActivated(const QString &link); + void _q_onLicenseActivated(const QString &link); QPixmap loadPixmap(const QString &file); @@ -44,13 +44,13 @@ QLabel *licenseLabel = nullptr; QLabel *companyLogoLabel = nullptr; QLabel *websiteLabel = nullptr; - QLabel *acknowledgementLabel = nullptr; QLabel *featureLabel = nullptr; DRedPointLabel *redPointLabel = nullptr; + QLabel *acknowledgementTipLabel = nullptr; + QLabel *acknowledgementLabel = nullptr; QString logoPath; QString websiteName; QString websiteLink; - QString acknowledgementLink; Q_DECLARE_PUBLIC(DAboutDialog) }; diff -Nru dtkwidget-5.6.8/src/widgets/private/dapplication_p.h dtkwidget-5.6.12/src/widgets/private/dapplication_p.h --- dtkwidget-5.6.8/src/widgets/private/dapplication_p.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/private/dapplication_p.h 2023-05-15 03:42:41.000000000 +0000 @@ -64,6 +64,10 @@ QString appDescription; QString homePage; QString acknowledgementPage; + QString applicationCreditsFile; + QByteArray applicationCreditsContent; + QString licensePath; + bool acknowledgementPageVisible = true; bool visibleMenuShortcutText = false; @@ -74,6 +78,7 @@ DAppHandler *appHandler = Q_NULLPTR; DAboutDialog *aboutDialog = Q_NULLPTR; DFeatureDisplayDialog *featureDisplayDialog = Q_NULLPTR; + DLicenseDialog *licenseDialog = Q_NULLPTR; // 需要自适应虚拟键盘环境的窗口 QPointer activeInputWindow; diff -Nru dtkwidget-5.6.8/src/widgets/private/dlineedit_p.h dtkwidget-5.6.12/src/widgets/private/dlineedit_p.h --- dtkwidget-5.6.8/src/widgets/private/dlineedit_p.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/private/dlineedit_p.h 2023-05-15 03:42:41.000000000 +0000 @@ -11,6 +11,7 @@ #include #include #include +#include DWIDGET_BEGIN_NAMESPACE @@ -25,6 +26,15 @@ void init(); + static inline QSize defaultIconSize() + { + return DSizeModeHelper::element(QSize(18, 18), QSize(24, 24)); + } + static inline int defaultButtonWidth() + { + return DSizeModeHelper::element(28, 40); + } + DAlertControl *control{nullptr}; QWidget *leftWidget; diff -Nru dtkwidget-5.6.8/src/widgets/private/dprintpreviewdialog_p.h dtkwidget-5.6.12/src/widgets/private/dprintpreviewdialog_p.h --- dtkwidget-5.6.8/src/widgets/private/dprintpreviewdialog_p.h 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/src/widgets/private/dprintpreviewdialog_p.h 2023-05-15 03:42:41.000000000 +0000 @@ -203,7 +203,7 @@ { public: PreviewSettingsPluginHelper(DPrintPreviewDialogPrivate *dd); - DPrintPreviewSettingInfo *loadInfo(DPrintPreviewSettingInfo::SettingType type); + DPrintPreviewSettingInfo *loadInfo(DPrintPreviewSettingInfo::SettingType type, bool manual = false); void setSubControlVisible(DPrintPreviewSettingInterface::SettingSubControl subControlType, bool visible); void setSubControlEnabled(DPrintPreviewSettingInterface::SettingSubControl subControlType, bool enabled); diff -Nru dtkwidget-5.6.8/tests/testcases/printpreview/ut_dprintpreviewdialog.cpp dtkwidget-5.6.12/tests/testcases/printpreview/ut_dprintpreviewdialog.cpp --- dtkwidget-5.6.8/tests/testcases/printpreview/ut_dprintpreviewdialog.cpp 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/tests/testcases/printpreview/ut_dprintpreviewdialog.cpp 2023-05-15 03:42:41.000000000 +0000 @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -1632,3 +1633,61 @@ DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::DarkType); } + +TEST_F(ut_DPrintPreviewDialog, testPrivateUpdateSubControlSettings) +{ + test_dialog_d->waterMarkBtn->setChecked(true); + QSignalSpy spy(test_dialog_d->inclinatBox, &DSpinBox::editingFinished); + test_dialog_d->updateSubControlSettings(DPrintPreviewSettingInfo::PS_Watermark); + if (DPrintPreviewDialog::currentPlugin().isEmpty()) { + EXPECT_EQ(spy.count(), 0); + } else { + auto info = testPrintDialog->createDialogSettingInfo(DPrintPreviewSettingInfo::PS_Watermark); + if (info) { + EXPECT_EQ(spy.count(), 1); + delete info; + } else { + EXPECT_EQ(spy.count(), 0); + } + } +} + +TEST_F(ut_DPrintPreviewDialog, createDialogSettingInfo) +{ + if (!DPrintPreviewDialog::currentPlugin().isEmpty()) { + return; + } + + auto info = testPrintDialog->createDialogSettingInfo(DPrintPreviewSettingInfo::PS_Watermark); + ASSERT_TRUE(info); + EXPECT_EQ(info->type(), DPrintPreviewSettingInfo::PS_Watermark); + delete info; + + info = testPrintDialog->createDialogSettingInfo(DPrintPreviewSettingInfo::PS_SettingsCount); + ASSERT_FALSE(info); +} + +TEST_F(ut_DPrintPreviewDialog, updateDialogSettingInfo) +{ + if (!DPrintPreviewDialog::currentPlugin().isEmpty()) { + return; + } + + test_dialog_d->waterMarkBtn->setChecked(true); + auto info = testPrintDialog->createDialogSettingInfo(DPrintPreviewSettingInfo::PS_Watermark); + auto watermarkInfo = dynamic_cast(info); + ASSERT_TRUE(watermarkInfo); + EXPECT_EQ(watermarkInfo->opened, true); + + watermarkInfo->opened = false; + bool newFlag = false; + testPrintDialog->updateDialogSettingInfo(watermarkInfo); + delete watermarkInfo; + + info = testPrintDialog->createDialogSettingInfo(DPrintPreviewSettingInfo::PS_Watermark); + watermarkInfo = dynamic_cast(info); + ASSERT_TRUE(watermarkInfo); + EXPECT_EQ(newFlag, watermarkInfo->opened); + + delete watermarkInfo; +} diff -Nru dtkwidget-5.6.8/.tx/config dtkwidget-5.6.12/.tx/config --- dtkwidget-5.6.8/.tx/config 2023-02-22 07:14:17.000000000 +0000 +++ dtkwidget-5.6.12/.tx/config 2023-05-15 03:42:41.000000000 +0000 @@ -3,7 +3,7 @@ minimum_perc = 80 mode = developer -[deepin-tool-kit.dwidget] +[o:linuxdeepin:p:deepin-tool-kit:r:dwidget] file_filter = src/translations/dtkwidget_.ts source_file = src/translations/dtkwidget.ts source_lang = en