Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
Fix line endings and switch to free icons.
  • Loading branch information
RobertBColton committed Aug 24, 2015
1 parent de5fbce commit d70a84d
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# DockFX
<table>
<tr>
<th><img src="http://i.imgur.com/x9P2tN5.png" ></th>
<th><img src="http://i.imgur.com/2jmP7Mo.png" ></th>
<th><img src="http://i.imgur.com/M69ZWgU.png" ></th>
<th><img src="http://i.imgur.com/yPLbHwy.png" ></th>
</tr>
</table>

Expand All @@ -27,7 +27,7 @@ Features to be added in a to be determined future version:
You can obtain a binary of the latest jar from the [releases](https://github.com/RobertBColton/DockFX/releases) page. The library itself includes a demo as the main class for testing purposes. This demo is always included for the time being as it is very small and not expected to get much bigger. An HTML readme file is included next to the jar but does not need to be distributed with the library. The library and the demo will also work regardless of whether the readme HTML file exists. You should be able to add the library to your class path and use it like any normal library.

## Compiling from Source
The project was originally written in the Eclipse IDE but is also configured for Apache Maven. The project will continue to facilitate development with both command line tools and the Eclipse IDE.
The project was originally written in the Eclipse IDE but is also configured for Apache Maven. The project will continue to facilitate development with both command line tools and the Eclipse IDE. Default icons are included from the [Calico icon set](https://github.com/enigma-dev/Calico-Icon) for the dock indicators and title bar.

## Contributing
Adaptations of the project are welcome but you are encouraged to send fixes upstream to the master repository. I use the [Google Java style conventions](https://github.com/google/styleguide) which you can download an Eclipse plugin for. After importing the Eclipse formatter you can use CTRL+SHIFT+F to run the formatter on your code. It is requested that commits sent to this repository follow these conventions. Please see the following [link](https://github.com/HPI-Information-Systems/Metanome/wiki/Installing-the-google-styleguide-settings-in-intellij-and-eclipse) for instructions on configuring the Google style conventions with the Eclipse or IntelliJ IDE.
Expand Down
12 changes: 4 additions & 8 deletions src/main/java/org/dockfx/DockNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ protected void invalidated() {
}

stage.setMaximized(get());

// TODO: This is a work around to fill the screen bounds and not
// overlap the task bar when the window is undecorated as in
// Visual Studio. Perhaps file a bug against JavaFX, though
// a similar work around needs applied for JFrame in Swing.
// http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4737788

// TODO: This is a work around to fill the screen bounds and not overlap the task bar when
// the window is undecorated as in Visual Studio. A similar work around needs applied for
// JFrame in Swing. http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4737788
// Bug report filed:
// https://bugs.openjdk.java.net/browse/JDK-8133330
if (this.get()) {
Expand Down Expand Up @@ -777,7 +775,5 @@ public void handle(MouseEvent event) {
event.consume();
}
}

}

}
2 changes: 1 addition & 1 deletion src/main/java/org/dockfx/DockPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public final Timeline getDockAreaStrokeTimeline() {
* @return The URL of the default style sheet used by DockFX.
*/
public final static String getDefaultUserAgentStyleheet() {
return DockPane.class.getResource("Default.css").toExternalForm();
return DockPane.class.getResource("default.css").toExternalForm();
}

/**
Expand Down
Binary file modified src/main/resources/org/dockfx/bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/org/dockfx/center.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/org/dockfx/demo/docknode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/org/dockfx/left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/org/dockfx/right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/org/dockfx/top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d70a84d

Please sign in to comment.