Commit b3e47756e66bee1761beb9a8eea1f9d9f6afb6fa
1 parent
054d6e75f8
Exists in
fhd
소스 파일 일괄 변경
Showing
18 changed files
with
59 additions
and
59 deletions
Show diff stats
app/gui/oven_control/autocookcheckwindow.cpp
| ... | ... | @@ -189,7 +189,7 @@ void AutoCookCheckWindow::updateView() |
| 189 | 189 | ui->doorStepLabel->setText(tr("중심 온도계 삽입")); |
| 190 | 190 | ui->cookStepAnimation->load(":/images/animation/thermometer_01.png"); |
| 191 | 191 | ui->cookStepAnimation->load(":/images/animation/thermometer_02.png"); |
| 192 | - ui->cookStepAnimation->setGeometry((900-210)/2, 800, 210, 307); | |
| 192 | + ui->cookStepAnimation->setGeometry((1080-252)/2, 960, 252, 368); | |
| 193 | 193 | ui->cookStepAnimation->start(300); |
| 194 | 194 | break; |
| 195 | 195 | case Define::Load: |
| ... | ... | @@ -201,7 +201,7 @@ void AutoCookCheckWindow::updateView() |
| 201 | 201 | ui->cookStepAnimation->load(":/images/animation/load_03.png"); |
| 202 | 202 | ui->cookStepAnimation->load(":/images/animation/load_02.png"); |
| 203 | 203 | ui->cookStepAnimation->load(":/images/animation/load_01.png"); |
| 204 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 204 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 205 | 205 | ui->cookStepAnimation->start(300); |
| 206 | 206 | break; |
| 207 | 207 | case Define::Cut: |
| ... | ... | @@ -209,7 +209,7 @@ void AutoCookCheckWindow::updateView() |
| 209 | 209 | ui->cookStepAnimation->load(":/images/animation/cut_01.png"); |
| 210 | 210 | ui->cookStepAnimation->load(":/images/animation/cut_02.png"); |
| 211 | 211 | ui->cookStepAnimation->load(":/images/animation/cut_03.png"); |
| 212 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 212 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 213 | 213 | ui->cookStepAnimation->start(300); |
| 214 | 214 | break; |
| 215 | 215 | case Define::Pour: |
| ... | ... | @@ -218,7 +218,7 @@ void AutoCookCheckWindow::updateView() |
| 218 | 218 | ui->cookStepAnimation->load(":/images/animation/pour_02.png"); |
| 219 | 219 | ui->cookStepAnimation->load(":/images/animation/pour_03.png"); |
| 220 | 220 | ui->cookStepAnimation->load(":/images/animation/pour_04.png"); |
| 221 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 221 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 222 | 222 | ui->cookStepAnimation->start(300); |
| 223 | 223 | break; |
| 224 | 224 | default: | ... | ... |
app/gui/oven_control/autocookselectionwindow.cpp
| ... | ... | @@ -33,7 +33,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy |
| 33 | 33 | connect(sm, SIGNAL(mapped(int)), SLOT(onCookSelected(int))); |
| 34 | 34 | |
| 35 | 35 | QFont font = this->font(); |
| 36 | - font.setPointSize(10); | |
| 36 | + font.setPointSize(12); | |
| 37 | 37 | font.setBold(true); |
| 38 | 38 | font.setWeight(75); |
| 39 | 39 | |
| ... | ... | @@ -51,11 +51,11 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy |
| 51 | 51 | QWidget *last = this; |
| 52 | 52 | for (int idx = 0; idx < cnt; idx++) |
| 53 | 53 | { |
| 54 | - int x = 12 + (idx % 3) * 294; | |
| 55 | - int y = 615 + (idx / 3) * 80; | |
| 54 | + int x = 14 + (idx % 3) * 352; | |
| 55 | + int y = 738 + (idx / 3) * 96; | |
| 56 | 56 | |
| 57 | 57 | QPushButton *pb = new QPushButton(this); |
| 58 | - pb->setGeometry(QRect(x, y, 288, 70)); | |
| 58 | + pb->setGeometry(QRect(x, y, 345, 84)); | |
| 59 | 59 | pb->setFont(font); |
| 60 | 60 | pb->setStyleSheet(stylesheet); |
| 61 | 61 | pb->setText(book.list.at(idx)); | ... | ... |
app/gui/oven_control/autocookwindow.cpp
| ... | ... | @@ -525,7 +525,7 @@ void AutoCookWindow::updateView() |
| 525 | 525 | ui->cookStepAnimation->load(":/images/animation/load_03.png"); |
| 526 | 526 | ui->cookStepAnimation->load(":/images/animation/load_02.png"); |
| 527 | 527 | ui->cookStepAnimation->load(":/images/animation/load_01.png"); |
| 528 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 528 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 529 | 529 | ui->cookStepAnimation->start(300); |
| 530 | 530 | break; |
| 531 | 531 | case Define::Cut: |
| ... | ... | @@ -533,7 +533,7 @@ void AutoCookWindow::updateView() |
| 533 | 533 | ui->cookStepAnimation->load(":/images/animation/cut_01.png"); |
| 534 | 534 | ui->cookStepAnimation->load(":/images/animation/cut_02.png"); |
| 535 | 535 | ui->cookStepAnimation->load(":/images/animation/cut_03.png"); |
| 536 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 536 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 537 | 537 | ui->cookStepAnimation->start(300); |
| 538 | 538 | break; |
| 539 | 539 | case Define::Pour: |
| ... | ... | @@ -542,7 +542,7 @@ void AutoCookWindow::updateView() |
| 542 | 542 | ui->cookStepAnimation->load(":/images/animation/pour_02.png"); |
| 543 | 543 | ui->cookStepAnimation->load(":/images/animation/pour_03.png"); |
| 544 | 544 | ui->cookStepAnimation->load(":/images/animation/pour_04.png"); |
| 545 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | |
| 545 | + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); | |
| 546 | 546 | ui->cookStepAnimation->start(300); |
| 547 | 547 | break; |
| 548 | 548 | default: | ... | ... |
app/gui/oven_control/circulargauge.cpp
| ... | ... | @@ -47,12 +47,12 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) |
| 47 | 47 | |
| 48 | 48 | painter.save(); |
| 49 | 49 | |
| 50 | - QRect rect((291-283)/2, (290-282)/2, 283, 282); | |
| 50 | + QRect rect((349-339)/2, (348-338)/2, 339, 338); | |
| 51 | 51 | |
| 52 | 52 | qreal degree = (qreal) qMax(value - minimum, 0) / qMax(maximum - minimum, 1) * 345; |
| 53 | 53 | |
| 54 | 54 | QBrush barBrush(bar); |
| 55 | - barBrush.setTransform(QTransform().translate(4, 3)); | |
| 55 | + barBrush.setTransform(QTransform().translate(5, 5)); | |
| 56 | 56 | |
| 57 | 57 | painter.setPen(Qt::NoPen); |
| 58 | 58 | painter.setBrush(barBrush); |
| ... | ... | @@ -61,7 +61,7 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) |
| 61 | 61 | painter.restore(); |
| 62 | 62 | painter.save(); |
| 63 | 63 | |
| 64 | - rect = QRect((291-25)/2 + 2, 2, indicator.size().width() - 2, indicator.size().height() - 2); | |
| 64 | + rect = QRect((349-30)/2 + 2, 2, indicator.size().width() - 2, indicator.size().height() - 2); | |
| 65 | 65 | rect.translate(-size().width() / 2, -size().height() / 2); |
| 66 | 66 | |
| 67 | 67 | painter.translate(size().width() / 2, size().height() / 2); |
| ... | ... | @@ -75,10 +75,10 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) |
| 75 | 75 | white.setWidth(3); |
| 76 | 76 | |
| 77 | 77 | painter.setPen(white); |
| 78 | - painter.drawLine(54, 167, 238, 167); | |
| 78 | + painter.drawLine(64.8, 200.4, 285.6, 200.4); | |
| 79 | 79 | |
| 80 | 80 | rect.setSize(icon.size()); |
| 81 | - rect.moveCenter(QPoint(291/2, 290/3 + 15)); | |
| 81 | + rect.moveCenter(QPoint(349.2/2, 348/3 + 18)); | |
| 82 | 82 | |
| 83 | 83 | painter.drawImage(rect, icon); |
| 84 | 84 | } | ... | ... |
app/gui/oven_control/configpanelbutton.cpp
| ... | ... | @@ -19,8 +19,8 @@ ConfigPanelButton::ConfigPanelButton(QWidget *parent, uint16_t btn_id) : |
| 19 | 19 | showingFavoriteButton = false; |
| 20 | 20 | ui->favoriteButton->hide(); |
| 21 | 21 | |
| 22 | - textRect = QRect(20, 0, 556, 65); | |
| 23 | - valueRect = QRect(556, 0, 265, 65); | |
| 22 | + textRect = QRect(24, 0, 667, 78); | |
| 23 | + valueRect = QRect(667, 0, 318, 78); | |
| 24 | 24 | // connect(ui->pushButton, SIGNAL(pressed()), SIGNAL(pressed())); |
| 25 | 25 | // connect(ui->pushButton, SIGNAL(released()), SIGNAL(released())); |
| 26 | 26 | // connect(ui->pushButton, SIGNAL(clicked()), SIGNAL(clicked())); |
| ... | ... | @@ -78,7 +78,7 @@ void ConfigPanelButton::showFavoriteButton() |
| 78 | 78 | showingFavoriteButton = true; |
| 79 | 79 | ui->favoriteButton->show(); |
| 80 | 80 | |
| 81 | - textRect = QRect(20 + 77, 0, 556 - 77, 65); | |
| 81 | + textRect = QRect(24 + 92, 0, 667 - 92, 78); | |
| 82 | 82 | updateIcon(); |
| 83 | 83 | } |
| 84 | 84 | |
| ... | ... | @@ -90,7 +90,7 @@ void ConfigPanelButton::hideFavoriteButton() |
| 90 | 90 | showingFavoriteButton = false; |
| 91 | 91 | ui->favoriteButton->hide(); |
| 92 | 92 | |
| 93 | - textRect = QRect(20, 0, 556, 65); | |
| 93 | + textRect = QRect(24, 0, 667, 78); | |
| 94 | 94 | updateIcon(); |
| 95 | 95 | } |
| 96 | 96 | ... | ... |
app/gui/oven_control/configsteamwashdlg.cpp
| ... | ... | @@ -35,7 +35,7 @@ void ConfigSteamWashDlg::updateView() |
| 35 | 35 | ui->ctrLbBody->setText(tr("시작하시겠습니까?")); |
| 36 | 36 | ui->ctrLbBody->show(); |
| 37 | 37 | ui->ctrGauge->hide(); |
| 38 | - ui->ctrBtnOk->setGeometry(300, 350, 150, 100); | |
| 38 | + ui->ctrBtnOk->setGeometry(360, 420, 180, 120); | |
| 39 | 39 | ui->ctrBtnOk->show(); |
| 40 | 40 | ui->ctrBtnCancel->show(); |
| 41 | 41 | break; |
| ... | ... | @@ -104,7 +104,7 @@ void ConfigSteamWashDlg::updateView() |
| 104 | 104 | ui->ctrGauge->setMaximum(1); |
| 105 | 105 | ui->ctrGauge->setValue(1); |
| 106 | 106 | ui->ctrGauge->show(); |
| 107 | - ui->ctrBtnOk->setGeometry(300, 350, 300, 100); | |
| 107 | + ui->ctrBtnOk->setGeometry(360, 420, 360, 120); | |
| 108 | 108 | ui->ctrBtnOk->show(); |
| 109 | 109 | ui->ctrBtnCancel->hide(); |
| 110 | 110 | } | ... | ... |
app/gui/oven_control/cook.cpp
| ... | ... | @@ -9,7 +9,7 @@ static void showError(QString errorMessage) |
| 9 | 9 | { |
| 10 | 10 | errorDialog = new QErrorMessage; |
| 11 | 11 | errorDialog->setWindowModality(Qt::ApplicationModal); |
| 12 | - errorDialog->setGeometry(QRect(0, 426, 900, 426)); | |
| 12 | + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); | |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | errorDialog->showMessage(errorMessage); | ... | ... |
app/gui/oven_control/cookbook.cpp
| ... | ... | @@ -12,7 +12,7 @@ static void showError(QString errorMessage) |
| 12 | 12 | { |
| 13 | 13 | errorDialog = new QErrorMessage; |
| 14 | 14 | errorDialog->setWindowModality(Qt::ApplicationModal); |
| 15 | - errorDialog->setGeometry(QRect(0, 426, 900, 426)); | |
| 15 | + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); | |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | errorDialog->showMessage(errorMessage); | ... | ... |
app/gui/oven_control/cookhistory.cpp
| ... | ... | @@ -1274,7 +1274,7 @@ QPixmap CookHistory::render(CookRecord record) |
| 1274 | 1274 | { |
| 1275 | 1275 | ManualCookSettingWidget *w = new ManualCookSettingWidget(record.manualRecord.setting); |
| 1276 | 1276 | |
| 1277 | - QPixmap p = w->grab().scaledToHeight(630, Qt::SmoothTransformation); | |
| 1277 | + QPixmap p = w->grab().scaledToHeight(756, Qt::SmoothTransformation); | |
| 1278 | 1278 | |
| 1279 | 1279 | w->deleteLater(); |
| 1280 | 1280 | |
| ... | ... | @@ -1284,7 +1284,7 @@ QPixmap CookHistory::render(CookRecord record) |
| 1284 | 1284 | { |
| 1285 | 1285 | AutoCookSettingWidget *w = new AutoCookSettingWidget(record.autoRecord.setting); |
| 1286 | 1286 | |
| 1287 | - QPixmap p = w->grab().scaledToHeight(630, Qt::SmoothTransformation); | |
| 1287 | + QPixmap p = w->grab().scaledToHeight(756, Qt::SmoothTransformation); | |
| 1288 | 1288 | |
| 1289 | 1289 | w->deleteLater(); |
| 1290 | 1290 | ... | ... |
app/gui/oven_control/cookpanelbutton.cpp
| ... | ... | @@ -46,7 +46,7 @@ void CookPanelButton::showInfo() |
| 46 | 46 | |
| 47 | 47 | label = new QLabel(this); |
| 48 | 48 | label->setPixmap(p); |
| 49 | - label->setGeometry((width() - p.width()) / 2, 65, p.width(), p.height()); | |
| 49 | + label->setGeometry((width() - p.width()) / 2, 93, p.width(), p.height()); | |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | label->show(); | ... | ... |
app/gui/oven_control/fileprocessgauge.cpp
| ... | ... | @@ -16,7 +16,7 @@ void FileProcessGauge::paintEvent(QPaintEvent */*event*/){ |
| 16 | 16 | QPainter painter(this); |
| 17 | 17 | painter.setBrush(Qt::NoBrush); |
| 18 | 18 | painter.setPen(Qt::NoPen); |
| 19 | - QRect textRect(0,0,72,40); | |
| 19 | + QRect textRect(0,0,86,48); | |
| 20 | 20 | |
| 21 | 21 | qreal percentage = (qreal) (val - min) / qMax(max - min, 1); |
| 22 | 22 | percentage = qBound((qreal) 0.0, percentage, (qreal) 1.0); |
| ... | ... | @@ -29,12 +29,12 @@ void FileProcessGauge::paintEvent(QPaintEvent */*event*/){ |
| 29 | 29 | QRect sourceRect(0, 0, body.size().width() * percentage, body.height()); |
| 30 | 30 | QFont font; |
| 31 | 31 | font.setFamily("나눔맑은고딕"); |
| 32 | - font.setPixelSize(30); | |
| 32 | + font.setPixelSize(36); | |
| 33 | 33 | painter.setFont(font); |
| 34 | 34 | painter.setPen(Qt::white); |
| 35 | 35 | painter.drawPixmap(targetRect, body, sourceRect); |
| 36 | 36 | painter.drawPixmap(textRect.width()/ 2, textRect.height()+indicator.size().height(), border); |
| 37 | 37 | painter.drawPixmap(targetRect.right() - indicator.size().width() / 2, textRect.height(), indicator); |
| 38 | - textRect.setRect(targetRect.right() - textRect.size().width()/2, textRect.top(),72,40); | |
| 38 | + textRect.setRect(targetRect.right() - textRect.size().width()/2, textRect.top(),86,48); | |
| 39 | 39 | painter.drawText(textRect,Qt::AlignCenter, QString("%1%").arg(val)); |
| 40 | 40 | } | ... | ... |
app/gui/oven_control/manualcookwindow.cpp
| ... | ... | @@ -160,8 +160,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : |
| 160 | 160 | oven->setDefault(mode); |
| 161 | 161 | |
| 162 | 162 | QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect(this); |
| 163 | - effect->setBlurRadius(10); | |
| 164 | - effect->setOffset(3, 3); | |
| 163 | + effect->setBlurRadius(12); | |
| 164 | + effect->setOffset(4, 4); | |
| 165 | 165 | |
| 166 | 166 | ui->infoTextLabel->setAttribute(Qt::WA_TransparentForMouseEvents); |
| 167 | 167 | ui->infoTextLabel->setGraphicsEffect(effect); | ... | ... |
app/gui/oven_control/multicookautowindow.cpp
| ... | ... | @@ -39,7 +39,7 @@ void MultiCookAutoWindow::setBook(MultiCookBook *book) |
| 39 | 39 | connect(sm, SIGNAL(mapped(int)), SLOT(select(int))); |
| 40 | 40 | |
| 41 | 41 | QFont font = this->font(); |
| 42 | - font.setPointSize(10); | |
| 42 | + font.setPointSize(12); | |
| 43 | 43 | font.setBold(true); |
| 44 | 44 | font.setWeight(75); |
| 45 | 45 | |
| ... | ... | @@ -55,11 +55,11 @@ void MultiCookAutoWindow::setBook(MultiCookBook *book) |
| 55 | 55 | QWidget *last = this; |
| 56 | 56 | for (int idx = 0; idx < list.size(); idx++) |
| 57 | 57 | { |
| 58 | - int x = 12 + (idx % 3) * 294; | |
| 59 | - int y = 615 + (idx / 3) * 80; | |
| 58 | + int x = 14 + (idx % 3) * 353; | |
| 59 | + int y = 738 + (idx / 3) * 96; | |
| 60 | 60 | |
| 61 | 61 | QPushButton *pb = new QPushButton(this); |
| 62 | - pb->setGeometry(QRect(x, y, 288, 70)); | |
| 62 | + pb->setGeometry(QRect(x, y, 345, 84)); | |
| 63 | 63 | pb->setFont(font); |
| 64 | 64 | pb->setStyleSheet(stylesheet); |
| 65 | 65 | pb->setText(list.at(idx)); | ... | ... |
app/gui/oven_control/multicookbook.cpp
| ... | ... | @@ -12,7 +12,7 @@ void showError(QString errorMessage) |
| 12 | 12 | { |
| 13 | 13 | errorDialog = new QErrorMessage; |
| 14 | 14 | errorDialog->setWindowModality(Qt::ApplicationModal); |
| 15 | - errorDialog->setGeometry(QRect(0, 426, 900, 426)); | |
| 15 | + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); | |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | errorDialog->showMessage(errorMessage); | ... | ... |
app/gui/oven_control/multicookview.cpp
| ... | ... | @@ -122,7 +122,7 @@ QList<QRect> MultiCookView::calcRects() |
| 122 | 122 | int w = width(); |
| 123 | 123 | int h = height(); |
| 124 | 124 | int x = w * (2-timePosition) / 10 + 1; |
| 125 | - int y = (h / 10 - 56) / 2; | |
| 125 | + int y = (h / 10 - 67) / 2; | |
| 126 | 126 | |
| 127 | 127 | QList<QRect> list; |
| 128 | 128 | for (int i = 0; i < 10; i++) |
| ... | ... | @@ -142,7 +142,7 @@ QList<QRect> MultiCookView::calcRects() |
| 142 | 142 | if (remainingTime > 0) |
| 143 | 143 | barW = qCeil(remainingTime / 2000000.0 * w); |
| 144 | 144 | |
| 145 | - list.append(QRect(x, barY, barW, 56)); | |
| 145 | + list.append(QRect(x, barY, barW, 67)); | |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | return list; |
| ... | ... | @@ -165,7 +165,7 @@ int MultiCookView::calcSlot(int x, int y) |
| 165 | 165 | |
| 166 | 166 | void MultiCookView::paintGrids(QPainter &painter) |
| 167 | 167 | { |
| 168 | - static const int padding = 10; | |
| 168 | + static const int padding = 12; | |
| 169 | 169 | |
| 170 | 170 | int w = width(); |
| 171 | 171 | int h = height(); |
| ... | ... | @@ -192,10 +192,10 @@ void MultiCookView::paintBars(QPainter &painter) |
| 192 | 192 | if (!r.isNull()) |
| 193 | 193 | paintBar(painter, r); |
| 194 | 194 | |
| 195 | - r.translate(10, 0); | |
| 195 | + r.translate(12, 0); | |
| 196 | 196 | |
| 197 | - if (r.left() < 10) | |
| 198 | - r.moveLeft(10); | |
| 197 | + if (r.left() < 12) | |
| 198 | + r.moveLeft(12); | |
| 199 | 199 | |
| 200 | 200 | painter.setBrush(Qt::NoBrush); |
| 201 | 201 | painter.setPen(Qt::white); |
| ... | ... | @@ -205,14 +205,14 @@ void MultiCookView::paintBars(QPainter &painter) |
| 205 | 205 | |
| 206 | 206 | void MultiCookView::paintCurrentTime(QPainter &painter) |
| 207 | 207 | { |
| 208 | - static const int padding = 10; | |
| 208 | + static const int padding = 12; | |
| 209 | 209 | |
| 210 | 210 | int w = width(); |
| 211 | 211 | int h = height(); |
| 212 | 212 | int x = w * (2-timePosition) / 10; |
| 213 | 213 | |
| 214 | 214 | QPen pen(Qt::yellow); |
| 215 | - pen.setWidth(3); | |
| 215 | + pen.setWidth(4); | |
| 216 | 216 | painter.setPen(pen); |
| 217 | 217 | painter.setBrush(Qt::NoBrush); |
| 218 | 218 | painter.drawLine(x, padding, x, h - padding); |
| ... | ... | @@ -220,11 +220,11 @@ void MultiCookView::paintCurrentTime(QPainter &painter) |
| 220 | 220 | |
| 221 | 221 | void MultiCookView::paintBar(QPainter &painter, QRect r) |
| 222 | 222 | { |
| 223 | - static const int fullWidth = 281; | |
| 224 | - static const int headWidth = 7; | |
| 225 | - static const int tailWidth = fullWidth - 255; | |
| 223 | + static const int fullWidth = 337; | |
| 224 | + static const int headWidth = 8; | |
| 225 | + static const int tailWidth = fullWidth - 306; | |
| 226 | 226 | static const int bodyWidth = fullWidth - headWidth - tailWidth; |
| 227 | - static const int height = 56; | |
| 227 | + static const int height = 67; | |
| 228 | 228 | |
| 229 | 229 | static const int bodyOffset = headWidth; |
| 230 | 230 | static const int tailOffset = fullWidth - tailWidth; | ... | ... |
app/gui/oven_control/programmingautoselectionwindow.cpp
| ... | ... | @@ -29,7 +29,7 @@ ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, |
| 29 | 29 | |
| 30 | 30 | QFont font; |
| 31 | 31 | font.setFamily(QStringLiteral("Roboto")); |
| 32 | - font.setPointSize(10);; | |
| 32 | + font.setPointSize(12); | |
| 33 | 33 | font.setBold(true); |
| 34 | 34 | font.setWeight(75); |
| 35 | 35 | |
| ... | ... | @@ -44,11 +44,11 @@ QPushButton:pressed, QPushButton:focus {\ |
| 44 | 44 | QWidget *last = this; |
| 45 | 45 | for (int idx = 0; idx < book.list.size(); idx++) |
| 46 | 46 | { |
| 47 | - int x = 12 + (idx % 3) * 294; | |
| 48 | - int y = 615 + (idx / 3) * 80; | |
| 47 | + int x = 14 + (idx % 3) * 352; | |
| 48 | + int y = 738 + (idx / 3) * 96; | |
| 49 | 49 | |
| 50 | 50 | QPushButton *pb = new QPushButton(this); |
| 51 | - pb->setGeometry(QRect(x, y, 288, 70)); | |
| 51 | + pb->setGeometry(QRect(x, y, 345, 84)); | |
| 52 | 52 | pb->setFont(font); |
| 53 | 53 | pb->setStyleSheet(stylesheet); |
| 54 | 54 | pb->setText(book.list.at(idx)); | ... | ... |
app/gui/oven_control/programmingwindow.cpp
| ... | ... | @@ -106,13 +106,13 @@ void ProgrammingWindow::setupUi() |
| 106 | 106 | ui->verticalScrollLayout->setAlignment(Qt::AlignTop); |
| 107 | 107 | |
| 108 | 108 | QFont font = ui->addButton->font(); |
| 109 | - font.setPixelSize(30); | |
| 109 | + font.setPixelSize(36); | |
| 110 | 110 | |
| 111 | 111 | int textWidth = QFontMetrics(font).width(tr("추가하기")); |
| 112 | 112 | |
| 113 | 113 | QPixmap iconPix(":/images/etc/bar_icon_03.png"); |
| 114 | 114 | |
| 115 | - QPixmap pixmap(QSize(iconPix.width() + 20 + textWidth, ui->addButton->height())); | |
| 115 | + QPixmap pixmap(QSize(iconPix.width() + 24 + textWidth, ui->addButton->height())); | |
| 116 | 116 | pixmap.fill(Qt::transparent); |
| 117 | 117 | |
| 118 | 118 | QRect textRect(iconPix.width() + 20, 0, textWidth, pixmap.height()); | ... | ... |
app/gui/oven_control/slider.cpp
| ... | ... | @@ -203,26 +203,26 @@ void Slider::paintEvent(QPaintEvent */*event*/) |
| 203 | 203 | for (int tick = minimum_; tick <= maximum_; tick += tickInterval) |
| 204 | 204 | { |
| 205 | 205 | int x = subLeftTop.x() + calcSubLength(tick); |
| 206 | - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 28); | |
| 206 | + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 33); | |
| 207 | 207 | } |
| 208 | 208 | else |
| 209 | 209 | foreach (int tick, ticks) |
| 210 | 210 | { |
| 211 | 211 | int x = subLeftTop.x() + calcSubLength(tick); |
| 212 | - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 28); | |
| 212 | + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 33); | |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | if (bigTickInterval) |
| 216 | 216 | for (int tick = minimum_; tick <= maximum_; tick += bigTickInterval) |
| 217 | 217 | { |
| 218 | 218 | int x = subLeftTop.x() + calcSubLength(tick); |
| 219 | - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 33); | |
| 219 | + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 39); | |
| 220 | 220 | } |
| 221 | 221 | else |
| 222 | 222 | foreach (int tick, bigTicks) |
| 223 | 223 | { |
| 224 | 224 | int x = subLeftTop.x() + calcSubLength(tick); |
| 225 | - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 33); | |
| 225 | + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 39); | |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | if (subVisible_) | ... | ... |