Commit 79ce3890 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor typo

parent 60645dfd
Pipeline #75016 passed with stage
in 10 minutes and 17 seconds
......@@ -22,7 +22,7 @@ DlgAnnotations::DlgAnnotations(QWidget *parent)
// BEGIN Annotation toolbar: Combo box to set the annotation toolbar associated to annotation action in tool menu
QComboBox *primaryAnnotationToolBar = new QComboBox(this);
primaryAnnotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Full Annotation Toobar"));
primaryAnnotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Full Annotation Toolbar"));
primaryAnnotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Quick Annotation Toolbar"));
primaryAnnotationToolBar->setObjectName(QStringLiteral("kcfg_PrimaryAnnotationToolBar"));
layout->addRow(i18nc("label:listbox Config dialog, general page", "Annotation toolbar:"), primaryAnnotationToolBar);
......
......@@ -155,7 +155,7 @@ void MiniBarLogic::notifyCurrentPageChanged(int previousPage, int currentPage)
MiniBar::MiniBar(QWidget *parent, MiniBarLogic *miniBarLogic)
: QWidget(parent)
, m_miniBarLogic(miniBarLogic)
, m_oldToobarParent(nullptr)
, m_oldToolbarParent(nullptr)
{
setObjectName(QStringLiteral("miniBar"));
......@@ -226,11 +226,11 @@ void MiniBar::changeEvent(QEvent *event)
{
if (event->type() == QEvent::ParentChange) {
QToolBar *tb = dynamic_cast<QToolBar *>(parent());
if (tb != m_oldToobarParent) {
if (m_oldToobarParent) {
disconnect(m_oldToobarParent, &QToolBar::iconSizeChanged, this, &MiniBar::slotToolBarIconSizeChanged);
if (tb != m_oldToolbarParent) {
if (m_oldToolbarParent) {
disconnect(m_oldToolbarParent, &QToolBar::iconSizeChanged, this, &MiniBar::slotToolBarIconSizeChanged);
}
m_oldToobarParent = tb;
m_oldToolbarParent = tb;
if (tb) {
connect(tb, &QToolBar::iconSizeChanged, this, &MiniBar::slotToolBarIconSizeChanged);
slotToolBarIconSizeChanged();
......@@ -288,7 +288,7 @@ void MiniBar::slotEmitPrevPage()
void MiniBar::slotToolBarIconSizeChanged()
{
const QSize buttonSize = m_oldToobarParent->iconSize();
const QSize buttonSize = m_oldToolbarParent->iconSize();
m_prevButton->setIconSize(buttonSize);
m_nextButton->setIconSize(buttonSize);
}
......
......@@ -142,7 +142,7 @@ private:
HoverButton *m_prevButton;
HoverButton *m_pagesButton;
HoverButton *m_nextButton;
QToolBar *m_oldToobarParent;
QToolBar *m_oldToolbarParent;
};
/**
......
......@@ -311,7 +311,7 @@ void Shell::closeUrl()
// * the focus was somewhere in the toolbar
// we don't have other places that accept focus
// * If it was on the tab, logic says it should go back to the next current tab
// * If it was on the toolbar, we could leave it there, but since we redo the menus/toobars for the new tab, it gets kind of lost
// * If it was on the toolbar, we could leave it there, but since we redo the menus/toolbars for the new tab, it gets kind of lost
// so it's easier to set it to the next current tab which also makes sense as consistency
if (m_tabWidget->count() >= 0) {
KParts::ReadWritePart *const newPart = m_tabs[m_tabWidget->currentIndex()].part;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment