Commit 885f3848e676dcddbbffbc0afc92a25724fd9a16
1 parent
f677b91ccd
Exists in
master
and in
2 other branches
메인 화면에서 숨긴 버튼 자리에 로고 부착, 버전 표시 삭제
Showing
3 changed files
with
20 additions
and
66 deletions
Show diff stats
app/gui/oven_control/images/symbol/main_logo.png
35.8 KB
app/gui/oven_control/mainwindow.ui
| @@ -646,71 +646,6 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -646,71 +646,6 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 646 | </property> | 646 | </property> |
| 647 | </widget> | 647 | </widget> |
| 648 | </widget> | 648 | </widget> |
| 649 | - <widget class="QLabel" name="steamLabel_13"> | ||
| 650 | - <property name="enabled"> | ||
| 651 | - <bool>true</bool> | ||
| 652 | - </property> | ||
| 653 | - <property name="geometry"> | ||
| 654 | - <rect> | ||
| 655 | - <x>750</x> | ||
| 656 | - <y>1550</y> | ||
| 657 | - <width>150</width> | ||
| 658 | - <height>50</height> | ||
| 659 | - </rect> | ||
| 660 | - </property> | ||
| 661 | - <property name="palette"> | ||
| 662 | - <palette> | ||
| 663 | - <active> | ||
| 664 | - <colorrole role="WindowText"> | ||
| 665 | - <brush brushstyle="SolidPattern"> | ||
| 666 | - <color alpha="255"> | ||
| 667 | - <red>255</red> | ||
| 668 | - <green>255</green> | ||
| 669 | - <blue>255</blue> | ||
| 670 | - </color> | ||
| 671 | - </brush> | ||
| 672 | - </colorrole> | ||
| 673 | - </active> | ||
| 674 | - <inactive> | ||
| 675 | - <colorrole role="WindowText"> | ||
| 676 | - <brush brushstyle="SolidPattern"> | ||
| 677 | - <color alpha="255"> | ||
| 678 | - <red>255</red> | ||
| 679 | - <green>255</green> | ||
| 680 | - <blue>255</blue> | ||
| 681 | - </color> | ||
| 682 | - </brush> | ||
| 683 | - </colorrole> | ||
| 684 | - </inactive> | ||
| 685 | - <disabled> | ||
| 686 | - <colorrole role="WindowText"> | ||
| 687 | - <brush brushstyle="SolidPattern"> | ||
| 688 | - <color alpha="255"> | ||
| 689 | - <red>123</red> | ||
| 690 | - <green>123</green> | ||
| 691 | - <blue>123</blue> | ||
| 692 | - </color> | ||
| 693 | - </brush> | ||
| 694 | - </colorrole> | ||
| 695 | - </disabled> | ||
| 696 | - </palette> | ||
| 697 | - </property> | ||
| 698 | - <property name="font"> | ||
| 699 | - <font> | ||
| 700 | - <family>Malgun Gothic</family> | ||
| 701 | - <pointsize>10</pointsize> | ||
| 702 | - </font> | ||
| 703 | - </property> | ||
| 704 | - <property name="text"> | ||
| 705 | - <string>V0.3.12</string> | ||
| 706 | - </property> | ||
| 707 | - <property name="alignment"> | ||
| 708 | - <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> | ||
| 709 | - </property> | ||
| 710 | - <property name="margin"> | ||
| 711 | - <number>10</number> | ||
| 712 | - </property> | ||
| 713 | - </widget> | ||
| 714 | <widget class="Line" name="line_7"> | 649 | <widget class="Line" name="line_7"> |
| 715 | <property name="geometry"> | 650 | <property name="geometry"> |
| 716 | <rect> | 651 | <rect> |
| @@ -724,6 +659,22 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -724,6 +659,22 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 724 | <enum>Qt::Horizontal</enum> | 659 | <enum>Qt::Horizontal</enum> |
| 725 | </property> | 660 | </property> |
| 726 | </widget> | 661 | </widget> |
| 662 | + <widget class="QLabel" name="label_5"> | ||
| 663 | + <property name="geometry"> | ||
| 664 | + <rect> | ||
| 665 | + <x>0</x> | ||
| 666 | + <y>1164</y> | ||
| 667 | + <width>600</width> | ||
| 668 | + <height>286</height> | ||
| 669 | + </rect> | ||
| 670 | + </property> | ||
| 671 | + <property name="pixmap"> | ||
| 672 | + <pixmap resource="resources.qrc">:/images/symbol/main_logo.png</pixmap> | ||
| 673 | + </property> | ||
| 674 | + <property name="alignment"> | ||
| 675 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 676 | + </property> | ||
| 677 | + </widget> | ||
| 727 | </widget> | 678 | </widget> |
| 728 | </widget> | 679 | </widget> |
| 729 | <layoutdefault spacing="6" margin="11"/> | 680 | <layoutdefault spacing="6" margin="11"/> |
| @@ -773,6 +724,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -773,6 +724,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 773 | <tabstop>configButton</tabstop> | 724 | <tabstop>configButton</tabstop> |
| 774 | <tabstop>helpButton</tabstop> | 725 | <tabstop>helpButton</tabstop> |
| 775 | </tabstops> | 726 | </tabstops> |
| 776 | - <resources/> | 727 | + <resources> |
| 728 | + <include location="resources.qrc"/> | ||
| 729 | + </resources> | ||
| 777 | <connections/> | 730 | <connections/> |
| 778 | </ui> | 731 | </ui> |
app/gui/oven_control/resources.qrc
| @@ -614,5 +614,6 @@ | @@ -614,5 +614,6 @@ | ||
| 614 | <file>images/manual_button/013_sys_icon_06_03_active.png</file> | 614 | <file>images/manual_button/013_sys_icon_06_03_active.png</file> |
| 615 | <file>images/manual_button/013_sys_icon_06_04_active.png</file> | 615 | <file>images/manual_button/013_sys_icon_06_04_active.png</file> |
| 616 | <file>images/manual_button/013_sys_icon_06_active.png</file> | 616 | <file>images/manual_button/013_sys_icon_06_active.png</file> |
| 617 | + <file>images/symbol/main_logo.png</file> | ||
| 617 | </qresource> | 618 | </qresource> |
| 618 | </RCC> | 619 | </RCC> |