From af65056c44f2eea6cb84596be564eb24fd8f176a Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 1 Feb 2026 10:06:34 -0600 Subject: [PATCH] Update default settings and enhance ConfirmingPage logic - Changed default settings to enable two-way and one-shot sync, disable notifications and sync fallback, and adjust confirmation behavior. - Improved ConfirmingPage to conditionally display the Abort button and update the Accept button text based on the presence of changes in the patch tree. - Updated logging level in SyncbackStats to warn for better visibility on debug logging hints. --- plugin/src/App/StatusPages/Confirming.lua | 12 ++++++++---- plugin/src/Settings.lua | 12 ++++++------ src/syncback/stats.rs | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua index ec86fd6a..9eddceef 100644 --- a/plugin/src/App/StatusPages/Confirming.lua +++ b/plugin/src/App/StatusPages/Confirming.lua @@ -111,6 +111,9 @@ function ConfirmingPage:render() allSelected = PatchTree.allNodesSelected(self.props.patchTree, self.state.selections) end + -- Check if there are any changes at all + local hasChanges = self.props.patchTree and self.props.patchTree:getCount() > 0 + return Theme.with(function(theme) local pageContent = Roact.createFragment({ Title = e("TextLabel", { @@ -159,17 +162,18 @@ function ConfirmingPage:render() LayoutOrder = 4, BackgroundTransparency = 1, }, { - Abort = e(TextButton, { + -- Only show Abort button when there are changes + Abort = if hasChanges then e(TextButton, { text = "Abort", style = "Bordered", transparency = self.props.transparency, layoutOrder = 1, onClick = self.props.onAbort, - }), + }) else nil, Accept = e(TextButton, { - text = "Accept", - style = "Primary", + text = if hasChanges then "Accept" else "OK", + style = if hasChanges then "Primary" else "Success", transparency = self.props.transparency, layoutOrder = 2, onClick = function() diff --git a/plugin/src/Settings.lua b/plugin/src/Settings.lua index 5dca3cc0..a74dd43e 100644 --- a/plugin/src/Settings.lua +++ b/plugin/src/Settings.lua @@ -11,17 +11,17 @@ local Roact = require(Packages.Roact) local defaultSettings = { openScriptsExternally = false, - twoWaySync = false, - oneShotSync = false, + twoWaySync = true, + oneShotSync = true, autoReconnect = false, - showNotifications = true, - enableSyncFallback = true, + showNotifications = false, + enableSyncFallback = false, syncReminderMode = "Notify" :: "None" | "Notify" | "Fullscreen", syncReminderPolling = true, - checkForUpdates = true, + checkForUpdates = false, checkForPrereleases = false, autoConnectPlaytestServer = false, - confirmationBehavior = "Initial" :: "Never" | "Initial" | "Always" | "Large Changes" | "Unlisted PlaceId", + confirmationBehavior = "Always" :: "Never" | "Initial" | "Always" | "Large Changes" | "Unlisted PlaceId", largeChangesConfirmationThreshold = 5, playSounds = true, typecheckingEnabled = false, diff --git a/src/syncback/stats.rs b/src/syncback/stats.rs index ff67a100..290834de 100644 --- a/src/syncback/stats.rs +++ b/src/syncback/stats.rs @@ -240,7 +240,7 @@ impl SyncbackStats { // Helpful hint about debug logging if duplicate_count > 0 || rbxm_count > 0 { - log::info!( + log::warn!( " Enable debug logging (RUST_LOG=debug) to see individual instance details" ); }