Skip to content

Commit 4fefe73

Browse files
cominterncomintern
authored
Merge branch 'next' into next
2 parents 0d5c984 + a7898d5 commit 4fefe73

File tree

6 files changed

+58
-126
lines changed

6 files changed

+58
-126
lines changed

‎RetailCoder.VBE/UI/RubberduckUI.fr.resx

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,43 +1828,43 @@ End Sub</value>
18281828
<data name="ContextReferences" xml:space="preserve">
18291829
<value>références</value>
18301830
</data>
1831-
<data name="DialogCaption_SaveInspectionSettings">
1832-
<value>Save Inspection Settings</value>
1831+
<data name="DialogCaption_SaveInspectionSettings" xml:space="preserve">
1832+
<value>Enregistrer les paramètres d'inspections</value>
18331833
</data>
1834-
<data name="DialogCaption_SaveToDoSettings">
1835-
<value>Save Todo List Settings</value>
1834+
<data name="DialogCaption_SaveToDoSettings" xml:space="preserve">
1835+
<value>Enregistrer les paramètres "TODO"</value>
18361836
</data>
1837-
<data name="DialogMask_XmlFilesOnly">
1838-
<value>XML file (.xml)|*.xml|Rubberduck config file|*.config</value>
1837+
<data name="DialogMask_XmlFilesOnly" xml:space="preserve">
1838+
<value>Fichiers XML (.xml)|*.xml|Configuration de Rubberduck|*.config</value>
18391839
</data>
1840-
<data name="DialogCaption_SaveGeneralSettings">
1841-
<value>Save General Settings</value>
1840+
<data name="DialogCaption_SaveGeneralSettings" xml:space="preserve">
1841+
<value>Enregistrer les paramètres généraux</value>
18421842
</data>
1843-
<data name="DialogCaption_LoadToDoSettings">
1844-
<value>Load Todo List Settings</value>
1843+
<data name="DialogCaption_LoadToDoSettings" xml:space="preserve">
1844+
<value>Charger les paramètres "TODO"</value>
18451845
</data>
1846-
<data name="DialogCaption_SaveUnitTestSettings">
1847-
<value>Save Unit Test Settings</value>
1846+
<data name="DialogCaption_SaveUnitTestSettings" xml:space="preserve">
1847+
<value>Enregistrer les paramètres des tests unitaires</value>
18481848
</data>
1849-
<data name="DialogCaption_LoadUnitTestSettings">
1850-
<value>Load Unit Test Settings</value>
1849+
<data name="DialogCaption_LoadUnitTestSettings" xml:space="preserve">
1850+
<value>Charger les paramètres des tests unitaires</value>
18511851
</data>
1852-
<data name="DialogCaption_LoadInspectionSettings">
1853-
<value>Load Inspection Settings</value>
1852+
<data name="DialogCaption_LoadInspectionSettings" xml:space="preserve">
1853+
<value>Charger les paramètres d'inspections</value>
18541854
</data>
1855-
<data name="SettingsCaption_ExportSettings">
1855+
<data name="SettingsCaption_ExportSettings" xml:space="preserve">
18561856
<value>Export</value>
18571857
</data>
1858-
<data name="DialogCaption_SaveIndenterSettings">
1859-
<value>Save Indenter Settings</value>
1858+
<data name="DialogCaption_SaveIndenterSettings" xml:space="preserve">
1859+
<value>Enregistrer les paramètres d'indentation</value>
18601860
</data>
1861-
<data name="DialogCaption_LoadIndenterSettings">
1862-
<value>Load Indenter Settings</value>
1861+
<data name="DialogCaption_LoadIndenterSettings" xml:space="preserve">
1862+
<value>Charger les paramètres d'indentation</value>
18631863
</data>
1864-
<data name="DialogCaption_LoadGeneralSettings">
1865-
<value>Load General Settings</value>
1864+
<data name="DialogCaption_LoadGeneralSettings" xml:space="preserve">
1865+
<value>Charger les paramètres généraux</value>
18661866
</data>
1867-
<data name="SettingsCaption_ImportSettings">
1867+
<data name="SettingsCaption_ImportSettings" xml:space="preserve">
18681868
<value>Import</value>
18691869
</data>
1870-
</root>
1870+
</root>

‎RetailCoder.VBE/UI/Settings/GeneralSettings.xaml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,26 +97,12 @@
9797
<ColumnDefinition MaxWidth="75"/>
9898
<ColumnDefinition MaxWidth="75"/>
9999
</Grid.ColumnDefinitions>
100-
<TextBlock Foreground="Blue"
101-
Grid.Column="1"
102-
TextDecorations="Underline"
103-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"
104-
VerticalAlignment="Center"
105-
Margin="5,0,5,0">
106-
<TextBlock.InputBindings>
107-
<MouseBinding Command="{Binding ImportButtonCommand}" MouseAction="LeftClick" />
108-
</TextBlock.InputBindings>
109-
</TextBlock>
110-
<TextBlock Foreground="Blue"
111-
Grid.Column="2"
112-
TextDecorations="Underline"
113-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"
114-
VerticalAlignment="Center"
115-
Margin="5,0,5,0">
116-
<TextBlock.InputBindings>
117-
<MouseBinding Command="{Binding ExportButtonCommand}" MouseAction="LeftClick" />
118-
</TextBlock.InputBindings>
119-
</TextBlock>
100+
<controls:LinkButton Grid.Column="1" Margin="2"
101+
Command="{Binding ImportButtonCommand}"
102+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
103+
<controls:LinkButton Grid.Column="2" Margin="2"
104+
Command="{Binding ExportButtonCommand}"
105+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
120106
</Grid>
121107
</StackPanel>
122108
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>

‎RetailCoder.VBE/UI/Settings/IndenterSettings.xaml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,12 @@
5858
<ColumnDefinition MaxWidth="75"/>
5959
<ColumnDefinition MaxWidth="75"/>
6060
</Grid.ColumnDefinitions>
61-
<TextBlock Foreground="Blue"
62-
Grid.Column="1"
63-
TextDecorations="Underline"
64-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"
65-
VerticalAlignment="Center"
66-
Margin="5,0,5,0">
67-
<TextBlock.InputBindings>
68-
<MouseBinding Command="{Binding ImportButtonCommand}" MouseAction="LeftClick" />
69-
</TextBlock.InputBindings>
70-
</TextBlock>
71-
<TextBlock Foreground="Blue"
72-
Grid.Column="2"
73-
TextDecorations="Underline"
74-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"
75-
VerticalAlignment="Center"
76-
Margin="5,0,5,0">
77-
<TextBlock.InputBindings>
78-
<MouseBinding Command="{Binding ExportButtonCommand}" MouseAction="LeftClick" />
79-
</TextBlock.InputBindings>
80-
</TextBlock>
61+
<controls:LinkButton Grid.Column="1" Margin="2"
62+
Command="{Binding ImportButtonCommand}"
63+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
64+
<controls:LinkButton Grid.Column="2" Margin="2"
65+
Command="{Binding ExportButtonCommand}"
66+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
8167
</Grid>
8268
</StackPanel>
8369
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>

‎RetailCoder.VBE/UI/Settings/InspectionSettings.xaml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -286,27 +286,13 @@
286286
<ColumnDefinition MaxWidth="75"/>
287287
<ColumnDefinition MaxWidth="75"/>
288288
</Grid.ColumnDefinitions>
289-
<TextBlock Foreground="Blue"
290-
Grid.Column="1"
291-
TextDecorations="Underline"
292-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"
293-
VerticalAlignment="Center"
294-
Margin="5,0,5,0">
295-
<TextBlock.InputBindings>
296-
<MouseBinding Command="{Binding ImportButtonCommand}" MouseAction="LeftClick" />
297-
</TextBlock.InputBindings>
298-
</TextBlock>
299-
<TextBlock Foreground="Blue"
300-
Grid.Column="2"
301-
TextDecorations="Underline"
302-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"
303-
VerticalAlignment="Center"
304-
Margin="5,0,5,0">
305-
<TextBlock.InputBindings>
306-
<MouseBinding Command="{Binding ExportButtonCommand}" MouseAction="LeftClick" />
307-
</TextBlock.InputBindings>
308-
</TextBlock>
309-
</Grid>
289+
<controls:LinkButton Grid.Column="1" Margin="2"
290+
Command="{Binding ImportButtonCommand}"
291+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
292+
<controls:LinkButton Grid.Column="2" Margin="2"
293+
Command="{Binding ExportButtonCommand}"
294+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
295+
</Grid>
310296
</StackPanel>
311297
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>
312298
</DockPanel>

‎RetailCoder.VBE/UI/Settings/TodoSettings.xaml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:settings="clr-namespace:Rubberduck.UI.Settings"
77
xmlns:themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
88
xmlns:converters="clr-namespace:Rubberduck.UI.Settings.Converters"
9+
xmlns:controls="clr-namespace:Rubberduck.UI.Controls"
910
mc:Ignorable="d"
1011
d:DesignHeight="300" d:DesignWidth="300"
1112
d:DataContext="{d:DesignInstance {x:Type settings:TodoSettingsViewModel}, IsDesignTimeCreatable=False}">
@@ -276,26 +277,12 @@
276277
<ColumnDefinition MaxWidth="75"/>
277278
<ColumnDefinition MaxWidth="75"/>
278279
</Grid.ColumnDefinitions>
279-
<TextBlock Foreground="Blue"
280-
Grid.Column="1"
281-
TextDecorations="Underline"
282-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"
283-
VerticalAlignment="Center"
284-
Margin="5,0,5,0">
285-
<TextBlock.InputBindings>
286-
<MouseBinding Command="{Binding ImportButtonCommand}" MouseAction="LeftClick" />
287-
</TextBlock.InputBindings>
288-
</TextBlock>
289-
<TextBlock Foreground="Blue"
290-
Grid.Column="2"
291-
TextDecorations="Underline"
292-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"
293-
VerticalAlignment="Center"
294-
Margin="5,0,5,0">
295-
<TextBlock.InputBindings>
296-
<MouseBinding Command="{Binding ExportButtonCommand}" MouseAction="LeftClick" />
297-
</TextBlock.InputBindings>
298-
</TextBlock>
280+
<controls:LinkButton Grid.Column="1" Margin="2"
281+
Command="{Binding ImportButtonCommand}"
282+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
283+
<controls:LinkButton Grid.Column="2" Margin="2"
284+
Command="{Binding ExportButtonCommand}"
285+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
299286
</Grid>
300287
</StackPanel>
301288
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>

‎RetailCoder.VBE/UI/Settings/UnitTestSettings.xaml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:settingsConfig="clr-namespace:Rubberduck.Settings"
88
xmlns:converters="clr-namespace:Rubberduck.UI.Settings.Converters"
99
xmlns:core="clr-namespace:System;assembly=mscorlib"
10+
xmlns:controls="clr-namespace:Rubberduck.UI.Controls"
1011
mc:Ignorable="d"
1112
d:DesignHeight="300" d:DesignWidth="300"
1213
d:DataContext="{d:DesignInstance {x:Type settings:UnitTestSettingsViewModel}, IsDesignTimeCreatable=False}">
@@ -59,26 +60,12 @@
5960
<ColumnDefinition MaxWidth="75"/>
6061
<ColumnDefinition MaxWidth="75"/>
6162
</Grid.ColumnDefinitions>
62-
<TextBlock Foreground="Blue"
63-
Grid.Column="1"
64-
TextDecorations="Underline"
65-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"
66-
VerticalAlignment="Center"
67-
Margin="5,0,5,0">
68-
<TextBlock.InputBindings>
69-
<MouseBinding Command="{Binding ImportButtonCommand}" MouseAction="LeftClick" />
70-
</TextBlock.InputBindings>
71-
</TextBlock>
72-
<TextBlock Foreground="Blue"
73-
Grid.Column="2"
74-
TextDecorations="Underline"
75-
Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"
76-
VerticalAlignment="Center"
77-
Margin="5,0,5,0">
78-
<TextBlock.InputBindings>
79-
<MouseBinding Command="{Binding ExportButtonCommand}" MouseAction="LeftClick" />
80-
</TextBlock.InputBindings>
81-
</TextBlock>
63+
<controls:LinkButton Grid.Column="1" Margin="2"
64+
Command="{Binding ImportButtonCommand}"
65+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ImportSettings}"/>
66+
<controls:LinkButton Grid.Column="2" Margin="2"
67+
Command="{Binding ExportButtonCommand}"
68+
Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SettingsCaption_ExportSettings}"/>
8269
</Grid>
8370
</StackPanel>
8471
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>

0 commit comments

Comments
 (0)