에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (5)
Showing 37 changed files   Show diff stats
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @aac0f73
... ... @@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
138 138 <rect>
139 139 <x>0</x>
140 140 <y>516</y>
141   - <width>240</width>
  141 + <width>300</width>
142 142 <height>180</height>
143 143 </rect>
144 144 </property>
... ...
app/gui/oven_control/define.h
  Diff comments   View file @aac0f73
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #define MAJOR_VER 2
7 7 #define MINOR_VER 1
8   -#define HOTFIX_VER 1
  8 +#define HOTFIX_VER 4
9 9  
10 10 // 0 for normal
11 11 // 1 for premium
... ...
app/gui/oven_control/images/cook_type/additional.png
  Diff comments   View file @aac0f73

3.02 KB | W: | H:

3.02 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/additional_big.png
  Diff comments   View file @aac0f73

2.82 KB | W: | H:

2.82 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/additional_hide.png
  Diff comments   View file @aac0f73

3 KB | W: | H:

3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/additional_ov.png
  Diff comments   View file @aac0f73

2.36 KB | W: | H:

2.36 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread.png
  Diff comments   View file @aac0f73

3.48 KB | W: | H:

3.48 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread_big.png
  Diff comments   View file @aac0f73

3.5 KB | W: | H:

3.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread_hide.png
  Diff comments   View file @aac0f73

3.48 KB | W: | H:

3.48 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread_ov.png
  Diff comments   View file @aac0f73

2.83 KB | W: | H:

2.83 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert.png
  Diff comments   View file @aac0f73

2.96 KB | W: | H:

2.96 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert_big.png
  Diff comments   View file @aac0f73

2.7 KB | W: | H:

2.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert_hide.png
  Diff comments   View file @aac0f73

2.94 KB | W: | H:

2.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert_ov.png
  Diff comments   View file @aac0f73

2.2 KB | W: | H:

2.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc.png
  Diff comments   View file @aac0f73

3.25 KB | W: | H:

3.25 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc_big.png
  Diff comments   View file @aac0f73

3.08 KB | W: | H:

3.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc_hide.png
  Diff comments   View file @aac0f73

3.26 KB | W: | H:

3.26 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc_ov.png
  Diff comments   View file @aac0f73

2.47 KB | W: | H:

2.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish.png
  Diff comments   View file @aac0f73

3.46 KB | W: | H:

3.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish_big.png
  Diff comments   View file @aac0f73

3.51 KB | W: | H:

3.51 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish_hide.png
  Diff comments   View file @aac0f73

3.44 KB | W: | H:

3.44 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish_ov.png
  Diff comments   View file @aac0f73

2.75 KB | W: | H:

2.75 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat.png
  Diff comments   View file @aac0f73

3.44 KB | W: | H:

3.44 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat_big.png
  Diff comments   View file @aac0f73

3.29 KB | W: | H:

3.29 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat_hide.png
  Diff comments   View file @aac0f73

3.43 KB | W: | H:

3.43 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat_ov.png
  Diff comments   View file @aac0f73

2.64 KB | W: | H:

2.64 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry.png
  Diff comments   View file @aac0f73

3.53 KB | W: | H:

3.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry_big.png
  Diff comments   View file @aac0f73

3.56 KB | W: | H:

3.56 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry_hide.png
  Diff comments   View file @aac0f73

3.51 KB | W: | H:

3.51 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry_ov.png
  Diff comments   View file @aac0f73

2.85 KB | W: | H:

2.85 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable.png
  Diff comments   View file @aac0f73

3.25 KB | W: | H:

3.25 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable_big.png
  Diff comments   View file @aac0f73

3.1 KB | W: | H:

3.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable_hide.png
  Diff comments   View file @aac0f73

3.24 KB | W: | H:

3.24 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable_ov.png
  Diff comments   View file @aac0f73

2.51 KB | W: | H:

2.51 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @aac0f73
... ... @@ -41,14 +41,15 @@ font-size: 48px;
41 41  
42 42 QPushButton[style=&quot;type&quot;] {
43 43 background-repeat: no-repeat;
44   -background-position: center;
45   -background-clip: border;
  44 +background-position: top;
  45 +background-clip: margin;
46 46 background-origin: border;
  47 +margin-top: 52px;
47 48  
48   -border-top: 198px;
  49 +padding-top: 100px;
49 50 border-style: hidden;
50 51 color: white;
51   -font-size: 36px;
  52 +font-size: 44px;
52 53 }
53 54  
54 55 QPushButton[style=&quot;function&quot;] {
... ...
app/gui/oven_control/multicookselectionwindow.ui
  Diff comments   View file @aac0f73
... ... @@ -32,14 +32,15 @@ font-size: 48px;
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 52px;
38 39  
39   -border-top: 198px;
  40 +padding-top: 100px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 36px;
  43 +font-size: 44px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ...
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @aac0f73
... ... @@ -32,14 +32,15 @@ font-size: 48px;
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 52px;
38 39  
39   -border-top: 198px;
  40 +padding-top: 100px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 36px;
  43 +font-size: 44px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ...