chibicitiberiu
/
rainmeter-studio
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug where save and close document commands were enabled/disabled badly.

This commit is contained in:
Tiberiu Chibici 2014-09-13 11:17:24 +03:00
parent 93b2e4918f
commit 425d7d62f1
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
RainmeterStudio/UI/Controller/DocumentController.cs
View File

@ -121,13 +121,13 @@ namespace RainmeterStudio.UI.Controller
DocumentSaveAllCommand = new Command("DocumentSaveAll", SaveAll, () => ProjectManager.ActiveProject != null);
DocumentCloseCommand = new Command("DocumentClose", () => Close(), HasActiveDocumentEditor);
ProjectManager.ActiveProjectChanged += new EventHandler((obj, e) =>
ProjectManager.ActiveProjectChanged += new EventHandler((sender, e) =>
{
DocumentCreateCommand.NotifyCanExecuteChanged();
DocumentSaveAllCommand.NotifyCanExecuteChanged();
});
ActiveDocumentEditorChanged += new EventHandler((obj, e) =>
ActiveDocumentEditorChanged += new EventHandler((sender, e) =>
{
DocumentSaveCommand.NotifyCanExecuteChanged();
DocumentSaveAsCommand.NotifyCanExecuteChanged();
@ -135,7 +135,7 @@ namespace RainmeterStudio.UI.Controller
DocumentCloseCommand.NotifyCanExecuteChanged();
});
}
private bool HasActiveDocumentEditor()
{
return ActiveDocumentEditor != null;
@ -305,6 +305,11 @@ namespace RainmeterStudio.UI.Controller
// Close
DocumentManager.Close(editor);
// Update ActiveDocument
if (editor == ActiveDocumentEditor)
ActiveDocumentEditor = null;
return true;
}
@ -315,14 +320,7 @@ namespace RainmeterStudio.UI.Controller
/// <remarks>Shows the 'are you sure' prompt if there are unsaved edits.</remarks>
public bool Close()
{
// Show the 'are you sure' prompt if necesary
if (Close(ActiveDocumentEditor))
{
ActiveDocumentEditor = null;
return true;
}
return false;
return Close(ActiveDocumentEditor);
}
/// <summary>

12
RainmeterStudio/UI/MainWindow.xaml
View File

@ -120,6 +120,18 @@
Style="{StaticResource CommandButtonStyle}">
<Image Width="16" Height="16" Source="{Binding Icon}" />
</Button>
<Button DataContext="{Binding DocumentController.DocumentOpenCommand}"
Style="{StaticResource CommandButtonStyle}">
<Image Width="16" Height="16" Source="{Binding Icon}" />
</Button>
<Button DataContext="{Binding DocumentController.DocumentSaveCommand}"
Style="{StaticResource CommandButtonStyle}">
<Image Width="16" Height="16" Source="{Binding Icon}" />
</Button>
<Button DataContext="{Binding DocumentController.DocumentSaveAllCommand}"
Style="{StaticResource CommandButtonStyle}">
<Image Width="16" Height="16" Source="{Binding Icon}" />
</Button>
</ToolBar>
</ToolBarTray>