Reword 'use custom home to Syncthing' to be clearer

Fixes #88
canton7 · May 20, 2015 · a49b3a0 · a49b3a0
1 parent 65d66f4
commit a49b3a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/SyncTrayzor/Pages/SettingsView.xaml b/src/SyncTrayzor/Pages/SettingsView.xaml
@@ -94,6 +94,9 @@
 
                             <CheckBox DockPanel.Dock="Top" IsChecked="{Binding StartSyncThingAutomatically}" Content="{l:Loc SettingsView_StartSyncthingAutomatically}"/>
                             <CheckBox DockPanel.Dock="Top" IsChecked="{Binding SyncthingRunLowPriority}" Content="{l:Loc SettingsView_SyncthingRunLowPriority}"/>
+                            <CheckBox DockPanel.Dock="Top" IsChecked="{Binding SyncthingUseDefaultHome}"
+                                          Content="{l:Loc SettingsView_SyncthingUseDefaultHome}"
+                                          ToolTip="{l:Loc SettingsView_SyncthingUseDefaultHome_ToolTip}"/>
 
                             <Label DockPanel.Dock="Top" Target="{Binding ElementName=SyncThingAddress}" Content="{l:Loc SettingsView_SyncthingAddress}" ToolTip="{StaticResource AddressOverride}"/>
                             <TextBox DockPanel.Dock="Top" x:Name="SyncThingAddress" ToolTip="{StaticResource AddressOverride}" Text="{Binding SyncThingAddress, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,40,20"/>
@@ -111,9 +114,6 @@
                     <Expander DockPanel.Dock="Bottom" Header="{l:Loc SettingsView_Section_Advanced}">
                         <GroupBox Header="{l:Loc SettingsView_Section_Advanced}">
                             <DockPanel LastChildFill="False">
-                                <CheckBox DockPanel.Dock="Top" IsChecked="{Binding SyncthingUseCustomHome}"
-                                          Content="{l:Loc SettingsView_SyncthingUseCustomHome}"
-                                          ToolTip="{l:Loc SettingsView_SyncthingUseCustomHome_ToolTip}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding SyncthingDenyUpgrade}"
                                           Content="{l:Loc SettingsView_SyncthingDenyUpgrade}"
                                           ToolTip="{l:Loc SettingsView_SyncthingDenyUpgrade_ToolTip}"/>

diff --git a/src/SyncTrayzor/Pages/SettingsViewModel.cs b/src/SyncTrayzor/Pages/SettingsViewModel.cs
@@ -130,7 +130,7 @@ public bool StartMinimizedEnabled
 
         public BindableCollection<WatchedFolder> WatchedFolders { get; set; }
 
-        public bool SyncthingUseCustomHome { get; set; }
+        public bool SyncthingUseDefaultHome { get; set; }
         public string SyncThingEnvironmentalVariables { get; set; }
         public bool SyncthingDenyUpgrade { get; set; }
 
@@ -175,7 +175,7 @@ public SettingsViewModel(
                 IsSelected = x.IsWatched
             }));
 
-            this.SyncthingUseCustomHome = configuration.SyncthingUseCustomHome;
+            this.SyncthingUseDefaultHome = !configuration.SyncthingUseCustomHome;
             this.SyncThingEnvironmentalVariables = EnvironmentalVariablesParser.Format(configuration.SyncthingEnvironmentalVariables);
             this.SyncthingDenyUpgrade = configuration.SyncthingDenyUpgrade;
         }
@@ -216,7 +216,7 @@ public void Save()
             }
 
             configuration.Folders = this.WatchedFolders.Select(x => new FolderConfiguration(x.Folder, x.IsSelected)).ToList();
-            configuration.SyncthingUseCustomHome = this.SyncthingUseCustomHome;
+            configuration.SyncthingUseCustomHome = !this.SyncthingUseDefaultHome;
 
             EnvironmentalVariableCollection envVars;
             EnvironmentalVariablesParser.TryParse(this.SyncThingEnvironmentalVariables, out envVars);

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -294,12 +294,12 @@
     <value>SyncTrayzor overrides the "GUI Listen Address" specified in Syncthing's configuration. However, you can set it to whatever value you like here.</value>
     <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingAddress text input. This shows more information on the input.</comment>
   </data>
-  <data name="SettingsView_SyncthingUseCustomHome" xml:space="preserve">
-    <value>Use custom home directory for Syncthing.</value>
+  <data name="SettingsView_SyncthingUseDefaultHome" xml:space="preserve">
+    <value>Use Syncthing's default database location</value>
   </data>
-  <data name="SettingsView_SyncthingUseCustomHome_ToolTip" xml:space="preserve">
-    <value>This will mean that SyncTrayzor will see a different set of configured folders to any other Syncthing instances on your computer.</value>
-    <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingUseCustomHome text input. This shows more information on the input.</comment>
+  <data name="SettingsView_SyncthingUseDefaultHome_ToolTip" xml:space="preserve">
+    <value>If unchecked, this will mean that SyncTrayzor will see a different set of configured folders to any other Syncthing instances on your computer.</value>
+    <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingUseDefaultHome text input. This shows more information on the input.</comment>
   </data>
   <data name="SettingsView_Title" xml:space="preserve">
     <value>Settings</value>