diff options
Diffstat (limited to 'src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp')
| -rw-r--r-- | src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp index 5feb371..2ac2574 100644 --- a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp +++ b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp @@ -2,7 +2,7 @@ * * This file is part of BibleTime's source code, http://www.bibletime.info/. * -* Copyright 1999-2011 by the BibleTime developers. +* Copyright 1999-2014 by the BibleTime developers. * The BibleTime source code is licensed under the GNU General Public License version 2.0. * **********/ @@ -21,11 +21,12 @@ #include <QStringList> #include <QToolButton> #include "backend/keys/cswordversekey.h" +#include "bibletimeapp.h" #include "frontend/keychooser/cscrollerwidgetset.h" #include "frontend/keychooser/versekeychooser/btdropdownchooserbutton.h" #include "util/btsignal.h" #include "util/cresmgr.h" -#include "util/directory.h" +#include "util/geticon.h" class BtLineEdit : public QLineEdit { @@ -52,16 +53,13 @@ BtBibleKeyWidget::BtBibleKeyWidget(const CSwordBibleModuleInfo *mod, { Q_UNUSED(name); - namespace DU = util::directory; - - updatelock = false; m_module = mod; setFocusPolicy(Qt::WheelFocus); QToolButton* clearRef = new QToolButton(this); - clearRef->setIcon(DU::getIcon("edit_clear_locationbar")); + clearRef->setIcon(util::getIcon("edit_clear_locationbar")); clearRef->setAutoRaise(true); clearRef->setStyleSheet("QToolButton{margin:0px;}"); connect(clearRef, SIGNAL(clicked()), SLOT(slotClearRef()) ); @@ -138,7 +136,7 @@ BtBibleKeyWidget::BtBibleKeyWidget(const CSwordBibleModuleInfo *mod, connect(m_verseScroller, SIGNAL(change(int)), SLOT(slotStepVerse(int))); connect(m_verseScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); connect(m_verseScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); - bool ok = connect(m_key->signaler(), SIGNAL(changed()), this, SLOT(updateText())); + bool ok = connect(m_key->afterChangedSignaller(), SIGNAL(signal()), this, SLOT(updateText())); Q_ASSERT(ok); setKey(key); // The order of these two functions is important. @@ -287,7 +285,7 @@ void BtBibleKeyWidget::slotChangeVerse(int n) { emit beforeChange(m_key); m_key->emitBeforeChanged(); m_key->setVerse(n); - m_key->emitChanged(); + m_key->emitAfterChanged(); setKey( m_key ); } if (!updatelock) emit changed(m_key); @@ -298,7 +296,7 @@ void BtBibleKeyWidget::slotChangeChapter(int n) { emit beforeChange(m_key); m_key->emitBeforeChanged(); m_key->setChapter(n); - m_key->emitChanged(); + m_key->emitAfterChanged(); setKey( m_key ); } if (!updatelock) @@ -310,7 +308,7 @@ void BtBibleKeyWidget::slotChangeBook(QString bookname) { emit beforeChange(m_key); m_key->emitBeforeChanged(); m_key->book( bookname ); - m_key->emitChanged(); + m_key->emitAfterChanged(); setKey( m_key ); } if (!updatelock) |