Skip to content

Commit

Permalink
info message redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Jul 4, 2019
1 parent 92ae304 commit 485c6c0
Show file tree
Hide file tree
Showing 33 changed files with 21,371 additions and 21,506 deletions.
179 changes: 11 additions & 168 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1981,10 +1981,6 @@
{
"name": "select_theme",
"implementationType": "native"
},
{
"name": "test",
"implementationType": "native"
}
],
"extensionDefinitions": [
Expand Down Expand Up @@ -2093,7 +2089,6 @@
"layout": "edit_mode_slider"
}
],
"closePageIfTouchedOutside": false,
"usedIn": [],
"left": 0,
"top": 0,
Expand Down Expand Up @@ -2384,7 +2379,6 @@
]
}
],
"closePageIfTouchedOutside": false,
"left": 0,
"top": 0,
"width": 480,
Expand Down Expand Up @@ -2881,7 +2875,6 @@
]
}
],
"closePageIfTouchedOutside": false,
"left": 0,
"top": 0,
"width": 480,
Expand All @@ -2907,7 +2900,6 @@
"height": 272
}
],
"closePageIfTouchedOutside": false,
"left": 0,
"top": 0,
"width": 480,
Expand Down Expand Up @@ -7588,23 +7580,6 @@
"width": "320",
"height": "36",
"layout": "old_task_bar"
},
{
"type": "Text",
"style": {
"inheritFrom": "button_bgnd",
"font": "small",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"action": "test",
"left": "357",
"top": "204",
"width": 64,
"height": 32,
"text": "Test"
}
],
"left": 0,
Expand Down Expand Up @@ -9505,108 +9480,6 @@
"width": 480,
"height": 240
},
{
"name": "info_alert",
"description": "Info message, single line",
"style": "info_alert",
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "info_alert",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"data": "alert_message",
"left": 0,
"top": 8,
"width": 280,
"height": 32,
"text": ""
},
{
"type": "Text",
"style": {
"inheritFrom": "info_alert_button",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"action": "ok",
"left": 110,
"top": 48,
"width": 60,
"height": 32,
"text": "OK"
}
],
"left": 20,
"top": 76,
"width": 280,
"height": 88
},
{
"name": "info_long_alert",
"description": "Info message, two line",
"style": "info_alert",
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "info_alert",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"data": "alert_message",
"left": 0,
"top": 8,
"width": 280,
"height": 28,
"text": ""
},
{
"type": "Text",
"style": {
"inheritFrom": "info_alert",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"data": "alert_message_2",
"left": 0,
"top": 36,
"width": 280,
"height": 28,
"text": ""
},
{
"type": "Text",
"style": {
"inheritFrom": "info_alert_button",
"padding": 0
},
"activeStyle": {
"padding": 0
},
"action": "ok",
"left": 110,
"top": 72,
"width": 60,
"height": 32,
"text": "OK"
}
],
"left": 20,
"top": 64,
"width": 280,
"height": 112
},
{
"name": "toast3_alert",
"description": "Info message",
Expand Down Expand Up @@ -10156,7 +10029,6 @@
"text": ""
}
],
"closePageIfTouchedOutside": true,
"left": 20,
"top": 76,
"width": 280,
Expand Down Expand Up @@ -10200,7 +10072,6 @@
"text": ""
}
],
"closePageIfTouchedOutside": false,
"left": 20,
"top": 76,
"width": 280,
Expand Down Expand Up @@ -10260,7 +10131,6 @@
"text": "Abort"
}
],
"closePageIfTouchedOutside": false,
"left": 40,
"top": 58,
"width": 240,
Expand Down Expand Up @@ -15627,7 +15497,6 @@
"text": "Insert row below"
}
],
"closePageIfTouchedOutside": true,
"left": 78,
"top": 76,
"width": 164,
Expand Down Expand Up @@ -15718,7 +15587,6 @@
"text": "Delete all"
}
],
"closePageIfTouchedOutside": true,
"left": 25,
"top": 44,
"width": 270,
Expand Down Expand Up @@ -15778,7 +15646,6 @@
"text": "Set to fixed"
}
],
"closePageIfTouchedOutside": true,
"left": 74,
"top": 60,
"width": 172,
Expand Down Expand Up @@ -19739,7 +19606,7 @@
"action": "set",
"left": 0,
"top": 0,
"width": "41",
"width": 41,
"height": 32,
"text": "_"
},
Expand Down Expand Up @@ -28283,7 +28150,6 @@
"text": "Cancel"
}
],
"closePageIfTouchedOutside": true,
"left": 87,
"top": 32,
"width": 146,
Expand Down Expand Up @@ -34521,7 +34387,6 @@
"listType": "horizontal"
}
],
"closePageIfTouchedOutside": false,
"usedIn": [
"simulator"
],
Expand Down Expand Up @@ -36005,7 +35870,7 @@
"left": 133,
"top": 0,
"width": 25,
"height": 26,
"height": 24,
"text": "9"
}
]
Expand Down Expand Up @@ -36559,7 +36424,7 @@
"left": 133,
"top": 0,
"width": 25,
"height": 26,
"height": 24,
"text": "9"
}
]
Expand Down Expand Up @@ -36710,30 +36575,6 @@
"top": 0,
"width": "478",
"height": "72"
},
{
"name": "test",
"style": "default",
"widgets": [
{
"type": "Rectangle",
"style": {
"padding": 0
},
"activeStyle": {
"padding": 0
},
"left": "0",
"top": "0",
"width": "100",
"height": "100"
}
],
"closePageIfTouchedOutside": false,
"left": 0,
"top": 0,
"width": 480,
"height": 272
}
],
"styles": [
Expand Down Expand Up @@ -37189,7 +37030,9 @@
"name": "info_alert",
"inheritFrom": "default_S",
"backgroundColor": "#5fd3b4",
"padding": 0
"padding": "20",
"margin": "20",
"alwaysBuild": true
},
{
"name": "info_alert_button",
Expand Down Expand Up @@ -37582,22 +37425,22 @@
"name": "select_enum_item_popup_container",
"inheritFrom": "default_S",
"backgroundColor": "#cae7f0",
"padding": 0,
"padding": "12",
"alwaysBuild": true
},
{
"name": "select_enum_item_popup_item",
"inheritFrom": "select_enum_item_popup_container",
"alignHorizontal": "left",
"color": "#2f2f2f",
"padding": 0,
"padding": "6",
"alwaysBuild": true
},
{
"name": "select_enum_item_popup_disabled_item",
"inheritFrom": "select_enum_item_popup_item",
"color": "#c0c0c0",
"padding": 0,
"padding": "6",
"alwaysBuild": true
},
{
Expand Down Expand Up @@ -226245,7 +226088,7 @@
{
"encoding": 88,
"x": 1,
"y": 0,
"y": 2,
"width": 16,
"height": 17,
"dx": 19,
Expand Down Expand Up @@ -228574,7 +228417,7 @@
{
"encoding": 95,
"x": 1,
"y": 0,
"y": 2,
"width": 16,
"height": 17,
"dx": 19,
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/gui/calibration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ void nextStep() {
void save() {
if (calibration::save()) {
calibration::stop();
infoMessageP("Calibration data saved!", popPage);
infoMessage("Calibration data saved!", popPage);
} else {
errorMessageP("Save failed!");
}
Expand Down
Loading

0 comments on commit 485c6c0

Please sign in to comment.