From 7c1f170055ef9e4024f80638f5779b5268b3adee Mon Sep 17 00:00:00 2001 From: Peter Leonov Date: Tue, 16 Jul 2013 04:42:28 +0300 Subject: [PATCH] just added a key equivalent for the commit button --- PBGitCommitView.xib | 1570 ++++++++++++++++--------------------------- 1 file changed, 595 insertions(+), 975 deletions(-) diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index d03af50fa..9011bad1a 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -2,10 +2,10 @@ 1050 - 10A432 - 732 - 1038 - 437.00 + 12E55 + 3084 + 1187.39 + 626.00 YES @@ -13,16 +13,36 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin - + YES - 732 - 732 + 3084 + 2053 - + YES - - + NSArrayController + NSBox + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSProgressIndicator + NSScrollView + NSScroller + NSSegmentedCell + NSSegmentedControl + NSSplitView + NSTableColumn + NSTableView + NSTextField + NSTextFieldCell + NSTextView + NSToolbar + NSToolbarItem + NSToolbarSeparatorItem + NSUserDefaultsController + WebView YES @@ -30,13 +50,8 @@ com.apple.WebKitIBPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -59,9 +74,11 @@ 292 {{27, 7}, {305, 17}} + + YES - 67239488 + 67108928 272630784 Ready to commit @@ -89,6 +106,7 @@ + NO @@ -121,6 +139,7 @@ {852, 173} + @@ -134,7 +153,7 @@ WebKitDefaultFontSize WebKitMinimumFontSize - + YES @@ -157,7 +176,7 @@ YES - 256 + 274 YES @@ -175,7 +194,11 @@ 4352 {189, 194} + + YES + NO + YES 256 @@ -188,7 +211,7 @@ 10 3.4028229999999999e+38 - 75628096 + 75497536 2048 @@ -213,7 +236,7 @@ - 337772096 + 337641536 133632 Text Cell @@ -252,10 +275,12 @@ 0 YES 0 + 1 {{1, 1}, {189, 194}} + @@ -266,6 +291,9 @@ -2147483392 {{174, 1}, {15, 178}} + + + NO _doScroller: 0.99337750000000002 @@ -275,6 +303,9 @@ -2147483392 {{1, 179}, {173, 15}} + + + NO 1 _doScroller: @@ -283,23 +314,31 @@ {{-1, -1}, {191, 196}} + - 562 + 133682 QSAAAEEgAABBiAAAQYgAAA + 0.25 + 4 + 1 {190, 200} + + {190, 215} + + {0, 0} - 67239424 + 67108864 0 Unstaged Changes @@ -327,7 +366,7 @@ YES - 256 + 274 YES @@ -335,26 +374,31 @@ 289 {{339, 0}, {96, 32}} + + YES - 67239424 + 67108864 134217728 Commit - -2038284033 - 129 + -2038284288 + 268435585 200 25 + NO 274 {{0, 36}, {429, 159}} + + PBCommitMessageBackgroundView @@ -393,8 +437,10 @@ public.url - {427, 105} + {427, 157} + + @@ -407,7 +453,7 @@ YES - 6 + 38 @@ -415,7 +461,7 @@ 1 - 10979 + 67119843 0 @@ -426,7 +472,7 @@ NSBackgroundColor NSColor - + YES 6 @@ -450,7 +496,7 @@ NSColor NSUnderline - + YES 1 @@ -460,21 +506,40 @@ + + 1 6 - {1161, 1e+07} - {223, 0} + {1161, 10000000} {{1, 1}, {427, 157}} + - {4, -5} - 1 + {4, 5} + + 79691776 + + YES + + YES + + + + file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff + + + + + 3 + MCAwAA + + 2 @@ -483,6 +548,9 @@ -2147483392 {{346, 1}, {15, 164}} + + + NO _doScroller: 0.99166670000000001 @@ -492,6 +560,9 @@ -2147483392 {{-100, -100}, {87, 18}} + + + NO 1 _doScroller: @@ -501,25 +572,31 @@ {{0, 36}, {429, 159}} - - 530 + + + 133650 + 0.25 + 4 + 1 292 {{-2, 9}, {65, 18}} + + YES - -2080244224 + -2080374784 0 Amend - 1211912703 + 1211912448 2 NSImage @@ -533,37 +610,45 @@ 200 25 + NO 289 {{243, 0}, {96, 32}} + + YES - 67239424 + 67108864 134217728 Sign-Off - -2038284033 + -2038284288 129 200 25 + NO {429, 200} + + {{199, 0}, {429, 215}} + + {0, 0} - 67239424 + 67108864 0 Commit Message @@ -586,7 +671,7 @@ YES - 256 + 274 YES @@ -604,8 +689,12 @@ 4352 {214, 194} + + 1 YES + NO + YES 256 @@ -618,7 +707,7 @@ 10 3.4028229999999999e+38 - 75628096 + 75497536 2048 @@ -626,7 +715,7 @@ - 67239488 + 67108928 133632 Text Cell @@ -653,10 +742,12 @@ 0 YES 0 + 1 {{1, 1}, {214, 194}} + @@ -667,6 +758,9 @@ -2147483392 {{257, 1}, {15, 246}} + + + NO _doScroller: 0.99519230000000003 @@ -676,6 +770,9 @@ -2147483392 {{1, 247}, {256, 15}} + + + NO 1 _doScroller: @@ -684,23 +781,31 @@ {{0, -1}, {216, 196}} + - 562 + 133682 QSAAAEEgAABBiAAAQYgAAA + 0.25 + 4 + 1 {215, 200} + + {{637, 0}, {215, 215}} + + {0, 0} - 67239424 + 67108864 0 Staged Changes @@ -719,19 +824,24 @@ {{0, 182}, {852, 215}} + + YES {{0, 35}, {852, 397}} + + CommitViewSplitView 1316 - {{6, 7}, {16, 16}} + + 28938 16 100 @@ -739,6 +849,8 @@ {852, 432} + + NSView @@ -792,7 +904,7 @@ 1E431E79-1591-49E7-9E17-49497CA4622A NSToolbarSeparatorItem - + YES @@ -802,14 +914,13 @@ View selector - + 268 {{0, 14}, {87, 25}} - 3 YES - 67239424 + 67108864 0 @@ -840,6 +951,7 @@ 1 2 + NO @@ -892,12 +1004,12 @@ - + YES - + YES @@ -916,78 +1028,6 @@ 44 - - - cachedFilesController - - - - 97 - - - - unstagedFilesController - - - - 98 - - - - controller - - - - 101 - - - - value: arrangedObjects.path - - - - - - value: arrangedObjects.path - value - arrangedObjects.path - 2 - - - 122 - - - - view - - - - 136 - - - - frameLoadDelegate - - - - 137 - - - - value: arrangedObjects.path - - - - - - value: arrangedObjects.path - value - arrangedObjects.path - 2 - - - 139 - cachedFilesController @@ -1020,38 +1060,6 @@ 213 - - - value: status - - - - - - value: status - value - status - 2 - - - 216 - - - - animate: busy - - - - - - animate: busy - animate - busy - 2 - - - 222 - viewToolbar @@ -1077,92 +1085,52 @@ 256 - - commitController - - + + signOff: + + - 257 + 280 - - delegate - - + + value: status + + + + + + value: status + value + status + 2 + - 258 + 216 delegate - + - 259 - - - - unstagedFilesController - - - - 260 - - - - stagedFilesController - - - - 261 + 258 - indexController - + dataSource + - 262 - - - - stagedTable - - - - 263 - - - - unstagedTable - - - - 264 - - - - rowClicked: - - - - 268 - - - - rowClicked: - - - - 269 + 276 - dataSource - + delegate + - 276 + 259 @@ -1172,14 +1140,6 @@ 277 - - - signOff: - - - - 280 - contentArray: index.indexChanges @@ -1213,42 +1173,194 @@ 282 - - value: index.amend - - - - - - value: index.amend - value - index.amend - 2 - + + cachedFilesController + + - 283 + 97 - commitMessageView - - + unstagedFilesController + + - 287 + 98 - - - - YES - - 0 - - - - - - -2 - + + + controller + + + + 101 + + + + view + + + + 136 + + + + indexController + + + + 262 + + + + value: arrangedObjects.path + + + + + + value: arrangedObjects.path + value + arrangedObjects.path + 2 + + + 139 + + + + value: arrangedObjects.path + + + + + + value: arrangedObjects.path + value + arrangedObjects.path + 2 + + + 122 + + + + frameLoadDelegate + + + + 137 + + + + animate: busy + + + + + + animate: busy + animate + busy + 2 + + + 222 + + + + value: index.amend + + + + + + value: index.amend + value + index.amend + 2 + + + 283 + + + + commitController + + + + 257 + + + + unstagedFilesController + + + + 260 + + + + stagedFilesController + + + + 261 + + + + stagedTable + + + + 263 + + + + unstagedTable + + + + 264 + + + + rowClicked: + + + + 268 + + + + rowClicked: + + + + 269 + + + + commitMessageView + + + + 287 + + + + + YES + + 0 + + + + + + -2 + File's Owner @@ -1586,11 +1698,10 @@ YES YES + -1.IBPluginDependency + -2.IBPluginDependency -3.IBPluginDependency - 1.IBEditorWindowLastContentRect 1.IBPluginDependency - 1.IBViewEditorWindowController.showingBoundsRectangles - 1.IBViewEditorWindowController.showingLayoutRectangles 104.IBPluginDependency 105.CustomClassName 105.IBPluginDependency @@ -1612,14 +1723,14 @@ 208.IBPluginDependency 209.IBPluginDependency 217.IBPluginDependency - 225.IBEditorWindowLastContentRect 225.IBPluginDependency - 225.editorWindowContentRectSynchronizationRect 226.IBPluginDependency + 227.IBPluginDependency 239.IBPluginDependency 240.IBPluginDependency 247.IBPluginDependency 248.IBPluginDependency + 254.IBPluginDependency 278.IBPluginDependency 279.IBPluginDependency 284.IBPluginDependency @@ -1637,14 +1748,14 @@ 77.IBPluginDependency 81.IBPluginDependency 86.IBPluginDependency + 96.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin - {{68, 131}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin - - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin PBIconAndTextCell com.apple.InterfaceBuilder.CocoaPlugin @@ -1666,9 +1777,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{202, 587}, {616, 169}} com.apple.InterfaceBuilder.CocoaPlugin - {{132, 614}, {616, 0}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1691,22 +1802,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES - - YES - + YES - - YES - + 287 @@ -1721,9 +1829,16 @@ commitMessageView NSTextView + + commitMessageView + + commitMessageView + NSTextView + + IBProjectSource - PBCommitMessageBackgroundView.h + ./Classes/PBCommitMessageBackgroundView.h @@ -1731,7 +1846,7 @@ NSTableView IBProjectSource - PBFileChangesTableView.h + ./Classes/PBFileChangesTableView.h @@ -1745,13 +1860,37 @@ refresh: signOff: - + YES id id id + + YES + + YES + commit: + refresh: + signOff: + + + YES + + commit: + id + + + refresh: + id + + + signOff: + id + + + YES @@ -1762,7 +1901,7 @@ unstagedFilesController webController - + YES NSArrayController NSTextView @@ -1771,9 +1910,43 @@ PBWebChangesController + + YES + + YES + cachedFilesController + commitMessageView + indexController + unstagedFilesController + webController + + + YES + + cachedFilesController + NSArrayController + + + commitMessageView + NSTextView + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + + + webController + PBWebChangesController + + + IBProjectSource - PBGitCommitController.h + ./Classes/PBGitCommitController.h @@ -1786,12 +1959,31 @@ rowClicked: tableClicked: - + YES NSCell NSTableView + + YES + + YES + rowClicked: + tableClicked: + + + YES + + rowClicked: + NSCell + + + tableClicked: + NSTableView + + + YES @@ -1802,7 +1994,7 @@ unstagedFilesController unstagedTable - + YES PBGitCommitController NSArrayController @@ -1811,9 +2003,43 @@ NSTableView + + YES + + YES + commitController + stagedFilesController + stagedTable + unstagedFilesController + unstagedTable + + + YES + + commitController + PBGitCommitController + + + stagedFilesController + NSArrayController + + + stagedTable + NSTableView + + + unstagedFilesController + NSArrayController + + + unstagedTable + NSTableView + + + IBProjectSource - PBGitIndexController.h + ./Classes/PBGitIndexController.h @@ -1821,7 +2047,7 @@ NSTextFieldCell IBProjectSource - PBIconAndTextCell.h + ./Classes/PBIconAndTextCell.h @@ -1829,7 +2055,7 @@ NSSplitView IBProjectSource - PBNiceSplitView.h + ./Classes/PBNiceSplitView.h @@ -1839,9 +2065,16 @@ viewToolbar NSToolbar + + viewToolbar + + viewToolbar + NSToolbar + + IBProjectSource - PBViewController.h + ./Classes/PBViewController.h @@ -1856,7 +2089,7 @@ indexController unstagedFilesController - + YES NSArrayController PBGitCommitController @@ -1864,725 +2097,112 @@ NSArrayController - - IBProjectSource - PBWebChangesController.h - - - - PBWebController - NSObject - + YES YES - repository - view + cachedFilesController + controller + indexController + unstagedFilesController - + YES - id - WebView + + cachedFilesController + NSArrayController + + + controller + PBGitCommitController + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + IBProjectSource - PBWebController.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h + ./Classes/PBWebChangesController.h - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSManagedObjectContext - NSObject - - IBFrameworkSource - CoreData.framework/Headers/NSManagedObjectContext.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - - NSObjectController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSObjectController.h - - - - NSProgressIndicator - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSProgressIndicator.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSSegmentedCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedCell.h - - - - NSSegmentedControl - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedControl.h - - - - NSSplitView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSSplitView.h - - - - NSTableColumn - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableColumn.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSToolbar - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbar.h - - - - NSToolbarItem + PBWebController NSObject - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSViewController - NSResponder - view - NSView - - - IBFrameworkSource - AppKit.framework/Headers/NSViewController.h - - - - WebView - NSView - YES YES - goBack: - goForward: - makeTextLarger: - makeTextSmaller: - makeTextStandardSize: - reload: - reloadFromOrigin: - stopLoading: - takeStringURLFrom: - toggleContinuousSpellChecking: - toggleSmartInsertDelete: + repository + view - + YES id - id - id - id - id - id - id - id - id - id - id + WebView + + + + YES + + YES + repository + view + + + YES + + repository + id + + + view + WebView + - IBFrameworkSource - WebKit.framework/Headers/WebView.h + IBProjectSource + ./Classes/PBWebController.h 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 YES - GitX.xcodeproj 3 + + YES + + YES + CommitViewTemplate + HistoryViewTemplate + NSMenuCheckmark + NSMenuMixedState + NSSwitch + + + YES + {128, 128} + {128, 128} + {11, 11} + {10, 3} + {15, 15} + +