Changeset 27602

Timestamp:

11/17/08 08:15:44 (2 months ago)

Author:

spitz

Message:

* GuiThesaurus?.cpp:

• entry parsing should work for all cases now.
  

Files:

• lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.cpp (modified) (2 diffs)

lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.cpp

@@ -106 +106 @@
-
-        QString item = meaningsTV->currentItem()->text(col);
-
-
-
-
-
+
+
-        QRegExp re("^([^\\(\\)]+)\\b\\(?.*\\)?.*$");
+        // This is for items with classifications at the beginning:
+        // "(noun) man" -> "man"; "(noun) male (generic term)" -> "male"
+        QRegExp rex("^(\\(.+\\))\\s*([^\\(\\)]+)\\s*\\(?.*\\)?.*$");
-        int pos = re.indexIn(item);
-        if (pos > -1)
-                item = re.cap(1).trimmed();
+        pos = rex.indexIn(item);
+        if (pos > -1)
+                item = rex.cap(2).trimmed();
-        replaceED->setText(item);
-        replacePB->setEnabled(true);
@@ -130 +133 @@
-{
-        QString str = item->text(col);
-
-
-
-
-
+
+
-        QRegExp re("^([^\\(\\)]+)\\b\\(?.*\\)?.*$");
+        // This is for items with classifications at the beginning:
+        // "(noun) man" -> "man"; "(noun) male (generic term)" -> "male"
+        QRegExp rex("^(\\(.+\\))\\s*([^\\(\\)]+)\\s*\\(?.*\\)?.*$");
-        int pos = re.indexIn(str);
-        if (pos > -1)
-                str = re.cap(1).trimmed();
+        pos = rex.indexIn(str);
+        if (pos > -1)
+                str = rex.cap(2).trimmed();
-        entryCO->insertItem(0, str);
-        entryCO->setCurrentIndex(0);