에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 93eb4676f34988055b1b98efd96da58d47122153

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

GUI V1.0.7 

 - 쿡북 비밀번호 변경
Showing 2 changed files with 9 additions and 5 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @93eb467
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 0 7 #define MINOR_VER 0
8 -#define HOTFIX_VER 6 8 +#define HOTFIX_VER 7
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 -#define MODEL_GRADE 1 12 +#define MODEL_GRADE 0
13 13
14 namespace Define 14 namespace Define
15 { 15 {
app/gui/oven_control/fileprocessdlg.cpp
  Diff comments   View file @93eb467
@@ -596,7 +596,7 @@ void FileProcessDlg::onProgressFinished(){ @@ -596,7 +596,7 @@ void FileProcessDlg::onProgressFinished(){
596 596
597 FileProcessor::detectUSB(strDescPath); 597 FileProcessor::detectUSB(strDescPath);
598 598
599 - strZipCmd = QString("sh -c \"unzip -P 1234 %1/prime/prime.zip -d /prime\"").arg(strDescPath); 599 + strZipCmd = QString("sh -c \"unzip -P primeov980308 %1/prime/prime.zip -d /prime\"").arg(strDescPath);
600 QFileInfo info(QString("%1/prime/prime.zip").arg(strDescPath)); 600 QFileInfo info(QString("%1/prime/prime.zip").arg(strDescPath));
601 601
602 602
@@ -646,9 +646,13 @@ void FileProcessDlg::onProgressFinished(){ @@ -646,9 +646,13 @@ void FileProcessDlg::onProgressFinished(){
646 process.start("sync"); 646 process.start("sync");
647 process.waitForFinished(); 647 process.waitForFinished();
648 qDebug() << QTime::currentTime(); 648 qDebug() << QTime::currentTime();
  649 + ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!."));
  650 + QTimer::singleShot(2000,this, SLOT(close()));
  651 + }
  652 + else{
  653 + ui->ctrLbRemainTime->setText(tr("완료"));
  654 + QTimer::singleShot(2000,this, SLOT(close()));
649 } 655 }
650 - ui->ctrLbRemainTime->setText(tr("완료"));  
651 - QTimer::singleShot(1000,this, SLOT(close()));  
652 } 656 }
653 657
654 void FileProcessDlg::onErrorFired(QString Desc) 658 void FileProcessDlg::onErrorFired(QString Desc)