Skip to content

Commit 75503dd

Browse files
committed
added project-version to zip file. removed copyright from xml. removed copyright in css files
1 parent 3540469 commit 75503dd

File tree

8 files changed

+180
-201
lines changed

8 files changed

+180
-201
lines changed

assembly.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<!-- Copyright 2019 doubleSlash Net Business GmbH -->
2-
31
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
42
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
53

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<descriptors>
9999
<descriptor>./assembly.xml</descriptor>
100100
</descriptors>
101-
<finalName>keeptime</finalName>
101+
<finalName>keeptime-${project.version}</finalName>
102102
</configuration>
103103
</execution>
104104
</executions>

src/main/java/de/doubleslash/keeptime/common/OS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class OS {
2121
private static final String OS_PROPERTY = "os.name";
2222

2323
private OS() {
24-
24+
// prevent instance creation
2525
}
2626

2727
public static boolean isWindows() {

src/main/java/de/doubleslash/keeptime/view/AboutController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ private void showLicense(final Licenses license) {
150150
final Alert alert = new Alert(AlertType.ERROR);
151151
alert.setTitle("Ooops");
152152
alert.setHeaderText("Could not find the license file");
153-
alert.setContentText(String.format("We could not find the license file at \"%s\".%nPlease visit \"%s\".",
153+
alert.setContentText(String.format(
154+
"We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".",
154155
license.getPath(), license.getUrl()));
155156

156157
alert.show();

src/main/java/de/doubleslash/keeptime/view/ViewController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private void initialize() {
212212
addNewProjectButton.textFillProperty().bind(fontColorProperty);
213213

214214
// Add a light to colorize buttons
215-
// TODO #12 is there a nicer way for this?
215+
// TODO is there a nicer way for this? (see #12)
216216
final Lighting lighting = new Lighting();
217217
lighting.lightProperty().bind(Bindings.createObjectBinding(() -> {
218218
final Color color = fontColorProperty.get();

src/main/resources/css/application.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
/* Copyright 2019 doubleSlash Net Business GmbH
2-
*
3-
* This file is part of KeepTime.
4-
* KeepTime is free software: you can redistribute it and/or modify
5-
* it under the terms of the GNU General Public License as published by
6-
* the Free Software Foundation, either version 3 of the License, or
7-
* (at your option) any later version.
8-
*
9-
* This program is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
* GNU General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU General Public License
15-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16-
*
17-
* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */
181
.text-area {
192
-fx-text-fill: rgba(1,1,1,.5);
203
-fx-background-color: rgba(0,0,0,0);

src/main/resources/css/menu.css

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/* Copyright 2019 doubleSlash Net Business GmbH
2-
*
3-
* This file is part of KeepTime.
4-
* KeepTime is free software: you can redistribute it and/or modify
5-
* it under the terms of the GNU General Public License as published by
6-
* the Free Software Foundation, either version 3 of the License, or
7-
* (at your option) any later version.
8-
*
9-
* This program is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
* GNU General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU General Public License
15-
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
16-
171
.menuBorder {
182
-fx-border-color: rgba(180,180,180,1);
193
-fx-padding: 2px;

src/main/resources/layouts/settings.fxml

Lines changed: 175 additions & 162 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)