Skip to content

Commit

Permalink
tidy: theme and copy
Browse files Browse the repository at this point in the history
  • Loading branch information
@stowmyy
stowmyy committed Aug 29, 2024
1 parent 5ae1838 commit 642791f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
8 changes: 5 additions & 3 deletions dropship/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ AppStore __default__appStore
//._window_overlaying = "";
.dashboard =
{
.title = "Servers",
.heading = "Changes will be applied immediately. You do not need to keep this app open.",
.title = "OW2 // DROPSHIP",
//.heading = "Changes will be applied immediately. You do not need to keep this app open.",
.heading = "Deselecting regions will block them permanently until you select them again.",
//.community = "STORMY.GG/DROPSHIP",
.community = "DISCORD.STORMY.GG",
//.community = "DISCORD.STORMY.GG",
.community = "@stormyy_ow",
//.heading = "にほんご"
},
.application_open = false
Expand Down
11 changes: 7 additions & 4 deletions dropship/src/AppManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ void AppManager::RenderInline()

this->downloadState.progress = 0.009f;
// this->downloadState.downloading = true;
this->downloadState.status = "CHECKING VERSION";
//this->downloadState.status = "CHECKING VERSION";
this->downloadState.appVersion = "CHECKING VERSION";
download_file("https://github.com/stowmyy/dropship-test/releases/latest/download/version.txt", "version.txt", &(this->downloadState.progress), &version);
// this->downloadState.downloading = false;

Expand All @@ -75,7 +76,8 @@ void AppManager::RenderInline()

this->downloadState.progress = 0.009f;
this->downloadState.downloading = true;
this->downloadState.status = "DOWNLOADING NEW VERSION";
//this->downloadState.status = "DOWNLOADING NEW VERSION";
this->downloadState.appVersion = "DOWNLOADING NEW VERSION";
download_file("https://github.com/stowmyy/dropship-test/releases/latest/download/dropship.exe", "dropship.exe", &(this->downloadState.progress), NULL, &_downloaded_path);
this->downloadState.downloading = false;

Expand All @@ -86,7 +88,8 @@ void AppManager::RenderInline()
//std::exit(42);

this->downloadState.active = false;
this->downloadState.status = "NEW VERSION AVAILABLE";
//this->downloadState.status = "NEW VERSION AVAILABLE";
this->downloadState.appVersion = "UPDATE AVAILABLE - CLOSE APP TO UPDATE";



Expand All @@ -100,7 +103,7 @@ void AppManager::RenderInline()

this->downloadState.active = false;
//this->downloadState.status = "NEWEST VERSION";
this->downloadState.status = __default__appStore.dashboard.community;
//this->downloadState.status = __default__appStore.dashboard.community;

}

Expand Down
15 changes: 9 additions & 6 deletions dropship/src/DashboardManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ DashboardManager::DashboardManager() :

// web https://www.reddit.com/r/Overwatch/comments/6blbkj/comment/dhnpq7k/

// https://cloud.google.com/datastream/docs/ip-allowlists-and-regions

{
.title= "NA - CENTRAL",
._ping_ip= "137.221.69.29",
Expand All @@ -179,7 +181,7 @@ DashboardManager::DashboardManager() :
{
.title = "EUROPE",
._ping_ip = "137.221.78.69",
.heading = "AMS1, CDG1", // Amsterdam, Paris
.heading = "AMS1 and CDG1", // Amsterdam, Paris
._firewall_rule_address = ips.at("eu"),
._firewall_rule_description = "Blocks EU",
.favorite = true,
Expand Down Expand Up @@ -223,7 +225,7 @@ DashboardManager::DashboardManager() :

{
.title = "TAIWAN",
._ping_ip = "137.221.112.69",
._ping_ip = "35.229.225.152", // 137.221.112.69
.heading = "TPE1", // Taipei
._firewall_rule_address = ips.at("taiwan"),
._firewall_rule_description = "Blocks TAIWAN",
Expand Down Expand Up @@ -293,7 +295,7 @@ DashboardManager::DashboardManager() :

if (!__previous__application_open && appStore.application_open)
{
appStore.dashboard.heading = "Blocking new servers won't take effect until Overwatch is restarted.";
// appStore.dashboard.heading = "Blocking new servers won't take effect until Overwatch is restarted.";
}

if (this->processes[process_name].icon.texture == nullptr)
Expand Down Expand Up @@ -515,6 +517,7 @@ void DashboardManager::RenderInline()
static const auto color = ImGui::ColorConvertFloat4ToU32({ .4f, .4f, .4f, 1.0f });
// static const auto color_2 = ImGui::ColorConvertFloat4ToU32({ 0, 0, 0, 0.6f });
static const std::string text = "GAME RESTART REQUIRED";
//static const std::string text = "GAME SHUT DOWN REQUIRED";

static const auto font = font_subtitle;
static const auto font_size = font->CalcTextSizeA(font_subtitle->FontSize, FLT_MAX, 0.0f, text.c_str());
Expand Down Expand Up @@ -694,9 +697,9 @@ void DashboardManager::RenderInline()
static const ImU32 color_disabled_secondary = ImGui::ColorConvertFloat4ToU32({ .88f, .88f, .88f, 1.0f });
static const ImU32 color_disabled_secondary_faded = ImGui::ColorConvertFloat4ToU32({ .95f, .95f, .95f, 1.0f });

ImU32 const color = disabled ? color_disabled : (ImU32) ImColor::HSV(i / 14.0f, 0.4f, 1.0f, style.Alpha);
ImU32 const color_secondary = disabled ? color_disabled_secondary : (ImU32) ImColor::HSV(i / 14.0f, 0.3f, 1.0f, style.Alpha);
ImU32 const color_secondary_faded = disabled ? color_disabled_secondary_faded : (ImU32) ImColor::HSV(i / 14.0f, 0.2f, 1.0f, 0.4f * style.Alpha);
ImU32 const color = disabled ? color_disabled : (ImU32)ImColor::HSV(1.0f - ((i + 1) / 32.0f), 0.4f, 1.0f, style.Alpha);
ImU32 const color_secondary = disabled ? color_disabled_secondary : (ImU32)ImColor::HSV(1.0f - ((i + 1) / 32.0f), 0.3f, 1.0f, style.Alpha);
ImU32 const color_secondary_faded = disabled ? color_disabled_secondary_faded : (ImU32)ImColor::HSV(1.0f - ((i + 1) / 32.0f), 0.2f, 1.0f, 0.4f * style.Alpha);

auto const w_list = ImGui::GetWindowDrawList();

Expand Down

0 comments on commit 642791f

Please sign in to comment.