-#ifdef NOMINGW
-static define buildString = $"Ecere SDK v0.44.10 (Without MinGW) -- built on March 9th, 2014 ";
-#else
-static define buildString = $"Ecere SDK v0.44.10 -- built on March 9th, 2014 ";
-#endif
+static define versionString = "Ecere SDK v0.44.10 (pr2)";
+static define dateString = $"August 7th, 2014";
+static define builtOnString = $"built on ";
+static define withoutMinGW = $" (Without MinGW)";
#define WIN32_LEAN_AND_MEAN
#define GetFreeSpace _GetFreeSpace
import "licensing"
import "CheckListBox"
+static void SetBuildString(Label label)
+{
+ static const String addMinGW = "";
+ String s;
+
+#ifdef NOMINGW
+ addMinGW = withoutMinGW;
+#endif
+
+ s = PrintString(versionString, addMinGW, " -- ", builtOnString, dateString);
+ label.caption = s;
+ delete s;
+}
+
static bool IsAdministrator()
{
BOOL b;
public enum AdditionalID
{
- eda, eda32, vanilla, vanilla32, extras, upx, gnurx, gnurx32, /*pthreads, */cpp, /*w32api, gcci18n, gdbi18n, makei18n, binutilsi18n, */none
+ eda, eda32, audio, audio32, vanilla, vanilla32, extras, upx, gnurx, gnurx32, /*pthreads, */cpp, /*w32api, gcci18n, gdbi18n, makei18n, binutilsi18n, */none
};
Array<Component> additional
{ [
{ $"Data Access", "ecere-sdk/eda", "bin", null, false, true, true, bits64 },
{ $"Data Access", "ecere-sdk32/eda", "bin", null, false, true, true, bits32 },
+ { $"Ecere Audio", "ecere-sdk/EcereAudio.dll", "bin", null, false, true, true, bits64 },
+ { $"Ecere Audio", "ecere-sdk32/EcereAudio.dll", "bin", null, false, true, true, bits32 },
{ $"Ecere Vanilla", "ecere-sdk/libecereVanilla.a", "lib", null, false, true, true, bits64 },
{ $"Ecere Vanilla", "ecere-sdk32/libecereVanilla.a", "lib", null, false, true, true, bits32 },
{ $"Ecere Extras", "extras", "extras", null, false, true, true, none },
tabCycle = true;
clientSize = { 636, 476 };
icon = { ":icon.png" };
- text = $"Ecere Software Development Kit Setup - v0.44.10 \"Ryōan-ji\" 64 Bit Edition";
+ caption = $"Ecere Software Development Kit Setup - v0.44.10 \"Ryōan-ji\" 64 Bit Edition";
// clientSize = { 796, 576 };
bool loaded;
FileDialog fileDialog
{
master = this, type = selectDir,
- text = $"Select a new location"
+ caption = $"Select a new location"
};
Button browse
{
- master = this, autoCreate = false, inactive = true, text = "...";
+ master = this, autoCreate = false, inactive = true, caption = "...";
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
{
{
char sizeString[100];
PrintSize(sizeString, totalSize, 2);
- totalSpaceValue.text = sizeString;
+ totalSpaceValue.caption = sizeString;
}
}
}
};
- Label agreementLbl { parent = this, text = $"By installing the Ecere SDK, you agree to the", font = { "Tahoma", 8.25f }, anchor = Anchor { right = 399, top = 448 } };
+ Label agreementLbl { parent = this, caption = $"By installing the Ecere SDK, you agree to the", font = { "Tahoma", 8.25f }, anchor = Anchor { right = 399, top = 448 } };
Button licenseButton
{
this, inactive = true, offset = false, bevel = false, foreground = blue, font = { "Tahoma", 8.25f, underline = true, bold = true },
- // text = $"terms and conditions", anchor = Anchor { left = 241, top = 421 };
- text = $"terms and conditions", anchor = Anchor { left = 235, top = 445 };
+ // caption = $"terms and conditions", anchor = Anchor { left = 241, top = 421 };
+ caption = $"terms and conditions", anchor = Anchor { left = 235, top = 445 };
cursor = ((GuiApplication)__thisModule).GetCursor(hand);
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
return true;
}
};
- Label dotLbl { parent = this, text = ".", font = { "Tahoma", 8.25f }, anchor = Anchor { left = 372, top = 448 } };
+ Label dotLbl { parent = this, caption = ".", font = { "Tahoma", 8.25f }, anchor = Anchor { left = 372, top = 448 } };
CheckListBox optionsBox
{
this, size = { 460, 114 }, position = { 160, 284 };
};
Button install
{
- parent = this, text = $"Install", isDefault = true, size = { 75, 23 }, position = { 432, 440 };
+ parent = this, caption = $"Install", isDefault = true, size = { 75, 23 }, position = { 432, 440 };
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
{
return true;
}
};
- Button button3 { parent = this, text = $"Cancel", hotKey = altX, size = Size { 75, 23 }, anchor = Anchor { left = 544, top = 440 }, NotifyClicked = ButtonCloseDialog };
+ Button button3 { parent = this, caption = $"Cancel", hotKey = altX, size = Size { 75, 23 }, anchor = Anchor { left = 544, top = 440 }, NotifyClicked = ButtonCloseDialog };
DropBox languageBox
{
this, position = { 14, 374 }, size = { 142, 0 }, caption = "Language:";
Label label1 { labeledWindow = destBox, tabCycle = true, isGroupBox = true, parent = this, inactive = false, size = Size { 458, 50 }, anchor = Anchor { left = 160, top = 96 } };
PathBox destBox
{
- parent = label1, master = this, text = $" Destination Folder", size = Size { 336, 22 }, anchor = Anchor { left = 12, top = 20, right = 12 };
+ parent = label1, master = this, caption = $" Destination Folder", size = Size { 336, 22 }, anchor = Anchor { left = 12, top = 20, right = 12 };
typeExpected = directory;
browseDialog = fileDialog;
opacity = 0;
};
Label totalSpaceLabel
{
- this, anchor = { right = 72, top = 404 }, text = $"Space Required: "
+ this, anchor = { right = 72, top = 404 }, caption = $"Space Required: "
};
Label totalSpaceValue
{
- this, anchor = { right = 14, top = 404 }, text = "0 mb"
+ this, anchor = { right = 14, top = 404 }, caption = "0 mb"
};
EditBox editBox1
{
label3, caption = "editBox1", opacity = 0, borderStyle = none, inactive = true, size = { 350, 35 }, position = { 256, 40 }, multiLine = true, noSelect = true, contents = $"Choose in which folder to install the Ecere SDK, which features\n"
"of the SDK to install, as well as where to install program icons."
};
- Label label2 { parent = this, text = buildString, position = { 16, 422 }, font = { "Tahoma", 10, true }, disabled = true, opacity = 0, background = activeBorder };
+ Label label2 { parent = this, position = { 16, 422 }, font = { "Tahoma", 10, true }, disabled = true, opacity = 0, background = activeBorder };
Picture picture1
{
- image = BitmapResource { ":ecere.png", alphaBlend = true }, filter = true, parent = label3, text = "picture1", anchor = Anchor { left = 16, top = 4 };
+ image = BitmapResource { ":ecere.png", alphaBlend = true }, filter = true, parent = label3, caption = "picture1", anchor = Anchor { left = 16, top = 4 };
cursor = ((GuiApplication)__thisModule).GetCursor(hand);
bool OnLeftButtonDown(int x, int y, Modifiers mods)
return true;
}
};
- Label label4 { label3, font = { "Tahoma", 8.25f, bold = true }, /*size = { 326, 16 }, */position = { 248, 24 }, text = $"Choose Components, Locations and Install Options" };
+ Label label4 { label3, font = { "Tahoma", 8.25f, bold = true }, /*size = { 326, 16 }, */position = { 248, 24 }, caption = $"Choose Components, Locations and Install Options" };
DataField componentField { "CheckItem", width = 160, header = $"Component" };
DataField locationField { "char *", width = 108, header = $"Destination Folder", editable = true };
DataField reqField { "FileSize", width = 70, header = $"Req. Space", alignment = right };
bool isAdministrator = IsAdministrator();
+ SetBuildString(label2);
+
if(!isAdministrator)
{
options[0].available = false;
{
char sizeString[100];
PrintSize(sizeString, totalSize, 2);
- totalSpaceValue.text = sizeString;
+ totalSpaceValue.caption = sizeString;
}
for(c = 0; options[c].name; c++)
{
class InstallProgress : Window
{
- text = $"Ecere Software Development Kit Setup - v0.44.10 \"Ryōan-ji\" 64 Bit Edition";
+ caption = $"Ecere Software Development Kit Setup - v0.44.10 \"Ryōan-ji\" 64 Bit Edition";
background = activeBorder;
borderStyle = fixed;
hasMinimize = true;
//clientSize = { 796, 576 };
icon = { ":icon.png" };
+ InstallProgress()
+ {
+ SetBuildString(label2);
+ }
+
Picture back { image = BitmapResource { ":ryoanji-progress.png" }, parent = this, position = { 0, 0 } };
Label installing { this, position = { 32, 160 } };
ProgressBar progressBar { parent = this, size = Size { 588, 24 }, anchor = Anchor { left = 24, top = 184 } };
Button finish
{
- parent = this, text = $"Install", disabled = true, isDefault = true, size = Size { 75, 23 }, anchor = Anchor { left = 432, top = 440 };
+ parent = this, caption = $"Install", disabled = true, isDefault = true, size = Size { 75, 23 }, anchor = Anchor { left = 432, top = 440 };
NotifyClicked = ButtonCloseDialog
};
Button cancel
{
- this, text = $"Cancel", hotKey = altX, size = Size { 75, 23 }, anchor = Anchor { left = 544, top = 440 };
+ this, caption = $"Cancel", hotKey = altX, size = Size { 75, 23 }, anchor = Anchor { left = 544, top = 440 };
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
{
multiLine = true, parent = label3, opacity = 0, borderStyle = none, size = Size { 350, 35 }, anchor = Anchor { horz = 111, vert = 13 },
contents = $"Please wait while the Ecere Software Development Kit is being installed."
};
- Label label2 { parent = this, text = buildString, position = { 16, 422 }, font = { "Tahoma", 10, true }, disabled = true, opacity = 0, background = activeBorder };
+ Label label2 { parent = this, position = { 16, 422 }, font = { "Tahoma", 10, true }, disabled = true, opacity = 0, background = activeBorder };
Picture picture1
{
image = BitmapResource { ":ecere.png", alphaBlend = true }, filter = true, parent = label3, anchor = Anchor { left = 16, top = 4 };
return true;
}
};
- Label title { parent = label3, text = $"Installing the Ecere SDK", font = FontResource { "Tahoma", 8.25f, bold = true }, size = Size { 326, 16 }, anchor = Anchor { horz = 91, vert = -12 } };
+ Label title { parent = label3, caption = $"Installing the Ecere SDK", font = FontResource { "Tahoma", 8.25f, bold = true }, size = Size { 326, 16 }, anchor = Anchor { horz = 91, vert = -12 } };
void OnDrawOverChildren(Surface surface)
{
if((c != eda && c != eda32 && c != upx) && (!pathOptions[PathOptions::AddMinGWPaths].available || !pathOptions[PathOptions::AddMinGWPaths].selected))
continue;
additional[c].GetFullPath(path, false);
- if(c != eda && c != eda32 && c != upx)
+ if(c != eda && c != eda32 && c != upx && c != audio && c != audio32)
PathCat(path, "bin");
AddPath(sysPaths, sysCount, paths, &count, oldPath, userPath ? userPath : systemPath, path);
}
{
installProgress.progressBar.range = 0;
installProgress.finish.Destroy(0);
- installProgress.cancel.text = $"Close";
+ installProgress.cancel.caption = $"Close";
installProgress.cancel.isDefault = true;
installProgress.cancel.disabled = false;
installProgress.cancel.NotifyClicked = Window::ButtonCloseDialog;
- installProgress.installing.text = $"Installation Cancelled.";
- installProgress.title.text = $"Installation Cancelled";
+ installProgress.installing.caption = $"Installation Cancelled.";
+ installProgress.title.caption = $"Installation Cancelled";
installProgress.titleInfo.contents = $"The installation was not completed.";
}
else
allUsers = options[0].selected;
};
CompilerConfig compiler;
- installProgress.installing.text = $"Configuring Ecere IDE...";
+ installProgress.installing.caption = $"Configuring Ecere IDE...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
// Set up Uninstaller
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = $"Registering uninstaller...";
+ installProgress.installing.caption = $"Registering uninstaller...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
wSystemPath[0] = 0;
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = "Registering paths...";
+ installProgress.installing.caption = "Registering paths...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
HKEY key;
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = $"Installing Start Menu Icons...";
+ installProgress.installing.caption = $"Installing Start Menu Icons...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
PathCat(desktopPath, "Ecere IDE.lnk");
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = $"Installing Desktop Icon...";
+ installProgress.installing.caption = $"Installing Desktop Icon...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
}
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = $"Installing Quicklaunch Icon...";
+ installProgress.installing.caption = $"Installing Quicklaunch Icon...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
associateOptions[AssociateOptions::AssociateIMG].selected)
{
((GuiApplication)__thisModule).Lock();
- installProgress.installing.text = $"Resgistering File Types...";
+ installProgress.installing.caption = $"Registering File Types...";
((GuiApplication)__thisModule).Unlock();
((GuiApplication)__thisModule).SignalEvent();
((GuiApplication)__thisModule).Lock();
installProgress.cancel.Destroy(0);
- installProgress.finish.text = $"Finish";
+ installProgress.finish.caption = $"Finish";
installProgress.finish.disabled = false;
installProgress.finish.Activate();
- installProgress.installing.text = $"Installation Complete.";
- installProgress.title.text = $"Installation Complete";
+ installProgress.installing.caption = $"Installation Complete.";
+ installProgress.title.caption = $"Installation Complete";
installProgress.titleInfo.contents = $"Thank you for using the Ecere SDK.";
}
((GuiApplication)__thisModule).Unlock();
Ecere Software / sdk / blobdiff