Skip to content

Commit 6403640

Browse files
committed
rename property as shortcutName
1 parent c8d7005 commit 6403640

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Diff for: docs/windows-specific-properties.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
## Exe creation properties
7979

8080
| Property | Mandatory | Default value | Description |
81-
|---------------------| --------- |-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
81+
| ------------------- | --------- | --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
8282
| `headerType` | :x: | `"gui"` | EXE header type: `console` or `gui`. |
8383
| `wrapJar` | :x: | `true` | Wrap JAR file in native EXE. |
8484
| `companyName` | :x: | `${organizationName}` | EXE company name. |
@@ -101,10 +101,10 @@
101101
## Setup generation properties
102102

103103
| Property | Mandatory | Default value | Description |
104-
|---------------------------| --------- |--------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------|
104+
| ------------------------- | --------- | ------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------- |
105105
| `setupMode` | :x: | `installForAllUsers` | Setup installation mode: require administrative privileges or not. [*](#setupmode) |
106106
| `setupLanguages` | :x: | `<english>compiler:Default.isl</english><spanish>compiler:Languages\Spanish.isl</spanish>` | Map with setup languages. |
107-
| `txtShortcutName` | :x: | `${name}` | Sets the name of the user optional shortcut created on the desktop |
107+
| `shortcutName` | :x: | `${name}` | Sets the name of the user optional shortcut created on the desktop |
108108
| `disableDirPage` | :x: | `true` | If this is set to `true`, Setup will not show the **Select Destination Location** wizard page. |
109109
| `disableProgramGroupPage` | :x: | `true` | If this is set to `true`, Setup will not show the **Select Start Menu Folder** wizard page. |
110110
| `disableFinishedPage` | :x: | `true` | If this is set to `true`, Setup will not show the **Setup Completed** wizard page. |

Diff for: src/main/java/io/github/fvarrui/javapackager/model/WindowsConfig.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class WindowsConfig implements Serializable {
3030
private String trademarks;
3131
private String txtFileVersion;
3232
private String txtProductVersion;
33-
private String txtShortcutName;
33+
private String shortcutName;
3434
private boolean disableDirPage = true;
3535
private boolean disableProgramGroupPage = true;
3636
private boolean disableFinishedPage = true;
@@ -154,12 +154,12 @@ public void setTxtProductVersion(String txtProductVersion) {
154154
this.txtProductVersion = txtProductVersion;
155155
}
156156

157-
public String getTxtShortcutName() {
158-
return txtShortcutName;
157+
public String getShortcutName() {
158+
return shortcutName;
159159
}
160160

161-
public void setTxtShortcutName(String txtShortcutName) {
162-
this.txtShortcutName = txtShortcutName;
161+
public void setShortcutName(String shortcutName) {
162+
this.shortcutName = shortcutName;
163163
}
164164

165165
public String getInternalName() {
@@ -321,7 +321,7 @@ public String toString() {
321321
+ ", internalName=" + internalName + ", language=" + language + ", originalFilename=" + originalFilename
322322
+ ", productName=" + productName + ", productVersion=" + productVersion + ", trademarks=" + trademarks
323323
+ ", txtFileVersion=" + txtFileVersion + ", txtProductVersion=" + txtProductVersion
324-
+ ", txtShortcutName=" + txtShortcutName
324+
+ ", shortcutName=" + shortcutName
325325
+ ", disableDirPage=" + disableDirPage + ", disableProgramGroupPage=" + disableProgramGroupPage
326326
+ ", disableFinishedPage=" + disableFinishedPage + ", disableRunAfterInstall=" + disableRunAfterInstall
327327
+ ", disableWelcomePage=" + disableWelcomePage + ", createDesktopIconTask=" + createDesktopIconTask
@@ -341,7 +341,7 @@ public void setDefaults(Packager packager) {
341341
this.setFileVersion(defaultIfBlank(this.getFileVersion(), "1.0.0.0"));
342342
this.setTxtFileVersion(defaultIfBlank(this.getTxtFileVersion(), "" + packager.getVersion()));
343343
this.setProductVersion(defaultIfBlank(this.getProductVersion(), "1.0.0.0"));
344-
this.setTxtShortcutName(defaultIfBlank(this.getTxtShortcutName(), packager.getName()));
344+
this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getName()));
345345
this.setTxtProductVersion(defaultIfBlank(this.getTxtProductVersion(), "" + packager.getVersion()));
346346
this.setCompanyName(defaultIfBlank(this.getCompanyName(), packager.getOrganizationName()));
347347
this.setCopyright(defaultIfBlank(this.getCopyright(), packager.getOrganizationName()));

Diff for: src/main/resources/windows/iss.vtl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
\#define MyAppFolder "${info.name}"
77
\#define MyAppLicense "$!{info.licenseFile.absolutePath}"
88
\#define MyAppIcon "${info.iconFile.absolutePath}"
9-
\#define MyShortcutName = "${info.winConfig.txtShortcutName}"
9+
\#define MyShortcutName = "${info.winConfig.shortcutName}"
1010

1111
[Setup]
1212
AppId={{{#MyAppName}}}

0 commit comments

Comments
 (0)