Skip to content

Commit

Permalink
com240514
Browse files Browse the repository at this point in the history
  • Loading branch information
@thierryH91200
thierryH91200 committed Jun 14, 2024
1 parent 1fe4ff4 commit 74c6cc6
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 397 deletions.
0 Doc/appcast.xml → Doc/appcastTest.xml
View file
File renamed without changes.
31 changes: 25 additions & 6 deletions Pegase.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
0315B71629C62B6D00FFE215 /* WeeklySummaryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0315B71429C62B6D00FFE215 /* WeeklySummaryController.swift */; };
0315B71729C62B6D00FFE215 /* WeeklySummaryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0315B71529C62B6D00FFE215 /* WeeklySummaryController.xib */; };
0315B71929C62D9D00FFE215 /* Transformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0315B71829C62D9D00FFE215 /* Transformable.swift */; };
0325D90C2C11895100C23376 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 0325D90B2C11895100C23376 /* Sparkle */; };
03279F9429C0B40E0027871E /* DefinitionsToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03279F7C29C0B40E0027871E /* DefinitionsToolBar.swift */; };
03279F9529C0B40E0027871E /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03279F7D29C0B40E0027871E /* Persistence.swift */; };
03279F9629C0B40E0027871E /* Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03279F7E29C0B40E0027871E /* Controller.swift */; };
Expand Down Expand Up @@ -313,7 +314,7 @@
0327A21E29C0D68F0027871E /* SchedulersDetailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0327A21C29C0D68F0027871E /* SchedulersDetailView.xib */; };
0327A22029C0D8EF0027871E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0327A21F29C0D8EF0027871E /* Assets.xcassets */; };
03A7D8A829E042B3008D9A90 /* ListTransactionsController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 03A7D8AA29E042B3008D9A90 /* ListTransactionsController.storyboard */; };
03B52F952C08910C00C16809 /* appcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 03B52F942C08910C00C16809 /* appcast.xml */; };
03B52F952C08910C00C16809 /* appcastTest.xml in Resources */ = {isa = PBXBuildFile; fileRef = 03B52F942C08910C00C16809 /* appcastTest.xml */; };
03C2B42C2C01076A0010C664 /* SchedulerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 03C2B42B2C01076A0010C664 /* SchedulerViewController.xib */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -646,7 +647,7 @@
03A7D8B029E042BD008D9A90 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/ListTransactionsController.strings; sourceTree = "<group>"; };
03A7D8B229E042BE008D9A90 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/ListTransactionsController.strings; sourceTree = "<group>"; };
03A7D8B429E042BF008D9A90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/ListTransactionsController.strings; sourceTree = "<group>"; };
03B52F942C08910C00C16809 /* appcast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = appcast.xml; sourceTree = "<group>"; };
03B52F942C08910C00C16809 /* appcastTest.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = appcastTest.xml; sourceTree = "<group>"; };
03C2B42A2C01076A0010C664 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SchedulerViewController.xib; sourceTree = "<group>"; };
03C2B42D2C01076A0010C664 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/SchedulerViewController.xcstrings; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -656,6 +657,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0325D90C2C11895100C23376 /* Sparkle in Frameworks */,
030715BF29C0A8D10028240B /* Defaults in Frameworks */,
030715BC29C0A8810028240B /* Alamofire in Frameworks */,
030715B029C0A6610028240B /* LaunchAtLogin in Frameworks */,
Expand Down Expand Up @@ -699,7 +701,7 @@
0307159529C0A58B0028240B /* Doc */ = {
isa = PBXGroup;
children = (
03B52F942C08910C00C16809 /* appcast.xml */,
03B52F942C08910C00C16809 /* appcastTest.xml */,
0307159C29C0A5B30028240B /* Capture1.png */,
030715A029C0A5B30028240B /* Capture2.png */,
0307159729C0A5B20028240B /* Capture3.png */,
Expand Down Expand Up @@ -1590,6 +1592,7 @@
030715B829C0A75C0028240B /* Charts */,
030715BB29C0A8810028240B /* Alamofire */,
030715BE29C0A8D10028240B /* Defaults */,
0325D90B2C11895100C23376 /* Sparkle */,
);
productName = Pegase;
productReference = 0310777129BF403C002B7F0C /* Pegase.app */;
Expand Down Expand Up @@ -1631,6 +1634,7 @@
030715B729C0A75C0028240B /* XCRemoteSwiftPackageReference "Charts" */,
030715BA29C0A8810028240B /* XCRemoteSwiftPackageReference "Alamofire" */,
030715BD29C0A8D10028240B /* XCRemoteSwiftPackageReference "Defaults" */,
0325D90A2C11895100C23376 /* XCRemoteSwiftPackageReference "Sparkle" */,
);
productRefGroup = 0310777229BF403C002B7F0C /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1696,7 +1700,7 @@
0327A12729C0D0560027871E /* RubricBarController.xib in Resources */,
0327A11A29C0CF800027871E /* RubriqueModalWindowController.xib in Resources */,
0327A0B329C0CAA70027871E /* Feeds.plist in Resources */,
03B52F952C08910C00C16809 /* appcast.xml in Resources */,
03B52F952C08910C00C16809 /* appcastTest.xml in Resources */,
0327A0C629C0CBFE0027871E /* CURTAINS OPEN.wav in Resources */,
0327A1BC29C0D3560027871E /* TresorerieViewController.xib in Resources */,
0327A1A829C0D3010027871E /* ListBankStatementDetailview.xib in Resources */,
Expand Down Expand Up @@ -2217,6 +2221,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Pegase/Pegase.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 96;
Expand All @@ -2233,7 +2238,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.15;
MARKETING_VERSION = 1.16;
PRODUCT_BUNDLE_IDENTIFIER = th.Pegase;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -2249,6 +2254,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Pegase/Pegase.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 96;
Expand All @@ -2265,7 +2271,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.15;
MARKETING_VERSION = 1.16;
PRODUCT_BUNDLE_IDENTIFIER = th.Pegase;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -2345,6 +2351,14 @@
kind = branch;
};
};
0325D90A2C11895100C23376 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.6.3;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -2378,6 +2392,11 @@
package = 030715BD29C0A8D10028240B /* XCRemoteSwiftPackageReference "Defaults" */;
productName = Defaults;
};
0325D90B2C11895100C23376 /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = 0325D90A2C11895100C23376 /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
Expand Down
11 changes: 10 additions & 1 deletion Pegase.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "4374cd93d6d2c38b7f4bf34e45b090f622d16ee1d0abc784147e4230a0edd6d7",
"originHash" : "db947abf955dada15608502f24695d9889348333f1ba6e53ddc7d9d0d73b1629",
"pins" : [
{
"identity" : "alamofire",
Expand Down Expand Up @@ -37,6 +37,15 @@
"revision" : "7ad6331f9c38953eb1ce8737758e18f7607e984a"
}
},
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle",
"state" : {
"revision" : "b456fd404954a9e13f55aa0c88cd5a40b8399638",
"version" : "2.6.3"
}
},
{
"identity" : "swift-algorithms",
"kind" : "remoteSourceControl",
Expand Down
20 changes: 18 additions & 2 deletions Pegase.xcodeproj/xcuserdata/thierryh24.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CCBAA365-2E48-4B7F-9CCE-959F31054B92"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Pegase/Group/ReferenceAccount/Schedulers/SchedulerViewController.swift"
Expand All @@ -40,7 +40,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CF648F3E-6F30-4490-A8E8-A74B5D4C9724"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Pegase/Group/ReferenceAccount/Schedulers/SchedulerViewController.swift"
Expand Down Expand Up @@ -68,5 +68,21 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "63271556-EC1D-4BC4-9363-815F4703AB96"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Pegase/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "317"
endingLineNumber = "317"
landmarkName = "checkForUpdates(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
10 changes: 8 additions & 2 deletions Pegase/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import SwiftUI
import NotificationCenter
import UserNotifications
import SwiftyTranslate
import Sparkle

typealias TFDatePicker = NSDatePicker

Expand All @@ -23,8 +24,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {

var splashScreenWindowController: SplashScreenWindowController! = nil
var checkUpdatePresenter = GitHubPresenter.shared

let updaterController: SPUStandardUpdaterController


// private let updater = SoftwareUpdater()

private var isAutomaticUpdateCheck = false

@IBOutlet var checkForUpdatesMenuItem: NSMenuItem!
Expand All @@ -42,8 +47,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// This way we can subclass NSDocumentController and use our class as the shared instance
_ = DocumentController.init()

// updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
// super.init()
updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
super.init()
}

func applicationDidFinishLaunching(_ aNotification: Notification) {
Expand Down Expand Up @@ -312,6 +317,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
isAutomaticUpdateCheck = false
checkUpdate()
}

}

extension NSApplication {
Expand Down
18 changes: 7 additions & 11 deletions Pegase/Group/ListTransactions/Base.lproj/ListTransactionsController.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23077.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23077.2"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down Expand Up @@ -199,7 +199,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential" tableStyle="plain" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" headerView="A9E-Dg-UJW" viewBased="YES" indentationPerLevel="13" autoresizesOutlineColumn="YES" outlineTableColumn="8YN-Ur-793" id="VND-Xg-fnc">
<rect key="frame" x="0.0" y="0.0" width="1618" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="1618" height="30"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="17" height="0.0"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -264,22 +264,18 @@
</tableCellView>
<tableCellView identifier="sousOpCell" id="Ott-IN-VDC" customClass="CategoryCellView" customModule="Pegase" customModuleProvider="target">
<rect key="frame" x="8" y="67" width="116" height="30"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Tvs-O9-PFB">
<rect key="frame" x="0.0" y="7" width="116" height="16"/>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tvs-O9-PFB">
<rect key="frame" x="0.0" y="7" width="96" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="CfA-MO-si0">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="Tvs-O9-PFB" firstAttribute="centerY" secondItem="Ott-IN-VDC" secondAttribute="centerY" id="B17-tx-jYx"/>
<constraint firstItem="Tvs-O9-PFB" firstAttribute="centerX" secondItem="Ott-IN-VDC" secondAttribute="centerX" id="TF8-Dx-1wm"/>
<constraint firstItem="Tvs-O9-PFB" firstAttribute="leading" secondItem="Ott-IN-VDC" secondAttribute="leading" constant="2" id="wxl-El-Bsn"/>
</constraints>
<connections>
<outlet property="textField" destination="Tvs-O9-PFB" id="aib-rS-hYg"/>
</connections>
Expand Down
Loading

0 comments on commit 74c6cc6

Please sign in to comment.