updates Mac OS X icons, Info.plist and fixes Issue #329

artisan-roaster-scope · Mar 10, 2019 · c23da46 · c23da46
1 parent 742769a
commit c23da46
Show file tree

Hide file tree

Showing 34 changed files with 40,692 additions and 40,792 deletions.
diff --git a/src/Info.plist b/src/Info.plist
@@ -19,10 +19,8 @@
 			<string>Artisan Profile</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>public.plain-text</string>
-			</array>
+			<key>LSTypeIsPackage</key>
+			<false/>
 			<key>NSDocumentClass</key>
 			<string>Document</string>
 		</dict>
@@ -37,12 +35,10 @@
 			<string>Artisan Alarms</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>public.plain-text</string>
-			</array>
+			<key>LSTypeIsPackage</key>
+			<false/>
 			<key>NSDocumentClass</key>
-			<string>Document</string>
+			<string>AlarmConfigurations</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
@@ -55,12 +51,10 @@
 			<string>Artisan Palettes</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>public.plain-text</string>
-			</array>
+			<key>LSTypeIsPackage</key>
+			<false/>
 			<key>NSDocumentClass</key>
-			<string>Document</string>
+			<string>PaletteConfigurations</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
@@ -73,12 +67,10 @@
 			<string>Artisan Settings</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>public.plain-text</string>
-			</array>
+			<key>LSTypeIsPackage</key>
+			<false/>
 			<key>NSDocumentClass</key>
-			<string>Document</string>
+			<string>SettingsDocument</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
@@ -91,12 +83,26 @@
 			<string>Artisan Wheel</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
-			<key>LSItemContentTypes</key>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSDocumentClass</key>
+			<string>WheelConfigurations</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
 			<array>
-				<string>public.plain-text</string>
+				<string>athm</string>
 			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>artisanTheme.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Artisan Theme</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
 			<key>NSDocumentClass</key>
-			<string>Document</string>
+			<string>ThemeConfigurations</string>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>

diff --git a/src/artisanAlarms.icns b/src/artisanAlarms.icns
diff --git a/src/artisanPalettes.icns b/src/artisanPalettes.icns
diff --git a/src/artisanProfile.icns b/src/artisanProfile.icns
diff --git a/src/artisanSettings.icns b/src/artisanSettings.icns
diff --git a/src/artisanTheme.icns b/src/artisanTheme.icns
diff --git a/src/artisanWheel.icns b/src/artisanWheel.icns
diff --git a/src/artisanlib/main.py b/src/artisanlib/main.py
@@ -3848,8 +3848,7 @@ def checkSaved(self):
             reply = QMessageBox.warning(aw,QApplication.translate("Message","Profile unsaved", None),string,
                                 QMessageBox.Discard |QMessageBox.Save|QMessageBox.Cancel)
             if reply == QMessageBox.Save:
-                aw.fileSave(aw.curFile)  #if accepted, makes safesaveflag = False
-                return True
+                return aw.fileSave(aw.curFile)  #if accepted, makes safesaveflag = False
             elif reply == QMessageBox.Discard:
                 self.safesaveflag = False
                 return True
@@ -19546,6 +19545,7 @@ def getProfile(self):
             return None
 
     #saves recorded profile in hard drive. Called from file menu 
+    # returns True if file was saved successfully
     def fileSave(self,fname):
         try:
             filename = fname
@@ -19585,13 +19585,17 @@ def fileSave(self,fname):
                             self.saveVectorGraph(extension=".svg",fname=filename)
                         else:
                             self.resizeImg(0,1,self.qmc.autosaveimageformat,fname=filename)
+                    return True
                 else:
                     self.sendmessage(QApplication.translate("Message","Cancelled", None))
+                    return False
             else:
                 self.sendmessage(QApplication.translate("Message","Cancelled", None))
+                return False
         except Exception as ex:
             _, _, exc_tb = sys.exc_info()
             aw.qmc.adderror((QApplication.translate("Error Message", "Exception:",None) + " filesave(): {0}").format(str(ex)),exc_tb.tb_lineno)
+            return False
 
     def fileExport(self,msg,ext,dumper):
         try: