Skip to content

Commit

Permalink
HSS 1.1.5 : deactivate the medcase name field while waiting for the l…
Browse files Browse the repository at this point in the history
…ist of existing cases
  • Loading branch information
b-deville committed Dec 10, 2013
1 parent 5f3c138 commit 1f9df8b
Show file tree
Hide file tree
Showing 7 changed files with 390 additions and 1,926 deletions.
8 changes: 5 additions & 3 deletions HSS/HSS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0430;
LastUpgradeCheck = 0500;
};
buildConfigurationList = CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "HSS" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -426,7 +426,8 @@
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = NO;
SDKROOT = macosx10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx10.8;
};
name = Development;
};
Expand All @@ -437,7 +438,8 @@
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = NO;
SDKROOT = macosx10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx10.8;
};
name = Deployment;
};
Expand Down
6 changes: 3 additions & 3 deletions HSS/HSS.xcodeproj/xcshareddata/xcschemes/HSS.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0430"
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -23,8 +23,8 @@
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Development">
<Testables>
Expand Down
2 changes: 1 addition & 1 deletion HSS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.4</string>
<string>1.1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>HSS base URL</key>
Expand Down
2,275 changes: 363 additions & 1,912 deletions HSS/Resources/English.lproj/HSSExportWindow.xib

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions HSS/Sources/HSSExportWindowController.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

@interface HSSExportWindowController : NSWindowController<NSWindowDelegate,NSOutlineViewDelegate,NSMenuDelegate> {
BOOL _alreadyDidBecomeSheet;
BOOL _doneFetchingCases;
NSArray* _images;
NSArray* _series;
HSSAPISession* _session;
Expand Down
4 changes: 3 additions & 1 deletion HSS/Sources/HSSExportWindowController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ - (void)observeValueForKeyPath:(NSString*)keyPath ofObject:(id)object change:(NS

[_diagnosisField setEnabled:enable];
[_historyField setEnabled:enable];
if (enable != [_nameField isEnabled]) {
if (_doneFetchingCases && enable != [_nameField isEnabled]) {
[_nameField setEnabled:enable];
[self.medcase setCaseName:(merge? item.name : @"")];
}
Expand Down Expand Up @@ -259,6 +259,7 @@ - (void)_authSheetCallbackWithSession:(HSSAPISession*)session contextInfo:(void*

- (void)_getUserFolderTreeThread {
@autoreleasepool {
_doneFetchingCases = NO;
NSArray* related = nil;
@try {
NSError* error = nil;
Expand Down Expand Up @@ -478,6 +479,7 @@ - (void)_fillUserMedcases:(NSDictionary*)medcasesByFolder {
a.animationCurve = NSAnimationEaseIn;
[a startAnimation];
self.animation = a;
_doneFetchingCases = YES;
}

/*- (void)_getFolderThread:(NSArray*)args {
Expand Down
20 changes: 14 additions & 6 deletions HelloWorld/HelloWorld.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@
/* Begin PBXProject section */
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
};
buildConfigurationList = CE6A9A9408AC841300D0C1EE /* Build configuration list for PBXProject "HelloWorld" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
Expand Down Expand Up @@ -390,6 +392,7 @@
CE6A9A9108AC841300D0C1EE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -422,6 +425,7 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = HelloWorld;
SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
Expand All @@ -436,6 +440,7 @@
CE6A9A9208AC841300D0C1EE /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -464,6 +469,7 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = HelloWorld;
SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
Expand All @@ -477,6 +483,7 @@
CE6A9A9308AC841300D0C1EE /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
Expand All @@ -503,6 +510,7 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = HelloWorld;
SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
Expand All @@ -515,25 +523,25 @@
CE6A9A9508AC841300D0C1EE /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
MACOSX_DEPLOYMENT_TARGET = 10.5;
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Development;
};
CE6A9A9608AC841300D0C1EE /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = macosx10.7;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
SDKROOT = macosx10.8;
};
name = Deployment;
};
CE6A9A9708AC841300D0C1EE /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = macosx10.7;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
SDKROOT = macosx10.8;
};
name = Default;
};
Expand Down

0 comments on commit 1f9df8b

Please sign in to comment.