diff --git a/README.md b/README.md
index 8640103..86b34a8 100644
--- a/README.md
+++ b/README.md
@@ -15,15 +15,15 @@ Keys | Actions
`Ctrl + A` | 全屏
`W / A / S / D` | 逐像素移动窗口
`↑ ← ↓ →` | 逐像素移动窗口
-`Ctrl + W / A / S / D` | 逐像素扩大窗口
-`Ctrl + ↑ ← ↓ →` | 逐像素缩小窗口
+`Ctrl + ↑ ← ↓ →` | 逐像素扩大窗口
+`Shift + ↑ ← ↓ →` | 逐像素缩小窗口
`ESC` | 退出
### 截图
Keys | Actions
:-:|---
-`F1` | 开始截图
+`F1(默认，可修改)` | 开始截图
`P` | 截图并贴图
`Ctrl + S` | 截图并保存到文件
`Page Up` | 上一个截图记录
@@ -42,8 +42,8 @@ Keys | Actions
`Ctrl + C`/`Ctrl + V` | Copy & Paste
`Delete` | 删除选中的图形
`Shift` | 椭圆->圆
矩形->正方形
直线->水平/垂直
-`Space` | 重新修改截图区域
-`Wheel` | 控制马赛克/橡皮擦直径; 放置于菜单上时，控制图形边框宽度
+`Space` | 重新调整截图区域
+`Wheel` | 控制马赛克/橡皮擦直径
放置于菜单上时，控制图形线条宽度
### 贴图
@@ -52,7 +52,7 @@ Keys | Actions
`F3` | 将粘贴板中的内容作为图片贴出
(文本内容也会渲染为图片)，如果粘贴板中的路径(路径为文本)为图片，则会贴出该图片
`Shift + F3` | 显示/隐藏所有贴出的贴图
`Wheel` | 缩放贴图
-`Ctrl + Wheel` | 更改贴图透明度
+`Ctrl + Wheel` | 调整贴图透明度
`G` | 灰阶显示
`R` | 顺时针旋转90
`Ctrl + R` | 逆时针旋转90
@@ -114,7 +114,7 @@ make -j8
make package
```
-### 安装FFmpeg
+### Install FFmpeg
#### Windows
diff --git a/languages/capturer_en_US.ts b/languages/capturer_en_US.ts
index 029789a..3fb385d 100644
--- a/languages/capturer_en_US.ts
+++ b/languages/capturer_en_US.ts
@@ -83,122 +83,122 @@
ImageWindow
-
+
Open Image
-
+
Save Image
-
+
Copy image
-
+
Paste image
-
+
Open image...
-
+
Save as...
-
+
Gray
-
+
Rotate 90
-
+
Edit
-
+
Grayscale
-
+
Rotate -90
-
+
Flip H
-
+
Flip V
-
+
Background
-
+
White
-
+
Black
-
+
Transparent
-
+
Shadow
-
+
Hide
-
+
Show
-
+
Zoom :
-
+
Opacity :
-
+
Recover
-
+
Close
@@ -342,7 +342,7 @@
- Copyright © 2018 - 2022 ffiirree All rights reserved
+ Copyright © 2018 - 2022 ffiirree. All rights reserved
diff --git a/languages/capturer_zh_CN.ts b/languages/capturer_zh_CN.ts
index 673128c..4f5c51c 100644
--- a/languages/capturer_zh_CN.ts
+++ b/languages/capturer_zh_CN.ts
@@ -83,122 +83,122 @@
ImageWindow
-
+
Open Image
打开图片
-
+
Save Image
保存图片
-
+
Copy image
复制图片
-
+
Paste image
粘贴图片
-
+
Edit
编辑
-
+
Open image...
打开图片
-
+
Save as...
另存为...
-
+
Gray
灰色
-
+
Rotate 90
顺时针旋转90°
-
+
Grayscale
灰阶
-
+
Rotate -90
逆时针旋转90°
-
+
Flip H
水平翻转
-
+
Flip V
垂直翻转
-
+
Background
背景色
-
+
White
白色
-
+
Black
黑色
-
+
Transparent
透明
-
+
Shadow
阴影
-
+
Hide
隐藏
-
+
Show
显示
-
+
Zoom :
缩放 ：
-
+
Opacity :
透明度 ：
-
+
Recover
复原
-
+
Close
关闭
@@ -342,7 +342,7 @@
- Copyright © 2018 - 2022 ffiirree All rights reserved
+ Copyright © 2018 - 2022 ffiirree. All rights reserved
diff --git a/src/capturer.qss b/src/capturer.qss
index fc1f5dd..fb8d3e4 100644
--- a/src/capturer.qss
+++ b/src/capturer.qss
@@ -1,24 +1,22 @@
QMenu#sys_tray_menu {
- background-color: #ffffff;
+ background-color: #fafafa;
border: 1px solid #e5e5e6;
- padding: 3px;
+ padding: 5px 0 5px 0;
+
+ font-family: "Microsoft YaHei";
+ color: #333333;
}
QMenu#sys_tray_menu::item {
- background-color:#ffffff;
- border-left: 15px solid #ffffff;
+ border-left: 10px solid transparent;
+ border-right: 13px solid transparent;
height: 35px;
- padding-left: 15px;
-
- font-size: 14px;
- font-family: "Microsoft YaHei";
- color: #333333;
+ padding-left: 5px;
}
QMenu#sys_tray_menu::item:selected {
background-color:#e5e5e6;
- border-left: 15px solid #e5e5e6;
}
QMenu#sys_tray_menu::separator {
diff --git a/src/pinned/imagewindow.cpp b/src/pinned/imagewindow.cpp
index ddf39b8..dafa7e0 100644
--- a/src/pinned/imagewindow.cpp
+++ b/src/pinned/imagewindow.cpp
@@ -151,8 +151,9 @@ void ImageWindow::update(Modified type)
}
canvas_->pixmap(scale_ == 1.0 ? pixmap_ : pixmap_.scaled(pixmap_.size() * scale_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
- auto geometry = getShadowGeometry(canvas_->pixmap().size());
+ auto geometry = getShadowGeometry(canvas_->pixmap().size());
+#ifdef _WIN32
if (type == Modified::SCALED) {
// resize and repaint first
resize(geometry.size());
@@ -162,6 +163,9 @@ void ImageWindow::update(Modified type)
else {
setGeometry(geometry);
}
+#elif __linux__
+ setGeometry(geometry);
+#endif
}
QRect ImageWindow::getShadowGeometry(QSize _size)
diff --git a/src/setting/settingdialog.cpp b/src/setting/settingdialog.cpp
index 6f85b75..69de981 100644
--- a/src/setting/settingdialog.cpp
+++ b/src/setting/settingdialog.cpp
@@ -341,7 +341,7 @@ void SettingWindow::setupAboutWidget()
/////
parent_layout->addStretch();
- auto copyright_ = new QLabel(tr("Copyright © 2018 - 2022 ffiirree All rights reserved"));
+ auto copyright_ = new QLabel(tr("Copyright © 2018 - 2022 ffiirree. All rights reserved"));
copyright_->setObjectName("copyright-label");
copyright_->setAlignment(Qt::AlignCenter);
parent_layout->addWidget(copyright_);