t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove paused column and replace status with paired/unpaired/has not added you

Browse Source
This commit is contained in:
Stanley Dimant
2022-06-21 14:57:03 +02:00
parent ba784be2fa
commit c446aa5502
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MareSynchronos/UI/PluginUI.cs
View File

@@ -20,8 +20,8 @@ namespace MareSynchronos.UI
{ {
SizeConstraints = new WindowSizeConstraints() SizeConstraints = new WindowSizeConstraints()
{ {
MinimumSize = new(1000, 400), MinimumSize = new(800, 400),
MaximumSize = new(1000, 2000), MaximumSize = new(800, 2000),
}; };
this._configuration = configuration; this._configuration = configuration;
@@ -171,14 +171,13 @@ namespace MareSynchronos.UI
private void DrawPairedClientsContent() private void DrawPairedClientsContent()
{ {
if (!_apiController.ServerAlive) return; if (!_apiController.ServerAlive) return;
if (ImGui.TreeNode("PairedWithOther Clients")) if (ImGui.TreeNode("Pairing Configuration"))
{ {
if (ImGui.BeginTable("PairedClientsTable", 6)) if (ImGui.BeginTable("PairedClientsTable", 5))
{ {
ImGui.TableSetupColumn("Pause", ImGuiTableColumnFlags.WidthFixed, 50); ImGui.TableSetupColumn("Pause", ImGuiTableColumnFlags.WidthFixed, 50);
ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.WidthFixed, 110); ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.WidthFixed, 110);
ImGui.TableSetupColumn("Status", ImGuiTableColumnFlags.WidthFixed, 120); ImGui.TableSetupColumn("Status", ImGuiTableColumnFlags.WidthFixed, 140);
ImGui.TableSetupColumn("Paused", ImGuiTableColumnFlags.WidthFixed, 140);
ImGui.TableSetupColumn("Comment", ImGuiTableColumnFlags.WidthFixed, 400); ImGui.TableSetupColumn("Comment", ImGuiTableColumnFlags.WidthFixed, 400);
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 70); ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 70);
@@ -199,15 +198,19 @@ namespace MareSynchronos.UI
UIShared.GetBoolColor(item.IsSynced && !item.IsPausedFromOthers && !item.IsPaused), UIShared.GetBoolColor(item.IsSynced && !item.IsPausedFromOthers && !item.IsPaused),
item.OtherUID); item.OtherUID);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextColored(UIShared.GetBoolColor(item.IsSynced), string pairString = !item.IsSynced
!item.IsSynced ? "Has not added you" : "PairedWithOther"); ? "Has not added you"
ImGui.TableNextColumn(); : ((item.IsPaused || item.IsPausedFromOthers) ? "Unpaired" : "Paired");
string pauseYou = item.IsPaused ? "You paused them" : ""; ImGui.TextColored(UIShared.GetBoolColor(item.IsSynced && !item.IsPaused && !item.IsPausedFromOthers), pairString);
/*string pauseYou = item.IsPaused ? "You paused them" : "";
string pauseThey = item.IsPausedFromOthers ? "They paused you" : ""; string pauseThey = item.IsPausedFromOthers ? "They paused you" : "";
string separator = (item.IsPaused && item.IsPausedFromOthers) ? Environment.NewLine : ""; string separator = (item.IsPaused && item.IsPausedFromOthers) ? Environment.NewLine : "";
string entry = pauseYou + separator + pauseThey; string entry = pauseYou + separator + pauseThey;
ImGui.TextColored(UIShared.GetBoolColor(!item.IsPausedFromOthers && !item.IsPaused), if (!string.IsNullOrEmpty(entry))
string.IsNullOrEmpty(entry) ? "No" : entry); {
ImGui.TextColored(UIShared.GetBoolColor(!item.IsPausedFromOthers && !item.IsPaused), entry);
}*/
ImGui.TableNextColumn(); ImGui.TableNextColumn();
string charComment = _configuration.UidComments.ContainsKey(item.OtherUID) ? _configuration.UidComments[item.OtherUID] : string.Empty; string charComment = _configuration.UidComments.ContainsKey(item.OtherUID) ? _configuration.UidComments[item.OtherUID] : string.Empty;
ImGui.SetNextItemWidth(400); ImGui.SetNextItemWidth(400);
@@ -240,7 +243,7 @@ namespace MareSynchronos.UI
ImGui.SameLine(); ImGui.SameLine();
ImGui.PushFont(UiBuilder.IconFont); ImGui.PushFont(UiBuilder.IconFont);
if (ImGui.Button(FontAwesomeIcon.Plus.ToIconString()+"##addToPairedClients")) if (ImGui.Button(FontAwesomeIcon.Plus.ToIconString() + "##addToPairedClients"))
{ {
if (_apiController.PairedClients.All(w => w.OtherUID != tempNameUID)) if (_apiController.PairedClients.All(w => w.OtherUID != tempNameUID))
{ {
@@ -249,6 +252,7 @@ namespace MareSynchronos.UI
tempNameUID = string.Empty; tempNameUID = string.Empty;
} }
} }
ImGui.PopFont();
ImGui.TreePop(); ImGui.TreePop();
} }