fix: file not finish loadding cannot be saved.

Change-Id: Ie14794978eac590e6124c258cc7acbf933e03c42
linuxdeepin · Sep 12, 2018 · 2e75eab · 2e75eab
1 parent 54c6259
commit 2e75eab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/editor/src/editor.cpp b/editor/src/editor.cpp
@@ -59,6 +59,7 @@ void Editor::loadFile(const QString &filepath)
     // QApplication::setOverrideCursor(Qt::WaitCursor);
 
     m_isWritable = QFileInfo(filepath).isWritable();
+    m_isLoadFinished = false;
 
     // update file path.
     updatePath(filepath);
@@ -180,6 +181,7 @@ void Editor::handleFileLoadFinished(const QByteArray &encode, const QString &con
     // restore mouse style.
     // QApplication::restoreOverrideCursor();
 
+    m_isLoadFinished = true;
     m_fileEncode = encode;
 
     // set text.

diff --git a/editor/src/editor.h b/editor/src/editor.h
@@ -42,6 +42,7 @@ class Editor : public QWidget
     bool saveFile(const QString &encode, const QString &newline);
     bool saveFile();
     bool isWritable() { return m_isWritable; }
+    bool isLoadFinished() { return m_isLoadFinished; }
 
     void updatePath(QString file);
     QByteArray fileEncode() { return m_fileEncode; }
@@ -60,6 +61,7 @@ class Editor : public QWidget
     int m_autoSaveInternal;
     bool m_hasLoadFile = false;
     bool m_isWritable = false;
+    bool m_isLoadFinished = false;
     QString m_newline;
 };
 

diff --git a/editor/src/window.cpp b/editor/src/window.cpp
@@ -148,6 +148,9 @@ Window::Window(DMainWindow *parent)
     DAnchorsBase::setAnchor(m_themePanel, Qt::AnchorBottom, m_centralWidget, Qt::AnchorBottom);
     DAnchorsBase::setAnchor(m_themePanel, Qt::AnchorRight, m_centralWidget, Qt::AnchorRight);
 
+    // for the first time open the need be init.
+    m_themePanel->setSelectionTheme(m_themePath);
+
     connect(m_themePanel, &ThemePanel::themeChanged, this, &Window::themeChanged);
     connect(this, &Window::requestDragEnterEvent, this, &Window::dragEnterEvent);
     connect(this, &Window::requestDropEvent, this, &Window::dropEvent);
@@ -483,6 +486,13 @@ bool Window::saveFile()
     const QString &currentDir = QFileInfo(currentPath).absolutePath();
     bool isBlankFile = QFileInfo(currentPath).dir().absolutePath() == m_blankFileDir;
 
+    // file not finish loadding cannot be saved
+    // otherwise you will save the content of the empty.
+    if (!m_editorMap[currentPath]->isLoadFinished()) {
+        showNotify(tr("File cannot be saved if it is not loaded."));
+        return false;
+    }
+
     // save blank file.
     if (isBlankFile) {
         QString encode, newline;