mirror of
https://github.com/qvacua/vimr.git
synced 2024-08-16 20:20:28 +03:00
Merge branch 'develop' into macvim/master
This commit is contained in:
Tae Won Ha
commit
add70e7171
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -7,3 +7,6 @@
|
||||
[submodule "StandardPlugins/ocdiscount"]
|
||||
path = StandardPlugins/ocdiscount
|
||||
url = git://github.com/qvacua/ocdiscount.git
|
||||
[submodule "qvworkspace"]
|
||||
path = qvworkspace
|
||||
url = https://github.com/qvacua/qvworkspace.git
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
1929B15E4DE9D40CD001D126 /* VRScoredPath.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1929B54A396D27D81AEB116E /* VRScoredPath.mm */; };
|
||||
1929B17F47B82FBA846A4936 /* VRFileBrowserOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC6450833D2DD65D870F /* VRFileBrowserOutlineView.m */; };
|
||||
1929B1858DA515DAC0109F42 /* VRLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC59B996498760F6EDE5 /* VRLogFormatter.m */; };
|
||||
1929B19571A09E107B6A806F /* PBXBuildFile */ = {isa = PBXBuildFile; fileRef = 1929BD04907C009FBFD8BA3D /* NSStringCategoryTest.m */; };
|
||||
1929B1C7E68E1C86C0181882 /* VRFileItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B37A2B86D52B945AD0D8 /* VRFileItemManager.m */; };
|
||||
1929B1D2E7F9326E3A3749C5 /* VRFileItemOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD08826A501D4F3AE082 /* VRFileItemOperation.mm */; };
|
||||
1929B1EAA9A1E1827AD89D73 /* VRNoPluginPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9FEF57174D43BE0D166 /* VRNoPluginPreviewView.m */; };
|
||||
@ -151,6 +150,20 @@
|
||||
1929BFD2A870FBF210148877 /* VRPluginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BAEC891444D375F472C8 /* VRPluginManager.m */; };
|
||||
1929BFE651FC624FDBB6C8AB /* VRMainWindowControllerFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B19627AB3EEDD0C4A7E0 /* VRMainWindowControllerFactory.m */; };
|
||||
1929BFEE218D1F29938F4E99 /* VRTextMateCppUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7D8D7809B241537B6F7 /* VRTextMateCppUtils.mm */; };
|
||||
4B6BDCE91AF36DBE0019DB59 /* NSString+QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDA1AF36DBE0019DB59 /* NSString+QVWorkspace.m */; };
|
||||
4B6BDCEA1AF36DBE0019DB59 /* NSString+QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDA1AF36DBE0019DB59 /* NSString+QVWorkspace.m */; };
|
||||
4B6BDCEB1AF36DBE0019DB59 /* NSView+QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDC1AF36DBE0019DB59 /* NSView+QVWorkspace.m */; };
|
||||
4B6BDCEC1AF36DBE0019DB59 /* NSView+QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDC1AF36DBE0019DB59 /* NSView+QVWorkspace.m */; };
|
||||
4B6BDCED1AF36DBE0019DB59 /* QVSeparatorLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDE1AF36DBE0019DB59 /* QVSeparatorLine.m */; };
|
||||
4B6BDCEE1AF36DBE0019DB59 /* QVSeparatorLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCDE1AF36DBE0019DB59 /* QVSeparatorLine.m */; };
|
||||
4B6BDCEF1AF36DBE0019DB59 /* QVTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE01AF36DBE0019DB59 /* QVTool.m */; };
|
||||
4B6BDCF01AF36DBE0019DB59 /* QVTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE01AF36DBE0019DB59 /* QVTool.m */; };
|
||||
4B6BDCF11AF36DBE0019DB59 /* QVToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE21AF36DBE0019DB59 /* QVToolbar.m */; };
|
||||
4B6BDCF21AF36DBE0019DB59 /* QVToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE21AF36DBE0019DB59 /* QVToolbar.m */; };
|
||||
4B6BDCF31AF36DBE0019DB59 /* QVToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE41AF36DBE0019DB59 /* QVToolbarButton.m */; };
|
||||
4B6BDCF41AF36DBE0019DB59 /* QVToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE41AF36DBE0019DB59 /* QVToolbarButton.m */; };
|
||||
4B6BDCF51AF36DBE0019DB59 /* QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE71AF36DBE0019DB59 /* QVWorkspace.m */; };
|
||||
4B6BDCF61AF36DBE0019DB59 /* QVWorkspace.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6BDCE71AF36DBE0019DB59 /* QVWorkspace.m */; };
|
||||
4B6F24DB197B000100AB1DD8 /* NoPluginPreviewContent.html in Resources */ = {isa = PBXBuildFile; fileRef = 1929BADD87FEE7512FA3D9AE /* NoPluginPreviewContent.html */; };
|
||||
4B6F2573197BAD4300AB1DD8 /* VimRPluginDefinition.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B6F2572197BAD4300AB1DD8 /* VimRPluginDefinition.framework */; };
|
||||
4B6F2574197BAD5300AB1DD8 /* VimRPluginDefinition.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B6F2572197BAD4300AB1DD8 /* VimRPluginDefinition.framework */; };
|
||||
@ -296,6 +309,7 @@
|
||||
1929B5FC0CACD06A926BB858 /* VROpenFilesInFrontmostWindowCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VROpenFilesInFrontmostWindowCommand.m; sourceTree = "<group>"; };
|
||||
1929B60202DAE063135DD32C /* VRLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRLog.h; sourceTree = "<group>"; };
|
||||
1929B610BD09830F426CB915 /* VRUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRUserDefaults.h; sourceTree = "<group>"; };
|
||||
1929B625D1EA6CD6EFF958D6 /* QVToolbarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVToolbarDelegate.h; path = qvworkspace/Workspace/QVToolbarDelegate.h; sourceTree = "<group>"; };
|
||||
1929B6422375B345DAA4E35A /* VRCppUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VRCppUtils.mm; sourceTree = "<group>"; };
|
||||
1929B68C34C504CB9E6CF69B /* VROpenFilesInNewWindowCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VROpenFilesInNewWindowCommand.m; sourceTree = "<group>"; };
|
||||
1929B68FDCF00DC74509A5DB /* VRInactiveTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRInactiveTableView.h; sourceTree = "<group>"; };
|
||||
@ -393,6 +407,22 @@
|
||||
1929BFDF13D59CE5B6D54B2D /* VRGeneralPrefPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VRGeneralPrefPane.m; sourceTree = "<group>"; };
|
||||
1929BFE6F9FFFCCA920EF56C /* VRPluginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VRPluginManager.h; sourceTree = "<group>"; };
|
||||
44ADE76C2C18B01D5595A5B8 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
|
||||
4B6BDCD91AF36DBE0019DB59 /* NSString+QVWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+QVWorkspace.h"; path = "qvworkspace/Workspace/NSString+QVWorkspace.h"; sourceTree = "<group>"; };
|
||||
4B6BDCDA1AF36DBE0019DB59 /* NSString+QVWorkspace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+QVWorkspace.m"; path = "qvworkspace/Workspace/NSString+QVWorkspace.m"; sourceTree = "<group>"; };
|
||||
4B6BDCDB1AF36DBE0019DB59 /* NSView+QVWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSView+QVWorkspace.h"; path = "qvworkspace/Workspace/NSView+QVWorkspace.h"; sourceTree = "<group>"; };
|
||||
4B6BDCDC1AF36DBE0019DB59 /* NSView+QVWorkspace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSView+QVWorkspace.m"; path = "qvworkspace/Workspace/NSView+QVWorkspace.m"; sourceTree = "<group>"; };
|
||||
4B6BDCDD1AF36DBE0019DB59 /* QVSeparatorLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVSeparatorLine.h; path = qvworkspace/Workspace/QVSeparatorLine.h; sourceTree = "<group>"; };
|
||||
4B6BDCDE1AF36DBE0019DB59 /* QVSeparatorLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QVSeparatorLine.m; path = qvworkspace/Workspace/QVSeparatorLine.m; sourceTree = "<group>"; };
|
||||
4B6BDCDF1AF36DBE0019DB59 /* QVTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVTool.h; path = qvworkspace/Workspace/QVTool.h; sourceTree = "<group>"; };
|
||||
4B6BDCE01AF36DBE0019DB59 /* QVTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QVTool.m; path = qvworkspace/Workspace/QVTool.m; sourceTree = "<group>"; };
|
||||
4B6BDCE11AF36DBE0019DB59 /* QVToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVToolbar.h; path = qvworkspace/Workspace/QVToolbar.h; sourceTree = "<group>"; };
|
||||
4B6BDCE21AF36DBE0019DB59 /* QVToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QVToolbar.m; path = qvworkspace/Workspace/QVToolbar.m; sourceTree = "<group>"; };
|
||||
4B6BDCE31AF36DBE0019DB59 /* QVToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVToolbarButton.h; path = qvworkspace/Workspace/QVToolbarButton.h; sourceTree = "<group>"; };
|
||||
4B6BDCE41AF36DBE0019DB59 /* QVToolbarButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QVToolbarButton.m; path = qvworkspace/Workspace/QVToolbarButton.m; sourceTree = "<group>"; };
|
||||
4B6BDCE51AF36DBE0019DB59 /* QVToolbarButtonDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVToolbarButtonDelegate.h; path = qvworkspace/Workspace/QVToolbarButtonDelegate.h; sourceTree = "<group>"; };
|
||||
4B6BDCE61AF36DBE0019DB59 /* QVWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVWorkspace.h; path = qvworkspace/Workspace/QVWorkspace.h; sourceTree = "<group>"; };
|
||||
4B6BDCE71AF36DBE0019DB59 /* QVWorkspace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QVWorkspace.m; path = qvworkspace/Workspace/QVWorkspace.m; sourceTree = "<group>"; };
|
||||
4B6BDCE81AF36DBE0019DB59 /* QVWorkspaceDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QVWorkspaceDelegate.h; path = qvworkspace/Workspace/QVWorkspaceDelegate.h; sourceTree = "<group>"; };
|
||||
4B6F2572197BAD4300AB1DD8 /* VimRPluginDefinition.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = VimRPluginDefinition.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
4B6F2585197BB59000AB1DD8 /* Markdown.vimr-plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = "Markdown.vimr-plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
4B89F119190A473F00AA0EE5 /* MacVimFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MacVimFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@ -701,6 +731,30 @@
|
||||
name = Resources;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4B6BDCD81AF36D780019DB59 /* QVWorkspace */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
4B6BDCD91AF36DBE0019DB59 /* NSString+QVWorkspace.h */,
|
||||
4B6BDCDA1AF36DBE0019DB59 /* NSString+QVWorkspace.m */,
|
||||
4B6BDCDB1AF36DBE0019DB59 /* NSView+QVWorkspace.h */,
|
||||
4B6BDCDC1AF36DBE0019DB59 /* NSView+QVWorkspace.m */,
|
||||
4B6BDCDD1AF36DBE0019DB59 /* QVSeparatorLine.h */,
|
||||
4B6BDCDE1AF36DBE0019DB59 /* QVSeparatorLine.m */,
|
||||
4B6BDCDF1AF36DBE0019DB59 /* QVTool.h */,
|
||||
4B6BDCE01AF36DBE0019DB59 /* QVTool.m */,
|
||||
4B6BDCE11AF36DBE0019DB59 /* QVToolbar.h */,
|
||||
4B6BDCE21AF36DBE0019DB59 /* QVToolbar.m */,
|
||||
4B6BDCE31AF36DBE0019DB59 /* QVToolbarButton.h */,
|
||||
4B6BDCE41AF36DBE0019DB59 /* QVToolbarButton.m */,
|
||||
4B6BDCE51AF36DBE0019DB59 /* QVToolbarButtonDelegate.h */,
|
||||
4B6BDCE61AF36DBE0019DB59 /* QVWorkspace.h */,
|
||||
4B6BDCE71AF36DBE0019DB59 /* QVWorkspace.m */,
|
||||
4B6BDCE81AF36DBE0019DB59 /* QVWorkspaceDelegate.h */,
|
||||
1929B625D1EA6CD6EFF958D6 /* QVToolbarDelegate.h */,
|
||||
);
|
||||
name = QVWorkspace;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4B6F2587197BB59800AB1DD8 /* Plugins */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@ -721,6 +775,7 @@
|
||||
4BE9240A18C20DBC00E67BB6 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
4B6BDCD81AF36D780019DB59 /* QVWorkspace */,
|
||||
4BE9241C18C20DBC00E67BB6 /* VimR */,
|
||||
4BE9243A18C20DBC00E67BB6 /* VimRTests */,
|
||||
4B6F2587197BB59800AB1DD8 /* Plugins */,
|
||||
@ -928,8 +983,6 @@
|
||||
mainGroup = 4BE9240A18C20DBC00E67BB6;
|
||||
productRefGroup = 4BE9241418C20DBC00E67BB6 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectReferences = (
|
||||
);
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
4BE9241218C20DBC00E67BB6 /* VimR */,
|
||||
@ -1041,6 +1094,7 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4BE9242A18C20DBC00E67BB6 /* VRAppDelegate.m in Sources */,
|
||||
4B6BDCF31AF36DBE0019DB59 /* QVToolbarButton.m in Sources */,
|
||||
4BE9242318C20DBC00E67BB6 /* main.m in Sources */,
|
||||
1929BE2CA3488AB3824DF598 /* VRManualBeanProvider.m in Sources */,
|
||||
1929BECCEE99FFCBA5ACD04E /* NSArray+VR.m in Sources */,
|
||||
@ -1049,6 +1103,7 @@
|
||||
1929B22F52F120AB48CCEBE1 /* VRFileItem.m in Sources */,
|
||||
1929B1C7E68E1C86C0181882 /* VRFileItemManager.m in Sources */,
|
||||
1929B85F39A41C42C8860028 /* VROpenQuicklyWindow.m in Sources */,
|
||||
4B6BDCEB1AF36DBE0019DB59 /* NSView+QVWorkspace.m in Sources */,
|
||||
1929BF1D3C2F7A3F89D6DD98 /* VROpenQuicklyWindowController.m in Sources */,
|
||||
1929BF36720565B5E5A0C630 /* VRScoredPath.mm in Sources */,
|
||||
1929BB2FD516E0C54A7F9F38 /* VRFilterItemsOperation.mm in Sources */,
|
||||
@ -1063,6 +1118,7 @@
|
||||
1929BC611C605EA2EA42D6CA /* VRCppUtils.mm in Sources */,
|
||||
1929BA227E512755391D3A00 /* VRUtils.m in Sources */,
|
||||
1929B96602CF1132D3C20FC0 /* VRAlert.m in Sources */,
|
||||
4B6BDCEF1AF36DBE0019DB59 /* QVTool.m in Sources */,
|
||||
1929BFEE218D1F29938F4E99 /* VRTextMateCppUtils.mm in Sources */,
|
||||
1929B9588523C90BA38223FA /* VRWorkspaceView.m in Sources */,
|
||||
1929B78E947C50865826F723 /* VRTextMateUiUtils.m in Sources */,
|
||||
@ -1083,11 +1139,14 @@
|
||||
1929B06DA7EA030C15EA09FB /* VRGeneralPrefPane.m in Sources */,
|
||||
1929B581DE1040A8E30A9368 /* VRFileBrowserPrefPane.m in Sources */,
|
||||
1929BFE651FC624FDBB6C8AB /* VRMainWindowControllerFactory.m in Sources */,
|
||||
4B6BDCED1AF36DBE0019DB59 /* QVSeparatorLine.m in Sources */,
|
||||
1929B8D9F169426078FA957B /* VRWorkspaceFactory.m in Sources */,
|
||||
1929B146BD30BF4DD3720188 /* VRWorkspaceViewFactory.m in Sources */,
|
||||
1929B89B42D69989BF0CBC3D /* VRFileBrowserViewFactory.m in Sources */,
|
||||
1929B683C26F3C2903644800 /* NSString+VR.m in Sources */,
|
||||
4B6BDCF11AF36DBE0019DB59 /* QVToolbar.m in Sources */,
|
||||
1929B9A5D27234DBF2990E31 /* VRApplication.m in Sources */,
|
||||
4B6BDCE91AF36DBE0019DB59 /* NSString+QVWorkspace.m in Sources */,
|
||||
1929B45FB56172D6481C412A /* VROpenFilesInNewWindowCommand.m in Sources */,
|
||||
1929BB9338D726C44D38C16A /* VROpenFilesCommand.m in Sources */,
|
||||
1929BDF505FDA350AFD3FD44 /* VROpenFilesInFrontmostWindowCommand.m in Sources */,
|
||||
@ -1096,6 +1155,7 @@
|
||||
1929BDE700B7387B64B9BB40 /* VRPropertyService.m in Sources */,
|
||||
1929B9F07662B5DE6F2D1A94 /* VROpenQuicklyIgnorePattern.m in Sources */,
|
||||
1929B0FE2E3F340E4AFFC552 /* VRMenuItem.m in Sources */,
|
||||
4B6BDCF51AF36DBE0019DB59 /* QVWorkspace.m in Sources */,
|
||||
1929BA14409C8CB2603B8E8E /* VRKeyBinding.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@ -1107,6 +1167,7 @@
|
||||
4B8BE1EE18EB556C004840F1 /* VRAppDelegate.m in Sources */,
|
||||
1929B65D8458FE1E5D4E0594 /* VRBaseTestCase.m in Sources */,
|
||||
1929B93BBCD53898D16541CD /* VRManualBeanProvider.m in Sources */,
|
||||
4B6BDCF61AF36DBE0019DB59 /* QVWorkspace.m in Sources */,
|
||||
1929BD434C100AD15EDA2FAF /* VRMainWindowControllerTest.m in Sources */,
|
||||
1929BD58ED16CFBDF23E41A5 /* VRWorkspaceControllerTest.m in Sources */,
|
||||
1929B99E6ED2346227C88A2B /* VRAppDelegateTest.m in Sources */,
|
||||
@ -1133,10 +1194,12 @@
|
||||
1929BD58A3D5B75CD348D907 /* VRMainWindow.m in Sources */,
|
||||
1929B8B706AC7A4DEBEA23BA /* VRWorkspace.m in Sources */,
|
||||
1929B3017554189DF3D5AB3E /* VRWorkspaceController.m in Sources */,
|
||||
4B6BDCEA1AF36DBE0019DB59 /* NSString+QVWorkspace.m in Sources */,
|
||||
1929BA573D9D927EF4FDA4E0 /* VRMainWindowController.m in Sources */,
|
||||
1929B44A377085462454D47A /* VRCppUtils.mm in Sources */,
|
||||
1929B64D6959587E9FAA14F2 /* VRUtils.m in Sources */,
|
||||
1929BAFE398C4B624DAC7FD9 /* VRAlert.m in Sources */,
|
||||
4B6BDCF41AF36DBE0019DB59 /* QVToolbarButton.m in Sources */,
|
||||
1929B159A8EDC43B78E512AD /* VRTextMateCppUtils.mm in Sources */,
|
||||
1929B55E015D40CDDCE5A13F /* VRWorkspaceView.m in Sources */,
|
||||
1929BA0717682C263764E1D8 /* VRTextMateUiUtils.m in Sources */,
|
||||
@ -1155,9 +1218,11 @@
|
||||
1929BB368BEEB9BEDE7797D9 /* VRPrefWindow.m in Sources */,
|
||||
1929BBFC6EFD8C4DD4861506 /* VRUserDefaults.m in Sources */,
|
||||
1929BFD2A870FBF210148877 /* VRPluginManager.m in Sources */,
|
||||
4B6BDCEE1AF36DBE0019DB59 /* QVSeparatorLine.m in Sources */,
|
||||
1929BB4F2309E600CC048F28 /* VRPluginManagerTest.m in Sources */,
|
||||
1929BEFE9E22FDC8EBD5A63D /* VRDummyPlugins.m in Sources */,
|
||||
1929B1EAA9A1E1827AD89D73 /* VRNoPluginPreviewView.m in Sources */,
|
||||
4B6BDCF01AF36DBE0019DB59 /* QVTool.m in Sources */,
|
||||
1929B620973945EF0B21A31F /* VRPreviewWindowController.m in Sources */,
|
||||
1929BA323D66CF24342883A8 /* VRPrefPane.m in Sources */,
|
||||
1929B489548A5818E1BA83F3 /* VRGeneralPrefPane.m in Sources */,
|
||||
@ -1177,8 +1242,10 @@
|
||||
1929BB4053A03944A91AB10E /* VRPropertyService.m in Sources */,
|
||||
1929BA1E08F2DA3328BA7D3C /* NSStringCategoryTest.m in Sources */,
|
||||
1929BACF4FF114769BC0DCA8 /* VROpenQuicklyIgnorePattern.m in Sources */,
|
||||
4B6BDCF21AF36DBE0019DB59 /* QVToolbar.m in Sources */,
|
||||
1929BCAAC084135BB4FB7A8E /* VROpenQuicklyIgnorePatternTest.m in Sources */,
|
||||
1929B9FD4D9474227497BFF0 /* VRMenuItem.m in Sources */,
|
||||
4B6BDCEC1AF36DBE0019DB59 /* NSView+QVWorkspace.m in Sources */,
|
||||
1929B7B8C69FAD008AFD9E13 /* VRKeyBinding.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
||||
@ -333,8 +333,7 @@ Gw
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Navigate" id="Qkn-nP-qpX">
|
||||
<items>
|
||||
<menuItem title="Show Folders First" id="jSN-4m-3wl" customClass="VRMenuItem">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menuItem title="Show Folders First" keyEquivalent="D" id="jSN-4m-3wl" customClass="VRMenuItem">
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="menuItemIdentifier" value="navigate.show-folders-first"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
@ -342,8 +341,7 @@ Gw
|
||||
<action selector="toggleShowFoldersFirst:" target="-1" id="HcS-j8-6t6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Show Hidden Files" id="9fO-Qz-cWQ" customClass="VRMenuItem">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menuItem title="Show Hidden Files" keyEquivalent="I" id="9fO-Qz-cWQ" customClass="VRMenuItem">
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="menuItemIdentifier" value="navigate.show-hidden-files"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
|
||||
@ -228,7 +228,7 @@ static const int qMinimumFileBrowserWidth = 100;
|
||||
_fileBrowserWidth = savedSidebarWidth;
|
||||
}
|
||||
|
||||
_cachedFileBrowserView = [_fileBrowserViewFactory newFileBrowserViewWithWorkspaceView:self rootUrl:self.mainWindowController.workingDirectory];
|
||||
_cachedFileBrowserView = [_fileBrowserViewFactory newFileBrowserViewWithVimController:self rootUrl:self.mainWindowController.workingDirectory];
|
||||
[_cachedFileBrowserView setUp];
|
||||
|
||||
if ([_userDefaults boolForKey:qDefaultShowSideBar]) {
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
@class VRFileBrowserOutlineView;
|
||||
@class VRNode;
|
||||
@class VRWorkspaceView;
|
||||
@class MMVimController;
|
||||
|
||||
@protocol VRFileBrowserActionDelegate;
|
||||
|
||||
@ -30,6 +31,7 @@
|
||||
@property (nonatomic, weak) VRFileItemManager *fileItemManager;
|
||||
@property (nonatomic, weak) NSUserDefaults *userDefaults;
|
||||
@property (nonatomic, weak) NSNotificationCenter *notificationCenter;
|
||||
@property (nonatomic, weak) MMVimController *vimController;
|
||||
|
||||
@property (nonatomic) NSURL *rootUrl;
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#import <PureLayout/ALView+PureLayout.h>
|
||||
#import <MacVimFramework/MacVimFramework.h>
|
||||
#import "VRFileBrowserOutlineView.h"
|
||||
#import "VRFileBrowserView.h"
|
||||
#import "VRUtils.h"
|
||||
@ -386,10 +387,6 @@ static NSComparisonResult (^qNodeDirComparator)(NSNumber *, NSNumber *) = ^NSCom
|
||||
}
|
||||
|
||||
#pragma mark Private
|
||||
- (MMVimController *)vimController {
|
||||
return self.workspaceView.vimView.vimController;
|
||||
}
|
||||
|
||||
- (void)addViews {
|
||||
NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:@"name"];
|
||||
tableColumn.dataCell = [[OakImageAndTextCell alloc] init];
|
||||
@ -537,7 +534,7 @@ static NSComparisonResult (^qNodeDirComparator)(NSNumber *, NSNumber *) = ^NSCom
|
||||
}
|
||||
|
||||
- (NSArray *)filterWildIngoreNodes:(NSArray *)children forParentPath:(NSString *)parentPath {
|
||||
NSSet *paths = [self.workspaceView nonFilteredWildIgnorePathsForParentPath:parentPath];
|
||||
NSSet *paths = [self nonFilteredWildIgnorePathsForParentPath:parentPath];
|
||||
|
||||
NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:paths.count];
|
||||
for (VRNode *node in children) {
|
||||
@ -549,6 +546,23 @@ static NSComparisonResult (^qNodeDirComparator)(NSNumber *, NSNumber *) = ^NSCom
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSSet *)nonFilteredWildIgnorePathsForParentPath:(NSString *)path {
|
||||
NSString *pathExpression = SF(@"globpath(\"%@\", \"*\")", path);
|
||||
NSString *dotPathExpression = SF(@"globpath(\"%@\", \".*\")", path);
|
||||
|
||||
// 공부 = ACF5 BD80 in composed Unicode, what Vim returns
|
||||
// 공부 = 1100 1169 11BC 1107 116E in decomposed Unicode, what usual NSStrings use
|
||||
NSMutableSet *paths = [NSMutableSet set];
|
||||
[paths addObjectsFromArray:
|
||||
[[_vimController evaluateVimExpression:pathExpression].decomposedStringWithCanonicalMapping componentsSeparatedByString:@"\n"]
|
||||
];
|
||||
[paths addObjectsFromArray:
|
||||
[[_vimController evaluateVimExpression:dotPathExpression].decomposedStringWithCanonicalMapping componentsSeparatedByString:@"\n"]
|
||||
];
|
||||
|
||||
return paths;
|
||||
}
|
||||
|
||||
- (NSArray *)filterHiddenNodesIfNec:(NSArray *)nodes {
|
||||
if (_workspaceView.showHiddenFiles) {return nodes;}
|
||||
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
@class VRFileItemManager;
|
||||
@class VRFileBrowserView;
|
||||
@class VRWorkspaceView;
|
||||
@class MMVimController;
|
||||
|
||||
|
||||
@interface VRFileBrowserViewFactory : NSObject <TBBean>
|
||||
@ -23,6 +24,6 @@
|
||||
@property (nonatomic, weak) NSUserDefaults *userDefaults;
|
||||
@property (nonatomic, weak) NSNotificationCenter *notificationCenter;
|
||||
|
||||
- (VRFileBrowserView *)newFileBrowserViewWithWorkspaceView:(VRWorkspaceView *)workspaceView rootUrl:(NSURL *)rootUrl;
|
||||
- (VRFileBrowserView *)newFileBrowserViewWithVimController:(MMVimController *)vimController rootUrl:(NSURL *)rootUrl;
|
||||
|
||||
@end
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
* See LICENSE
|
||||
*/
|
||||
|
||||
#import <MacVimFramework/MacVimFramework.h>
|
||||
#import "VRFileBrowserViewFactory.h"
|
||||
#import "VRFileItemManager.h"
|
||||
#import "VRFileBrowserOutlineView.h"
|
||||
#import "VRFileBrowserView.h"
|
||||
#import "VRWorkspaceView.h"
|
||||
|
||||
|
||||
@implementation VRFileBrowserViewFactory
|
||||
@ -21,14 +21,14 @@
|
||||
@autowire(userDefaults)
|
||||
@autowire(notificationCenter)
|
||||
|
||||
- (VRFileBrowserView *)newFileBrowserViewWithWorkspaceView:(VRWorkspaceView *)workspaceView rootUrl:(NSURL *)rootUrl {
|
||||
- (VRFileBrowserView *)newFileBrowserViewWithVimController:(MMVimController *)vimController rootUrl:(NSURL *)rootUrl {
|
||||
VRFileBrowserView *view = [[VRFileBrowserView alloc] initWithRootUrl:rootUrl];
|
||||
|
||||
view.fileItemManager = _fileItemManager;
|
||||
view.userDefaults = _userDefaults;
|
||||
view.notificationCenter = _notificationCenter;
|
||||
view.fileManager = _fileManager;
|
||||
view.workspaceView = workspaceView;
|
||||
view.vimController = vimController;
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#import <MacVimFramework/MacVimFramework.h>
|
||||
#import "VRUserDefaults.h"
|
||||
#import "VRUserDefaultsObserver.h"
|
||||
#import "QVWorkspaceDelegate.h"
|
||||
|
||||
|
||||
@class VRWorkspaceController;
|
||||
@ -20,6 +21,9 @@
|
||||
@class VRPreviewWindowController;
|
||||
@class VRFileItemManager;
|
||||
@class VRWorkspaceViewFactory;
|
||||
@class VRFileBrowserViewFactory;
|
||||
|
||||
@protocol QVToolbarDelegate;
|
||||
|
||||
|
||||
extern const int qMainWindowBorderThickness;
|
||||
@ -29,10 +33,11 @@ extern const int qMainWindowBorderThickness;
|
||||
NSWindowDelegate,
|
||||
MMVimControllerDelegate,
|
||||
VRUserDefaultsObserver,
|
||||
NSUserInterfaceValidations>
|
||||
NSUserInterfaceValidations, QVToolbarDelegate>
|
||||
|
||||
@property (nonatomic, weak) VRWorkspace *workspace;
|
||||
@property (nonatomic, weak) VRWorkspaceViewFactory *workspaceViewFactory;
|
||||
@property (nonatomic, weak) VRFileBrowserViewFactory *fileBrowserViewFactory;
|
||||
@property (nonatomic, weak) VRFileItemManager *fileItemManager;
|
||||
@property (nonatomic, weak) VROpenQuicklyWindowController *openQuicklyWindowController;
|
||||
@property (nonatomic, weak) NSUserDefaults *userDefaults;
|
||||
@ -68,6 +73,8 @@ extern const int qMainWindowBorderThickness;
|
||||
- (IBAction)zoomOut:(id)sender;
|
||||
- (IBAction)selectNthTab:(id)sender;
|
||||
|
||||
- (IBAction)toggleSyncWorkspaceWithPwd:(NSMenuItem *)sender;
|
||||
|
||||
#pragma mark NSUserInterfaceValidations
|
||||
- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem;
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
#import <PSMTabBarControl/PSMTabBarControl.h>
|
||||
#import <MacVimFramework/MacVimFramework.h>
|
||||
#import <PureLayout/ALView+PureLayout.h>
|
||||
#import "QVToolbarDelegate.h"
|
||||
#import "VRMainWindowController.h"
|
||||
#import "VRLog.h"
|
||||
#import "VRAlert.h"
|
||||
@ -26,6 +27,10 @@
|
||||
#import "NSArray+VR.h"
|
||||
#import "VRPreviewWindowController.h"
|
||||
#import "VRWorkspaceViewFactory.h"
|
||||
#import "QVWorkspace.h"
|
||||
#import "VRFileBrowserViewFactory.h"
|
||||
#import "QVToolbarButtonDelegate.h"
|
||||
#import "QVToolbar.h"
|
||||
|
||||
|
||||
const int qMainWindowBorderThickness = 22;
|
||||
@ -46,7 +51,8 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
BOOL _needsToResizeVimView;
|
||||
BOOL _windowOriginShouldMoveToKeepOnScreen;
|
||||
|
||||
VRWorkspaceView *_workspaceView;
|
||||
QVWorkspace *_workspaceView;
|
||||
VRFileBrowserView *_fileBrowserView;
|
||||
}
|
||||
|
||||
#pragma mark Public
|
||||
@ -60,7 +66,7 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (void)updateWorkingDirectory {
|
||||
_workspaceView.fileBrowserView.rootUrl = _workspace.workingDirectory;
|
||||
_fileBrowserView.rootUrl = _workspace.workingDirectory;
|
||||
}
|
||||
|
||||
- (void)cleanUpAndClose {
|
||||
@ -70,9 +76,10 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
|
||||
[_previewWindowController close];
|
||||
|
||||
// FIXME: where is the bar?! trbl?
|
||||
if (self.window.isKeyWindow) {
|
||||
[_userDefaults setObject:NSStringFromRect(self.window.frame) forKey:qMainWindowFrameAutosaveName];
|
||||
[_userDefaults setFloat:(float) _workspaceView.fileBrowserWidth forKey:qSidebarWidthAutosaveName];
|
||||
[_userDefaults setFloat:(float) _workspaceView.leftBar.dimension forKey:qSidebarWidthAutosaveName];
|
||||
}
|
||||
|
||||
[self close];
|
||||
@ -125,6 +132,7 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (void)forceRedrawVimView {
|
||||
DDLogError(@"forcing redraw");
|
||||
[self sendCommandToVim:@":redraw!"];
|
||||
}
|
||||
|
||||
@ -248,10 +256,13 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
[_vimView selectTabWithIndex:(int) [sender tag] fromVim:NO];
|
||||
}
|
||||
|
||||
- (IBAction)toggleSyncWorkspaceWithPwd:(id)sender {
|
||||
_workspace.syncWorkspaceWithPwd = ! _workspace.syncWorkspaceWithPwd;
|
||||
[_fileBrowserView reload];
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
- (IBAction)debug1Action:(id)sender {
|
||||
[_workspaceView setFileBrowserWidth:400];
|
||||
|
||||
// DDLogDebug(@"tabs: %@", _vimController.tabs);
|
||||
// DDLogDebug(@"buffers: %@", _vimController.buffers);
|
||||
// NSMenu *menu = _vimController.mainMenu;
|
||||
@ -309,6 +320,12 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
[_userDefaults removeObserver:self forKeyPath:qDefaultAutoSaveOnCursorHold];
|
||||
}
|
||||
|
||||
#pragma mark QVToolbarDelegate
|
||||
- (void)toolbarChangedDimension:(QVToolbar *)toolbar {
|
||||
DDLogError(@"toolbar changed!");
|
||||
[self forceRedrawVimView];
|
||||
}
|
||||
|
||||
#pragma mark MMViewDelegate informal protocol
|
||||
/**
|
||||
* Resize code
|
||||
@ -488,7 +505,8 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (void)controller:(MMVimController *)controller openWindowWithData:(NSData *)data {
|
||||
self.window.acceptsMouseMovedEvents = YES; // Vim wants to have mouse move events
|
||||
// FIXME find out why Vim wants to get the mouse events!
|
||||
// self.window.acceptsMouseMovedEvents = YES; // Vim wants to have mouse move events
|
||||
|
||||
[self updateResizeConstraints];
|
||||
|
||||
@ -549,7 +567,7 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (void)controller:(MMVimController *)controller setVimState:(NSDictionary *)vimState data:(NSData *)data {
|
||||
if (_workspaceView.syncWorkspaceWithPwd) {
|
||||
if (_workspace.syncWorkspaceWithPwd) {
|
||||
NSString *pwdPath = _vimController.vimState[@"pwd"];
|
||||
if (![_workspace.workingDirectory.path isEqualToString:pwdPath]) {
|
||||
[_workspace updateWorkingDirectoryToUrl:[[NSURL alloc] initFileURLWithPath:pwdPath]];
|
||||
@ -558,13 +576,14 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (void)controller:(MMVimController *)controller setWindowTitle:(NSString *)title data:(NSData *)data {
|
||||
// FIXME
|
||||
[self setWindowTitleToCurrentBuffer];
|
||||
|
||||
if (!_vimController.currentBuffer.fileName) {
|
||||
[_workspaceView setUrlOfPathControl:_workspace.workingDirectory];
|
||||
} else {
|
||||
[_workspaceView setUrlOfPathControl:[NSURL fileURLWithPath:_vimController.currentBuffer.fileName]];
|
||||
}
|
||||
// if (!_vimController.currentBuffer.fileName) {
|
||||
// [_workspaceView setUrlOfPathControl:_workspace.workingDirectory];
|
||||
// } else {
|
||||
// [_workspaceView setUrlOfPathControl:[NSURL fileURLWithPath:_vimController.currentBuffer.fileName]];
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
@ -860,11 +879,15 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
_vimView.tabBarControl.styleNamed = @"Metal";
|
||||
|
||||
_workspaceView = [_workspaceViewFactory newWorkspaceViewWithFrame:CGRectZero vimView:_vimView];
|
||||
_workspaceView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
_workspaceView.leftBar.delegate = self;
|
||||
|
||||
NSView *contentView = self.window.contentView;
|
||||
[contentView addSubview:_workspaceView];
|
||||
[_workspaceView setUp];
|
||||
// FIXME: nil workspace view
|
||||
_fileBrowserView = [_fileBrowserViewFactory newFileBrowserViewWithVimController:_vimController rootUrl:self.workingDirectory];
|
||||
[_fileBrowserView setUp];
|
||||
|
||||
[_workspaceView addToolView:_fileBrowserView displayName:@"Files" location:QVToolbarLocationLeft];
|
||||
|
||||
[self.window.contentView addSubview:_workspaceView];
|
||||
|
||||
[_workspaceView autoPinEdgesToSuperviewEdgesWithInsets:ALEdgeInsetsZero];
|
||||
}
|
||||
@ -936,7 +959,7 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
- (void)updateBuffersInTabs {
|
||||
[_workspace updateBuffersInTabs];
|
||||
|
||||
if (_workspaceView.syncWorkspaceWithPwd) {
|
||||
if (_workspace.syncWorkspaceWithPwd) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -971,7 +994,7 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
}
|
||||
|
||||
- (BOOL)fileBrowserVisible {
|
||||
return _workspaceView.fileBrowserView != nil;
|
||||
return _workspaceView.leftBar.hasActiveTool;
|
||||
}
|
||||
|
||||
- (NSData *)vimArgsAsDataFromUrl:(NSURL *)url mode:(NSUInteger)mode {
|
||||
@ -990,8 +1013,9 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
- (CGSize)uncorrectedVimViewSizeForWinFrameRect:(CGRect)winFrameRect {
|
||||
CGSize winContentSize = [self.window contentRectForFrameRect:winFrameRect].size;
|
||||
|
||||
winContentSize.width = winContentSize.width - _workspaceView.sidebarAndDividerWidth;
|
||||
winContentSize.height = winContentSize.height - (_workspaceView.showStatusBar ? (qMainWindowBorderThickness + 1) : 0);
|
||||
// FIXME
|
||||
winContentSize.width = winContentSize.width - _workspaceView.leftBar.dimension;
|
||||
winContentSize.height = winContentSize.height;// - (_workspaceView.showStatusBar ? (qMainWindowBorderThickness + 1) : 0);
|
||||
|
||||
return winContentSize;
|
||||
}
|
||||
@ -1000,9 +1024,10 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
* Resize code
|
||||
*/
|
||||
- (CGSize)winContentSizeForVimViewSize:(CGSize)vimViewSize {
|
||||
// FIXME
|
||||
return CGSizeMake(
|
||||
_workspaceView.sidebarAndDividerWidth + vimViewSize.width,
|
||||
vimViewSize.height + (_workspaceView.showStatusBar ? (qMainWindowBorderThickness + 1) : 0)
|
||||
_workspaceView.leftBar.dimension + vimViewSize.width,
|
||||
vimViewSize.height// + (_workspaceView.showStatusBar ? (qMainWindowBorderThickness + 1) : 0)
|
||||
);
|
||||
}
|
||||
|
||||
@ -1137,8 +1162,9 @@ static NSString *const qMainWindowFrameAutosaveName = @"main-window-frame-autosa
|
||||
winFrameRect.size = [self winContentSizeForVimViewSize:_vimView.minSize];
|
||||
self.window.minSize = [self.window frameRectForContentRect:winFrameRect].size;
|
||||
|
||||
// FIXME
|
||||
// We also update the increment of the workspace view, because it could be that the font size has changed
|
||||
_workspaceView.dragIncrement = (NSUInteger) _vimView.textView.cellSize.width;
|
||||
_workspaceView.leftBar.dragIncrement = (NSUInteger) _vimView.textView.cellSize.width;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
@class VRFileItemManager;
|
||||
@class VROpenQuicklyWindowController;
|
||||
@class VRWorkspaceViewFactory;
|
||||
@class VRFileBrowserViewFactory;
|
||||
|
||||
|
||||
@interface VRMainWindowControllerFactory : NSObject <TBBean>
|
||||
@ -28,6 +29,7 @@
|
||||
@property (nonatomic, weak) VROpenQuicklyWindowController *openQuicklyWindowController;
|
||||
@property (nonatomic, weak) NSNotificationCenter *notificationCenter;
|
||||
@property (nonatomic, weak) VRWorkspaceViewFactory *workspaceViewFactory;
|
||||
@property (nonatomic, weak) VRFileBrowserViewFactory *fileBrowserViewFactory;
|
||||
@property (nonatomic, unsafe_unretained) NSFontManager *fontManager;
|
||||
|
||||
- (VRMainWindowController *)newMainWindowControllerWithContentRect:(CGRect)contentRect
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
#import "VRFileItemManager.h"
|
||||
#import "VROpenQuicklyWindowController.h"
|
||||
#import "VRWorkspaceViewFactory.h"
|
||||
#import "VRFileBrowserViewFactory.h"
|
||||
|
||||
|
||||
@implementation VRMainWindowControllerFactory
|
||||
@ -26,9 +27,13 @@
|
||||
@autowire(pluginManager)
|
||||
@autowire(notificationCenter)
|
||||
@autowire(workspaceViewFactory)
|
||||
@autowire(fileBrowserViewFactory)
|
||||
@autowire(fontManager)
|
||||
|
||||
- (VRMainWindowController *)newMainWindowControllerWithContentRect:(CGRect)contentRect workspace:(VRWorkspace *)workspace vimController:(MMVimController *)vimController {
|
||||
- (VRMainWindowController *)newMainWindowControllerWithContentRect:(CGRect)contentRect
|
||||
workspace:(VRWorkspace *)workspace
|
||||
vimController:(MMVimController *)vimController {
|
||||
|
||||
VRMainWindowController *mainWinController = [[VRMainWindowController alloc] initWithContentRect:contentRect];
|
||||
mainWinController.workspace = workspace;
|
||||
mainWinController.vimController = vimController;
|
||||
@ -36,6 +41,7 @@
|
||||
mainWinController.openQuicklyWindowController = _openQuicklyWindowController;
|
||||
mainWinController.userDefaults = _userDefaults;
|
||||
mainWinController.workspaceViewFactory = _workspaceViewFactory;
|
||||
mainWinController.fileBrowserViewFactory = _fileBrowserViewFactory;
|
||||
mainWinController.fontManager = _fontManager;
|
||||
|
||||
mainWinController.vimView = vimController.vimView;
|
||||
|
||||
@ -31,6 +31,8 @@
|
||||
@property (nonatomic) VRMainWindowController *mainWindowController;
|
||||
@property (nonatomic) NSURL *workingDirectory;
|
||||
|
||||
@property (nonatomic) BOOL syncWorkspaceWithPwd;
|
||||
|
||||
#pragma mark Public
|
||||
- (void)ensureUrlsAreVisible:(NSArray *)urls;
|
||||
- (BOOL)isOnlyWorkspace;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
@class VRFileBrowserViewFactory;
|
||||
@class VRWorkspaceView;
|
||||
@class QVWorkspace;
|
||||
|
||||
|
||||
@interface VRWorkspaceViewFactory : NSObject <TBBean>
|
||||
@ -20,6 +20,6 @@
|
||||
@property (nonatomic, weak) NSUserDefaults *userDefaults;
|
||||
@property (nonatomic, weak) VRFileBrowserViewFactory *fileBrowserViewFactory;
|
||||
|
||||
- (VRWorkspaceView *)newWorkspaceViewWithFrame:(NSRect)frame vimView:(MMVimView *)vimView;
|
||||
- (QVWorkspace *)newWorkspaceViewWithFrame:(NSRect)frame vimView:(MMVimView *)vimView;
|
||||
|
||||
@end
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
*/
|
||||
|
||||
#import <MacVimFramework/MacVimFramework.h>
|
||||
#import <PureLayout/ALView+PureLayout.h>
|
||||
#import "VRWorkspaceViewFactory.h"
|
||||
#import "VRFileBrowserViewFactory.h"
|
||||
#import "VRWorkspaceView.h"
|
||||
#import "QVWorkspace.h"
|
||||
|
||||
|
||||
@implementation VRWorkspaceViewFactory
|
||||
@ -18,12 +18,10 @@
|
||||
@autowire(userDefaults)
|
||||
@autowire(fileBrowserViewFactory)
|
||||
|
||||
- (VRWorkspaceView *)newWorkspaceViewWithFrame:(NSRect)frame vimView:(MMVimView *)vimView {
|
||||
VRWorkspaceView *view = [[VRWorkspaceView alloc] initWithFrame:frame];
|
||||
- (QVWorkspace *)newWorkspaceViewWithFrame:(NSRect)frame vimView:(MMVimView *)vimView {
|
||||
QVWorkspace *view = [[QVWorkspace alloc] initForAutoLayout];
|
||||
|
||||
view.fileBrowserViewFactory = _fileBrowserViewFactory;
|
||||
view.userDefaults = _userDefaults;
|
||||
view.vimView = vimView;
|
||||
view.centerView = vimView;
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
1
qvworkspace
Submodule
1
qvworkspace
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 6b7acde88b5a3b7003d98646b81cf35bbe8d79f3
|
||||
Loading…
Reference in New Issue
Block a user