Skip to content

Commit

Permalink
PPEC, French corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmorgan001
rmorgan001 committed Jan 21, 2021
1 parent bcf9023 commit 44af134
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 101 deletions.
8 changes: 4 additions & 4 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Trademark>GS Server</Trademark>
<NeutralLanguage>en</NeutralLanguage>
<Copyright>Copyright © GreenSwamp Software 2019-2021</Copyright>
<AssemblyVersion>1.0.2.4</AssemblyVersion>
<FileVersion>1.0.2.4</FileVersion>
<ProductVersion>1.0.2.4</ProductVersion>
<Version>1.0.2.4</Version>
<AssemblyVersion>1.0.2.5</AssemblyVersion>
<FileVersion>1.0.2.5</FileVersion>
<ProductVersion>1.0.2.5</ProductVersion>
<Version>1.0.2.5</Version>
</PropertyGroup>
</Project>
10 changes: 5 additions & 5 deletions GS.Server/Controls/RaDecGoTo.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<RowDefinition Height="47"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="70"/>
Expand Down Expand Up @@ -120,17 +120,17 @@
</ComboBox.ItemsPanel>
</ComboBox>
<StackPanel Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Orientation="Vertical" VerticalAlignment="Center">
<Button Margin="0,0,0,0" Height="20" Padding="-5" Width="70" ToolTip="{StaticResource goTipCopy}"
<Button Margin="0,0,0,0" Height="20" Padding="-5" Width="85" ToolTip="{StaticResource goTipCopy}"
Command="{Binding PopulateGoToRaDecCommand}" Style="{StaticResource MaterialDesignRaisedDarkButton}" Content="{StaticResource goCopy}"/>
<md:DialogHost CloseOnClickAway="True" IsOpen="{Binding IsRaGoToDialogOpen}" DialogContent="{Binding RaGoToContent}">
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="70" ToolTip="{StaticResource goTipGoTo}"
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="85" ToolTip="{StaticResource goTipGoTo}"
Command="{Binding OpenRaGoToDialogCommand}" Style="{StaticResource MaterialDesignRaisedDarkButton}" Content="{StaticResource goGoTo}"/>
</md:DialogHost>
<md:DialogHost CloseOnClickAway="True" IsOpen="{Binding IsRaGoToSyncDialogOpen}" DialogContent="{Binding RaGoToSyncContent}">
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="70" ToolTip="{StaticResource goSync}"
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="85" ToolTip="{StaticResource goSync}"
Command="{Binding OpenRaGoToSyncDialogCmd}" Style="{StaticResource MaterialDesignRaisedDarkButton}" Content="{StaticResource goSync}"/>
</md:DialogHost>
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="70" ToolTip="{StaticResource diaImport}" Command="{Binding ImportGoToRaDecCmd}" Style="{StaticResource MaterialDesignRaisedDarkButton}" Content="{StaticResource diaImport}" />
<Button Margin="0,2,0,0" Height="20" Padding="-5" Width="85" ToolTip="{StaticResource diaImport}" Command="{Binding ImportGoToRaDecCmd}" Style="{StaticResource MaterialDesignRaisedDarkButton}" Content="{StaticResource diaImport}" />
</StackPanel>
</Grid>
</Border>
Expand Down
2 changes: 1 addition & 1 deletion GS.Server/SkyTelescope/SkyTelescopeV.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<Label VerticalAlignment="Bottom" HorizontalAlignment="Center" Content="{StaticResource skyDiagnostics}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,15,0,0">
<ToggleButton Style="{StaticResource MaterialDesignActionLightToggleButton}" HorizontalAlignment="Center" Width="25" Height="25" ToolTip="{StaticResource skyDiagnostics}" IsChecked="{Binding SyncLimitOn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<ToggleButton Style="{StaticResource MaterialDesignActionLightToggleButton}" HorizontalAlignment="Center" Width="25" Height="25" ToolTip="{StaticResource skySyncLimitOn}" IsChecked="{Binding SyncLimitOn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<Label VerticalAlignment="Bottom" HorizontalAlignment="Center" Content="{StaticResource skySyncLimitOn}" />
</StackPanel>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion GS.Server/SkyTelescope/SkyTelescopeVM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private void PropertyChangedSkyServer(object sender, PropertyChangedEventArgs e)
case "Azimuth":
Azimuth = _util.DegreesToDMS(SkyServer.Azimuth, "° ", ":", "", 2);
break;
case "CanPec":
case "CanPPec":
PPecEnabled = SkyServer.CanPPec;
break;
case "DeclinationXForm":
Expand Down
6 changes: 2 additions & 4 deletions GS.Shared/LanguageFiles/GSChart_fr-FR.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see<https://www.gnu.org/licenses/> .
*/-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">

<!--Dialog -->
<system:String x:Key="diaAccept">Accepter</system:String>
<system:String x:Key="diaAccept">Valider</system:String>
<system:String x:Key="diaCancel">Annuler</system:String>
<system:String x:Key="diaOk">Ok</system:String>
<system:String x:Key="diaStart">Démarrer</system:String>
Expand Down
Loading

0 comments on commit 44af134

Please sign in to comment.