fix for new project created failed with changed project name

live query when auto complete item is highlighted

Author: ychclone

Display/CMainWindow.cpp

@@ -575,6 +575,9 @@ void CMainWindow::createActions()
 	connect(&completer_, SIGNAL(activated(const QString &)),
             this, SLOT(queryTag(const QString&)));
 
+	connect(&completer_, SIGNAL(highlighted(const QString &)),
+            this, SLOT(queryTagTop1000(const QString&)));
+
     // symbol search frame
 	connect(symbolSearchFrameShortcut, SIGNAL(activated()), this, SLOT(on_symbolSearchFrameShortcutPressed()));
 	connect(frameSymbol_lineEdit, SIGNAL(textChanged(const QString &)),
@@ -2167,6 +2170,14 @@ void CMainWindow::queryTagRowLimit(const QString& tag, unsigned int limitSearchR
 	qDebug() << "queryTag full took" << timerQuery.elapsed() << "ms";
 }
 
+void CMainWindow::queryTagTop1000(const QString& tag)
+{
+	bool bLiveSearch = confManager_->getAppSettingValue("LiveSearch", true).toBool();
+	if (bLiveSearch) {
+		queryTagRowLimit(tag, 1000);
+	}
+
+}
 void CMainWindow::on_searchButton_clicked()
 {
 	QString tagToQuery;

Display/CMainWindow.h

@@ -145,6 +145,7 @@ private slots:
 
 	void queryTag(const QString& tag);
 	void queryTagRowLimit(const QString& tag, unsigned int limitSearchRow);
+	void queryTagTop1000(const QString& tag);
 
 private:
 	void updateProjectListWidget();

Display/CProjectDlg.cpp

@@ -84,12 +84,7 @@ void CProjectDlg::on_applyButton_clicked()
     qDebug() << "projectItem.tagUpdateDateTime_ = " << projectItem.tagUpdateDateTime_;
 
     if (projectItem.tagUpdateDateTime_ == "") { // new project
-        if (currentProjectName_ == "") { // no project loaded yet
-            CProjectManager::getInstance()->updateProjectItem(true, modifiedItem.name_, modifiedItem);
-        } else {
-            // use currentProjectName_ for updateProjectItem as name may have be changed
-            CProjectManager::getInstance()->updateProjectItem(true, currentProjectName_, modifiedItem);
-        }
+        CProjectManager::getInstance()->updateProjectItem(true, modifiedItem.name_, modifiedItem);
     } else { // old project which has updated tag time
         if (currentProjectName_ == "") { // no project loaded yet
             CProjectManager::getInstance()->updateProjectItem(false, modifiedItem.name_, modifiedItem);

Model/CProjectManager.cpp

@@ -84,10 +84,10 @@ void CProjectManager::updateProjectItem(bool newProject, const QString& projectI
 	QDir currentDir(QDir::currentPath());
 
 	if (projectItemName != newItem.name_) { // project renamed
-        projectMap_.remove(projectItemName); // remove old one
+		qDebug() << "newItem.name_ = " << newItem.name_;
+		qDebug() << "projectItemName = " << projectItemName;
 
-		// current directory
-		QDir currentDir(QDir::currentPath());
+        projectMap_.remove(projectItemName); // remove old one
 
 		// using absoluteFilePath so relative and absolute path also possible
 		tagDir = currentDir.absoluteFilePath(CConfigManager::getInstance()->getAppSettingValue("TagDir").toString() + "/" + projectItemName);

Resources/Forms/aboutDialog.ui

@@ -67,7 +67,7 @@
        <item>
         <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Blink v1.7.1</string>
+          <string>Blink v1.7.2</string>
          </property>
         </widget>
        </item>