Skip to content

Commit

Permalink
2.5 - Organize xib files and localize xibs. Add the ability to modify…
Browse files Browse the repository at this point in the history 
… personal tags. Fix MyAnimeList importer with entries being added/updated with the wrong status. Add ability to import tags associated with a list entry for MyAnimeList XML importing. Add type column for Manga List and Manga Search table views. Remove preference option “Use Filters as Tabs” as this will always be the default.Update URLs and copyright year.
  • Loading branch information
桐間紗路 authored and 桐間紗路 committed Dec 4, 2017
1 parent f1b40c4 commit 404a3bb
Show file tree
Hide file tree
Showing 81 changed files with 403 additions and 334 deletions.
4 changes: 2 additions & 2 deletions License.md
View file
@@ -1,4 +1,4 @@
Copyright © 2017, Atelier Shiori.
Copyright © 2017-2018, Atelier Shiori, Moy IT Solutions
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand All @@ -10,4 +10,4 @@ Redistribution and use in source and binary forms, with or without modification,
3. Neither the name of the Atelier Shiori nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.


THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
74 changes: 41 additions & 33 deletions MAL Library.xcodeproj/project.pbxproj
View file
Expand Up @@ -590,6 +590,46 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2D4C22161FA7B1ED00539245 /* XIB */ = {
isa = PBXGroup;
children = (
915E8C4D1E8C235D005A49A4 /* AddTitle.xib */,
910589F21E981E2400501B9A /* AdvancedPref.xib */,
915E8C501E8C2362005A49A4 /* AdvancedSearch.xib */,
91B378B51E989C7C000061E6 /* AiringView.xib */,
2D4E01121FA3B1C10053A82B /* CharactersBrowser.xib */,
2D4E01161FA3B1C90053A82B /* CharacterView.xib */,
917897ED1E89F19900C155DF /* DonationWindow.xib */,
915E8C5D1E8C2B4D005A49A4 /* EditTitle.xib */,
9199BAE21E89843300F6E9FF /* GeneralPref.xib */,
91B378B91E989C83000061E6 /* HistoryView.xib */,
2D8BF8BA1EC4EED80068856A /* ImportPrompt.xib */,
9188226F1E8C90A700C7FEF1 /* InfoView.xib */,
2D8BF8B61EC4EED30068856A /* ListImport.xib */,
2D371E821ECFA3E400F47138 /* ListStatistics.xib */,
916502C61E8C65A500565D30 /* ListView.xib */,
9199BAE41E89843300F6E9FF /* LoginView.xib */,
913A11AC1E8F212600450B66 /* MainMenu-AppStore.xib */,
9199BAA11E89836000F6E9FF /* MainMenu.xib */,
9199BAE61E89843300F6E9FF /* MainWindow.xib */,
2D20C4F11EB8FF6000B241B9 /* messagecomposer.xib */,
91822A5B1EAEAC70005E33DB /* messageswindow.xib */,
91822A5F1EAEAC77005E33DB /* messageview.xib */,
916502C91E8C65A900565D30 /* NotLoggedIn.xib */,
2D4E010A1FA3B1A10053A82B /* ProfileViewController.xib */,
2D4E010E1FA3B1A70053A82B /* ProfileWindowController.xib */,
2D371E861ECFA3E700F47138 /* ratingchartview.xib */,
91822A631EAEAC88005E33DB /* RecommendedTitleView.xib */,
2D20C4F51EB8FF7600B241B9 /* ReviewView.xib */,
2D8BF8AF1EC4ED800068856A /* ReviewWindow.xib */,
91999D041E8C7DFE0026D3E9 /* SearchView.xib */,
91999D0C1E8C86A40026D3E9 /* SeasonView.xib */,
9199BAE81E89843300F6E9FF /* SoftwareUpdateView.xib */,
2D4E011A1FA3B1D50053A82B /* StreamPopup.xib */,
);
name = XIB;
sourceTree = "<group>";
};
2D60A1201E9B322A0034C3AA /* MAL LibraryUITests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -671,18 +711,14 @@
91D3D89D1E89C0020046C4CC /* about */,
915E8C461E8C1AEC005A49A4 /* AddTitle.h */,
915E8C471E8C1AEC005A49A4 /* AddTitle.m */,
915E8C4D1E8C235D005A49A4 /* AddTitle.xib */,
910589E81E981E1A00501B9A /* AdvancedPref.h */,
910589E91E981E1A00501B9A /* AdvancedPref.m */,
910589F21E981E2400501B9A /* AdvancedPref.xib */,
915E8C411E8C0ACC005A49A4 /* AdvancedSearch.h */,
915E8C421E8C0ACC005A49A4 /* AdvancedSearch.m */,
915E8C501E8C2362005A49A4 /* AdvancedSearch.xib */,
2D42FA951F2511D700FDEA60 /* AFHTTPSessionManager+Synchronous.h */,
2D42FA961F2511D700FDEA60 /* AFHTTPSessionManager+Synchronous.m */,
91D094CD1E9876D8009454F8 /* AiringView.h */,
91D094CE1E9876D8009454F8 /* AiringView.m */,
91B378B51E989C7C000061E6 /* AiringView.xib */,
2D0A64561F5B22A00001C906 /* AniListImport.h */,
2D0A64571F5B22A00001C906 /* AniListImport.m */,
2D8A41F71E9AB41600CE52B2 /* AppDelegate.h */,
Expand All @@ -691,18 +727,14 @@
9168F92A1E89858900CCB5B3 /* Base64Category.m */,
2D8A47B01F290E2200FC2B35 /* CharactersBrowser.h */,
2D8A47B11F290E2200FC2B35 /* CharactersBrowser.m */,
2D4E01121FA3B1C10053A82B /* CharactersBrowser.xib */,
2D8A47B71F292D1800FC2B35 /* CharacterView.h */,
2D8A47B81F292D1800FC2B35 /* CharacterView.m */,
2D4E01161FA3B1C90053A82B /* CharacterView.xib */,
59E8DDEF1F64C65C00A34A51 /* ClientConstants.h */,
59E8DDF01F64C65C00A34A51 /* ClientConstants.m */,
917897ED1E89F19900C155DF /* DonationWindow.xib */,
917897E61E89E6AD00C155DF /* DonationWindowController.h */,
917897E71E89E6AD00C155DF /* DonationWindowController.m */,
915E8C561E8C24B3005A49A4 /* EditTitle.h */,
915E8C571E8C24B3005A49A4 /* EditTitle.m */,
915E8C5D1E8C2B4D005A49A4 /* EditTitle.xib */,
2DC28DC61EB8DF64005B7B77 /* ESCssParser.h */,
2DC28DC71EB8DF64005B7B77 /* ESCssParser.m */,
2DC28DC81EB8DF64005B7B77 /* ESCssTokenizer.m */,
Expand All @@ -711,54 +743,40 @@
9199BAEF1E89843B00F6E9FF /* Frameworks */,
9199BAB11E89842400F6E9FF /* GeneralPref.h */,
9199BAB21E89842400F6E9FF /* GeneralPref.m */,
9199BAE21E89843300F6E9FF /* GeneralPref.xib */,
91D094BF1E983095009454F8 /* HistoryView.h */,
91D094C01E983095009454F8 /* HistoryView.m */,
91B378B91E989C83000061E6 /* HistoryView.xib */,
2DA42F1D1EB79B200006FB9F /* HTMLtoBBCode.h */,
2DA42F1E1EB79B200006FB9F /* HTMLtoBBCode.m */,
2D08F51D1ECDE3470047A2BF /* imagecachetransformer.h */,
2D08F51E1ECDE3470047A2BF /* imagecachetransformer.m */,
2D8BF8A81EC4D6DC0068856A /* ImportPrompt.h */,
2D8BF8A91EC4D6DC0068856A /* ImportPrompt.m */,
2D8BF8BA1EC4EED80068856A /* ImportPrompt.xib */,
913A11AB1E8F206A00450B66 /* Info-AppStore.plist */,
9199BAA41E89836000F6E9FF /* Info.plist */,
91999D0F1E8C88280026D3E9 /* InfoView.h */,
91999D101E8C88280026D3E9 /* InfoView.m */,
9188226F1E8C90A700C7FEF1 /* InfoView.xib */,
9168F92C1E89861300CCB5B3 /* Keychain.h */,
91D3D89E1E89C0E40046C4CC /* Keychain.m */,
2D86F1891EC21D4B00650E34 /* ListExporter.h */,
2D86F18A1EC21D4B00650E34 /* ListExporter.m */,
2D94612B1EC38CC8004E171B /* ListImport.h */,
2D94612C1EC38CC8004E171B /* ListImport.m */,
2D8BF8B61EC4EED30068856A /* ListImport.xib */,
2D371E711ECF8AF500F47138 /* ListStatistics.h */,
2D371E721ECF8AF500F47138 /* ListStatistics.m */,
2D371E821ECFA3E400F47138 /* ListStatistics.xib */,
916502BA1E8C576B00565D30 /* ListView.h */,
916502BB1E8C576B00565D30 /* ListView.m */,
916502C61E8C65A500565D30 /* ListView.xib */,
9199BAB61E89842400F6E9FF /* LoginPref.h */,
9199BAB71E89842400F6E9FF /* LoginPref.m */,
9199BAE41E89843300F6E9FF /* LoginView.xib */,
9199BAB81E89842400F6E9FF /* main.m */,
913A11AC1E8F212600450B66 /* MainMenu-AppStore.xib */,
9199BAA11E89836000F6E9FF /* MainMenu.xib */,
9199BAB91E89842400F6E9FF /* MainWindow.h */,
9199BABA1E89842400F6E9FF /* MainWindow.m */,
9199BAE61E89843300F6E9FF /* MainWindow.xib */,
916EABCE1E8F252600DC5C2A /* MAL Library.entitlements */,
2DAA9FBF1EB6524A00F562BD /* messagecomposer.h */,
2DAA9FC01EB6524A00F562BD /* messagecomposer.m */,
2D20C4F11EB8FF6000B241B9 /* messagecomposer.xib */,
91DAFC5A1EAE6C9F0037A6F2 /* messageswindow.h */,
91DAFC5B1EAE6C9F0037A6F2 /* messageswindow.m */,
91822A5B1EAEAC70005E33DB /* messageswindow.xib */,
91DAFC611EAE6FA20037A6F2 /* messageview.h */,
91DAFC621EAE6FA20037A6F2 /* messageview.m */,
91822A5F1EAEAC77005E33DB /* messageview.xib */,
9199BABB1E89842400F6E9FF /* MSWeakTimer.h */,
9199BABC1E89842400F6E9FF /* MSWeakTimer.m */,
9167E3D71E9D5FA5002CF119 /* MyAnimeList.h */,
Expand All @@ -767,7 +785,6 @@
2D7877751F87E44000AD40F1 /* MyListView.m */,
916502BF1E8C606E00565D30 /* NotLoggedIn.h */,
916502C01E8C606E00565D30 /* NotLoggedIn.m */,
916502C91E8C65A900565D30 /* NotLoggedIn.xib */,
9199BABD1E89842400F6E9FF /* NSNumberFormatterNumberOnly.h */,
9199BABE1E89842400F6E9FF /* NSNumberFormatterNumberOnly.m */,
2D6ECA321F2E9B20003C455E /* NSString_stripHtml.h */,
Expand All @@ -787,33 +804,24 @@
9199BAC51E89842400F6E9FF /* Preferences.h */,
2DA863EE1F89B2F300D2876A /* ProfileViewController.h */,
2DA863EF1F89B2F300D2876A /* ProfileViewController.m */,
2D4E010A1FA3B1A10053A82B /* ProfileViewController.xib */,
2DA863E71F895F9B00D2876A /* ProfileWindowController.h */,
2DA863E81F895F9B00D2876A /* ProfileWindowController.m */,
2D4E010E1FA3B1A70053A82B /* ProfileWindowController.xib */,
2D371E781ECF8B4F00F47138 /* ratingchartview.h */,
2D371E791ECF8B4F00F47138 /* ratingchartview.m */,
2D371E861ECFA3E700F47138 /* ratingchartview.xib */,
91822A491EAE99E6005E33DB /* RecommendedTitleView.h */,
91822A4A1EAE99E6005E33DB /* RecommendedTitleView.m */,
91822A631EAEAC88005E33DB /* RecommendedTitleView.xib */,
91999D0E1E8C87F10026D3E9 /* Resources */,
91C0601C1EAD309C0099E433 /* ReviewView.m */,
2D20C4F51EB8FF7600B241B9 /* ReviewView.xib */,
91C060101EAD2CDC0099E433 /* ReviewWindow.h */,
91C060111EAD2CDC0099E433 /* ReviewWindow.m */,
2D8BF8AF1EC4ED800068856A /* ReviewWindow.xib */,
91999CFD1E8C73300026D3E9 /* SearchView.h */,
91999CFE1E8C73300026D3E9 /* SearchView.m */,
91999D041E8C7DFE0026D3E9 /* SearchView.xib */,
91999D051E8C81580026D3E9 /* SeasonView.h */,
91999D061E8C81580026D3E9 /* SeasonView.m */,
91999D0C1E8C86A40026D3E9 /* SeasonView.xib */,
2DAB19E71EF9F2C400420182 /* siteimage.h */,
2DAB19E81EF9F2C400420182 /* siteimage.m */,
9199BAC61E89842400F6E9FF /* SoftwareUpdatesPref.h */,
9199BAC71E89842400F6E9FF /* SoftwareUpdatesPref.m */,
9199BAE81E89843300F6E9FF /* SoftwareUpdateView.xib */,
9199BAC81E89842400F6E9FF /* SSKeychain.h */,
9199BAC91E89842400F6E9FF /* SSKeychain.m */,
9199BACA1E89842400F6E9FF /* SSKeychainQuery.h */,
Expand All @@ -822,14 +830,14 @@
2DAB19E41EF9ED9400420182 /* StreamDataRetriever.m */,
2DAB19DC1EF9D16800420182 /* StreamPopup.h */,
2DAB19DD1EF9D16800420182 /* StreamPopup.m */,
2D4E011A1FA3B1D50053A82B /* StreamPopup.xib */,
91B3A89E1EB0097C0066CEB1 /* StringDatetoDate.h */,
91B3A89F1EB0097C0066CEB1 /* StringDatetoDate.m */,
9199BA9C1E89836000F6E9FF /* Supporting Files */,
91D3D8A41E89C3E00046C4CC /* TypeNumtoStringType.h */,
91D3D8A51E89C3E00046C4CC /* TypeNumtoStringType.m */,
9199BACC1E89842400F6E9FF /* Utility.h */,
9199BACD1E89842400F6E9FF /* Utility.m */,
2D4C22161FA7B1ED00539245 /* XIB */,
2DC64B661EC3D661005A8BCE /* XMLReader.h */,
2DC64B671EC3D661005A8BCE /* XMLReader.m */,
);
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AddTitle.h
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/03/29.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import <Cocoa/Cocoa.h>
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AddTitle.m
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/03/29.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import "AddTitle.h"
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AdvancedPref.h
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/04/07.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import <Cocoa/Cocoa.h>
Expand Down
4 changes: 2 additions & 2 deletions MAL Library/AdvancedPref.m
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/04/07.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import "AdvancedPref.h"
Expand Down Expand Up @@ -44,7 +44,7 @@ - (NSString *)toolbarItemLabel {
#pragma mark
-(IBAction)resetMALAPI:(id)sender {
//Reset Unofficial MAL API URL
_fieldmalapi.stringValue = @"https://malapi.ateliershiori.moe";
_fieldmalapi.stringValue = @"https://malapi.malupdaterosx.moe";
// Set MAL API URL in settings
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults] ;
[defaults setObject:_fieldmalapi.stringValue forKey:@"MALAPIURL"];
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AdvancedSearch.h
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/03/29.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import <Cocoa/Cocoa.h>
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AdvancedSearch.m
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/03/29.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import "AdvancedSearch.h"
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AiringView.h
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/04/07.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import <Cocoa/Cocoa.h>
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AiringView.m
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 天々座理世 on 2017/04/07.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import "AiringView.h"
Expand Down
2 changes: 1 addition & 1 deletion MAL Library/AppDelegate.h
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 桐間紗路 on 2017/02/28.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import <Cocoa/Cocoa.h>
Expand Down
7 changes: 3 additions & 4 deletions MAL Library/AppDelegate.m
View file
Expand Up @@ -3,7 +3,7 @@
// MAL Library
//
// Created by 桐間紗路 on 2017/02/28.
// Copyright © 2017 Atelier Shiori. All rights reserved. Licensed under 3-clause BSD License
// Copyright © 2017-2018 Atelier Shiori Software and Moy IT Solutions. All rights reserved. Licensed under 3-clause BSD License
//

#import "AppDelegate.h"
Expand Down Expand Up @@ -45,8 +45,7 @@ + (void)initialize {
#endif
defaultValues[@"NSApplicationCrashOnExceptions"] = @YES;
defaultValues[@"readingfilter"] = @(1);
defaultValues[@"malapiurl"] = @"https://malapi.ateliershiori.moe";
defaultValues[@"filtersastabs"] = @(1);
defaultValues[@"malapiurl"] = @"https://malapi.malupdaterosx.moe";
defaultValues[@"stream_region"] = @(0);

//Register Dictionary
Expand Down Expand Up @@ -148,7 +147,7 @@ - (IBAction)showaboutwindow:(id)sender{
if (!_aboutWindowController) {
_aboutWindowController = [PFAboutWindowController new];
}
(self.aboutWindowController).appURL = [[NSURL alloc] initWithString:@"https://malupdaterosx.ateliershiori.moe/mallibrary/"];
(self.aboutWindowController).appURL = [[NSURL alloc] initWithString:@"https://malupdaterosx.moe/mallibrary/"];
NSMutableString *copyrightstr = [NSMutableString new];
NSDictionary *bundleDict = [NSBundle mainBundle].infoDictionary;
[copyrightstr appendFormat:@"%@ \r\r",bundleDict[@"NSHumanReadableCopyright"]];
Expand Down

0 comments on commit 404a3bb

Please sign in to comment.