blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-05-03 23:06:35 +08:00
Code Issues Projects Releases Wiki Activity

Merge multiline messages into a single string, refresh free space after completing an operation.

Browse Source
This commit is contained in:
Steven Smith 2015-02-01 18:00:14 -08:00
parent 9e250102ff
commit 1a682b420e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/main.cpp
View File

@ -24,15 +24,14 @@ bool ui_display_install_progress(int progress) {
state.copyfmt(stream); state.copyfmt(stream);
stream << "] " << std::setfill('0') << std::setw(3) << progress; stream << "] " << std::setfill('0') << std::setw(3) << progress;
stream.copyfmt(state); stream.copyfmt(state);
stream << "%"; stream << "%" << "\n";
stream << "Press B to cancel." << "\n";
std::string msg = stream.str(); std::string str = stream.str();
std::string cancel = "Press B to cancel.";
screen_begin_draw(TOP_SCREEN); screen_begin_draw(TOP_SCREEN);
screen_clear(0, 0, 0); screen_clear(0, 0, 0);
screen_draw_string(msg, (screen_get_width() - screen_get_str_width(msg)) / 2, (screen_get_height() - screen_get_str_height(msg)) / 2 - screen_get_str_height(msg), 255, 255, 255); screen_draw_string(str, (screen_get_width() - screen_get_str_width(str)) / 2, (screen_get_height() - screen_get_str_height(str)) / 2, 255, 255, 255);
screen_draw_string(cancel, (screen_get_width() - screen_get_str_width(cancel)) / 2, (screen_get_height() - screen_get_str_height(cancel)) / 2 + screen_get_str_height(cancel), 255, 255, 255);
screen_end_draw(); screen_end_draw();
screen_swap_buffers_quick();; screen_swap_buffers_quick();;
@ -67,9 +66,10 @@ void ui_display_result(bool install, bool state) {
bool ui_prompt_operation(Mode mode, std::string name) { bool ui_prompt_operation(Mode mode, std::string name) {
std::stringstream stream; std::stringstream stream;
stream << (mode == INSTALL ? "Install" : "Delete") << " the selected title?"; stream << (mode == INSTALL ? "Install" : "Delete") << " the selected title?" << "\n";
std::string msg = stream.str(); stream << name << "\n";
std::string prompt = "Press A to confirm, B to cancel."; stream << "Press A to confirm, B to cancel." << "\n";
std::string str = stream.str();
while(platform_is_running()) { while(platform_is_running()) {
input_poll(); input_poll();
if(input_is_pressed(BUTTON_A)) { if(input_is_pressed(BUTTON_A)) {
@ -82,9 +82,7 @@ bool ui_prompt_operation(Mode mode, std::string name) {
screen_begin_draw(TOP_SCREEN); screen_begin_draw(TOP_SCREEN);
screen_clear(0, 0, 0); screen_clear(0, 0, 0);
screen_draw_string(msg, (screen_get_width() - screen_get_str_width(msg)) / 2, (screen_get_height() - screen_get_str_height(msg)) / 2 - screen_get_str_height(msg), 255, 255, 255); screen_draw_string(str, (screen_get_width() - screen_get_str_width(str)) / 2, (screen_get_height() - screen_get_str_height(str)) / 2, 255, 255, 255);
screen_draw_string(name, (screen_get_width() - screen_get_str_width(name)) / 2, (screen_get_height() - screen_get_str_height(name)) / 2, 255, 255, 255);
screen_draw_string(prompt, (screen_get_width() - screen_get_str_width(prompt)) / 2, (screen_get_height() - screen_get_str_height(prompt)) / 2 + screen_get_str_height(prompt), 255, 255, 255);
screen_end_draw(); screen_end_draw();
screen_swap_buffers(); screen_swap_buffers();
} }
@ -160,6 +158,8 @@ int main(int argc, char **argv) {
ui_display_result(false, app_delete(targetDelete)); ui_display_result(false, app_delete(targetDelete));
} }
} }
freeSpace = fs_get_free_space(destination);
} }
} }