valerie
/
MAndViewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

Conflicts:
	src/Item.java
master
Marcus Gosselin 2014-11-18 13:34:21 -05:00
parent 6529cc4989 4ddb45c1cd
commit 91d1d34ae3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Item.java
View File

@ -136,8 +136,10 @@ public class Item {
thumbnail = (fillImageScale(images[0], Viewer.THUMBNAIL_SIZE, Viewer.THUMBNAIL_SIZE));
path = file.getAbsolutePath();
name = file.getName();
if(name.endsWith(".enc")) {
name = Viewer.encryptor.nameTable.decrypt(name.substring(0, name.length() - 4));
}
} else if (path.equals("\\drives")) {
name = "Drives";

4
src/Viewer.java
View File

@ -25,7 +25,7 @@ public class Viewer implements BasicApp {
private static int WIDTH = 800, HEIGHT = 600;
// we need to have a home in case all else fails.
private static final String defaultSearchDirectory = System.getenv("APPDATA") + "\\MAndWorks\\MAndApps\\Backgrounds\\";
private static final String defaultSearchDirectory = System.getenv("USERPROFILE") + "\\Desktop";
// current selection
private static int selection = 0;
@ -74,7 +74,7 @@ public class Viewer implements BasicApp {
// make sure we have our variable and file
// we can explicitly set them as we are trying to pick up where we left
// off
currentDirectoryVariable = new Variable("MAndWorks\\MAndApps\\Settings", "WallpaperSearchDirectory", defaultSearchDirectory, false);
currentDirectoryVariable = new Variable("MAndWorks\\MAndViewer", "currentDirectory", defaultSearchDirectory, false);
currentDirectoryFile = new File(currentDirectoryVariable.getValue());
// which we use, be it variable or file, is completely arbitrary here.