Browse Source

Some visual improvements in AddInManager's GUI (better text wrapping, buttons at bottom of list entries etc.).

pull/343/merge
Andreas Weizel 12 years ago
parent
commit
70c3badc26
  1. 2
      src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
  2. 146
      src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml
  3. 4
      src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/OfflineAddInViewModel.cs

2
src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml

@ -56,7 +56,7 @@
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="packageRepositoryItemTemplate" DataType="{x:Type model:PackageRepository}"> <DataTemplate x:Key="packageRepositoryItemTemplate" DataType="{x:Type model:PackageRepository}">
<TextBlock Text="{Binding Path=NameWithHighlight}"> <TextBlock Text="{Binding Path=NameWithHighlight}" ToolTip="{Binding Path=NameWithHighlight}" TextWrapping="Wrap">
<TextBlock.Style> <TextBlock.Style>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Style.Triggers> <Style.Triggers>

146
src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml

@ -91,6 +91,8 @@
<Style x:Key="addInListButtonStyle" TargetType="{x:Type Button}" BasedOn="{x:Static core:GlobalStyles.ButtonStyle}"> <Style x:Key="addInListButtonStyle" TargetType="{x:Type Button}" BasedOn="{x:Static core:GlobalStyles.ButtonStyle}">
<Setter Property="Visibility" Value="Collapsed" /> <Setter Property="Visibility" Value="Collapsed" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Margin" Value="2,2,2,2" />
<Style.Triggers> <Style.Triggers>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
@ -128,16 +130,16 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <!--<Grid.RowDefinitions>
<RowDefinition Height="60"/> <RowDefinition Height="60"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>-->
<Image <Image
Grid.Column="0" Grid.Column="0"
Height="32" Height="32"
VerticalAlignment="Top"
Style="{StaticResource AddInImageStyle}" /> Style="{StaticResource AddInImageStyle}" />
<Image <Image
Grid.Column="0" Grid.Column="0"
@ -159,79 +161,66 @@
Width="16" Width="16"
Style="{StaticResource InstalledTickImageStyle}" Style="{StaticResource InstalledTickImageStyle}"
Margin="36,0,0,0"/> Margin="36,0,0,0"/>
<StackPanel
Grid.Column="1" <Grid Grid.Column="1" Margin="0,0,0,0" HorizontalAlignment="Left">
Margin="4, 0"> <Grid.RowDefinitions>
<TextBlock <RowDefinition Height="Auto" />
x:Name="nameTextBlock" <RowDefinition Height="Auto" />
Text="{Binding Path=Name}" </Grid.RowDefinitions>
FontWeight="Bold"/> <StackPanel Grid.Row="0" Margin="4,4,4,4" HorizontalAlignment="Left">
<TextBlock <TextBlock
x:Name="summaryTextBlock" x:Name="nameTextBlock"
Text="{Binding Path=Summary}" Text="{Binding Path=Name}"
TextWrapping="Wrap" FontWeight="Bold"
TextTrimming="CharacterEllipsis" TextWrapping="Wrap"
MaxHeight="40"/> Margin="0,0,0,6"/>
</StackPanel> <TextBlock
<Button x:Name="summaryTextBlock"
x:Name="addPackageButton" Text="{Binding Path=Summary}"
Grid.Column="2" TextWrapping="Wrap"
Content="{core:Localize AddInManager.ActionInstall}" TextTrimming="CharacterEllipsis"/>
IsDefault="True" </StackPanel>
Command="{Binding Path=AddPackageCommand}" <StackPanel Grid.Row="1" Margin="2,2,2,2" Orientation="Horizontal">
VerticalAlignment="Top" <Button
Style="{StaticResource addInListButtonStyle}" x:Name="addPackageButton"
Margin="2,2,2,2"/> Content="{core:Localize AddInManager.ActionInstall}"
<Button IsDefault="True"
x:Name="updatePackageButton" Command="{Binding Path=AddPackageCommand}"
Grid.Column="2" Style="{StaticResource addInListButtonStyle}"/>
Content="{core:Localize AddInManager.ActionUpdate}" <Button
IsDefault="True" x:Name="updatePackageButton"
Command="{Binding Path=UpdatePackageCommand}" Content="{core:Localize AddInManager.ActionUpdate}"
VerticalAlignment="Top" IsDefault="True"
Style="{StaticResource addInListButtonStyle}" Command="{Binding Path=UpdatePackageCommand}"
Margin="2,2,2,2"/> Style="{StaticResource addInListButtonStyle}"/>
<Button <Button
x:Name="disablePackageButton" x:Name="disablePackageButton"
Grid.Column="2" Content="{core:Localize AddInManager.ActionDisable}"
Content="{core:Localize AddInManager.ActionDisable}" IsDefault="True"
IsDefault="True" Command="{Binding Path=DisablePackageCommand}"
Command="{Binding Path=DisablePackageCommand}" Style="{StaticResource addInListButtonStyle}"/>
VerticalAlignment="Top" <Button
Style="{StaticResource addInListButtonStyle}" x:Name="removePackageButton"
Margin="2,2,2,2"/> Content="{core:Localize AddInManager.ActionUninstall}"
<Button Command="{Binding Path=RemovePackageCommand}"
x:Name="removePackageButton" Style="{StaticResource addInListButtonStyle}"/>
Grid.Column="2" <Button
Content="{core:Localize AddInManager.ActionUninstall}" x:Name="cancelInstallationButton"
Command="{Binding Path=RemovePackageCommand}" Content="{core:Localize AddInManager.ActionCancelInstallation}"
VerticalAlignment="Bottom" Command="{Binding Path=CancelInstallationCommand}"
Style="{StaticResource addInListButtonStyle}" Style="{StaticResource addInListButtonStyle}"/>
Margin="2,2,2,2"/> <Button
<Button x:Name="cancelUpdateButton"
x:Name="cancelInstallationButton" Content="{core:Localize AddInManager.ActionCancelUpdate}"
Grid.Column="2" Command="{Binding Path=CancelUpdateCommand}"
Content="{core:Localize AddInManager.ActionCancelInstallation}" Style="{StaticResource addInListButtonStyle}"/>
Command="{Binding Path=CancelInstallationCommand}" <Button
VerticalAlignment="Bottom" x:Name="cancelUninstallationButton"
Style="{StaticResource addInListButtonStyle}" Content="{core:Localize AddInManager.ActionCancelDeinstallation}"
Margin="2,2,2,2"/> Command="{Binding Path=CancelUninstallationCommand}"
<Button Style="{StaticResource addInListButtonStyle}"/>
x:Name="cancelUpdateButton" </StackPanel>
Grid.Column="2" </Grid>
Content="{core:Localize AddInManager.ActionCancelUpdate}"
Command="{Binding Path=CancelUpdateCommand}"
VerticalAlignment="Bottom"
Style="{StaticResource addInListButtonStyle}"
Margin="2,2,2,2"/>
<Button
x:Name="cancelUninstallationButton"
Grid.Column="2"
Content="{core:Localize AddInManager.ActionCancelDeinstallation}"
Command="{Binding Path=CancelUninstallationCommand}"
VerticalAlignment="Bottom"
Style="{StaticResource addInListButtonStyle}"
Margin="2,2,2,2"/>
</Grid> </Grid>
<DataTemplate.Triggers> <DataTemplate.Triggers>
@ -468,12 +457,11 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="200"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width=".6*" MinWidth="100"/> <ColumnDefinition Width=".6*" MinWidth="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Grid.Column="0"> <Grid Grid.Column="0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -495,7 +483,7 @@
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- <TextBlock <!-- <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"

4
src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/OfflineAddInViewModel.cs

@ -267,8 +267,8 @@ namespace ICSharpCode.AddInManager2.ViewModel
{ {
get get
{ {
// Disabling is only possible if this AddIn has an identity! // Disabling is only possible if this AddIn has an identity and is not the AddInManager itself
return (Id != null); return (Id != null) && (_addIn.Manifest.PrimaryIdentity != "ICSharpCode.AddInManager2");
} }
} }

Loading…
Cancel
Save