From a0f86bdc0d4e61338ede7ebd53da56563f2998bf Mon Sep 17 00:00:00 2001 From: louis Date: Tue, 31 Mar 2015 07:14:18 +0200 Subject: [PATCH] translate drawtextvertical --- HISTORY | 1 + libtemplate/templatefunction.c | 5 ++++- libtemplate/templateview.c | 18 +++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/HISTORY b/HISTORY index e7f8ebf..c130eff 100644 --- a/HISTORY +++ b/HISTORY @@ -245,5 +245,6 @@ Version 0.3.3 height, posx or posy values are not parsed correctly - fixed bug also for loops - added possibility to draw vertical text bottomum and topdown +- translate drawtextvertical diff --git a/libtemplate/templatefunction.c b/libtemplate/templatefunction.c index afbc5fa..9081d23 100644 --- a/libtemplate/templatefunction.c +++ b/libtemplate/templatefunction.c @@ -188,7 +188,7 @@ void cTemplateFunction::SetTextboxHeight(int boxHeight) { } void cTemplateFunction::SetTranslatedText(string translation) { - if (type != ftDrawText && type != ftDrawTextBox) + if (type != ftDrawText && type != ftDrawTextBox && type != ftDrawTextVertical) return; if (translation.size() == 0) return; @@ -1454,6 +1454,9 @@ string cTemplateFunction::GetFuncName(void) { case ftDrawTextBox: name = "Function DrawTextBox"; break; + case ftDrawTextVertical: + name = "Function DrawTextVertical"; + break; case ftDrawImage: name = "Function DrawImage"; break; diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index a111d70..d475b2d 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -313,7 +313,7 @@ void cTemplateView::Translate(void) { pix->InitIterator(); cTemplateFunction *func = NULL; while(func = pix->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -326,7 +326,7 @@ void cTemplateView::Translate(void) { funcsLoop->InitIterator(); cTemplateFunction *loopFunc = NULL; while(loopFunc = funcsLoop->GetNextFunction()) { - if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox) { + if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = loopFunc->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -349,7 +349,7 @@ void cTemplateView::Translate(void) { pix->InitIterator(); cTemplateFunction *func = NULL; while(func = pix->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -365,7 +365,7 @@ void cTemplateView::Translate(void) { pix->InitIterator(); cTemplateFunction *func = NULL; while(func = pix->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -383,7 +383,7 @@ void cTemplateView::Translate(void) { pix->InitIterator(); cTemplateFunction *func = NULL; while(func = pix->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -409,7 +409,7 @@ void cTemplateView::Translate(void) { viewTab->InitIterator(); cTemplateFunction *func = NULL; while(func = viewTab->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; translated = globals->Translate(text, translation); @@ -422,7 +422,7 @@ void cTemplateView::Translate(void) { funcsLoop->InitIterator(); cTemplateFunction *loopFunc = NULL; while(loopFunc = funcsLoop->GetNextFunction()) { - if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox) { + if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = loopFunc->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -445,7 +445,7 @@ void cTemplateView::Translate(void) { pix->InitIterator(); cTemplateFunction *func = NULL; while(func = pix->GetNextFunction()) { - if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox) { + if (func->GetType() == ftDrawText || func->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = func->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation); @@ -458,7 +458,7 @@ void cTemplateView::Translate(void) { funcsLoop->InitIterator(); cTemplateFunction *loopFunc = NULL; while(loopFunc = funcsLoop->GetNextFunction()) { - if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox) { + if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) { string text = loopFunc->GetParameter(ptText); string translation; bool translated = globals->Translate(text, translation);