Skip to content

Commit 5d34bf7

Browse files
Update Licenses
1 parent 6126b4e commit 5d34bf7

File tree

8 files changed

+858
-144
lines changed

8 files changed

+858
-144
lines changed

README.md

Lines changed: 153 additions & 126 deletions
Large diffs are not rendered by default.

WinDiskWriter/Constants/Licenses-Constants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
1313
@interface Licenses_Constants : NSObject
1414

1515
extern NSString * const WIMLIB_LICENSE_TEXT;
16+
extern NSString * const GRUB4DOS_LICENSE_TEXT;
1617

1718
@end
1819

WinDiskWriter/Constants/Licenses-Constants.m

Lines changed: 342 additions & 0 deletions
Large diffs are not rendered by default.

WinDiskWriter/Views/LabelView/LabelView.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,10 @@ - (void)unregisterClickAction {
6060
- (void)mouseEntered:(NSEvent *)event {
6161
[super mouseEntered: event];
6262

63-
[[NSCursor pointingHandCursor] set];
63+
[self addCursorRect:[self bounds] cursor:[NSCursor pointingHandCursor]];
64+
[self resetCursorRects];
6465
}
6566

66-
- (void)mouseExited:(NSEvent *)event {
67-
[super mouseExited: event];
68-
69-
[[NSCursor arrowCursor] set];
70-
}
7167

7268
- (void)mouseDown:(NSEvent *)event {
7369
[super mouseDown: event];

WinDiskWriter/Windows/AboutWindow/AboutWindow.m

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,24 @@ - (void)setupViews {
126126
height: openSourceLicensesLabelView.cell.cellSize.height];
127127
}
128128

129+
// TODO: Replace with external text loading
129130
AdvancedTextView *openSourceLicensesAdvancedTextView = [[AdvancedTextView alloc] init]; {
130131
[openSourceLicensesAdvancedTextView appendLine:
131-
@"WinDiskWriter is an application for macOS that enables users to create bootable flash drives with the Windows operating system, which belongs to Microsoft Corporation." "\n\n"
132-
"The application is an Open Source product developed by TechUnRestricted." "\n"
132+
@"WinDiskWriter is a macOS application that allows users to create bootable flash drives with the Windows operating system, which is a product of Microsoft Corporation." "\n\n"
133+
"The application is an open source project developed by TechUnRestricted." "\n\n"
133134

134-
"It relies on the wimlib library, which is licensed under the GNU LESSER GENERAL PUBLIC LICENSE Version 3." "\n\n"
135-
"The library has been slightly modified to avoid application crashes caused by assertions." "\n"
136-
"This allowed the integration of wimlib as a part of the project, instead of a separate binary file that is invoked through the console." "\n\n"
135+
"It uses the wimlib library, which is licensed under the GNU Lesser General Public License Version 3. The library has been slightly modified to prevent application crashes caused by assertions. This enabled the integration of wimlib as a part of the project, instead of a separate binary file that is invoked through the console." "\n\n"
137136

138-
"The application is written in Objective-C programming language, with backward compatibility for older operating systems." "\n"
139-
"This is achieved by using legacy code and custom solutions, instead of reinventing the wheel." "\n"
140-
"The user interface and the logic of element placement are coded manually, without using xib and storyboards." "\n\n"
137+
"The application also uses the grub4dos tool, which is licensed under the GNU General Public License Version 2. The tool is not built into the code, but it is a separate binary file in the Resources folder." "\n"
138+
"Grub4dos used to enable legacy booting for older systems." "\n\n"
139+
"!!! The user is free to modify, replace or remove grub4dos binaries from the WinDiskWriter.app !!!" "\n\n"
141140

142-
"This software has two versions: GUI and CLI." "\n"
143-
"At the moment, WinDiskWriter supports writing Windows Vista, 7, 8, 8.1, 10 and 11 in UEFI mode." "\n"
144-
"Future improvements will include support for Legacy systems and other features." "\n\n\n"
141+
"The application is written in Objective-C programming language, with backward compatibility for older operating systems. This is achieved by using legacy code and custom solutions, instead of relying on external frameworks. The user interface and the logic of element placement are coded manually, without using xib and storyboards." "\n\n"
145142

143+
"The application has only one version: GUI. It supports writing Windows Vista, 7, 8, 8.1, 10 and 11 in both UEFI and Legacy modes. It also supports x32 bit Windows images. Future improvements will include more features and enhancements." "\n\n\n"
144+
145+
146+
146147
"——————————————————" "\n"
147148
"[ — WIMLIB Open Source License — ]" "\n"
148149
"——————————————————" "\n\n"
@@ -151,6 +152,14 @@ - (void)setupViews {
151152

152153
[openSourceLicensesAdvancedTextView appendLine: WIMLIB_LICENSE_TEXT];
153154

155+
[openSourceLicensesAdvancedTextView appendLine:
156+
@"\n\n"
157+
"——————————————————" "\n"
158+
"[ — grub4dos Open Source License — ]" "\n"
159+
"——————————————————" "\n\n"];
160+
161+
[openSourceLicensesAdvancedTextView appendLine: GRUB4DOS_LICENSE_TEXT];
162+
154163
[openSourceLicensesVerticalLayout addView: openSourceLicensesAdvancedTextView
155164
minWidth: 0
156165
maxWidth: INFINITY

WinDiskWriter/Windows/MainWindow/MainWindow.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ - (void)setupViews {
423423
}
424424

425425
[self setEnabledUIState: YES];
426-
427426
}
428427

429428
- (void)exitApplication {

0 commit comments

Comments
 (0)