Skip to content

Commit

Permalink
优化托盘菜单样式
Browse files Browse the repository at this point in the history
  • Loading branch information
@ffiirree
ffiirree committed Apr 20, 2022
1 parent 4955476 commit e08b29c
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 69 deletions.
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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` | 上一个截图记录
Expand All @@ -42,8 +42,8 @@ Keys | Actions
`Ctrl + C`/`Ctrl + V` | Copy & Paste
`Delete` | 删除选中的图形
`Shift` | 椭圆->圆<br>矩形->正方形<br>直线->水平/垂直
`Space` | 重新修改截图区域
`Wheel` | 控制马赛克/橡皮擦直径; 放置于菜单上时，控制图形边框宽度
`Space` | 重新调整截图区域
`Wheel` | 控制马赛克/橡皮擦直径 <br>放置于菜单上时，控制图形线条宽度

### 贴图

Expand All @@ -52,7 +52,7 @@ Keys | Actions
`F3` | 将粘贴板中的内容作为图片贴出<br>(文本内容也会渲染为图片)，如果粘贴板中的路径(路径为文本)为图片，则会贴出该图片
`Shift + F3` | 显示/隐藏所有贴出的贴图
`Wheel` | 缩放贴图
`Ctrl + Wheel` | 更改贴图透明度
`Ctrl + Wheel` | 调整贴图透明度
`G` | 灰阶显示
`R` | 顺时针旋转90
`Ctrl + R` | 逆时针旋转90
Expand Down Expand Up @@ -114,7 +114,7 @@ make -j8
make package
```

### 安装FFmpeg
### Install FFmpeg

#### Windows

Expand Down
50 changes: 25 additions & 25 deletions languages/capturer_en_US.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,122 +83,122 @@
<context>
<name>ImageWindow</name>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="261"/>
<location filename="../src/pinned/imagewindow.cpp" line="265"/>
<source>Open Image</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="278"/>
<location filename="../src/pinned/imagewindow.cpp" line="282"/>
<source>Save Image</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="315"/>
<location filename="../src/pinned/imagewindow.cpp" line="319"/>
<source>Copy image</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="316"/>
<location filename="../src/pinned/imagewindow.cpp" line="320"/>
<source>Paste image</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="335"/>
<location filename="../src/pinned/imagewindow.cpp" line="339"/>
<source>Open image...</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="336"/>
<location filename="../src/pinned/imagewindow.cpp" line="340"/>
<source>Save as...</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="350"/>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<source>Gray</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="341"/>
<location filename="../src/pinned/imagewindow.cpp" line="345"/>
<source>Rotate 90</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="320"/>
<location filename="../src/pinned/imagewindow.cpp" line="324"/>
<source>Edit</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="340"/>
<location filename="../src/pinned/imagewindow.cpp" line="344"/>
<source>Grayscale</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="342"/>
<location filename="../src/pinned/imagewindow.cpp" line="346"/>
<source>Rotate -90</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="343"/>
<location filename="../src/pinned/imagewindow.cpp" line="347"/>
<source>Flip H</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="344"/>
<location filename="../src/pinned/imagewindow.cpp" line="348"/>
<source>Flip V</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="348"/>
<location filename="../src/pinned/imagewindow.cpp" line="352"/>
<source>Background</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="349"/>
<location filename="../src/pinned/imagewindow.cpp" line="353"/>
<source>White</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="351"/>
<location filename="../src/pinned/imagewindow.cpp" line="355"/>
<source>Black</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="352"/>
<location filename="../src/pinned/imagewindow.cpp" line="356"/>
<source>Transparent</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Shadow</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Hide </source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Show </source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="355"/>
<location filename="../src/pinned/imagewindow.cpp" line="359"/>
<source>Zoom : </source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="356"/>
<location filename="../src/pinned/imagewindow.cpp" line="360"/>
<source>Opacity : </source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="357"/>
<location filename="../src/pinned/imagewindow.cpp" line="361"/>
<source>Recover</source>
<translation></translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="361"/>
<location filename="../src/pinned/imagewindow.cpp" line="365"/>
<source>Close</source>
<translation></translation>
</message>
Expand Down Expand Up @@ -342,7 +342,7 @@
</message>
<message>
<location filename="../src/setting/settingdialog.cpp" line="344"/>
<source>Copyright © 2018 - 2022 ffiirree All rights reserved</source>
<source>Copyright © 2018 - 2022 ffiirree. All rights reserved</source>
<translation></translation>
</message>
</context>
Expand Down
50 changes: 25 additions & 25 deletions languages/capturer_zh_CN.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,122 +83,122 @@
<context>
<name>ImageWindow</name>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="261"/>
<location filename="../src/pinned/imagewindow.cpp" line="265"/>
<source>Open Image</source>
<translation>打开图片</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="278"/>
<location filename="../src/pinned/imagewindow.cpp" line="282"/>
<source>Save Image</source>
<translation>保存图片</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="315"/>
<location filename="../src/pinned/imagewindow.cpp" line="319"/>
<source>Copy image</source>
<translation>复制图片</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="316"/>
<location filename="../src/pinned/imagewindow.cpp" line="320"/>
<source>Paste image</source>
<translation>粘贴图片</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="320"/>
<location filename="../src/pinned/imagewindow.cpp" line="324"/>
<source>Edit</source>
<translation>编辑</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="335"/>
<location filename="../src/pinned/imagewindow.cpp" line="339"/>
<source>Open image...</source>
<translation>打开图片</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="336"/>
<location filename="../src/pinned/imagewindow.cpp" line="340"/>
<source>Save as...</source>
<translation>另存为...</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="350"/>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<source>Gray</source>
<translation>灰色</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="341"/>
<location filename="../src/pinned/imagewindow.cpp" line="345"/>
<source>Rotate 90</source>
<translation>顺时针旋转90°</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="340"/>
<location filename="../src/pinned/imagewindow.cpp" line="344"/>
<source>Grayscale</source>
<translation>灰阶</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="342"/>
<location filename="../src/pinned/imagewindow.cpp" line="346"/>
<source>Rotate -90</source>
<translation>逆时针旋转90°</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="343"/>
<location filename="../src/pinned/imagewindow.cpp" line="347"/>
<source>Flip H</source>
<translation>水平翻转</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="344"/>
<location filename="../src/pinned/imagewindow.cpp" line="348"/>
<source>Flip V</source>
<translation>垂直翻转</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="348"/>
<location filename="../src/pinned/imagewindow.cpp" line="352"/>
<source>Background</source>
<translation>背景色</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="349"/>
<location filename="../src/pinned/imagewindow.cpp" line="353"/>
<source>White</source>
<translation>白色</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="351"/>
<location filename="../src/pinned/imagewindow.cpp" line="355"/>
<source>Black</source>
<translation>黑色</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="352"/>
<location filename="../src/pinned/imagewindow.cpp" line="356"/>
<source>Transparent</source>
<translation>透明</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Shadow</source>
<translation>阴影</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Hide </source>
<translation>隐藏</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="354"/>
<location filename="../src/pinned/imagewindow.cpp" line="358"/>
<source>Show </source>
<translation>显示</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="355"/>
<location filename="../src/pinned/imagewindow.cpp" line="359"/>
<source>Zoom : </source>
<translation>缩放 ：</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="356"/>
<location filename="../src/pinned/imagewindow.cpp" line="360"/>
<source>Opacity : </source>
<translation>透明度 ：</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="357"/>
<location filename="../src/pinned/imagewindow.cpp" line="361"/>
<source>Recover</source>
<translation>复原</translation>
</message>
<message>
<location filename="../src/pinned/imagewindow.cpp" line="361"/>
<location filename="../src/pinned/imagewindow.cpp" line="365"/>
<source>Close</source>
<translation>关闭</translation>
</message>
Expand Down Expand Up @@ -342,7 +342,7 @@
</message>
<message>
<location filename="../src/setting/settingdialog.cpp" line="344"/>
<source>Copyright © 2018 - 2022 ffiirree All rights reserved</source>
<source>Copyright © 2018 - 2022 ffiirree. All rights reserved</source>
<translation></translation>
</message>
</context>
Expand Down
18 changes: 8 additions & 10 deletions src/capturer.qss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading

0 comments on commit e08b29c

Please sign in to comment.