Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mayuso committed Sep 24, 2018
2 parents cfcbf1e + 11383de commit b6c8f0b
Show file tree
Hide file tree
Showing 18 changed files with 483 additions and 612 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ proguard/
*.iws
.idea/

#Gradle
# Gradle
.gradletasknamecache
.gradle/
build/
bin/
out/

*.xml
# JMarkPad Preference
jmarkpad.properties
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Changelog
All notable changes to this project will be documented in this file.

## [1.1] - 23-08-2018
### Added
- Changed "config.xml" to "jmarkpad.properties". (JMarkPad no longer user XML files)
- JMarkPad will now remember the last directory you worked in and open it by default the next time you are searching for your documents.
- Unique changelog file

### Fixed
- Fixed a bug that caused opening an existing document to automatically mark it as already edited.

### Changed
- Various GUI improvements ("About" section reworked, color sistem rewritten, button appearance improved).
- Updated JFoenix from 8.0.1 to 8.0.4.
- Updated Flexmark from 0.32.4 to 0.34.0.

### Removed
- releaseNotes folder

## [1.0] - 28-02-2018
### Added
- Various theme improvements and optimizations.
- Tab close button.
- Added markdown examples.
- Added extra information about the project ("About" section).
- Adjusted window border size to make resizing the window easier.
- Replaced *txtmark* with *flexmark* (Mainly because flexmark is still being developed and supported).

### Fixed
- Fixed a bug that showed an incorrect file name in the save confirmation alert.
- Improved confirmation alert look and feel.
- Catch the exception and properly print when the user settings file (config.xml) is missing and is created.

## [0.1] - 29-01-2018
### Added
- "Save as" option added.
- "Save all" option added.
- Theme (Color) edit option.
- JMarkPad now remembers where each file is saved, it doesn't ask for location each time you save.
- Load a file directly to a new tab when using (Open with-> JMarkPad).
- User settings saved on close and opened on start.

### Fixed
- Fixed a bug that allowed the user to open a file more than once.
- Each new tab now has a unique name.
- Fixed a bug that would open a new file when opening an existing file.

## [0.0.1] - 17-01-2018
### Added
* "Open", "Save", "Close" and "New" file options.
* Multiple open files at the same time (Diferent tabs).
* Realtime preview of how the markdown text would look like on web.
10 changes: 0 additions & 10 deletions releaseNotes/0.0.1.md

This file was deleted.

14 changes: 0 additions & 14 deletions releaseNotes/0.1.md

This file was deleted.

14 changes: 0 additions & 14 deletions releaseNotes/1.0.md

This file was deleted.

16 changes: 0 additions & 16 deletions releaseNotes/1.1.md

This file was deleted.

108 changes: 0 additions & 108 deletions src/main/java/io/XML.java

This file was deleted.

20 changes: 20 additions & 0 deletions src/main/java/ui/JMPDecorator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package ui;

import com.jfoenix.controls.JFXDecorator;
import javafx.scene.Node;
import javafx.stage.Stage;

public class JMPDecorator extends JFXDecorator {

public JMPDecorator(Stage stage, Node node) {
super(stage, node);
}

public boolean isBtnFullscreenVisible() {
return super.btnFull.isVisible();
}

public void setBtnFullscreenVisible(boolean isVisible) {
super.btnFull.setVisible(isVisible);
}
}
Loading

0 comments on commit b6c8f0b

Please sign in to comment.