Merge branch 'master' into dz

LC044 · web-flow · commit 1f9952d02bfa · 2023-08-22T09:10:46.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,6 @@ Thumbs.db
 *.exe
 .VS
 build
-test.*
+test*
 .vscode
 .VSCodeCounter
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,7 @@ set(PROJECT_SOURCES
         src/common.h
         src/common.cpp
         src/menu.cpp
+        src/global.cpp
         ${TS_FILES}
         ${qrc_FILES}
 )
diff --git a/OneMarkdown_zh_CN.ts b/OneMarkdown_zh_CN.ts
diff --git a/data/icon/ProMakr.png b/data/icon/ProMakr.png
diff --git a/data/icon/btn_source_code.png b/data/icon/btn_source_code.png
diff --git a/data/img.qrc b/data/img.qrc
@@ -6,5 +6,6 @@
         <file>icon/btn_side_bar_hide.png</file>
         <file>icon/btn_side_bar_hover.png</file>
         <file>icon/btn_side_bar_show.png</file>
+        <file>icon/btn_source_code.png</file>
     </qresource>
 </RCC>
diff --git a/include/global.h b/include/global.h
@@ -1,7 +1,8 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 #include <string>
+#include <QString>
 const int TAB_WIDTH = 4;
-
-// QString  CURRENT_FILE="NULL";
+extern bool IS_FILE_SAVED;
+extern QString  CURRENT_FILE;
 #endif // GLOBAL_H
diff --git a/readme.md b/readme.md
@@ -1,4 +1,5 @@
 # 一个优秀的Markdown编辑器
+
 <div align="center">
 <img src="./data/icon/ProMakr.png">
 </div>
@@ -15,9 +16,14 @@
 </a>
 </div>
 
+<div align="center" style="font-size:66px">
+<span style="color:#BB2E2E">更快、</span><span style="color:#BB2E2E">更强、</span><span style="color:#BB2E2E">更开源</span>
+</div>
+
 ## 致谢
 
 [Markdown转HTML](https://github.com/progsource/maddy)
+
 <!-- 
 git config --global http.https://github.com.proxy socks5://127.0.0.1:7890
 
diff --git a/src/OneMarkdown.cpp b/src/OneMarkdown.cpp
@@ -49,17 +49,21 @@ void OneMarkdown::textEdit_textChanged()
 {
     // disconnect 可以使得编辑textedit内容的时候不陷入死循环
     disconnect(ui->textEdit, &QTextEdit::textChanged, this, &OneMarkdown::textEdit_textChanged);
+
+    if(IS_FILE_SAVED){
+        IS_FILE_SAVED = false;
+    }
     QString text = ui->textEdit->toPlainText();
     std::string str = text.toStdString();
     std::stringstream markdownInput(str);
     std::string htmlOutput = parser->Parse(markdownInput);
     QString html = QString::fromStdString(htmlOutput);
     ui->webEngineView->page()->runJavaScript(QString("add('%1')").arg(html));
+
     connect(ui->textEdit, &QTextEdit::textChanged, this, &OneMarkdown::textEdit_textChanged);
     countWords();
     qDebug() << "HTML output" << html << endl;
     qDebug() << "text output" << text << endl;
-    qDebug() << "text output" << text.replace('\t', "    ") << endl;
     // ui->statusBar.
 }
 
@@ -211,13 +215,15 @@ void OneMarkdown::on_btn_outline_clicked()
 
 void OneMarkdown::on_btn_outline_toggled(bool checked)
 {
-    if(!checked) return;
+    if (!checked)
+        return;
     qDebug() << "btn_outline_toggled" << endl;
 }
 
 void OneMarkdown::on_btn_file_list_toggled(bool checked)
 {
-    if(!checked) return;
+    if (!checked)
+        return;
     qDebug() << "btn_file_list_toggled" << endl;
 }
 
diff --git a/src/OneMarkdown.h b/src/OneMarkdown.h
@@ -18,6 +18,7 @@
 #include <QTimer>
 #include "common.h"
 #include <QPropertyAnimation>
+#include <QMessageBox>
 #pragma execution_character_set("utf-8")
 QT_BEGIN_NAMESPACE
 
@@ -81,12 +82,21 @@ private slots:
 
     void on_action_58_triggered();
 
+    void on_action_new_window_triggered();
+
+    void on_action_open_recent_file_triggered();
+
+    void on_action_save_file_triggered();
+
+    void on_action_save_as_triggered();
+
+
 private:
     int WORD_NUM = 0;
     int CHAR_NUM = 0;
     int LINE_NUM = 0;
     bool isSideClosed = false;
-    QList<int> SidePos={10000,40000};
+    QList<int> SidePos = {10000, 40000};
     int size = 0;
     int counter = 0;
     int start = 0;
diff --git a/src/OneMarkdown.ui b/src/OneMarkdown.ui
@@ -440,11 +440,8 @@ solid:rgb(221,221,221);</string>
                <property name="styleSheet">
                 <string notr="true">QPushButton:hover {
 	background-color: rgb(240, 240, 240);
-	color:rgb(128,128,128);
-	
 }
 QPushButton{
-	color:white;
 	background-color:transparent;
 }</string>
                </property>
@@ -504,12 +501,12 @@ QPushButton{
                </property>
                <property name="icon">
                 <iconset resource="../data/img.qrc">
-                 <normaloff>:/icon/icon/btn_hide_show_sideBar.png</normaloff>:/icon/icon/btn_hide_show_sideBar.png</iconset>
+                 <normaloff>:/icon/icon/btn_source_code.png</normaloff>:/icon/icon/btn_source_code.png</iconset>
                </property>
                <property name="iconSize">
                 <size>
-                 <width>16</width>
-                 <height>16</height>
+                 <width>24</width>
+                 <height>24</height>
                 </size>
                </property>
                <property name="flat">
@@ -663,8 +660,8 @@ QToolButton:hover {
     <addaction name="action_open_file_quick"/>
     <addaction name="action_open_recent_file"/>
     <addaction name="separator"/>
-    <addaction name="action_6"/>
-    <addaction name="action_9"/>
+    <addaction name="action_save_file"/>
+    <addaction name="action_save_as"/>
     <addaction name="action_10"/>
     <addaction name="separator"/>
     <addaction name="action_12"/>
@@ -1008,15 +1005,15 @@ QToolButton:hover {
     <string>打开最近文件</string>
    </property>
   </action>
-  <action name="action_6">
+  <action name="action_save_file">
    <property name="text">
     <string>保存</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
   </action>
-  <action name="action_9">
+  <action name="action_save_as">
    <property name="text">
     <string>另存为...</string>
    </property>
diff --git a/src/global.cpp b/src/global.cpp
@@ -0,0 +1,3 @@
+#include "global.h"
+bool IS_FILE_SAVED = false;
+QString  CURRENT_FILE="";
diff --git a/src/main.cpp b/src/main.cpp
@@ -10,25 +10,27 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
     {
-    #if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
-    #if _MSC_VER
-    QTextCodec *codec = QTextCodec::codecForName("GBK");
-    #else
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    #endif
-    QTextCodec::setCodecForLocale(codec);
-    QTextCodec::setCodecForCStrings(codec);
-    QTextCodec::setCodecForTr(codec);
-    #else
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    QTextCodec::setCodecForLocale(codec);
-    #endif
+#if (QT_VERSION <= QT_VERSION_CHECK(5, 0, 0))
+#if _MSC_VER
+        QTextCodec *codec = QTextCodec::codecForName("GBK");
+#else
+        QTextCodec *codec = QTextCodec::codecForName("UTF-8");
+#endif
+        QTextCodec::setCodecForLocale(codec);
+        QTextCodec::setCodecForCStrings(codec);
+        QTextCodec::setCodecForTr(codec);
+#else
+        QTextCodec *codec = QTextCodec::codecForName("UTF-8");
+        QTextCodec::setCodecForLocale(codec);
+#endif
     }
     QTranslator translator;
     const QStringList uiLanguages = QLocale::system().uiLanguages();
-    for (const QString &locale : uiLanguages) {
+    for (const QString &locale : uiLanguages)
+    {
         const QString baseName = "OneMarkdown_" + QLocale(locale).name();
-        if (translator.load(":/i18n/" + baseName)) {
+        if (translator.load(":/i18n/" + baseName))
+        {
             a.installTranslator(&translator);
             break;
         }
diff --git a/src/menu.cpp b/src/menu.cpp
@@ -1,51 +1,123 @@
-
-#include "OneMarkdown.h"
+﻿#include "OneMarkdown.h"
 #include "./ui_OneMarkdown.h"
+#include "global.h"
 
 void OneMarkdown::on_action_new_file_triggered()
 {
-    
 }
 
-
 void OneMarkdown::on_action_open_file_triggered()
 {
-    //选择文件对话框/
-	disconnect(ui->textEdit,&QTextEdit::textChanged,this,&OneMarkdown::textEdit_textChanged);
-    QFileDialog* f = new QFileDialog(this);
+    // 选择文件对话框/
+    disconnect(ui->textEdit, &QTextEdit::textChanged, this, &OneMarkdown::textEdit_textChanged);
+    QFileDialog *f = new QFileDialog(this);
     f->setWindowTitle("选择数据文件*.md");
     f->setNameFilter("*.md");
     f->setViewMode(QFileDialog::Detail);
 
     QString filePath;
-    if(f->exec() == QDialog::Accepted)
+    if (f->exec() == QDialog::Accepted)
         filePath = f->selectedFiles()[0];
 
     // ui->lineEdit->setText(filePath);
     // ui->textEdit->append("文件路径:"+filePath);
     // 文件信息//
     QFileInfo info(filePath);
+    CURRENT_FILE = filePath;
     // ui->textEdit->append(QString("文件大小:%1 byte").arg(info.size()));
     // ui->textEdit->append(QString("文件名称:%1").arg(info.fileName()));
     // ui->textEdit->append(QString("创建时间:%1").arg(info.created().toString("yyyy-MM-dd hh:mm:ss")));
     // ui->textEdit->append(QString("修改时间:%1").arg(info.lastModified().toString("yyyy-MM-dd hh:mm:ss")));
 
-    ///文件内容//
-    //首先设置要使用的编码格式
-    QTextCodec * qc = QTextCodec::codecForName("utf-8");
+    /// 文件内容//
+    // 首先设置要使用的编码格式
+    QTextCodec *qc = QTextCodec::codecForName("utf-8");
     QFile file(filePath);
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
         ui->textEdit->append("文件打开失败");
         return;
     }
     ui->textEdit->clear();
     QTextStream readStream(&file);
 
-    while(!readStream.atEnd())
+    while (!readStream.atEnd())
     {
         ui->textEdit->append(readStream.readLine());
     }
-    connect(ui->textEdit,&QTextEdit::textChanged,this,&OneMarkdown::textEdit_textChanged);
+    connect(ui->textEdit, &QTextEdit::textChanged, this, &OneMarkdown::textEdit_textChanged);
     textEdit_textChanged();
-}
+}
+void OneMarkdown::on_action_save_file_triggered()
+{
+    if (!IS_FILE_SAVED) // r如果标记为1，证明有文件加载，不然没有不需要保存
+    {
+        QString filePath; // 存储保存路径
+        if (CURRENT_FILE.isEmpty())
+        {
+
+            filePath = QFileDialog::getSaveFileName(this, "保存");
+            if (filePath.isEmpty())
+            {
+                QMessageBox::information(this, "信息", "保存失败");
+                return;
+            }
+        }
+        else
+        {
+            filePath = CURRENT_FILE;
+        }
+        // 内容保存到路径文件
+        QFile file(filePath);
+        // 以文本方式打开
+        if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
+            // todo: 增量保存，优化保存性能
+            QTextStream out(&file);                     // IO设备对象的地址对其进行初始化
+            out << ui->textEdit->toPlainText() << endl; // 输出
+            file.close();
+            IS_FILE_SAVED = true;
+        }
+        else
+        {
+            QMessageBox::warning(this, tr("Error"), tr("File to open file!"));
+        }
+    }
+    else
+    {
+        QMessageBox::information(this, "错误", "保存失败");
+    }
+}
+void OneMarkdown::on_action_save_as_triggered()
+{
+    QString filePath; // 存储保存路径
+    QString filter = "Markdown文档 (*.md);;纯文本文档 (*.txt)";
+    filePath = QFileDialog::getSaveFileName(this, "保存","Untitled.md",filter);
+    if (filePath.isEmpty())
+    {
+        QMessageBox::information(this, "错误", "未选择文件");
+        return;
+    }
+    // 内容保存到路径文件
+    QFile file(filePath);
+    // 以文本方式打开
+    if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        // todo: 增量保存，优化保存性能
+        QTextStream out(&file);                     // IO设备对象的地址对其进行初始化
+        out << ui->textEdit->toPlainText() << endl; // 输出
+        file.close();
+        IS_FILE_SAVED = true;
+    }
+    else
+    {
+        QMessageBox::warning(this, tr("Error"), tr("File to open file!"));
+    }
+}
+void OneMarkdown::on_action_new_window_triggered()
+{
+}
+
+void OneMarkdown::on_action_open_recent_file_triggered()
+{
+}

-Original file line number
+Diff line change
 *.exe
 .VS
 build
 -test.*
 +test*
 .vscode
 .VSCodeCounter
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ set(PROJECT_SOURCES`
`36`	`36`	`src/common.h`
`37`	`37`	`src/common.cpp`
`38`	`38`	`src/menu.cpp`
	`39`	`+ src/global.cpp`
`39`	`40`	`${TS_FILES}`
`40`	`41`	`${qrc_FILES}`
`41`	`42`	`)`