mac m2 update

midoks · Nov 9, 2023 · f6038ee · f6038ee
1 parent 67e1096
commit f6038ee
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/mdserver/mdserver.xcodeproj/project.pbxproj b/mdserver/mdserver.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
 		82F8CFEA1A70E5FC00B9FD25 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1230;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = midoks.cachecha.com;
 				TargetAttributes = {
 					82F8CFF11A70E5FC00B9FD25 = {
@@ -589,7 +589,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				INFOPLIST_FILE = mdserver/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 4.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.midoks.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -605,7 +605,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				INFOPLIST_FILE = mdserver/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 4.0.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.midoks.$(PRODUCT_NAME:rfc1034identifier)";
@@ -628,6 +628,7 @@
 				);
 				INFOPLIST_FILE = mdserverTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.midoks.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/mdserver.app/Contents/MacOS/mdserver";
@@ -645,6 +646,7 @@
 				);
 				INFOPLIST_FILE = mdserverTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.midoks.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/mdserver.app/Contents/MacOS/mdserver";

diff --git a/...codeproj/project.xcworkspace/xcuserdata/midoks.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/midoks.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/mdserver/mdserver.xcodeproj/xcuserdata/midoks.xcuserdatad/xcschemes/mdserver.xcscheme b/mdserver/mdserver.xcodeproj/xcuserdata/midoks.xcuserdatad/xcschemes/mdserver.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/mdserver/mdserver/AppDelegate.m b/mdserver/mdserver/AppDelegate.m
@@ -45,7 +45,7 @@ -(void)alert:(NSString *)content
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText:@"提示"];
     [alert setInformativeText:content];
-    [alert setAlertStyle:NSInformationalAlertStyle];
+    [alert setAlertStyle:NSAlertStyleInformational];
     [alert runModal];
 }
 

diff --git a/mdserver/mdserver/Controller/HostNameController.m b/mdserver/mdserver/Controller/HostNameController.m
@@ -191,7 +191,7 @@ -(IBAction)remove:(id)sender
             [alert setInformativeText:@"你是否确认删除有设置路径的配置"];
             [alert addButtonWithTitle:@"确定"];
             [alert addButtonWithTitle:@"取消"];
-            [alert setAlertStyle:NSInformationalAlertStyle];
+            [alert setAlertStyle:NSAlertStyleInformational];
             NSModalResponse r = [alert runModal];
 
             if (r != 1000) {
@@ -324,7 +324,7 @@ -(IBAction)save:(id)sender
         [alert setInformativeText:@"你是否重新启动服务?"];
         [alert addButtonWithTitle:@"确定"];
         [alert addButtonWithTitle:@"取消"];
-        [alert setAlertStyle:NSInformationalAlertStyle];
+        [alert setAlertStyle:NSAlertStyleInformational];
         NSModalResponse r = [alert runModal];
 
         if (1001 == r) {

diff --git a/mdserver/mdserver/NSCommon.m b/mdserver/mdserver/NSCommon.m
@@ -20,7 +20,7 @@ +(void)alert:(NSString *)content
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText:@"提示"];
     [alert setInformativeText:content];
-    [alert setAlertStyle:NSInformationalAlertStyle];
+    [alert setAlertStyle:NSAlertStyleInformational];
     [alert runModal];
 }
 
@@ -29,7 +29,7 @@ +(void)alert:(NSString *)content delayedClose:(float)t
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText:@"提示"];
     [alert setInformativeText:content];
-    [alert setAlertStyle:NSInformationalAlertStyle];
+    [alert setAlertStyle:NSAlertStyleInformational];
     [alert runModal];
 
     //[alert cl];
@@ -130,22 +130,23 @@ +(NSString *)getAppDir
 #pragma mark 获取运行根目录
 + (NSString *)getRootDir
 {
-    char path[1024];
-    unsigned size = 1024;
-
-    _NSGetExecutablePath(path, &size);
-    path[size] = '\0';
-
-    NSString *str = [NSString stringWithFormat:@"%s", path];
-    str = [self getDirName:str];
-    str = [self getDirName:str];
-    str = [self getDirName:str];
-    str = [self getDirName:str];
+//    char path[1024];
+//    unsigned size = 1024;
+//    
+//    _NSGetExecutablePath(path, &size);
+//    path[size] = '\0';
+//    
+//    NSString *str = [NSString stringWithFormat:@"%s", path];
+//    str = [self getDirName:str];
+//    str = [self getDirName:str];
+//    str = [self getDirName:str];
+//    str = [self getDirName:str];
 
 //    str = [NSString stringWithFormat:@"%@/mdserver/", str];
 //    NSLog(@"debug:%@", str);
-    str = [NSString stringWithFormat:@"/Applications/mdserver/%@", @""];
-    return str;
+//    return str;
+    NSString *root_path = [NSString stringWithFormat:@"/Applications/mdserver/%@", @""];
+    return root_path;
 }
 
 +(NSString *)getBundleName{

diff --git a/mdserver/mdserver/NSTextField+Copypast.m b/mdserver/mdserver/NSTextField+Copypast.m
@@ -15,7 +15,7 @@ @implementation NSTextField (Copypast)
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event
 {
-    if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask) {
+    if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagCommand) {
         // The command key is the ONLY modifier key being pressed.
         if ([[event charactersIgnoringModifiers] isEqualToString:@"x"]) {
             return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];