MainWindow.cs (pinta-1.7) | : | MainWindow.cs (pinta-1.7.1) | ||
---|---|---|---|---|
skipping to change at line 76 | skipping to change at line 76 | |||
try { | try { | |||
errorDialog.SetMessage (message); | errorDialog.SetMessage (message); | |||
errorDialog.AddDetails (details); | errorDialog.AddDetails (details); | |||
errorDialog.Run (); | errorDialog.Run (); | |||
} finally { | } finally { | |||
errorDialog.Destroy (); | errorDialog.Destroy (); | |||
} | } | |||
} | } | |||
); | ); | |||
PintaCore.Chrome.InitializeUnsupportedFormatDialog((paren | ||||
t, message, details) => { | ||||
System.Console.Error.WriteLine("Pinta: {0}", deta | ||||
ils); | ||||
FileUnsupportedFormatDialog unsupportedFormDialog | ||||
= new FileUnsupportedFormatDialog(parent); | ||||
try | ||||
{ | ||||
unsupportedFormDialog.SetMessage(message) | ||||
; | ||||
unsupportedFormDialog.Run(); | ||||
} | ||||
finally | ||||
{ | ||||
unsupportedFormDialog.Destroy(); | ||||
} | ||||
} | ||||
); | ||||
PintaCore.Initialize (); | PintaCore.Initialize (); | |||
// Initialize extensions | // Initialize extensions | |||
AddinManager.Initialize (); | AddinManager.Initialize (); | |||
AddinManager.Registry.Update (); | AddinManager.Registry.Update (); | |||
AddinSetupService setupService = new AddinSetupService (A ddinManager.Registry); | AddinSetupService setupService = new AddinSetupService (A ddinManager.Registry); | |||
if (!setupService.AreRepositoriesRegistered ()) | if (!setupService.AreRepositoriesRegistered ()) | |||
setupService.RegisterRepositories (true); | setupService.RegisterRepositories (true); | |||
//Look out for any changes in extensions | //Look out for any changes in extensions | |||
skipping to change at line 241 | skipping to change at line 256 | |||
// Give the Canvas (and by extension the tools) | // Give the Canvas (and by extension the tools) | |||
// first shot at handling the event if | // first shot at handling the event if | |||
// the mouse pointer is on the canvas | // the mouse pointer is on the canvas | |||
if (PintaCore.Workspace.HasOpenDocuments) { | if (PintaCore.Workspace.HasOpenDocuments) { | |||
var canvas_window = ((PintaCanvas)PintaCore.Workspace.ActiveWork space.Canvas).CanvasWindow; | var canvas_window = ((PintaCanvas)PintaCore.Workspace.ActiveWork space.Canvas).CanvasWindow; | |||
if (canvas_window.Canvas.HasFocus || canvas_window.IsMouseOnCanv as) | if (canvas_window.Canvas.HasFocus || canvas_window.IsMouseOnCanv as) | |||
canvas_window.Canvas.DoKeyPressEvent (o, e); | canvas_window.Canvas.DoKeyPressEvent (o, e); | |||
} | } | |||
// If the canvas/tool didn't consume it, see if its a toolbox shortc | // If the canvas/tool didn't consume it, see if its a too | |||
ut | lbox shortcut | |||
if (e.RetVal == null || !(bool)e.RetVal) | if (e.RetVal == null || !(bool)e.RetVal) { | |||
if (e.Event.State.FilterModifierKeys () == Gdk.ModifierType.None | if (e.Event.State.FilterModifierKeys () == Gdk.Mo | |||
) | difierType.None) | |||
PintaCore.Tools.SetCurrentTool (e.Event.Key); | PintaCore.Tools.SetCurrentTool (e.Event.K | |||
ey); | ||||
} | ||||
// Finally, see if the palette widget wants it. | ||||
if (e.RetVal == null || !(bool)e.RetVal) { | ||||
PintaCore.Palette.DoKeyPress (o, e); | ||||
} | ||||
} | } | |||
[GLib.ConnectBefore] | [GLib.ConnectBefore] | |||
private void MainWindow_KeyReleaseEvent (object o, KeyReleaseEven tArgs e) | private void MainWindow_KeyReleaseEvent (object o, KeyReleaseEven tArgs e) | |||
{ | { | |||
if (SendToFocusWidget (e, e.Event) || !PintaCore.Workspace.HasOpenDo cuments) | if (SendToFocusWidget (e, e.Event) || !PintaCore.Workspace.HasOpenDo cuments) | |||
return; | return; | |||
// Give the Canvas (and by extension the tools) | // Give the Canvas (and by extension the tools) | |||
// first shot at handling the event if | // first shot at handling the event if | |||
End of changes. 2 change blocks. | ||||
6 lines changed or deleted | 32 lines changed or added |