Merge pull request #129 from f3nix/typo-fixes-2

Fix typo. s/brin/bring.
This commit is contained in:
fralx 2018-12-23 15:59:16 +03:00 committed by GitHub
commit 543710dc8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -55,9 +55,9 @@ ItemsAlignmentEditorWidget::ItemsAlignmentEditorWidget(PageDesignIntf* page, QWi
initEditor(); initEditor();
} }
void ItemsAlignmentEditorWidget::slotBrinToFront() void ItemsAlignmentEditorWidget::slotBringToFront()
{ {
if (m_reportEditor) m_reportEditor->brinToFront(); if (m_reportEditor) m_reportEditor->bringToFront();
if (m_page) m_page->bringToFront(); if (m_page) m_page->bringToFront();
} }
@ -119,7 +119,7 @@ void ItemsAlignmentEditorWidget::initEditor()
{ {
m_bringToFront = new QAction(tr("Bring to top"),this); m_bringToFront = new QAction(tr("Bring to top"),this);
m_bringToFront->setIcon(QIcon(":/report/images/bringToTop")); m_bringToFront->setIcon(QIcon(":/report/images/bringToTop"));
connect(m_bringToFront,SIGNAL(triggered()),this,SLOT(slotBrinToFront())); connect(m_bringToFront,SIGNAL(triggered()),this,SLOT(slotBringToFront()));
addAction(m_bringToFront); addAction(m_bringToFront);
m_sendToBack = new QAction(tr("Send to back"),this); m_sendToBack = new QAction(tr("Send to back"),this);

View File

@ -45,7 +45,7 @@ public:
explicit ItemsAlignmentEditorWidget(PageDesignIntf* page, const QString &title, QWidget *parent = 0); explicit ItemsAlignmentEditorWidget(PageDesignIntf* page, const QString &title, QWidget *parent = 0);
explicit ItemsAlignmentEditorWidget(PageDesignIntf* page, QWidget *parent = 0); explicit ItemsAlignmentEditorWidget(PageDesignIntf* page, QWidget *parent = 0);
private slots: private slots:
void slotBrinToFront(); void slotBringToFront();
void slotSendToBack(); void slotSendToBack();
void slotAlignToLeft(); void slotAlignToLeft();
void slotAlignToRight(); void slotAlignToRight();

View File

@ -1238,7 +1238,7 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
pasteAction->setEnabled(true); pasteAction->setEnabled(true);
} }
menu.addSeparator(); menu.addSeparator();
QAction* brinToTopAction = menu.addAction(QIcon(":/report/images/bringToTop"), tr("Bring to top")); QAction* bringToTopAction = menu.addAction(QIcon(":/report/images/bringToTop"), tr("Bring to top"));
QAction* sendToBackAction = menu.addAction(QIcon(":/report/images/sendToBack"), tr("Send to back")); QAction* sendToBackAction = menu.addAction(QIcon(":/report/images/sendToBack"), tr("Send to back"));
QAction* createHLayout = 0; QAction* createHLayout = 0;
if( page->selectedItems().count()>1){ if( page->selectedItems().count()>1){
@ -1263,7 +1263,7 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
page->copy(); page->copy();
if (a == pasteAction) if (a == pasteAction)
page->paste(); page->paste();
if (a == brinToTopAction) if (a == bringToTopAction)
page->bringToFront(); page->bringToFront();
if (a == sendToBackAction) if (a == sendToBackAction)
page->sendToBack(); page->sendToBack();

View File

@ -555,7 +555,7 @@ void ReportDesignWidget::cut()
activePage()->cut(); activePage()->cut();
} }
void ReportDesignWidget::brinToFront() void ReportDesignWidget::bringToFront()
{ {
if (activePage()) if (activePage())
activePage()->bringToFront(); activePage()->bringToFront();

View File

@ -138,7 +138,7 @@ public slots:
void copy(); void copy();
void paste(); void paste();
void cut(); void cut();
void brinToFront(); void bringToFront();
void sendToBack(); void sendToBack();
void alignToLeft(); void alignToLeft();
void alignToRight(); void alignToRight();