From fbc14e854a4236b2db0e909e871caf6ef4b383b2 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 13:11:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/js/pages/Forward/index.js | 4 ++--
src/js/pages/Home/ChatContent/index.js | 12 ++++++------
src/js/pages/Home/Chats/index.js | 8 ++++----
src/js/pages/UserInfo/index.js | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/package.json b/package.json
index 55d8ac1..36ec953 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wewechat",
- "version": "1.2.1",
+ "version": "1.2.1.1",
"description": "make weweChat great again!!!",
"main": "main.js",
"scripts": {
diff --git a/src/js/pages/Forward/index.js b/src/js/pages/Forward/index.js
index 691ba08..ffef11d 100644
--- a/src/js/pages/Forward/index.js
+++ b/src/js/pages/Forward/index.js
@@ -78,7 +78,7 @@ export default class Forward extends Component {
onCancel={e => this.close()}
show={this.props.show}>
<ModalBody className={classes.container}>
- Forward Message
+ 转发消息
<div className={classes.avatars}>
{
@@ -100,7 +100,7 @@ export default class Forward extends Component {
<button
disabled={!this.state.selected.length}
onClick={e => this.send(this.state.selected)}>
- Send Message
+ 发送消息
</button>
<button onClick={e => this.close()}>Cancel</button>
diff --git a/src/js/pages/Home/ChatContent/index.js b/src/js/pages/Home/ChatContent/index.js
index 7f07064..a64159f 100644
--- a/src/js/pages/Home/ChatContent/index.js
+++ b/src/js/pages/Home/ChatContent/index.js
@@ -448,7 +448,7 @@ export default class ChatContent extends Component {
var caniforward = [1, 3, 47, 43, 49 + 6].includes(message.MsgType);
var templates = [
{
- label: 'Delete',
+ label: '删除',
click: () => {
this.props.deleteMessage(message.MsgId);
}
@@ -458,7 +458,7 @@ export default class ChatContent extends Component {
if (caniforward) {
templates.unshift({
- label: 'Forward',
+ label: '转发',
click: () => {
this.props.showForward(message);
}
@@ -468,7 +468,7 @@ export default class ChatContent extends Component {
if (message.isme
&& message.CreateTime - new Date() < 2 * 60 * 1000) {
templates.unshift({
- label: 'Recall',
+ label: '撤回',
click: () => {
this.props.recallMessage(message);
}
@@ -494,7 +494,7 @@ export default class ChatContent extends Component {
type: 'separator',
},
{
- label: 'Empty Content',
+ label: '清空聊天内容',
click: () => {
this.props.empty(user);
}
@@ -503,13 +503,13 @@ export default class ChatContent extends Component {
type: 'separator'
},
{
- label: helper.isTop(user) ? 'Unsticky' : 'Sticky on Top',
+ label: helper.isTop(user) ? '取消置顶' : '聊天置顶',
click: () => {
this.props.sticky(user);
}
},
{
- label: 'Delete',
+ label: '删除',
click: () => {
this.props.removeChat(user);
}
diff --git a/src/js/pages/Home/Chats/index.js b/src/js/pages/Home/Chats/index.js
index a706ecc..5d2e466 100644
--- a/src/js/pages/Home/Chats/index.js
+++ b/src/js/pages/Home/Chats/index.js
@@ -56,7 +56,7 @@ export default class Chats extends Component {
showContextMenu(user) {
var menu = new remote.Menu.buildFromTemplate([
{
- label: 'Send Message',
+ label: '发送消息',
click: () => {
this.props.chatTo(user);
}
@@ -65,19 +65,19 @@ export default class Chats extends Component {
type: 'separator'
},
{
- label: helper.isTop(user) ? 'Unsticky' : 'Sticky on Top',
+ label: helper.isTop(user) ? '取消置顶' : '聊天置顶',
click: () => {
this.props.sticky(user);
}
},
{
- label: 'Delete',
+ label: '删除',
click: () => {
this.props.removeChat(user);
}
},
{
- label: 'Mark as Read',
+ label: '标为已读',
click: () => {
this.props.markedRead(user.UserName);
}
diff --git a/src/js/pages/UserInfo/index.js b/src/js/pages/UserInfo/index.js
index 3a0d520..387747d 100644
--- a/src/js/pages/UserInfo/index.js
+++ b/src/js/pages/UserInfo/index.js
@@ -210,7 +210,7 @@ class UserInfo extends Component {
color: buttonColor,
opacity: .6,
}}>
- {helper.isChatRoom(UserName) || isFriend ? 'Send Message' : 'Add Friend'}
+ {helper.isChatRoom(UserName) || isFriend ? '发送消息' : '添加好友'}
</div>
</div>
From 442489dce29932e8b383cf51163db808d2241674 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 13:15:27 +0800
Subject: [PATCH 2/6] 1.2.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 36ec953..9a2bfeb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wewechat",
- "version": "1.2.1.1",
+ "version": "1.2.2",
"description": "make weweChat great again!!!",
"main": "main.js",
"scripts": {
From 62c2d3d99db7ca5d297dac53828b8aa82e27ebe1 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 13:59:05 +0800
Subject: [PATCH 3/6] single
---
main.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/main.js b/main.js
index af24f19..762e1ce 100644
--- a/main.js
+++ b/main.js
@@ -477,7 +477,14 @@ function createMenu() {
mainWindow.setMenu(menu);
}
}
+const shouldQuit = app.makeSingleInstance(() => {
+ if (mainWindow) {
+ if (mainWindow.isMinimized()) mainWindow.restore()
+ mainWindow.focus()
+ }
+})
+shouldQuit && app.quit()
const createMainWindow = () => {
var mainWindowState = windowStateKeeper({
defaultWidth: 745,
From ff988aa4460632a06161ee3b43d6a802be89b375 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 14:02:41 +0800
Subject: [PATCH 4/6] single
---
main.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/main.js b/main.js
index 762e1ce..421dc2b 100644
--- a/main.js
+++ b/main.js
@@ -479,12 +479,12 @@ function createMenu() {
}
const shouldQuit = app.makeSingleInstance(() => {
if (mainWindow) {
- if (mainWindow.isMinimized()) mainWindow.restore()
- mainWindow.focus()
+ if (mainWindow.isMinimized()) mainWindow.restore();
+ mainWindow.focus();
}
})
-shouldQuit && app.quit()
+shouldQuit && app.quit();
const createMainWindow = () => {
var mainWindowState = windowStateKeeper({
defaultWidth: 745,
From 4c2cdd9499a90bf6c21249c6f3130f32d48b313c Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 14:08:16 +0800
Subject: [PATCH 5/6] single
---
main.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main.js b/main.js
index 421dc2b..a3293db 100644
--- a/main.js
+++ b/main.js
@@ -482,9 +482,9 @@ const shouldQuit = app.makeSingleInstance(() => {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
}
-})
-
+});
shouldQuit && app.quit();
+
const createMainWindow = () => {
var mainWindowState = windowStateKeeper({
defaultWidth: 745,
From 90d68492eb60d9e6fc80bb5e8874bfbb249f8efa Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 14:18:11 +0800
Subject: [PATCH 6/6] single
---
main.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/main.js b/main.js
index a3293db..50f93ff 100644
--- a/main.js
+++ b/main.js
@@ -480,6 +480,7 @@ function createMenu() {
const shouldQuit = app.makeSingleInstance(() => {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
+ mainWindow.show();
mainWindow.focus();
}
});