Skip to content

Commit 7b67e66

Browse files
tumuyantumuyan
committed
Merge branch 'master' into add_restart
2 parents 8ed8843 + 54872fc commit 7b67e66

File tree

6 files changed

+99
-44
lines changed

6 files changed

+99
-44
lines changed

‎SerialTool/include/mainwindow.h

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ private slots:
3333
void onPortSwitchAction2Triggered();
3434
void dispPortStatus();
3535
void clear();
36+
void removeConfig();
3637
void setOptions();
3738
void onStaysOnTopTriggered();
3839
void about();

‎SerialTool/include/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __VERSION_H
22
#define __VERSION_H
33

4-
#define MAIN_VERSION 1.4.0Alpha
4+
#define MAIN_VERSION 1.4.1(T)
55

66
#define SOFTWARE_NAME "SerialTool"
77
#define COPYRIGHT "Copyleft 2017-2018, Wenliang Guan"

‎SerialTool/language/serialtool_zh_CN.qm

7.93 KB
Binary file not shown.

‎SerialTool/language/serialtool_zh_CN.ts

+66-41
Original file line numberDiff line numberDiff line change
@@ -144,142 +144,147 @@
144144
<context>
145145
<name>MainWindow</name>
146146
<message>
147-
<location filename="../ui/mainwindow.ui" line="82"/>
147+
<location filename="../ui/mainwindow.ui" line="69"/>
148148
<source>File</source>
149149
<translation>文件</translation>
150150
</message>
151151
<message>
152-
<location filename="../ui/mainwindow.ui" line="91"/>
152+
<location filename="../ui/mainwindow.ui" line="78"/>
153153
<source>Tools</source>
154154
<translation>工具</translation>
155155
</message>
156156
<message>
157-
<location filename="../ui/mainwindow.ui" line="98"/>
157+
<location filename="../ui/mainwindow.ui" line="85"/>
158158
<source>Edit</source>
159159
<translation>编辑</translation>
160160
</message>
161161
<message>
162-
<location filename="../ui/mainwindow.ui" line="108"/>
162+
<location filename="../ui/mainwindow.ui" line="95"/>
163163
<source>View</source>
164164
<translation>视图</translation>
165165
</message>
166166
<message>
167-
<location filename="../ui/mainwindow.ui" line="118"/>
167+
<location filename="../ui/mainwindow.ui" line="106"/>
168168
<source>Help</source>
169169
<translation>帮助</translation>
170170
</message>
171171
<message>
172-
<location filename="../ui/mainwindow.ui" line="132"/>
173-
<location filename="../ui/mainwindow.ui" line="245"/>
172+
<location filename="../ui/mainwindow.ui" line="120"/>
173+
<location filename="../ui/mainwindow.ui" line="233"/>
174174
<source>Tool Bar</source>
175175
<translation>工具栏</translation>
176176
</message>
177177
<message>
178-
<location filename="../ui/mainwindow.ui" line="164"/>
178+
<location filename="../ui/mainwindow.ui" line="152"/>
179179
<source>Save</source>
180180
<translation>保存</translation>
181181
</message>
182182
<message>
183-
<location filename="../ui/mainwindow.ui" line="167"/>
183+
<location filename="../ui/mainwindow.ui" line="155"/>
184184
<source>Ctrl+S</source>
185185
<translation></translation>
186186
</message>
187187
<message>
188-
<location filename="../ui/mainwindow.ui" line="176"/>
188+
<location filename="../ui/mainwindow.ui" line="164"/>
189189
<source>Options</source>
190190
<translation>选项</translation>
191191
</message>
192192
<message>
193-
<location filename="../ui/mainwindow.ui" line="185"/>
194-
<location filename="../src/mainwindow.cpp" line="263"/>
193+
<location filename="../ui/mainwindow.ui" line="173"/>
194+
<location filename="../src/mainwindow.cpp" line="268"/>
195195
<source>Open Port</source>
196196
<translation>打开端口</translation>
197197
</message>
198198
<message>
199-
<location filename="../ui/mainwindow.ui" line="188"/>
199+
<location filename="../ui/mainwindow.ui" line="176"/>
200200
<source>Alt+S</source>
201201
<translation></translation>
202202
</message>
203203
<message>
204-
<location filename="../ui/mainwindow.ui" line="201"/>
205-
<location filename="../src/mainwindow.cpp" line="213"/>
204+
<location filename="../ui/mainwindow.ui" line="189"/>
205+
<location filename="../src/mainwindow.cpp" line="218"/>
206206
<source>Pause Tx/Rx</source>
207207
<translation>暂停发送/接收</translation>
208208
</message>
209209
<message>
210-
<location filename="../ui/mainwindow.ui" line="204"/>
210+
<location filename="../ui/mainwindow.ui" line="192"/>
211211
<source>Alt+R</source>
212212
<translation></translation>
213213
</message>
214214
<message>
215-
<location filename="../ui/mainwindow.ui" line="213"/>
215+
<location filename="../ui/mainwindow.ui" line="201"/>
216216
<source>Clear Buffer</source>
217217
<translation>清空缓冲</translation>
218218
</message>
219219
<message>
220-
<location filename="../ui/mainwindow.ui" line="216"/>
220+
<location filename="../ui/mainwindow.ui" line="204"/>
221221
<source>Alt+C</source>
222222
<translation></translation>
223223
</message>
224224
<message>
225-
<location filename="../ui/mainwindow.ui" line="225"/>
225+
<location filename="../ui/mainwindow.ui" line="213"/>
226226
<source>Port Settings</source>
227227
<translation>端口设置</translation>
228228
</message>
229229
<message>
230-
<location filename="../ui/mainwindow.ui" line="234"/>
230+
<location filename="../ui/mainwindow.ui" line="222"/>
231231
<source>Close</source>
232232
<translation>关闭</translation>
233233
</message>
234234
<message>
235-
<location filename="../ui/mainwindow.ui" line="256"/>
235+
<location filename="../ui/mainwindow.ui" line="244"/>
236236
<source>Status Bar</source>
237237
<translation>状态栏</translation>
238238
</message>
239239
<message>
240-
<location filename="../ui/mainwindow.ui" line="261"/>
240+
<location filename="../ui/mainwindow.ui" line="249"/>
241241
<source>About</source>
242242
<translation>关于</translation>
243243
</message>
244244
<message>
245-
<location filename="../ui/mainwindow.ui" line="264"/>
245+
<location filename="../ui/mainwindow.ui" line="252"/>
246246
<source>F1</source>
247247
<translation></translation>
248248
</message>
249249
<message>
250-
<location filename="../ui/mainwindow.ui" line="269"/>
251-
<location filename="../ui/mainwindow.ui" line="272"/>
250+
<location filename="../ui/mainwindow.ui" line="257"/>
251+
<location filename="../ui/mainwindow.ui" line="260"/>
252252
<source>Wiki</source>
253253
<translation></translation>
254254
</message>
255255
<message>
256-
<location filename="../ui/mainwindow.ui" line="281"/>
257-
<location filename="../ui/mainwindow.ui" line="284"/>
256+
<location filename="../ui/mainwindow.ui" line="269"/>
257+
<location filename="../ui/mainwindow.ui" line="272"/>
258258
<source>Open</source>
259259
<translation>打开</translation>
260260
</message>
261261
<message>
262-
<location filename="../ui/mainwindow.ui" line="287"/>
262+
<location filename="../ui/mainwindow.ui" line="275"/>
263263
<source>Ctrl+O</source>
264264
<translation></translation>
265265
</message>
266266
<message>
267-
<location filename="../ui/mainwindow.ui" line="296"/>
267+
<location filename="../ui/mainwindow.ui" line="284"/>
268268
<source>Stays On Top</source>
269269
<translation>置于顶层</translation>
270270
</message>
271271
<message>
272-
<location filename="../ui/mainwindow.ui" line="301"/>
272+
<location filename="../ui/mainwindow.ui" line="289"/>
273273
<source>Update</source>
274274
<translation>更新</translation>
275275
</message>
276276
<message>
277-
<location filename="../src/mainwindow.cpp" line="208"/>
277+
<location filename="../ui/mainwindow.ui" line="294"/>
278+
<source>Reset Config</source>
279+
<translation>清除设置</translation>
280+
</message>
281+
<message>
282+
<location filename="../src/mainwindow.cpp" line="213"/>
278283
<source>Start Tx/Rx</source>
279284
<translation>开始发送/接收</translation>
280285
</message>
281286
<message>
282-
<location filename="../src/mainwindow.cpp" line="249"/>
287+
<location filename="../src/mainwindow.cpp" line="254"/>
283288
<source>Close Port</source>
284289
<translation>关闭端口</translation>
285290
</message>
@@ -402,12 +407,12 @@
402407
<translation>波特率</translation>
403408
</message>
404409
<message>
405-
<location filename="../src/port/serialport.cpp" line="94"/>
410+
<location filename="../src/port/serialport.cpp" line="92"/>
406411
<source>Error</source>
407412
<translation>错误</translation>
408413
</message>
409414
<message>
410-
<location filename="../src/port/serialport.cpp" line="95"/>
415+
<location filename="../src/port/serialport.cpp" line="93"/>
411416
<source>Can not open the port!
412417
Port may be occupied or configured incorrectly!</source>
413418
<translation>无法打开端口！
@@ -487,6 +492,14 @@ Please check the port number.</source>
487492
<translation>远程主机关闭连接。</translation>
488493
</message>
489494
</context>
495+
<context>
496+
<name>TerminalView</name>
497+
<message>
498+
<location filename="../src/views/terminal/terminalview.h" line="16"/>
499+
<source>Terminal</source>
500+
<translation type="unfinished">终端</translation>
501+
</message>
502+
</context>
490503
<context>
491504
<name>TextTRView</name>
492505
<message>
@@ -520,23 +533,23 @@ Please check the port number.</source>
520533
<translation>发送</translation>
521534
</message>
522535
<message>
523-
<location filename="../src/views/terminal/texttrview.cpp" line="189"/>
536+
<location filename="../src/views/texttr/texttrview.cpp" line="205"/>
524537
<source>Ctrl + Enter to send</source>
525538
<translation>Ctrl + Enter发送</translation>
526539
</message>
527540
<message>
528-
<location filename="../src/views/terminal/texttrview.cpp" line="190"/>
541+
<location filename="../src/views/texttr/texttrview.cpp" line="206"/>
529542
<source>Connect port and start transmission to enable this button</source>
530543
<translation>连接端口并开启传输来启用此按钮</translation>
531544
</message>
532545
<message>
533-
<location filename="../src/views/terminal/texttrview.cpp" line="442"/>
534-
<location filename="../src/views/terminal/texttrview.cpp" line="447"/>
546+
<location filename="../src/views/texttr/texttrview.cpp" line="479"/>
547+
<location filename="../src/views/texttr/texttrview.cpp" line="484"/>
535548
<source>Terminal Text File (*.txt)</source>
536549
<translation>终端文本文件 (*.txt)</translation>
537550
</message>
538551
<message>
539-
<location filename="../src/views/terminal/texttrview.h" line="18"/>
552+
<location filename="../src/views/texttr/texttrview.h" line="18"/>
540553
<source>Text Tx/Rx</source>
541554
<translation>文本收发</translation>
542555
</message>
@@ -681,12 +694,24 @@ Please check the port number.</source>
681694
<context>
682695
<name>ViewManager</name>
683696
<message>
684-
<location filename="../src/views/viewmanager.cpp" line="113"/>
697+
<location filename="../src/views/viewmanager.cpp" line="146"/>
685698
<source>Save</source>
686699
<translation>保存</translation>
687700
</message>
688701
<message>
689-
<location filename="../src/views/viewmanager.cpp" line="126"/>
702+
<location filename="../src/views/viewmanager.cpp" line="155"/>
703+
<location filename="../src/views/viewmanager.cpp" line="174"/>
704+
<source>Warning</source>
705+
<translation type="unfinished">警告</translation>
706+
</message>
707+
<message>
708+
<location filename="../src/views/viewmanager.cpp" line="156"/>
709+
<location filename="../src/views/viewmanager.cpp" line="175"/>
710+
<source>This view does not support this operation.</source>
711+
<translation type="unfinished"></translation>
712+
</message>
713+
<message>
714+
<location filename="../src/views/viewmanager.cpp" line="165"/>
690715
<source>Open</source>
691716
<translation>打开</translation>
692717
</message>

‎SerialTool/src/mainwindow.cpp

+25-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ MainWindow::MainWindow(QWidget *parent) :
2020
QMainWindow(parent),
2121
ui(new Ui::MainWindow)
2222
{
23-
QString configPath(QStandardPaths::writableLocation(
24-
QStandardPaths::AppConfigLocation) + "/config.ini");
23+
// QString configPath(QStandardPaths::writableLocation(
24+
// QStandardPaths::AppConfigLocation) + "/config.ini");
25+
26+
QString configPath( QCoreApplication::applicationDirPath() + "/config.ini");
27+
2528
syncDefaultConfig(configPath);
2629
m_config = new QSettings(configPath, QSettings::IniFormat);
2730

@@ -51,6 +54,7 @@ MainWindow::MainWindow(QWidget *parent) :
5154
connect(ui->portSwitchAction, SIGNAL(triggered()), this, SLOT(onPortSwitchActionTriggered()));
5255
connect(ui->portSwitchAction2, SIGNAL(triggered()), this, SLOT(onPortSwitchAction2Triggered()));
5356
connect(ui->clearAction, SIGNAL(triggered()), this, SLOT(clear()));
57+
connect(ui->actionRemoveConfig, SIGNAL(triggered()), this, SLOT(removeConfig()));
5458
connect(&m_timer, &QTimer::timeout, this, &MainWindow::onSecTimerTimeout);
5559
connect(ui->actionOption, SIGNAL(triggered()), this, SLOT(setOptions()));
5660
connect(ui->actionClose, SIGNAL(triggered()), this, SLOT(close()));
@@ -305,6 +309,24 @@ void MainWindow::clear()
305309
m_controller->clear();
306310
}
307311

312+
// 删除配置文件并退出
313+
void MainWindow::removeConfig(){
314+
315+
// QString configPath(QStandardPaths::writableLocation(
316+
// QStandardPaths::AppConfigLocation) + "/config.ini");
317+
// syncDefaultConfig(configPath);
318+
319+
// QFile file(configPath);
320+
// file.open(QFile::WriteOnly|QFile::Truncate);
321+
// file.close();
322+
323+
QString fileName = QCoreApplication::applicationDirPath() + "/config.ini";
324+
QFile fileTemp(fileName);
325+
fileTemp.remove();
326+
QApplication* app;
327+
app->exit(0);
328+
}
329+
308330
void MainWindow::setWindowStaysOnTop(bool enabled)
309331
{
310332
QString str = enabled ? ":/SerialTool/images/pin_down.ico"
@@ -326,6 +348,7 @@ void MainWindow::onStaysOnTopTriggered()
326348

327349
void MainWindow::about()
328350
{
351+
329352
AboutBox aboutBox(this);
330353

331354
aboutBox.exec();

‎SerialTool/ui/mainwindow.ui

+6
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<addaction name="actionVisibleStatusBar"/>
100100
<addaction name="separator"/>
101101
<addaction name="actionStaysOnTop"/>
102+
<addaction name="actionRemoveConfig"/>
102103
</widget>
103104
<widget class="QMenu" name="menu_5">
104105
<property name="title">
@@ -305,6 +306,11 @@
305306
<string>Update</string>
306307
</property>
307308
</action>
309+
<action name="actionRemoveConfig">
310+
<property name="text">
311+
<string>Reset Config</string>
312+
</property>
313+
</action>
308314
</widget>
309315
<layoutdefault spacing="6" margin="11"/>
310316
<resources>

0 commit comments

Comments
 (0)