added refresh button.

This commit is contained in:
morkt 2014-08-01 16:37:16 +04:00
parent e880cac7c3
commit 5d8962138b
2 changed files with 12 additions and 3 deletions

View File

@ -18,6 +18,7 @@
<BitmapImage x:Key="Icon32x32Back" UriSource="Images/32x32/back button.png"/> <BitmapImage x:Key="Icon32x32Back" UriSource="Images/32x32/back button.png"/>
<BitmapImage x:Key="Icon32x32Forward" UriSource="Images/32x32/forward button.png"/> <BitmapImage x:Key="Icon32x32Forward" UriSource="Images/32x32/forward button.png"/>
<BitmapImage x:Key="Icon32x32Help" UriSource="Images/32x32/help.png"/> <BitmapImage x:Key="Icon32x32Help" UriSource="Images/32x32/help.png"/>
<BitmapImage x:Key="Icon48x48Refresh" UriSource="Images/48x48/refresh.png"/>
<CollectionViewSource x:Key="ListViewSource" Source="{Binding}"/> <CollectionViewSource x:Key="ListViewSource" Source="{Binding}"/>
<local:BooleanToCollapsedVisibilityConverter x:Key="booleanToCollapsedVisibilityConverter" /> <local:BooleanToCollapsedVisibilityConverter x:Key="booleanToCollapsedVisibilityConverter" />
<local:EntryTypeConverter x:Key="entryTypeConverter"/> <local:EntryTypeConverter x:Key="entryTypeConverter"/>
@ -94,7 +95,7 @@
</Window.Resources> </Window.Resources>
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<Menu x:Name="MainMenuBar" DockPanel.Dock="Top" IsMainMenu="True" Visibility="Visible" <Menu x:Name="MainMenuBar" DockPanel.Dock="Top" IsMainMenu="True" Visibility="Visible"
Background="{Binding Path=Background, ElementName=AppStatusBar}"> Background="{DynamicResource {x:Static SystemColors.MenuBrushKey}}">
<MenuItem Header="{x:Static s:guiStrings.MenuFile}"> <MenuItem Header="{x:Static s:guiStrings.MenuFile}">
<MenuItem Header="{x:Static s:guiStrings.MenuOpen}" Command="{x:Static local:Commands.OpenFile}" InputGestureText="Ctrl+O"/> <MenuItem Header="{x:Static s:guiStrings.MenuOpen}" Command="{x:Static local:Commands.OpenFile}" InputGestureText="Ctrl+O"/>
<MenuItem Header="{x:Static s:guiStrings.MenuRecent}" x:Name="RecentFilesMenu"> <MenuItem Header="{x:Static s:guiStrings.MenuRecent}" x:Name="RecentFilesMenu">
@ -163,7 +164,14 @@
<Image Source="{StaticResource Icon32x32Forward}"/> <Image Source="{StaticResource Icon32x32Forward}"/>
</Button> </Button>
<Separator/> <Separator/>
<local:ExtAutoCompleteBox x:Name="pathLine" Height="22" Width="100"/> <StackPanel Orientation="Horizontal" x:Name="PathWidget">
<local:ExtAutoCompleteBox x:Name="pathLine" Height="22" Width="100" Margin="0" BorderThickness="1,1,0,1"/>
<Button ToolTip="{x:Static s:guiStrings.CtxMenuRefresh}" Height="22" Width="22" Margin="0"
Background="{Binding ElementName=pathLine, Path=Background}"
BorderBrush="{Binding ElementName=pathLine, Path=BorderBrush}" BorderThickness="1">
<Image Source="Images/48x48/refresh.png" Height="16" Width="16"/>
</Button>
</StackPanel>
<Button ToolTip="{x:Static s:guiStrings.MenuAbout}" DockPanel.Dock="Right" Margin="0,2,10,2" <Button ToolTip="{x:Static s:guiStrings.MenuAbout}" DockPanel.Dock="Right" Margin="0,2,10,2"
Command="{x:Static local:Commands.About}"> Command="{x:Static local:Commands.About}">
<Image Source="{StaticResource Icon32x32Help}"/> <Image Source="{StaticResource Icon32x32Help}"/>

View File

@ -73,7 +73,7 @@ namespace GARbro.GUI
if (e.WidthChanged) if (e.WidthChanged)
{ {
pathLine.MinWidth = e.NewSize.Width-79; pathLine.MinWidth = e.NewSize.Width-79;
this.MinWidth = e.NewSize.Width+65; this.MinWidth = e.NewSize.Width+79;
} }
}; };
pathLine.EnterKeyDown += acb_OnKeyDown; pathLine.EnterKeyDown += acb_OnKeyDown;
@ -148,6 +148,7 @@ namespace GARbro.GUI
const int MaxRecentFiles = 10; const int MaxRecentFiles = 10;
LinkedList<string> m_recent_files; LinkedList<string> m_recent_files;
// Item1 = file name, Item2 = menu item string
public IEnumerable<Tuple<string,string>> RecentFiles public IEnumerable<Tuple<string,string>> RecentFiles
{ {
get get