root
/
dtkwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,738 Commits 19 Branches 203 Tags 44 MiB
Commit Graph

1738 Commits

Author SHA1 Message Date
wangpeng 571fa9fc3b fix: 修复dwindowquitfullbutton头文件问题 
修复dwindowquitfullbutton头文件引入错误

Log: 修复dwindowquitfullbutton头文件问题
Change-Id: I54e0587d0ecaeb6572f520060e9127505cc394bb
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3631
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-08 09:23:38 +08:00
ck 9870649cb8 docs: 函数注释说明修改 
函数注释不太明确的地方修改，使之更清晰

Log: 修改注释
Change-Id: Iaed3ea18ce9920769353906fd8e781d22b2212d8
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3789
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-07 15:04:53 +08:00
sunkang 084a6f8ee4 refactor: 调整example的UI设计,整理删除Example的部分代码 
1.对Example的代码进行重构,整理删除部分代码
2.添加了部分图标资源文件

Log: 对dtk的example按照新的UI设计实现

Change-Id: I0e19db2d956d0481542736eed5a8739ee0b7c372
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3756
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: hudeng <506460991@qq.com>
Tested-by: <mailman@uniontech.com>
 2020-09-07 11:35:26 +08:00
linxun 145f21ae86 fix: 解决pdf保存名字重复问题 
外部保存名字并进行设置,保存并判断加上对相同名字的限制

Log: 解决pdf保存名字重复问题

Bug: https://pms.uniontech.com/zentao/bug-view-46114.html
Change-Id: I48d39b2e8c4afe19d961ea4e0c6af8062070ec24
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3554
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-07 09:49:04 +08:00
Lvpeilong c4932fb374 fix: 修复当没有预览数据时切换缩放导致程序异常退出的问题 
加入当没有预览数据时对页面数据对象进行非空判断

Log: 修复当没有预览数据时切换缩放导致程序异常退出的问题
Bug: https://pms.uniontech.com/zentao/bug-view-46374.html
Change-Id: Ibb1f5fb77f2e2f8933fb6c70ae4fab373bd0526e
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3699
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-04 18:44:03 +08:00
sunkang 582a2db24c feat: 添加Button的使用例子 
添加了DPushButton,DWarningButton,DSuggestButton的使用例子

Log: 添加Button的使用例子,简单展示用法

Change-Id: I9b6de9fc40bd1fa06155f7b112d6fd8502b7cb15
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3416
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: zhangjide <zhangjide@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-03 09:59:34 +08:00
sunkang 62ec5e0d7f refactor: 重构example代码 
重构example的代码,采用两级菜单实现,并整理相关代码

Log: 重构example代码,使dtk的控件展示更清晰

Change-Id: Ib5a98936446f284f820533528bfe8d33611f4217
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3273
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 15:38:24 +08:00
chengyulong_cm f5ee748ad2 fix: 更新翻译文件 
更新翻译文件

Log: 更新翻译文件
Change-Id: Ib085b66b433e9ffe236d388ea1785729792fd088
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3310
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 15:23:32 +08:00
ck 6cb35182fb fix: 触摸屏按住滚动条上下跳动 
设置对话框支持触屏滑动，按住滚动条来滑动会出现上下跳动

Log: 修复设置页面滑动滚动条页面会跳的问题
Bug: https://pms.uniontech.com/zentao/bug-view-44480.html
Change-Id: I0f4bff05c13704b092eeeafe844edcdceda105fa
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3142
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 10:12:55 +08:00
ck ae68950404 fix: 触屏滑动时出现大片空白 
触屏滑动是子控件(快捷键)收到鼠标消息，发生layout变动导致viewport位置异常，现在滑动中屏蔽子控件鼠标消息来解决。

Log: 修复设置页面滑动出现空白
Bug: https://pms.uniontech.com/zentao/bug-view-44587.html
Change-Id: Id0cd2d14daf9edf2d1083c691751d7fe33c8295d
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3181
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 10:12:33 +08:00
chenbin fcd09ac98d fix: 修改DSlider刻度文字的样式为不超过刻度线 
修改DSlider中第一个和最后一个刻度文字的样式，将样式
由居中刻度线修改为不超过刻度线。

Log: 修改DSlider刻度文字的样式
Bug: https://pms.uniontech.com/zentao/bug-view-44984.html
Change-Id: I9f34e118281e1daaaed7b0ef5714c713761b2e37
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3176
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 09:57:02 +08:00
WangPeng b31b143dbb feat: 添加DArrowrectangle控件新样式 
添加DArrowrectangle控件 四个方向的圆角箭头样式,
对其他功能无影响.

Log: 添加DArrowrectangle控件新样式
Bug: https://pms.uniontech.com/zentao/bug-view-42916.html
Change-Id: I2654330d6f82b70296a65b440b245bba89264c1c
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2842
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 09:45:54 +08:00
chengyulong_cm 8ef32c3a9e fix: 修改预览页面和页码显示错误的问题 
修改翻页、改变纸张\页边距\打印方向后预览页面和页码显示错误的问题。

Log: 修改预览页面和页码显示错误的问题
Bug: https://pms.uniontech.com/zentao/bug-view-45306.html
     https://pms.uniontech.com/zentao/bug-view-45310.html
     https://pms.uniontech.com/zentao/bug-view-45312.html
Change-Id: Ic89bacf3a8d571a839fa64bbaaf746b8103315e9
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3113
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 09:31:32 +08:00
zhangkai 55db330a35 chore: 根据DDoubleSpinbox更新的接口及其属性设置，修改代码 
更换DDoubleSpinbox处属性设置所用接口

Log: 根据DDoubleSpinbox更新的接口及其属性设置，修改代码
Change-Id: Ia1d90da254275edf18bf4b440c489863ac95158f
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3187
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 09:30:36 +08:00
chengyulong_cm acbf7b381b fix: 更新翻译文件 
更新翻译文件

Log: 更新翻译文件
Change-Id: I5b352ef92ed60d13295c2c2e7fd952bb315fa425
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3253
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-02 09:21:03 +08:00
linxun e5cb5e6c9d fix: 修改打印自定义页码不合法无警示信息的问题 
增加对自定义页码的判断,对不合法的页码增加警示提示

Log: 修改打印自定义页码不合法无警示信息的问题

Bug: https://pms.uniontech.com/zentao/bug-view-45316.html
Change-Id: Ib0d32a84ad22c1c575f1d13ca1a92ffcd6b7314e
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3063
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-01 18:01:03 +08:00
chengyulong_cm 4b9748c461 fix: 修改打印预览颜色错误的问题 
修改打印预览颜色错误的问题

Log: 修改打印预览颜色错误的问题
Bug: https://pms.uniontech.com/zentao/bug-view-45309.html
Change-Id: I8dd187ccb01cb0296eb39fe9e8a66249753a0b0d
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3222
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-01 17:59:25 +08:00
Lvpeilong 1f6a2731f5 feat: 添加DPrintPreviewDialog文件 
添加DPrintPreviewDialog文件

Log: 添加DPrintPreviewDialog文件
Change-Id: I9da9bd008707721efc9595b470709bbf4a6de15c
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3180
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-01 13:13:42 +08:00
zhangkai 5876e06018 fix: 打印预览文案修改 
打印范围提示架空格

Log: 打印预览文案修改
Change-Id: I694160274d5531295ada056d275463c95bf87d8d
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3174
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-01 10:56:30 +08:00
zhangkai ac150b604c feat: 打印范围自定义时，翻页框可输入“1-6-2-1-1-” 
使用正则表达进行过滤，输入格式类似于1,1-2,3,3-5

Log: 打印范围自定义时，翻页框可输入“1-6-2-1-1-”

Task: https://pms.uniontech.com/zentao/story-view-5379.html
Change-Id: I2aa18267f7a70871ae45e840a3481a534a3f57d5
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3073
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-01 09:21:32 +08:00
kongyunzhen ae9633ee25 fix: 修复设置系统默认打印颜色为灰色时打印预览设置彩色打印无效问题 
通过setCupsOption设置cups options颜色模式

Log: 修复设置系统默认打印颜色为灰色时打印预览设置彩色打印无效问题

Bug: https://pms.uniontech.com/zentao/bug-view-44561.html
Change-Id: Icafc028fa7276123b4edaf32b93aa2e8302ee1ac
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3085
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-31 17:35:48 +08:00
ck a2ffddc1cc fix: build failed on Arch 
Arch build失败，去掉这一行可以

Log: 修复Arch上编译失败的问题
Issue: fix #1882 https://github.com/linuxdeepin/developer-center/issues/1882
Change-Id: I6a810a2f78db06e5d52106777ee6d6fca21b1f25
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/3056
Reviewed-by: zhangdingyuan <justforlxz@gmail.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: zhangwengeng <zhangwengeng@uniontech.com>
Reviewed-by: zhangjide <zhangjide@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-31 15:06:43 +08:00
kongyunzhen ccaf1a6a6a fix: 修复DDialog在未设置defaultbutton时内部包含的其它控件也不响应enter和return事件 
移除窗口action，从pressevent中捕获enter和return事件进行处理

Log: 修复DDialog在未设置defaultbutton时内部包含的其它控件也不响应enter和return事件

Change-Id: Ice929c7977fb4ce16070d693238a4ae6ad26bc10
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2592
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: zhangjide <zhangjide@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-31 14:59:39 +08:00
zhangkai 1f6c994b19 chore: 打印预览模块代码规范性清理 
清理qDebug打印代码、测试代码、空格、不必要注释以及二期ui开发代码，头文件引用规范性调整、代码段新增空格

Log: 打印预览模块代码清理
Change-Id: I0a0d6cf7b82c4a607cd3f23f72c8dba5b80c9278
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2873
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-29 13:24:12 +08:00
Lvpeilong 6908ceec44 fix: 处理视图控制部分注释 
处理视图控制部分注释

Log: 处理视图控制部分注释
Change-Id: Idb3fd96c5772356d40dfb5d0dde7e1e41a6e99b9
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2877
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:06:30 +08:00
zhangkai f43b2a9ed3 fix: 切换主题，背景色设置及去除界面边框问题 
根据当前主题，设置对应颜色，设置边框宽度为0

Log: 切换主题，背景色设置及去除边框设置
Change-Id: I0e74a2ef14a05ff713ef5015609e94a56dd6f1e9
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2849
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:06:03 +08:00
chenbin 46f61b19eb fix: 增加设置预览缩放的spinbox按回车键和1秒延时后界面刷新 
通过增加设置缩放的spinbox键位的事件，新增使用return(enter)
键位立刻设置界面缩放;同时增加设置缩放的spinbox 1秒未操作延时
设置界面缩放。

Log: 增加设置预览缩放回车键和1秒延时界面刷新
Bug: https://pms.uniontech.com/zentao/bug-view-44675.html
Change-Id: Iaf7d962ee5e7cea2062179351ae2bc3b91f14af4
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2825
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:05:30 +08:00
linxun 1c52e998bf fix: 修复自定义边距某一个数值为0时,其他数据失效的问题 
获取打印机和纸张的最小边距,增加判断,有一个边距小于最小值,将所有边距设为最小值

Log: 修复自定义边距某一个数值为0时,其他数据失效的问题

Bug: https://pms.uniontech.com/zentao/bug-view-44560.html
Change-Id: I887b7324df6537d0fd2c4ba5854e150cf70f92e8
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2780
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:05:30 +08:00
chenbin a21a824ad7 fix: 自定义页边距后，增加失去焦点和Return按下预览界面页边距更改 
设置自定义边距后，当spinbox失去焦点或者按下return(enter)键，调用外部
重绘预览界面页边距更改。同时避免1秒超时刷新界面和失去焦点界面的冲突。

Log: 自定义页边距spinbox增加失去焦点预览界面页边距更改
Bug: https://pms.uniontech.com/zentao/bug-view-44675.html
Change-Id: I956d0f4d136d70c8ccfe3e6f2340979ef0b01588
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2758
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:05:30 +08:00
chengyulong_cm f8457bcc54 fix: 修改预览显示错误的问题 
修改翻页、改变纸张\页边距\打印方向后预览显示错误的问题

Log: 修改后预览显示错误的问题
Bug: bug 44569\44568\44564\44562\44551
Change-Id: I2337b80def8b87ba41824d8d14c1e3e9bf6d60f5
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2733
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:05:30 +08:00
linxun bba6a5cad9 fix: 修复缩放滚动条可以将数值设置为0%的问题 
修改spinbox的范围,设置最小值为1

Log: 修复鼠标滚动条可将缩放的百分比置为：0%

Bug: https://pms.uniontech.com/zentao/bug-view-44472.html
Change-Id: Ibc0332f220f7297bb1738c33e08d8589bebbe696
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2713
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:05:27 +08:00
zhangkai 79d410bf05 fix: 再次切换自定义选项，显示上一次自定义页码的记录 
自定义页码后，切换到其他选项（比如当前页），再切回来时，保留用户上次输入的值，若为空，则显示默认提示。

Log: 再次切换自定义选项，显示上一次自定义页码的记录
Change-Id: Ia9da294d8206cb96ae2363bfdb99ab3cfbb06e0c
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2696
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
linxun a340a37be1 fix: 修改不匹配的文案 
对照需求文档修改不匹配的文案

Log: 修改不匹配的文案
Bug: https://pms.uniontech.com/zentao/bug-view-44483.html
Change-Id: I6f7cc1c69c6334bb7bd0db8df3a9b21c35f51a54
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2700
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
zhangkai 4e53c88aa7 fix: 打印范围为当前页面或者自定义时，打印预览模块的页码按钮应该禁用；页边距最大值修改 
根据页码判断，禁用翻页按钮；修改页边距正则表达

Log: 解决打印范围为当前页面或者自定义时，打印预览模块的页码按钮应该禁用及页边距最大值修改

Bug: https://pms.uniontech.com/zentao/bug-view-44253.html
Change-Id: I7357cdc2b6a319bb76be4ba8625b69aa96ebc49b
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2648
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
chengyulong_cm 9d00b5bed0 fix: 修改当前页为第一页的问题 
当选择预览某页时，切换到当前页显示上一次预览页面

Log: 修改当前页为第一页的问题
Change-Id: I3f335eeaafc665dea3aabd222c4472a7f54b4da2
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2643
Reviewed-by: chengyulong <chengyulong@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
linxun 748c567414 fix: 修复打印边距不生效的问题 
打印边距默认是点为单位,设置以毫米为单位使边距生效

Log: 修复打印边距不生效的问题

Bug: https://pms.uniontech.com/zentao/bug-view-43362.html
Change-Id: Ib30127815f3cb4e27233e87b53a0c695b746e295
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2630
Reviewed-by: chenke <chenke@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
linxun 50f00a5fc7 fix: 修复打印横向纵向切换排版问题 
去除设置打印范围的带有特殊限制的属性

Log: 打印方向调整后排版正常

Bug: https://pms.uniontech.com/zentao/bug-view-43275.html
Change-Id: I305ab5aa47f46ca4be81ca9614dced1e5a0c9cf0
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2619
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
chengyulong_cm 08df8f5f47 fix: 将当前页和选择页修改为当前页时只显示第一页、选择页时默认显示所有 
当前页和选择页修改为当前页时只显示第一页、选择页时默认显示所有

Log: 当前页和选择页修改为当前页时只显示第一页、选择页时默认显示所有
Change-Id: Ie9cc4ab157848775623a262bd6c1e42d3bca1d31
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2618
Reviewed-by: chengyulong <chengyulong@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
zhangkai 28dc74f219 fix: 解决当系统字体放大后，页边距各个方向的数据框的数据显示不完整 
根据字体大小，调节页边距布局自适应；修改打印设备及属性初始化

Log: 当系统字体放大后，页边距各个方向的数据框的数据显示不完整

Bug: https://pms.uniontech.com/zentao/bug-view-43236.html
Change-Id: I15c2e7a34441dc7957e423fc845be6cdcdcaa6c4
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2594
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
zhangkai ea07b48cb9 fix: 解决初始化时实际打印与列表显示打印机不一致 
修改初始化打印机默认打印机为当前打印机

Log: 初始化时实际打印与列表显示打印机不一致
Change-Id: I2a3113d4c2c93ebe2c844b2410b25bf25842ea2a
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2575
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
linxun 11e752cb22 fix: 优化打印机颜色模式打印 
优化灰度和彩色模式的预览调用,解决打印机彩色和灰色打印失效问题

Log: 打印机支持彩色和灰色打印,减少调用预览灰度和彩色调用
Change-Id: Id60cee602b0115ad9b3d949ed15503e9f6c2bdec
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2577
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:57 +08:00
linxun 888049386d fix: 缩放输入框不可输入特殊符号 
根据UI調整后的设计图设置过滤缩放输入过滤和输入的范围

Log: 缩放输入框限制输入,只能输入10-200中的数字

Bug: https://pms.uniontech.com/zentao/bug-view-43230.html
Change-Id: I1514beafd00c1927733b98958de16d34ef14933a
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2454
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:49 +08:00
zhangkai 39438bce5a fix: 解决页边距为“自定义”时，各个方向的边界值有误，并且可输入“+、-”特殊字符 
使用正则表达进行过滤

Log: 页边距为“自定义”时，各个方向的边界值有误，并且可输入“+、-”特殊字符

Bug: https://pms.uniontech.com/zentao/bug-view-43223.html
Change-Id: Iec7b9c925de2f77feb4e9697d4cabec86970108a
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2469
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:26 +08:00
lvpeilong 43424e7aa2 feat(preview): 去掉预览边框，修改预览视图底色以满足UI设计要求 
去掉预览边框，修改预览视图底色以满足UI设计要求

Log: 去掉预览边框，修改预览视图底色以满足UI设计要求
Change-Id: I42d8aae4e102e41fe43a7fe521b7079951e3e1b9
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2501
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:26 +08:00
chengyulong_cm c5e1eec15d fix: 修改打印时右下两边的边距跟随打印设置 
改打印时右下两边的边距跟随打印设置

Log: 改打印时右下两边的边距跟随打印设置
Bug: https://pms.uniontech.com/zentao/task-view-29938.html
Change-Id: I5c8dbed3612385f2381760b07c643dd4de998931
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2537
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:26 +08:00
chengyulong_cm c2ce367a79 fix: 更新debian/api.json文件 
更新debian/api.json文件

Log: 更新debian/api.json文件
Change-Id: Iae2e815b9ef6c36c79414c5f614567fcfb5e1fe5
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2562
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:04:23 +08:00
lvpeilong 87a4394ece feat(preview): 添加预览页面打印数据在缩放时超出边距不显示（但在页面内） 
在页面对象中添加数据容对象，绘制数据内容对象时按页面边框进行裁减显示

Log: 添加预览页面打印数据在缩放时超出边距不显示（但在页面内）
Change-Id: I0fb035247f0c62f1460c3c327424690c451459a2
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2441
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:03:35 +08:00
chengyulong_cm b616e71e97 fix: 修改打印预览视图外框圆角 
修改打印预览视图外框圆角

Log: 修改打印预览视图外框圆角
Change-Id: I2f63e55e31d52be0b90de45160ee15b6d6ae27eb
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2389
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:03:35 +08:00
zhangkai a0e5b05a7a fix: 解决当系统字体放大后，页边距各个方向的数据框的数据显示不完整 
修改布局，根据获取的系统字号修改

Log: 当系统字体放大后，页边距各个方向的数据框的数据显示不完整

Bug: https://pms.uniontech.com/zentao/bug-view-43236.html
Change-Id: I469fef506e0d3b155314f38fc8253394e2749630
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2386
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: lvpeilong <lvpeilong@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:03:27 +08:00
lvpeilong f241dcc3e6 fix(preview): 屏蔽预览窗鼠标滚轮缩放功能 
SP3无预览效果缩放设计，暂时屏蔽

Log: 屏蔽预览窗鼠标滚轮缩放功能
Change-Id: Ibea935985d835e8fd12ebfd334cbdeb0c0b64948
Reviewed-on: http://gerrit.uniontech.com/c/dtkwidget/+/2382
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: kongyunzhen <kongyunzhen@uniontech.com>
Reviewed-by: chenke <chenke@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-08-28 18:02:58 +08:00