diff --git a/src/Manager.cpp b/src/Manager.cpp index 6a7220d..58db37f 100644 --- a/src/Manager.cpp +++ b/src/Manager.cpp @@ -359,12 +359,12 @@ void Manager::extractEnd() page7_set(Page7state::done); shortcut(installDir + createBat(), installDir + createIcon(), - (downloadCandidate.architecture == Arcs::i686 ? "MinGW-W64-x32" : "MinGW-W64-x64"), + (downloadCandidate.architecture == Arcs::i686 ? "MinGW-W64-32bit" : "MinGW-W64-64bit"), 0); if(desktopShortcut) shortcut(installDir + createBat(), installDir + createIcon(), - (downloadCandidate.architecture == Arcs::i686 ? "MinGW-W64-x32" : "MinGW-W64-x64"), + (downloadCandidate.architecture == Arcs::i686 ? "MinGW-W64-32bit" : "MinGW-W64-64bit"), 1); }else{ showError("extractEnd: invalid status"); diff --git a/src/page0.cpp b/src/page0.cpp index 5da7f96..254eb55 100644 --- a/src/page0.cpp +++ b/src/page0.cpp @@ -13,7 +13,7 @@ void page_0() auto *g = new Fl_Group(0, 0, width, height); auto *text = new Fl_Help_View(50 + png_size, 1, 600, 275); - text->value("

Welcome to Mingw install wizard

" + text->value("

Welcome to MinGW-W64 install wizard

" "

This installer was developed for Windows users of the MinGW-W64 compiler. " "MinGW-W64 is a native Windows compiler based " "on the GNU C Compiler.

" diff --git a/src/page4.cpp b/src/page4.cpp index 7281579..74639d1 100644 --- a/src/page4.cpp +++ b/src/page4.cpp @@ -54,7 +54,7 @@ void page_4() button_width, button_height, "@<- Back"); back->callback(back_cb); - auto *out = new Fl_Box(20 + png_size, 100, 25, 25, "Select a exceptions"); + auto *out = new Fl_Box(20 + png_size, 100, 25, 25, "Select an exceptions"); out->labelsize(50); out->align(FL_ALIGN_TOP | FL_ALIGN_LEFT); diff --git a/src/page_about.cpp b/src/page_about.cpp index 77245e2..36fe9b0 100644 --- a/src/page_about.cpp +++ b/src/page_about.cpp @@ -1,3 +1,5 @@ +extern const char * const version; + #include "pages.hpp" #include "Manager.hpp" @@ -12,10 +14,12 @@ void page_about() { auto *g = new Fl_Group(0, 0, width, height); auto *text = new Fl_Help_View(50 + png_size, 1, 600, 275); - text->value("

About

" - "

This installer was developed by Vuniverse." + std::string ver{version}; + text->value(("

About

Version: " + ver + + "

This installer was developed by Vuniverse." "

It is open source." - "

Report a bug or an error.

"); + "

Report a bug or an error.

" + ).c_str()); text->textsize(20); auto *next = new Fl_Button(button_x + png_size, button_y, button_width, button_height, "Ok"); diff --git a/src/version.cpp b/src/version.cpp index e942a78..c011895 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1 +1 @@ -extern const char * const version = "1.1.0"; \ No newline at end of file +extern const char * const version = "1.1.1"; \ No newline at end of file