* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiRef.cpp

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index 1c5210dae6b6265a76984c9bb20475d27b911abc..d98a507b371d61ece7744b14900f688276016624 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -45,21 +45,21 @@ GuiRef::GuiRef(GuiView & lv)
 {
        setupUi(this);
 
-       sort_ = false;
        at_ref_ = false;
 
-       //FIXME: when/if we support the xr package for cross-reference
-       //between independant files. Those can be re-enabled.
-       refsL->setEnabled(false);
-       refsL->hide();
-       bufferCO->setEnabled(false);
-       bufferCO->hide();
+       // Enabling is set in updateRefs. Disable for now in case no
+       // call to updateContents follows (e.g. read-only documents).
+       sortCB->setEnabled(false);
+       caseSensitiveCB->setEnabled(false);
+       caseSensitiveCB->setChecked(false);
+       refsLW->setEnabled(false);
+       gotoPB->setEnabled(false);
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(reset_dialog()));
-       connect(this, SIGNAL(rejected()), this, SLOT(dialog_rejected()));
+       connect(closePB, SIGNAL(clicked()), this, SLOT(resetDialog()));
+       connect(this, SIGNAL(rejected()), this, SLOT(dialogRejected()));
 
        connect(typeCO, SIGNAL(activated(int)),
                this, SLOT(changed_adaptor()));
@@ -71,10 +71,12 @@ GuiRef::GuiRef(GuiView & lv)
                this, SLOT(refHighlighted(QListWidgetItem *)));
        connect(refsLW, SIGNAL(itemSelectionChanged()),
                this, SLOT(selectionChanged()));
-       connect(refsLW, SIGNAL(itemActivated(QListWidgetItem *)),
+       connect(refsLW, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
                this, SLOT(refSelected(QListWidgetItem *)));
-       connect(sortCB, SIGNAL(clicked(bool)),
-               this, SLOT(sortToggled(bool)));
+       connect(sortCB, SIGNAL(clicked()),
+               this, SLOT(sortToggled()));
+       connect(caseSensitiveCB, SIGNAL(clicked()),
+               this, SLOT(caseSensitiveToggled()));
        connect(gotoPB, SIGNAL(clicked()),
                this, SLOT(gotoClicked()));
        connect(updatePB, SIGNAL(clicked()),
@@ -82,14 +84,13 @@ GuiRef::GuiRef(GuiView & lv)
        connect(bufferCO, SIGNAL(activated(int)),
                this, SLOT(updateClicked()));
 
-       setFocusProxy(refsLW);
-
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
        bc().setOK(okPB);
        bc().setApply(applyPB);
        bc().setCancel(closePB);
        bc().addReadOnly(refsLW);
        bc().addReadOnly(sortCB);
+       bc().addReadOnly(caseSensitiveCB);
        bc().addReadOnly(nameED);
        bc().addReadOnly(referenceED);
        bc().addReadOnly(typeCO);
@@ -166,9 +167,15 @@ void GuiRef::refSelected(QListWidgetItem * sel)
 }
 
 
-void GuiRef::sortToggled(bool on)
+void GuiRef::sortToggled()
+{
+       caseSensitiveCB->setEnabled(sortCB->isChecked());
+       redoRefs();
+}
+
+
+void GuiRef::caseSensitiveToggled()
 {
-       sort_ = on;
        redoRefs();
 }
 
@@ -179,16 +186,16 @@ void GuiRef::updateClicked()
 }
 
 
-void GuiRef::dialog_rejected()
+void GuiRef::dialogRejected()
 {
-       reset_dialog();
+       resetDialog();
        // We have to do this manually, instead of calling slotClose(), because
        // the dialog has already been made invisible before rejected() triggers.
        Dialog::disconnect();
 }
 
 
-void GuiRef::reset_dialog()
+void GuiRef::resetDialog()
 {
        at_ref_ = false;
        setGotoRef();
@@ -198,7 +205,7 @@ void GuiRef::reset_dialog()
 void GuiRef::closeEvent(QCloseEvent * e)
 {
        slotClose();
-       reset_dialog();
+       resetDialog();
        e->accept();
 }
 
@@ -221,8 +228,6 @@ void GuiRef::updateContents()
        if (!typeAllowed())
                typeCO->setCurrentIndex(0);
 
-       sortCB->setChecked(sort_);
-
        // insert buffer list
        bufferCO->clear();
        FileNameList const & buffers = theBufferList().fileNames();
@@ -231,13 +236,13 @@ void GuiRef::updateContents()
                bufferCO->addItem(toqstr(makeDisplayPath(it->absFilename())));
        }
 
-       int thebuffer = theBufferList().bufferNum(buffer().fileName());
+       int const thebuffer = theBufferList().bufferNum(buffer().fileName());
        // restore the buffer combo setting for new insets
        if (params_["reference"].empty() && restored_buffer_ != -1
            && restored_buffer_ < bufferCO->count() && thebuffer == active_buffer_)
                bufferCO->setCurrentIndex(restored_buffer_);
        else {
-               int num = theBufferList().bufferNum(buffer().fileName());
+               int const num = theBufferList().bufferNum(buffer().fileName());
                bufferCO->setCurrentIndex(num);
                if (thebuffer != active_buffer_)
                        restored_buffer_ = num;
@@ -306,6 +311,11 @@ void GuiRef::gotoRef()
        at_ref_ = !at_ref_;
 }
 
+inline bool caseInsensitiveLessThan(QString const & s1, QString const & s2)
+{
+       return s1.toLower() < s2.toLower();
+}
+
 
 void GuiRef::redoRefs()
 {
@@ -321,13 +331,20 @@ void GuiRef::redoRefs()
        // the first item inserted
        QString const oldSelection(referenceED->text());
 
-       for (vector<docstring>::const_iterator iter = refs_.begin();
-               iter != refs_.end(); ++iter) {
-               refsLW->addItem(toqstr(*iter));
+       QStringList refsStrings;
+       vector<docstring>::const_iterator iter;
+       for (iter = refs_.begin(); iter != refs_.end(); ++iter)
+               refsStrings.append(toqstr(*iter));
+
+       if (sortCB->isEnabled() && sortCB->isChecked()) {
+               if(caseSensitiveCB->isEnabled() && caseSensitiveCB->isChecked())
+                       qSort(refsStrings.begin(), refsStrings.end());
+               else
+                       qSort(refsStrings.begin(), refsStrings.end(),
+                             caseInsensitiveLessThan /*defined above*/);
        }
 
-       if (sort_)
-               refsLW->sortItems();
+       refsLW->addItems(refsStrings);
 
        referenceED->setText(oldSelection);
 
@@ -361,10 +378,14 @@ void GuiRef::redoRefs()
 void GuiRef::updateRefs()
 {
        refs_.clear();
-       FileName const & name = theBufferList().fileNames()[bufferCO->currentIndex()];
-       Buffer const * buf = theBufferList().getBuffer(name);
-       buf->getLabelList(refs_);
+       int const the_buffer = bufferCO->currentIndex();
+       if (the_buffer != -1) {
+               FileName const & name = theBufferList().fileNames()[the_buffer];
+               Buffer const * buf = theBufferList().getBuffer(name);
+               buf->getLabelList(refs_);
+       }       
        sortCB->setEnabled(!refs_.empty());
+       caseSensitiveCB->setEnabled(sortCB->isEnabled() && sortCB->isChecked());
        refsLW->setEnabled(!refs_.empty());
        // refsLW should only be the focus proxy when it is enabled
        setFocusProxy(refs_.empty() ? 0 : refsLW);
@@ -413,4 +434,4 @@ Dialog * createGuiRef(GuiView & lv) { return new GuiRef(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiRef_moc.cpp"
+#include "moc_GuiRef.cpp"