#10571 improved handling of WM's signal when switching from or to full-screen window

[features.git] / src / frontends / qt / GuiRef.cpp

diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 0c6b12d46214fcd56f14a449c7335e93113c0416..a727700005a8f829efb76a7bbf5872dd23a14434 100644 (file)
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -96,8 +96,6 @@ GuiRef::GuiRef(GuiView & lv)
                this, SLOT(resetFilter()));
        connect(csFindCB, SIGNAL(clicked()),
                this, SLOT(filterLabels()));
-       connect(nameED, SIGNAL(textChanged(QString)),
-               this, SLOT(changed_adaptor()));
        connect(refsTW, SIGNAL(itemClicked(QTreeWidgetItem *, int)),
                this, SLOT(refHighlighted(QTreeWidgetItem *)));
        connect(refsTW, SIGNAL(itemSelectionChanged()),
@@ -203,7 +201,7 @@ void GuiRef::refHighlighted(QTreeWidgetItem * sel)
 /*     int const cur_item = refsTW->currentRow();
        bool const cur_item_selected = cur_item >= 0 ?
                refsLB->isSelected(cur_item) : false;*/
-       bool const cur_item_selected = refsTW->isItemSelected(sel);
+       bool const cur_item_selected = sel->isSelected();
 
        if (cur_item_selected)
                referenceED->setText(sel->text(0));
@@ -211,10 +209,8 @@ void GuiRef::refHighlighted(QTreeWidgetItem * sel)
        if (at_ref_)
                gotoRef();
        gotoPB->setEnabled(true);
-       if (typeAllowed() && !isBufferReadonly())
+       if (!isBufferReadonly())
                typeCO->setEnabled(true);
-       nameED->setHidden(!nameAllowed());
-       nameL->setHidden(!nameAllowed());
 }
 
 
@@ -239,7 +235,7 @@ void GuiRef::refSelected(QTreeWidgetItem * sel)
 /*     int const cur_item = refsTW->currentRow();
        bool const cur_item_selected = cur_item >= 0 ?
                refsLB->isSelected(cur_item) : false;*/
-       bool const cur_item_selected = refsTW->isItemSelected(sel);
+       bool const cur_item_selected = sel->isSelected();
 
        if (cur_item_selected)
                referenceED->setText(sel->text(0));
@@ -318,7 +314,6 @@ void GuiRef::updateContents()
                typeCO->itemData(typeCO->currentIndex()).toString();
 
        referenceED->clear();
-       nameED->clear();
        typeCO->clear();
 
        // FIXME Bring InsetMathRef on par with InsetRef
@@ -336,9 +331,6 @@ void GuiRef::updateContents()
                typeCO->addItem(qt_("Formatted reference"), "prettyref");
 
        referenceED->setText(toqstr(params_["reference"]));
-       nameED->setText(toqstr(params_["name"]));
-       nameED->setHidden(!nameAllowed());
-       nameL->setHidden(!nameAllowed());
 
        // restore type settings for new insets
        bool const new_inset = params_["reference"].empty();
@@ -351,9 +343,7 @@ void GuiRef::updateContents()
        else
                typeCO->setCurrentIndex(
                        typeCO->findData(toqstr(params_.getCmdName())));
-       typeCO->setEnabled(typeAllowed() && !isBufferReadonly());
-       if (!typeAllowed())
-               typeCO->setCurrentIndex(0);
+       typeCO->setEnabled(!isBufferReadonly());
 
        pluralCB->setChecked(params_["plural"] == "true");
        capsCB->setChecked(params_["caps"] == "true");
@@ -394,7 +384,6 @@ void GuiRef::applyView()
 
        params_.setCmdName(fromqstr(typeCO->itemData(typeCO->currentIndex()).toString()));
        params_["reference"] = qstring_to_ucs4(last_reference_);
-       params_["name"] = qstring_to_ucs4(nameED->text());
        params_["plural"] = pluralCB->isChecked() ?
              from_ascii("true") : from_ascii("false");
        params_["caps"] = capsCB->isChecked() ?
@@ -405,19 +394,6 @@ void GuiRef::applyView()
 }
 
 
-bool GuiRef::nameAllowed()
-{
-       KernelDocType const doc_type = docType();
-       return doc_type != LATEX && doc_type != LITERATE;
-}
-
-
-bool GuiRef::typeAllowed()
-{
-       return docType() != DOCBOOK;
-}
-
-
 void GuiRef::setGoBack()
 {
        gotoPB->setText(qt_("&Go Back"));
@@ -490,19 +466,19 @@ void GuiRef::redoRefs()
                }
        }
        // sort categories case-intensively
-       qSort(refsCategories.begin(), refsCategories.end(),
-             caseInsensitiveLessThan /*defined above*/);
+       sort(refsCategories.begin(), refsCategories.end(),
+                 caseInsensitiveLessThan /*defined above*/);
        if (noprefix)
                refsCategories.insert(0, qt_("<No prefix>"));
 
-       QString const sort = sortingCO->isEnabled() ?
-                               sortingCO->itemData(sortingCO->currentIndex()).toString()
-                               : QString();
-       if (sort == "nocase")
-               qSort(refsStrings.begin(), refsStrings.end(),
-                     caseInsensitiveLessThan /*defined above*/);
-       else if (sort == "case")
-               qSort(refsStrings.begin(), refsStrings.end());
+       QString const sort_method = sortingCO->isEnabled() ?
+                                       sortingCO->itemData(sortingCO->currentIndex()).toString()
+                                       : QString();
+       if (sort_method == "nocase")
+               sort(refsStrings.begin(), refsStrings.end(),
+                         caseInsensitiveLessThan /*defined above*/);
+       else if (sort_method == "case")
+               sort(refsStrings.begin(), refsStrings.end());
 
        if (groupCB->isChecked()) {
                QList<QTreeWidgetItem *> refsCats;
@@ -545,7 +521,7 @@ void GuiRef::redoRefs()
                while (*it) {
                        if ((*it)->text(0) == textToFind) {
                                refsTW->setCurrentItem(*it);
-                               refsTW->setItemSelected(*it, true);
+                               (*it)->setSelected(true);
                                //Make sure selected item is visible
                                refsTW->scrollToItem(*it);
                                last_reference_ = textToFind;