diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-03-05 05:03:32 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-03-05 05:03:32 +0100 |
commit | f9f32cc93e35d51abba0fb9f26afc211c60a5ea4 (patch) | |
tree | df566426539627ac453c084e8dccba09afdb64b8 /kivio | |
parent | 98a0195cc514bc04129ef9420f1bfbc971770895 (diff) | |
download | koffice-f9f32cc93e35d51abba0fb9f26afc211c60a5ea4.tar.gz koffice-f9f32cc93e35d51abba0fb9f26afc211c60a5ea4.zip |
Fix incorrectly renamed strings
Diffstat (limited to 'kivio')
-rw-r--r-- | kivio/kiviopart/kivio_view.cpp | 8 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_shape_data.h | 2 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_text_style.h | 2 | ||||
-rw-r--r-- | kivio/plugins/kiviotexttool/stenciltexteditor.cpp | 2 | ||||
-rw-r--r-- | kivio/plugins/kiviotexttool/tool_text.cpp | 10 |
5 files changed, 12 insertions, 12 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index c34022d8..63326efc 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -1568,13 +1568,13 @@ void KivioView::setHParaAlign( int i ) KivioStencil *pStencil = m_pActivePage->selectedStencils()->first(); if (!pStencil) return; - KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Horizontal Alignment")); + KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Horizontal Alignment")); bool createMacro = false; while( pStencil ) { if ( pStencil->hTextAlign() != i) { - KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change StencilQt::Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i); + KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change Stencil Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i); pStencil->setHTextAlign(i); macro->addCommand( cmd ); @@ -1596,13 +1596,13 @@ void KivioView::setVParaAlign( int i ) KivioStencil *pStencil = m_pActivePage->selectedStencils()->first(); if (!pStencil) return; - KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Vertical Alignment")); + KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Vertical Alignment")); bool createMacro = false; while( pStencil ) { if ( pStencil->vTextAlign() != i ) { - KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change StencilQt::Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i); + KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change Stencil Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i); pStencil->setVTextAlign( i ); macro->addCommand( cmd ); createMacro = true; diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h index bd89dcc8..9717cb27 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h @@ -40,7 +40,7 @@ public: TQColor m_textColor; // The text color TQFont m_textFont; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags + int m_hTextAlign, m_vTextAlign; // Horizontal and vertical text alignment flags }; /** diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h index 73c13e0e..339b6f29 100644 --- a/kivio/kiviopart/kiviosdk/kivio_text_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h @@ -18,7 +18,7 @@ protected: TQColor m_color; // The text color TQFont m_font; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags + int m_hTextAlign, m_vTextAlign; // Horizontal and vertical text alignment flags public: KivioTextStyle(); diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 53708a64..575f5df5 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -59,7 +59,7 @@ StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, menu = new TQPopupMenu(m_mainWidget->m_vAlignButton, "hAlignMenu"); menu->setCheckable(true); menu->insertItem(SmallIconSet("align_top", 16), i18n("Align Top"), TQt::AlignTop); - menu->insertItem(SmallIconSet("align_vcenter", 16), i18n("AlignQt::Vertical Center"), TQt::AlignVCenter); + menu->insertItem(SmallIconSet("align_vcenter", 16), i18n("Align Vertical Center"), TQt::AlignVCenter); menu->insertItem(SmallIconSet("align_bottom", 16), i18n("Align Bottom"), TQt::AlignBottom); m_mainWidget->m_vAlignButton->setPopup(menu); connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVerticalAlign(int))); diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index bfc54a73..e8ebc0fa 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -169,7 +169,7 @@ void TextTool::mousePress( TQMouseEvent *e ) int colType; KivioPage *page = view()->activePage(); KivioStencil* stencil = page->checkForStencil( &pagePoint, &colType, 0.0, false); - + if(stencil) { applyToolAction(stencil, pagePoint); } else if(startRubberBanding(e)) { @@ -319,7 +319,7 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) if(changeHAlignment && (stencil->hTextAlign() != halignment)) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( - i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment); + i18n("Change Stencil Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment); stencil->setHTextAlign(halignment); macroCmd->addCommand(cmd); changed = true; @@ -327,7 +327,7 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) if(changeVAlignment && (stencil->vTextAlign() != valignment)) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( - i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment); + i18n("Change Stencil Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment); stencil->setVTextAlign(valignment); macroCmd->addCommand(cmd); changed = true; @@ -404,7 +404,7 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos) if(stencil->hTextAlign(name) != halignment) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( - i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, + i18n("Change Stencil Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(name), halignment, name); stencil->setHTextAlign(name, halignment); macroCmd->addCommand(cmd); @@ -415,7 +415,7 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos) if(stencil->vTextAlign(name) != valignment) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( - i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, + i18n("Change Stencil Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(name), valignment, name); stencil->setVTextAlign(name, valignment); macroCmd->addCommand(cmd); |