gui/mainwindow.cpp

@@ -363,14 +363,12 @@ void MainWindow::initSettingsTabs()
 	QString pdfViewerCmd = settings.value(SETTINGS_KEY_PDFVIEWER).toString();
 	QString excludedPaths = Common::excludedPaths().join(';');
 	QString mountPaths = Common::mountPaths().join(';');
-	QString databasePath = Common::databasePath();
 	int numPagesPerPreview = settings.value(SETTINGS_KEY_PREVIEWSPERPAGE, 20).toInt();
 
 	ui->txtSettingPdfPreviewerCmd->setText(pdfViewerCmd);
 	ui->txtSettingIgnoredPaths->setText(excludedPaths);
 	ui->txtSettingMountPaths->setText(mountPaths);
 	ui->spinSettingNumerPerPages->setValue(numPagesPerPreview);
-	ui->txtSettingDatabasePath->setText(databasePath);
 }
 
 void MainWindow::saveSettings()
@@ -380,13 +378,11 @@ void MainWindow::saveSettings()
 	QString pdfViewerCmd = ui->txtSettingPdfPreviewerCmd->text();
 	QStringList excludedPaths = ui->txtSettingIgnoredPaths->text().split(';');
 	QStringList mountPaths = ui->txtSettingMountPaths->text().split(';');
-	QString databasePath = ui->txtSettingDatabasePath->text();
 
 	settings.setValue(SETTINGS_KEY_PDFVIEWER, pdfViewerCmd);
 	settings.setValue(SETTINGS_KEY_EXCLUDEDPATHS, excludedPaths);
 	settings.setValue(SETTINGS_KEY_MOUNTPATHS, mountPaths);
 	settings.setValue(SETTINGS_KEY_PREVIEWSPERPAGE, ui->spinSettingNumerPerPages->value());
-	settings.setValue(SETTINGS_KEY_DBPATH, databasePath);
 
 	settings.sync();
 
@@ -548,7 +544,7 @@ void MainWindow::makePreviews(int page)
 	scaleText.chop(1);
 
 	QVector<QString> wordsToHighlight;
-	QRegularExpression extractor(R"#("([^"]*)"|((\p{L}|\p{N})+))#");
+	QRegularExpression extractor(R"#("([^"]*)"|(\p{L}+))#");
 	for(const Token &token : this->contentSearchQuery.getTokens())
 	{
 		if(token.type == FILTER_CONTENT_CONTAINS)

gui/mainwindow.ui

@@ -406,25 +406,6 @@
           </layout>
          </widget>
         </item>
-        <item>
-         <widget class="QGroupBox" name="groupSettingDatabasePath">
-          <property name="title">
-           <string>Database path</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_10">
-           <item>
-            <widget class="QLabel" name="lblSettingDatabasePath">
-             <property name="text">
-              <string>Path of the database. Note: Changing it here will create an empty, new database. The old will not be moved.  </string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtSettingDatabasePath"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
         <item>
          <widget class="QGroupBox" name="Misc">
           <property name="title">

shared/looqsquery.cpp

@@ -181,8 +181,8 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
 	QStringList loneWords;
 	LooqsQuery result;
 	QRegularExpression rx(
-		"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([\\p{L}\\p{N},])+)|(?<boolean>AND|OR)"
+		"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([\\p{L},])+)|(?<boolean>AND|OR)"
-		"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[\"\\p{L}\\p{N}]+))");
+		"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[\"\\p{L}]+))");
 	QRegularExpressionMatchIterator i = rx.globalMatch(expression);
 	auto previousWasBool = [&result] { return !result.tokens.empty() && ((result.tokens.last().type & BOOL) == BOOL); };
 	auto previousWas = [&result](TokenType t) { return !result.tokens.empty() && (result.tokens.last().type == t); };