1 files changed, 173 insertions, 215 deletions

diff --git a/src/frontend/searchdialog/crangechooserdialog.cpp b/src/frontend/searchdialog/crangechooserdialog.cpp
index 4fc2a3d..6a8c89d 100644
--- a/src/frontend/searchdialog/crangechooserdialog.cpp
+++ b/src/frontend/searchdialog/crangechooserdialog.cpp
@@ -17,7 +17,6 @@
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QPushButton>
-#include <QString>
 #include <QTextEdit>
 #include <QVBoxLayout>
 #include "backend/config/cbtconfig.h"
@@ -27,285 +26,244 @@
 #include "versekey.h"
 #include "listkey.h"
 
-
 namespace Search {
 
-/********** RangeItem ******************/
-CRangeChooserDialog::RangeItem::RangeItem(QListWidget* view, QListWidgetItem* /*afterThis*/, const QString caption, const QString range)
-        : QListWidgetItem(view) {
-    setCaption(caption);
-    setRange(range);
-}
-
-CRangeChooserDialog::RangeItem::~RangeItem() {}
-
-const QString& CRangeChooserDialog::RangeItem::range() const {
-    //  qWarning("range is %s", (const char*)m_range.utf8());
-    return m_range;
-}
-
-void CRangeChooserDialog::RangeItem::setRange(QString newRange) {
-    m_range = newRange;
-}
-
-QString CRangeChooserDialog::RangeItem::caption() const {
-    return text();
-}
-
-void CRangeChooserDialog::RangeItem::setCaption(const QString newCaption) {
-    setText(newCaption);
-}
-
-
-/*********** Dialog ***************/
-
-CRangeChooserDialog::CRangeChooserDialog( QWidget* parentDialog )
-        : QDialog(parentDialog) {
-    //Set the flag to destroy when closed - otherwise eats memory
-    setAttribute(Qt::WA_DeleteOnClose);
+CRangeChooserDialog::CRangeChooserDialog(QWidget *parentDialog)
+    : QDialog(parentDialog)
+{
     initView();
     initConnections();
 
-    //add the existing scopes
-    CBTConfig::StringMap map = CBTConfig::get
-                               (CBTConfig::searchScopes);
+    retranslateUi();
+
+    // Add the existing scopes
+    CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
     CBTConfig::StringMap::Iterator it;
     for (it = map.begin(); it != map.end(); ++it) {
-        new RangeItem(m_rangeList, 0, it.key(), it.value());
-    };
-
-    editRange(0);
-    if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())
-       ) {
-        nameChanged(i->caption());
+        new RangeItem(it.key(), it.value(), m_rangeList);
     }
+    resetEditControls();
 }
 
-/** Initializes the view of this object. */
 void CRangeChooserDialog::initView() {
-    setWindowTitle(tr("Setup Search Scopes"));
-
-    QVBoxLayout* vboxLayout = new QVBoxLayout(this);
-
-    QHBoxLayout* hboxLayout = new QHBoxLayout();
-    QVBoxLayout* vboxLayout1 = new QVBoxLayout();
-    QLabel* rangeListLabel = new QLabel(tr("S&earch range:"), this);
-    vboxLayout1->addWidget(rangeListLabel);
-
     m_rangeList = new QListWidget(this);
-    m_rangeList->setToolTip(tr("Select a scope from the list to edit the search ranges"));
-    vboxLayout1->addWidget(m_rangeList);
-
-    QHBoxLayout* hboxLayout1 = new QHBoxLayout();
-    m_newRangeButton = new QPushButton(tr("&Add new scope"), this);
-    m_newRangeButton->setToolTip(tr("Add a new search scope. First enter an appropriate name, then edit the search ranges."));
-    hboxLayout1->addWidget(m_newRangeButton);
-    m_deleteRangeButton = new QPushButton(tr("Delete current &scope"), this);
-    m_deleteRangeButton->setToolTip(tr("Delete the selected search scope"));
-    hboxLayout1->addWidget(m_deleteRangeButton);
+    m_rangeListLabel = new QLabel(this);
+    m_rangeListLabel->setBuddy(m_rangeList);
 
-    vboxLayout1->addLayout(hboxLayout1);
-    hboxLayout->addLayout(vboxLayout1);
-
-    QVBoxLayout* vboxLayout2 = new QVBoxLayout();
-    QHBoxLayout* hboxLayout2 = new QHBoxLayout();
-    QLabel* nameEditLabel = new QLabel(tr("&Name:"), this);
-    hboxLayout2->addWidget(nameEditLabel);
+    m_newRangeButton = new QPushButton(this);
+    m_deleteRangeButton = new QPushButton(this);
 
     m_nameEdit = new QLineEdit(this);
-    m_nameEdit->setToolTip(tr("Change the name of the selected search scope"));
-    hboxLayout2->addWidget(m_nameEdit);
-    vboxLayout2->addLayout(hboxLayout2);
-
-    QLabel* rangeEditLabel = new QLabel(tr("Edi&t current range:"), this);
-    vboxLayout2->addWidget(rangeEditLabel);
+    m_nameEditLabel = new QLabel(this);
+    m_nameEditLabel->setBuddy(m_nameEdit);
 
     m_rangeEdit = new QTextEdit(this);
-    m_rangeEdit->setToolTip(tr("Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed."));
-
-    vboxLayout2->addWidget(m_rangeEdit);
-
-    QLabel* resultListLabel = new QLabel(tr("Parsed search range:"), this);
-    vboxLayout2->addWidget(resultListLabel);
+    m_rangeEditLabel = new QLabel(this);
+    m_rangeEditLabel->setBuddy(m_rangeEdit);
 
     m_resultList = new QListWidget(this);
-    m_resultList->setToolTip(tr("The search ranges which will be used for the search, parsed to the canonical form"));
-    vboxLayout2->addWidget(m_resultList);
-
-    hboxLayout->addLayout(vboxLayout2);
-    vboxLayout->addLayout(hboxLayout);
+    m_resultListLabel = new QLabel(this);
+    m_resultListLabel->setBuddy(m_resultList);
 
-    QFrame* line = new QFrame(this);
-    line->setFrameShape(QFrame::HLine);
-    line->setFrameShadow(QFrame::Sunken);
-    vboxLayout->addWidget(line);
+    QFrame *hSeparatorLine = new QFrame(this);
+    hSeparatorLine->setFrameShape(QFrame::HLine);
+    hSeparatorLine->setFrameShadow(QFrame::Sunken);
 
     m_buttonBox = new QDialogButtonBox(this);
     m_buttonBox->setOrientation(Qt::Horizontal);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::NoButton | QDialogButtonBox::Ok | QDialogButtonBox::RestoreDefaults);
+    m_buttonBox->setStandardButtons(QDialogButtonBox::Ok
+                                    | QDialogButtonBox::Cancel
+                                    | QDialogButtonBox::RestoreDefaults);
     util::prepareDialogBox(m_buttonBox);
+
+    QHBoxLayout *rangeButtonsLayout = new QHBoxLayout();
+    rangeButtonsLayout->addWidget(m_newRangeButton);
+    rangeButtonsLayout->addWidget(m_deleteRangeButton);
+
+    QVBoxLayout* rangeListLayout = new QVBoxLayout;
+    rangeListLayout->addWidget(m_rangeListLabel);
+    rangeListLayout->addWidget(m_rangeList);
+    rangeListLayout->addLayout(rangeButtonsLayout);
+
+    QHBoxLayout* nameEditLayout = new QHBoxLayout();
+    nameEditLayout->addWidget(m_nameEditLabel);
+    nameEditLayout->addWidget(m_nameEdit);
+
+    QVBoxLayout* rangeEditLayout = new QVBoxLayout();
+    rangeEditLayout->addLayout(nameEditLayout);
+    rangeEditLayout->addWidget(m_rangeEditLabel);
+    rangeEditLayout->addWidget(m_rangeEdit);
+    rangeEditLayout->addWidget(m_resultListLabel);
+    rangeEditLayout->addWidget(m_resultList);
+
+    QHBoxLayout *topLayout = new QHBoxLayout;
+    topLayout->addLayout(rangeListLayout);
+    topLayout->addLayout(rangeEditLayout);
+
+    QVBoxLayout *vboxLayout = new QVBoxLayout(this);
+    vboxLayout->addLayout(topLayout);
+    vboxLayout->addWidget(hSeparatorLine);
     vboxLayout->addWidget(m_buttonBox);
+}
 
-    rangeListLabel->setBuddy(m_rangeList);
-    nameEditLabel->setBuddy(m_nameEdit);
-    rangeEditLabel->setBuddy(m_rangeEdit);
-    resultListLabel->setBuddy(m_resultList);
+void CRangeChooserDialog::initConnections() {
+    connect(m_rangeList, SIGNAL(currentItemChanged(QListWidgetItem*,
+                                                   QListWidgetItem*)),
+            this,        SLOT(selectedRangeChanged(QListWidgetItem*,
+                                                   QListWidgetItem*)));
+    connect(m_nameEdit, SIGNAL(textEdited(QString)),
+            this,       SLOT(nameEditTextChanged(QString)));
+    connect(m_rangeEdit, SIGNAL(textChanged()),
+           this,        SLOT(updateResultList()));
+
+    // Connect buttons:
+    connect(m_buttonBox, SIGNAL(accepted()),
+            this,        SLOT(accept()));
+    connect(m_buttonBox, SIGNAL(rejected()),
+            this,        SLOT(reject()));
+    connect(m_newRangeButton, SIGNAL(clicked()),
+            this,             SLOT(addNewRange()));
+    connect(m_deleteRangeButton, SIGNAL(clicked()),
+            this,                SLOT(deleteCurrentRange()));
+    QPushButton * defaultsButton = m_buttonBox->button(QDialogButtonBox::RestoreDefaults);
+    connect(defaultsButton, SIGNAL(clicked()),
+            this,           SLOT(restoreDefaults()));
 }
 
+void CRangeChooserDialog::retranslateUi() {
+    setWindowTitle(tr("Setup Search Scopes"));
 
+    m_rangeListLabel->setText(tr("S&earch range:"));
+    m_rangeList->setToolTip(tr("Select a scope from the list to edit the search"
+                               "ranges"));
 
-void CRangeChooserDialog::initConnections() {
-    // Signals from text/list widgets
-    QObject::connect(m_rangeList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
-                     this, SLOT(editRange(QListWidgetItem*)));
-
-    QObject::connect(m_rangeEdit, SIGNAL(textChanged()),
-                     this, SLOT(parseRange()));
-    QObject::connect(m_rangeEdit, SIGNAL(textChanged()),
-                     this, SLOT(rangeChanged()));
-
-    QObject::connect(m_nameEdit, SIGNAL(textChanged(const QString&)),
-                     this, SLOT(nameChanged(const QString&)));
-
-    // Buttons
-    QObject::connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(slotOk()));
-    QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(close()));
-    QObject::connect(m_newRangeButton, SIGNAL(clicked()), this, SLOT(addNewRange()));
-    QObject::connect(m_deleteRangeButton, SIGNAL(clicked()), this, SLOT(deleteCurrentRange()));
-    //restore defaults!
-    QPushButton* defaultsButton = m_buttonBox->button(QDialogButtonBox::RestoreDefaults);
-    QObject::connect(defaultsButton, SIGNAL(clicked()), this, SLOT(slotDefault()));
+    m_newRangeButton->setText(tr("&Add new scope"));
+    m_newRangeButton->setToolTip(tr("Add a new search scope. First enter an "
+                                    "appropriate name, then edit the search "
+                                    "ranges."));
+
+    m_deleteRangeButton->setText(tr("Delete current &scope"));
+    m_deleteRangeButton->setToolTip(tr("Delete the selected search scope"));
+
+    m_nameEditLabel->setText(tr("&Name:"));
+    m_nameEdit->setToolTip(tr("Change the name of the selected search scope"));
+
+    m_rangeEditLabel->setText(tr("Edi&t current range:"));
+    m_rangeEdit->setToolTip(tr("Change the search ranges of the selected search"
+                               "scope item. Have a look at the predefined "
+                               "search scopes to see how search ranges are "
+                               "constructed."));
+
+    m_resultListLabel->setText(tr("Parsed search range:"));
+    m_resultList->setToolTip(tr("The search ranges which will be used for the "
+                                "search, parsed to the canonical form"));
+}
+
+void CRangeChooserDialog::saveCurrentToRange(RangeItem * i) {
+    if (!m_nameEdit->text().isEmpty())
+        i->setCaption(m_nameEdit->text());
+
+    i->setRange(m_rangeEdit->toPlainText());
 }
 
-/** Adds a new range to the list. */
 void CRangeChooserDialog::addNewRange() {
-    //qDebug() << "CRangeChooserDialog::addNewRange";
-    //RangeItem* i = new RangeItem(m_rangeList, m_rangeList->lastItem(), tr("New range"));
-    RangeItem* i = new RangeItem(m_rangeList, 0, tr("New range"));
-    //use just setCurrentItem... m_rangeList->setSelected(i, true);
+    static const QString nullStr;
+    RangeItem * const i = new RangeItem(tr("New range"), nullStr, m_rangeList);
     m_rangeList->setCurrentItem(i);
-    editRange(i);
+    resetEditControls();
+}
 
-    m_nameEdit->setFocus();
+void CRangeChooserDialog::selectedRangeChanged(QListWidgetItem * current,
+                                               QListWidgetItem * previous)
+{
+    if (previous) {
+        Q_ASSERT(dynamic_cast<RangeItem*>(previous) != 0);
+        saveCurrentToRange(static_cast<RangeItem*>(previous));
+    }
+
+    resetEditControls();
 }
 
-/** No descriptions */
-void CRangeChooserDialog::editRange(QListWidgetItem* item) {
-    //qDebug() << "CRangeChooserDialog::editRange";
-    RangeItem* const range = dynamic_cast<RangeItem*>(item);
+void CRangeChooserDialog::resetEditControls() {
+    const QListWidgetItem * const item = m_rangeList->currentItem();
+    Q_ASSERT(item == 0 || dynamic_cast<const RangeItem *>(item) != 0);
+    const RangeItem * rangeItem = static_cast<const RangeItem *>(item);
 
-    m_nameEdit->setEnabled( range ); //only if an item is selected enable the edit part
-    m_rangeEdit->setEnabled( range );
-    m_resultList->setEnabled( range );
-    m_deleteRangeButton->setEnabled( range );
+    m_nameEdit->setEnabled(item != 0);
+    m_rangeEdit->setEnabled(item != 0);
+    m_resultList->setEnabled(item != 0);
+    m_deleteRangeButton->setEnabled(item != 0);
+    m_nameEdit->setText(item != 0 ? rangeItem->caption() : "");
+    m_rangeEdit->setText(item != 0 ? rangeItem->range() : "");
 
-    if (range) {
-        m_nameEdit->setText(range->caption());
-        m_rangeEdit->setText(range->range());
-    }
+    if (item != 0)
+        m_nameEdit->setFocus();
+
+    nameEditTextChanged(item != 0 ? rangeItem->caption() : "");
 }
 
-/** Parses the entered text and prints out the result in the list box below the edit area. */
-void CRangeChooserDialog::parseRange() {
-    //qDebug() << "CRangeChooserDialog::parseRange";
+void CRangeChooserDialog::updateResultList() {
+    typedef sword::VerseKey VK;
+
     m_resultList->clear();
 
     /// \todo remove this hack:
-    //HACK: repair range to  work with Sword 1.5.6
-    QString range( m_rangeEdit->toPlainText() );
-    range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
+    //HACK: repair range to work with Sword 1.5.6
+    const QString range = m_rangeEdit->toPlainText().replace(QRegExp("\\s{0,}-\\s{0,}"), "-");
 
-    sword::VerseKey key;
-    sword::ListKey verses = key.ParseVerseList((const char*)range.toUtf8(), "Genesis 1:1", true);
+    sword::ListKey verses = VK().ParseVerseList(range.toUtf8().constData(),
+                                                "Genesis 1:1", true);
     for (int i = 0; i < verses.Count(); ++i) {
-        new QListWidgetItem(QString::fromUtf8(verses.GetElement(i)->getRangeText()), m_resultList );
-        //    qWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() );
+        new QListWidgetItem(QString::fromUtf8(verses.getElement(i)->getRangeText()),
+                            m_resultList);
     }
-
 }
 
-/** No descriptions */
-void CRangeChooserDialog::rangeChanged() {
-    //qDebug() << "CRangeChooserDialog::rangeChanged";
-    if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())
-       ) {
-        QString range( m_rangeEdit->toPlainText() );
-        /// \todo remove this hack:
-        //HACK: repair range to work with Sword 1.5.6
-        range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
-        i->setRange(range);
-    };
-}
+void CRangeChooserDialog::deleteCurrentRange() {
+    Q_ASSERT(dynamic_cast<RangeItem*>(m_rangeList->currentItem()) != 0);
+    QListWidgetItem *i = m_rangeList->currentItem();
+    m_rangeList->removeItemWidget(i);
+    delete i;
 
-/** No descriptions */
-void CRangeChooserDialog::nameChanged(const QString& newCaption) {
-    //qDebug() << "CRangeChooserDialog::nameChanged";
-    m_rangeEdit->setEnabled(!newCaption.isEmpty());
-    m_resultList->setEnabled(!newCaption.isEmpty());
-    //m_resultList->header()->setEnabled(!newCaption.isEmpty());
-
-    if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())
-       ) {
-        if (!newCaption.isEmpty()) {
-            //enable some items (see "else" below)
-            m_newRangeButton->setEnabled(true);
-            m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
-            m_rangeList->setDisabled(false);
-            i->setCaption(newCaption);
-        }
-        else { //invalid name
-            i->setCaption(tr("<invalid name of search range>"));
-            //disable some items to prevent saving invalid range
-            m_newRangeButton->setEnabled(false);
-            m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-            m_rangeList->setDisabled(true);
-        };
-    };
+    resetEditControls();
 }
 
-/** Deletes the selected range. */
-void CRangeChooserDialog::deleteCurrentRange() {
-    //qDebug() << "CRangeChooserDialog::deleteCurrentRange";
-    if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) ) {
-        int row = m_rangeList->row(i);
-        m_rangeList->takeItem(row);
-        delete i;
+void CRangeChooserDialog::accept() {
+    // Update the active item:
+    QListWidgetItem *currentItem = m_rangeList->currentItem();
+    if (currentItem != 0) {
+        Q_ASSERT(dynamic_cast<RangeItem*>(currentItem) != 0);
+        saveCurrentToRange(static_cast<RangeItem*>(currentItem));
     }
-    editRange(m_rangeList->currentItem());
-}
 
-void CRangeChooserDialog::slotOk() {
-    m_rangeList->sortItems(); //sorted first because the order will be saved
-    //save the new map of search scopes
+    // Save the new sorted map of search scopes:
+    m_rangeList->sortItems();
     CBTConfig::StringMap map;
     for (int i = 0; i < m_rangeList->count(); i++) {
-        if ( RangeItem* item = dynamic_cast<RangeItem*>(m_rangeList->item(i)) ) {
-            map[item->caption()] = item->range();
-        };
+        Q_ASSERT(dynamic_cast<RangeItem*>(m_rangeList->item(i)) != 0);
+        const RangeItem * item = static_cast<RangeItem*>(m_rangeList->item(i));
+        map[item->caption()] = item->range();
     }
-    CBTConfig::set
-    (CBTConfig::searchScopes, map);
+    CBTConfig::set(CBTConfig::searchScopes, map);
 
     QDialog::accept();
 }
 
-void CRangeChooserDialog::slotDefault() {
-    //qDebug() << "CRangeChooserDialog::slotDefault";
+void CRangeChooserDialog::restoreDefaults() {
+    typedef CBTConfig::StringMap::ConstIterator SMCI;
+
     m_rangeList->clear();
-    CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
-    CBTConfig::StringMap::Iterator it;
-    for (it = map.begin(); it != map.end(); ++it) {
-        new RangeItem(m_rangeList, 0, it.key(), it.value());
+    const CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
+    for (SMCI it = map.begin(); it != map.end(); ++it) {
+        new RangeItem(it.key(), it.value(), m_rangeList);
     };
     m_rangeList->setCurrentItem(0);
-
-    editRange(0);
-    if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())
-       ) {
-        nameChanged(i->caption());
-    }
-
+    resetEditControls();
 }
 
+void CRangeChooserDialog::nameEditTextChanged(const QString &newText) {
+    const bool e = !newText.isEmpty() || m_rangeList->count() <= 0;
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(e);
+}
 
 } //end of namespace Search