에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5f644fa45de629c238f0cd98a8ae8a7153445a46

Authored by 고영탁
1 parent 64f6e5e049
Exists in master and in 2 other branches fhd, fhd-demo

한글화 진행 define.cpp 외 1파일

Showing 3 changed files with 62 additions and 61 deletions   Show diff stats
app/gui/oven_control/define.cpp
  Diff comments   View file @5f644fa
... ... @@ -253,29 +253,29 @@ QString Define::minimum(Define::CookConfigType type)
253 253 switch (type)
254 254 {
255 255 case Brightness:
256   - return "연한색";
  256 + return QObject::tr("연한색");
257 257 case BurnDegree:
258   - return "중간익힘";
  258 + return QObject::tr("중간익힘");
259 259 case SoftBoilDegree:
260   - return "반숙";
  260 + return QObject::tr("반숙");
261 261 case PieceSize:
262   - return "작은조각";
  262 + return QObject::tr("작은조각");
263 263 case CrispyDegree:
264   - return "연한색";
  264 + return QObject::tr("연한색");
265 265 case MoistDegree:
266   - return "촉촉하게";
  266 + return QObject::tr("촉촉하게");
267 267 case Thickness:
268   - return "얇음";
  268 + return QObject::tr("얇음");
269 269 case Humidity:
270   - return "건조함";
  270 + return QObject::tr("건조함");
271 271 case Temperature:
272   - return "약";
  272 + return QObject::tr("약");
273 273 case Time:
274   - return "단시간";
  274 + return QObject::tr("단시간");
275 275 case CoreTemperature:
276   - return "따뜻함";
  276 + return QObject::tr("따뜻함");
277 277 case Thermometer:
278   - return "있음";
  278 + return QObject::tr("있음");
279 279 case InvalidConfig:
280 280 case ConfigNotUsed:
281 281 default:
... ... @@ -288,29 +288,29 @@ QString Define::maximum(Define::CookConfigType type)
288 288 switch (type)
289 289 {
290 290 case Brightness:
291   - return "진한색";
  291 + return QObject::tr("진한색");
292 292 case BurnDegree:
293   - return "완전익힘";
  293 + return QObject::tr("완전익힘");
294 294 case SoftBoilDegree:
295   - return "완숙";
  295 + return QObject::tr("완숙");
296 296 case PieceSize:
297   - return "큰조각";
  297 + return QObject::tr("큰조각");
298 298 case CrispyDegree:
299   - return "진한색";
  299 + return QObject::tr("진한색");
300 300 case MoistDegree:
301   - return "완전익힘";
  301 + return QObject::tr("완전익힘");
302 302 case Thickness:
303   - return "두꺼움";
  303 + return QObject::tr("두꺼움");
304 304 case Humidity:
305   - return "습윤";
  305 + return QObject::tr("습윤");
306 306 case Temperature:
307   - return "강";
  307 + return QObject::tr("강");
308 308 case Time:
309   - return "장시간";
  309 + return QObject::tr("장시간");
310 310 case CoreTemperature:
311   - return "뜨거움";
  311 + return QObject::tr("뜨거움");
312 312 case Thermometer:
313   - return "없음";
  313 + return QObject::tr("없음");
314 314 case InvalidConfig:
315 315 case ConfigNotUsed:
316 316 default:
... ... @@ -371,67 +371,67 @@ QString Define::name(Define::StepType type)
371 371 switch (type)
372 372 {
373 373 case Preheat:
374   - return "예열";
  374 + return QObject::tr("예열");
375 375 case PutThermometer:
376   - return "중심 온도계 삽입";
  376 + return QObject::tr("중심 온도계 삽입");
377 377 case Load:
378   - return "식재료 적재";
  378 + return QObject::tr("식재료 적재");
379 379 case Cut:
380   - return "자르기";
  380 + return QObject::tr("자르기");
381 381 case Pour:
382   - return "물 붓기";
  382 + return QObject::tr("물 붓기");
383 383 case Bake:
384   - return "베이킹";
  384 + return QObject::tr("베이킹");
385 385 case Dry:
386   - return "건조";
  386 + return QObject::tr("건조");
387 387 case Ferment:
388   - return "발효";
  388 + return QObject::tr("발효");
389 389 case BlowSteam:
390   - return "스팀 쏘이기";
  390 + return QObject::tr("스팀 쏘이기");
391 391 case CoolDown:
392   - return "식히기";
  392 + return QObject::tr("식히기");
393 393 case Steam:
394   - return "찌기";
  394 + return QObject::tr("찌기");
395 395 case Roast:
396   - return "로스팅";
  396 + return QObject::tr("로스팅");
397 397 case Boil:
398   - return "끓이기";
  398 + return QObject::tr("끓이기");
399 399 case Thicken:
400   - return "걸쭉하게 만들기";
  400 + return QObject::tr("걸쭉하게 만들기");
401 401 case WarmUp:
402   - return "데우기";
  402 + return QObject::tr("데우기");
403 403 case MakeCrispy:
404   - return "바삭하게 만들기";
  404 + return QObject::tr("바삭하게 만들기");
405 405 case Finish:
406   - return "피니싱";
  406 + return QObject::tr("피니싱");
407 407 case Damp:
408   - return "습윤하게 만들기";
  408 + return QObject::tr("습윤하게 만들기");
409 409 case Defer:
410   - return "보류";
  410 + return QObject::tr("보류");
411 411 case Grill:
412   - return "그릴";
  412 + return QObject::tr("그릴");
413 413 case End:
414   - return "종료";
  414 + return QObject::tr("종료");
415 415 case Burn:
416   - return "그을리기";
  416 + return QObject::tr("그을리기");
417 417 case Fry:
418   - return "기름에 재빨리 볶기";
  418 + return QObject::tr("기름에 재빨리 볶기");
419 419 case HeatUp:
420   - return "온도 높이기";
  420 + return QObject::tr("온도 높이기");
421 421 case Ripen:
422   - return "숙성";
  422 + return QObject::tr("숙성");
423 423 case RipenKeep:
424   - return "숙성 & 보존";
  424 + return QObject::tr("숙성 & 보존");
425 425 case BoilSteadily:
426   - return "뭉근하게 끓이기";
  426 + return QObject::tr("뭉근하게 끓이기");
427 427 case CookGratin:
428   - return "그라탱 요리";
  428 + return QObject::tr("그라탱 요리");
429 429 case Brown:
430   - return "브라우닝";
  430 + return QObject::tr( "브라우닝");
431 431 case Simmer:
432   - return "약한 불로 끓이기";
  432 + return QObject::tr("약한 불로 끓이기");
433 433 case Moisten:
434   - return "촉촉하게";
  434 + return QObject::tr("촉촉하게");
435 435 default:
436 436 return "";
437 437 }
... ... @@ -484,11 +484,11 @@ QString Define::name(Define::Process type)
484 484 switch (type)
485 485 {
486 486 case CookAgain:
487   - return "새로운 재료 넣기";
  487 + return QObject::tr("새로운 재료 넣기");
488 488 case MakeCrisper:
489   - return "바삭함 주기";
  489 + return QObject::tr("바삭함 주기");
490 490 case KeepWarm:
491   - return "보온 유지";
  491 + return QObject::tr("보온 유지");
492 492 default:
493 493 return "";
494 494 }
... ...
app/gui/oven_control/fileprocessdlg.cpp
  Diff comments   View file @5f644fa
... ... @@ -577,11 +577,13 @@ void FileProcessDlg::onProgressed(int progress, int sec){
577 577 min = sec/60;
578 578 _sec = sec%60;
579 579 if(min >0){
580   - strTemp.sprintf("남은 예상 시간 : %d분 %d초", min, _sec);
  580 + //strTemp.sprintf("남은 예상 시간 : %d분 %d초", min, _sec);
  581 + strTemp = tr("남은 예상 시간 : %1분 %2초").arg(min).arg(sec);
581 582 ui->ctrLbRemainTime->setText(strTemp);
582 583 }
583 584 else{
584   - strTemp.sprintf("남은 예상 시간 : %d초", sec);
  585 + //strTemp.sprintf("남은 예상 시간 : %d초", sec);
  586 + strTemp = tr("남은 예상 시간 : %1초").arg(sec);
585 587 ui->ctrLbRemainTime->setText(strTemp);
586 588 }
587 589 }
... ... @@ -643,7 +645,6 @@ void FileProcessDlg::configDownload(){
643 645 if(QFile::copy("/prime/config/favorite.ini", strUsbPath)){
644 646 sync();
645 647 ui->ctrWjProcess->setValue(100);
646   - ui->ctrLbRemainTime->setText("남은 예상 시간 : 0초");
647 648 ui->ctrLbRemainTime->setText(tr("남은 예상 시간 : 완료"));
648 649 QTimer::singleShot(1000,this,SLOT(close()));
649 650 }
... ...
app/gui/oven_control/lang_en.qm
  Diff comments   View file @5f644fa
No preview for this file type