浏览代码

remove "name" parameter in directory config file

Signed-off-by: Le Tan <[email protected]>
Le Tan 9 年之前
父节点
当前提交
30766f5738
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 1 2
      src/vdirectorytree.cpp
  2. 1 1
      src/vmainwindow.cpp

+ 1 - 2
src/vdirectorytree.cpp

@@ -350,7 +350,7 @@ void VDirectoryTree::deleteDirectory()
     QMessageBox msgBox(QMessageBox::Warning, tr("Warning"), QString("Are you sure you want to delete directory \"%1\"?")
                        .arg(curItemName), QMessageBox::Ok | QMessageBox::Cancel, this);
     msgBox.setInformativeText(tr("This will delete any files under this directory."));
-    msgBox.setDefaultButton(QMessageBox::Ok);
+    msgBox.setDefaultButton(QMessageBox::Cancel);
     if (msgBox.exec() == QMessageBox::Ok) {
         deleteDirectoryAndUpdateTree(curItem);
     }
@@ -378,7 +378,6 @@ QTreeWidgetItem* VDirectoryTree::createDirectoryAndUpdateTree(QTreeWidgetItem *p
 
     QJsonObject configJson;
     configJson["version"] = "1";
-    configJson["name"] = name;
     configJson["sub_directories"] = QJsonArray();
     configJson["files"] = QJsonArray();
 

+ 1 - 1
src/vmainwindow.cpp

@@ -274,7 +274,7 @@ void VMainWindow::onDeleteNotebookBtnClicked()
     QMessageBox msgBox(QMessageBox::Warning, tr("Warning"), QString("Are you sure you want to delete notebook \"%1\"?")
                        .arg(curName), QMessageBox::Ok | QMessageBox::Cancel, this);
     msgBox.setInformativeText(QString("This will delete any files in this notebook (\"%1\").").arg(curPath));
-    msgBox.setDefaultButton(QMessageBox::Ok);
+    msgBox.setDefaultButton(QMessageBox::Cancel);
     if (msgBox.exec() == QMessageBox::Ok) {
         vnote->removeNotebook(curName);
     }