Skip to content

Commit

Permalink
fix version 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Vuniverse0 committed Sep 29, 2022
1 parent e169159 commit c184c3c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/Manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/page0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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("<h1>Welcome to Mingw install wizard</h1>"
text->value("<h1>Welcome to MinGW-W64 install wizard</h1>"
"<p>This installer was developed for Windows users of the MinGW-W64 compiler. "
"<a href=\"https://www.mingw-w64.org/\">MinGW-W64</a> is a native Windows compiler based "
"on the <a href=\"https://gcc.gnu.org/\">GNU C Compiler</a>. </p> <p>"
Expand Down
2 changes: 1 addition & 1 deletion src/page4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 7 additions & 3 deletions src/page_about.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
extern const char * const version;

#include "pages.hpp"

#include "Manager.hpp"
Expand All @@ -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("<h1>About</h1>"
"<p>This installer was developed by <a href=\"https://github.com/Vuniverse0/\">Vuniverse</a>."
std::string ver{version};
text->value(("<h1>About</h1> <p>Version: " + ver +
"</p><p>This installer was developed by <a href=\"https://github.com/Vuniverse0/\">Vuniverse</a>."
"</p> <p> It is open <a href=\"https://github.com/Vuniverse0/mingwInstaller/\">source</a>."
"<p><a href=\"https://github.com/Vuniverse0/mingwInstaller/issues\">Report a bug or an error.</a></p>");
"<p><a href=\"https://github.com/Vuniverse0/mingwInstaller/issues\">Report a bug or an error.</a></p>"
).c_str());
text->textsize(20);

auto *next = new Fl_Button(button_x + png_size, button_y, button_width, button_height, "Ok");
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
extern const char * const version = "1.1.0";
extern const char * const version = "1.1.1";

0 comments on commit c184c3c

Please sign in to comment.