Navigation

← Previous Changeset
Next Changeset →

Changeset 133

Timestamp:

12/16/06 13:00:13 (2 years ago)

Author:

jlee

Message:

Resource extraction and Windows testing

Files:

trunk/src/org/thestaticvoid/iriverter/AboutDialog.java (modified) (2 diffs)
trunk/src/org/thestaticvoid/iriverter/ConverterOptions.java (modified) (4 diffs)
trunk/src/org/thestaticvoid/iriverter/ConverterUI.java (modified) (5 diffs)
trunk/src/org/thestaticvoid/iriverter/Logger.java (modified) (2 diffs)
trunk/src/org/thestaticvoid/iriverter/MPlayerPathDialog.java (modified) (3 diffs)
trunk/src/org/thestaticvoid/iriverter/Profile.java (modified) (1 diff)
trunk/src/org/thestaticvoid/iriverter/VolumeDialog.java (modified) (1 diff)
trunk/web/iriverter.jnlp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/org/thestaticvoid/iriverter/AboutDialog.java

r117	r133
34	34	private Button dismiss;
35	35
	36	public static final String VERSION = "1.0.0";
	37
36	38	public AboutDialog(Shell parent, int style) {
37	39	super(parent, style);
…	…
59	61
60	62	Label appName = new Label(shell, SWT.NONE);
61		appName.setText("iriverter " + ~~Config.~~VERSION);
	63	appName.setText("iriverter " + VERSION);
62	64	FontData[] fontData = appName.getFont().getFontData();
63	65	fontData[0].setStyle(SWT.BOLD);

trunk/src/org/thestaticvoid/iriverter/ConverterOptions.java

r117	r133
25	25
26	26	public class ConverterOptions {
27		private static File optionsFile = new File(System.getProperty("user.home") + File.separator + ".iriverter.conf");
	27	public static final File CONF_DIR;
	28	static {
	29	if (System.getProperty("os.name").indexOf("Windows") >= 0)
	30	CONF_DIR = new File(System.getProperty("user.home") + File.separator + "Application Data" + File.separator + "iriverter");
	31	else
	32	CONF_DIR = new File(System.getProperty("user.home") + File.separator + ".iriverter");
	33	}
	34	public static final File CONF_FILE = new File(CONF_DIR + File.separator + "conf");
28	35
29	36	public static String getOptionsText() {
30	37	BufferedReader input = null;
31	38	try {
32		input = new BufferedReader(new FileReader(~~optionsFile~~));
	39	input = new BufferedReader(new FileReader(CONF_FILE));
33	40	} catch (IOException e) {
34	41	// empty
…	…
53	60	Logger.logMessage("Setting: " + option + "=" + setting, Logger.INFO);
54	61
55		if (!optionsFile.exists())
56		optionsFile.createNewFile();
57
58		BufferedReader input = new BufferedReader(new FileReader(optionsFile));
	62	if (!CONF_FILE.exists()) {
	63	CONF_FILE.mkdirs();
	64	CONF_FILE.delete();
	65	CONF_FILE.createNewFile();
	66	}
	67
	68	BufferedReader input = new BufferedReader(new FileReader(CONF_FILE));
59	69
60	70	StringBuffer options = new StringBuffer();
…	…
75	85	input.close();
76	86
77		PrintWriter output = new PrintWriter(new BufferedWriter(new FileWriter(~~optionsFile~~)));
	87	PrintWriter output = new PrintWriter(new BufferedWriter(new FileWriter(CONF_FILE)));
78	88	output.print(options.toString());
79	89	output.close();
…	…
87	97
88	98	try {
89		BufferedReader input = new BufferedReader(new FileReader(~~optionsFile~~));
	99	BufferedReader input = new BufferedReader(new FileReader(CONF_FILE));
90	100	String line;
91	101

trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

r117	r133
32	32	import java.io.*;
33	33	import java.util.*;
	34	import java.util.zip.*;
34	35
35	36	public class ConverterUI implements SelectionListener, CTabFolder2Listener, DropTargetListener {
…	…
60	61	shell.setLayout(gridLayout);
61	62
	63	extractResources();
62	64	setupMenus();
63	65	setupToolBar();
…	…
301	303	}
302	304
	305	public void extractResources() {
	306	ZipInputStream in = new ZipInputStream(getClass().getResourceAsStream("resources.zip"));
	307
	308	try {
	309	ZipEntry entry;
	310	while ((entry = in.getNextEntry()) != null) {
	311	File extractedFile = new File(ConverterOptions.CONF_DIR + File.separator + entry.getName());
	312	if (entry.isDirectory() && !extractedFile.exists())
	313	extractedFile.mkdirs();
	314	else if (!extractedFile.exists() \|\| entry.getTime() > extractedFile.lastModified()) {
	315	OutputStream out = new FileOutputStream(extractedFile);
	316
	317	int length;
	318	byte[] buffer = new byte[4096];
	319	while ((length = in.read(buffer)) > 0)
	320	out.write(buffer, 0, length);
	321
	322	out.close();
	323
	324	extractedFile.setLastModified(entry.getTime());
	325	}
	326	}
	327	} catch (IOException io) {
	328	Logger.logException(io);
	329
	330	MessageBox messageBox = new MessageBox(new Shell(display), SWT.ICON_ERROR \| SWT.OK);
	331	messageBox.setText("Could Not Extract Resources");
	332	messageBox.setMessage("An error occured while extracting the resources. Execution will try to continue. Please see the log for details.");
	333	messageBox.open();
	334	}
	335
	336	try {
	337	in.close();
	338	} catch (IOException io) {
	339	Logger.logException(io);
	340	}
	341	}
	342
303	343	public void setupToolBar() {
304	344	ToolBar toolBar = new ToolBar(shell, SWT.HORIZONTAL \| SWT.FLAT);
…	…
482	522	}
483	523
484		if (e.getSource() == contents) {
485		String index;
486		if (Config.getPackageDataDir().equals("."))
487		index = "file://" + System.getProperty("user.dir") + "/doc/html/index.html";
488		else
489		index = "file://" + Config.getPackageDataDir() + "/doc/html/index.html";
490
491		new HelpBrowser(index);
492		}
	524	if (e.getSource() == contents)
	525	new HelpBrowser("file://" + ConverterOptions.CONF_DIR + "/doc/index.html");
493	526
494	527	if (e.getSource() == logViewer) {
…	…
675	708	new ConverterUI();
676	709	} catch (Throwable t) {
677		String message = "An unhandled exception occured: " + t.getClass() + "\n" + t.getMessage() + "\n\n";
678		StackTraceElement[] st = t.getStackTrace();
679		for (int i = 0; i < st.length; i++)
680		message += st[i] + "\n";
681
682		Logger.logMessage(message, Logger.ERROR);
	710	Logger.logException(t);
683	711
684	712	MessageBox messageBox = new MessageBox(new Shell(Display.getDefault()), SWT.ICON_ERROR \| SWT.OK);

trunk/src/org/thestaticvoid/iriverter/Logger.java

r117	r133
32	32	private static void openLogFile() {
33	33	try {
34		output = new PrintWriter(new BufferedWriter(new FileWriter(new File(~~System.getProperty("user.home") + File.separator + ".iriverter.~~log"))));
	34	output = new PrintWriter(new BufferedWriter(new FileWriter(new File(ConverterOptions.CONF_DIR + File.separator + "log"))));
35	35
36	36	if (LogViewer.getSingleton() != null)
37	37	LogViewer.getSingleton().clear();
38	38
39		logMessage("iriverter " + ~~Confi~~g.VERSION + "\n", Logger.INFO);
	39	logMessage("iriverter " + AboutDialog.VERSION + "\n", Logger.INFO);
40	40	logMessage("Settings:\n" + ConverterOptions.getOptionsText().trim() + "\n", Logger.INFO);
41	41	} catch (IOException e) {
…	…
67	67	}
68	68
	69	public static void logException(Throwable t) {
	70	String message = "An unhandled exception occured: " + t.getClass() + "\n" + t.getMessage() + "\n\n";
	71	StackTraceElement[] st = t.getStackTrace();
	72	for (int i = 0; i < st.length; i++)
	73	message += st[i] + "\n";
	74
	75	logMessage(message, Logger.ERROR);
	76	}
	77
69	78	public static String getLogText() {
70	79	InputStream input = null;
71	80	try {
72		input = new FileInputStream(new File(~~System.getProperty("user.home") + File.separator + ".iriverter.~~log"));
	81	input = new FileInputStream(new File(ConverterOptions.CONF_DIR + File.separator + "log"));
73	82	} catch (IOException e) {
74	83	// empty

trunk/src/org/thestaticvoid/iriverter/MPlayerPathDialog.java

r117	r133
57	57	gridLayout = new GridLayout();
58	58	gridLayout.horizontalSpacing = 6;
59		gridLayout.verticalSpacing = 0;
	59	gridLayout.verticalSpacing = 3;
60	60	gridLayout.marginHeight = 0;
61	61	gridLayout.marginWidth = 0;
…	…
76	76	gridLayout = new GridLayout();
77	77	gridLayout.horizontalSpacing = 6;
78		gridLayout.verticalSpacing = 0;
	78	gridLayout.verticalSpacing = 3;
79	79	gridLayout.marginHeight = 0;
80	80	gridLayout.marginWidth = 0;
…	…
136	136	}
137	137
138		shell.pack();
	138	shell.pack();
	139	shell.setSize(450, shell.getSize().y);
139	140	shell.open();
140	141	while (!shell.isDisposed())

trunk/src/org/thestaticvoid/iriverter/Profile.java

r117	r133
33	33
34	34	public static Profile getProfile(String profileName) {
35		return new Profile(new File(Con~~fig.getPackageDataDir()~~ + File.separator + "profiles" + File.separator + profileName + ".profile"));
	35	return new Profile(new File(ConverterOptions.CONF_DIR + File.separator + "profiles" + File.separator + profileName + ".profile"));
36	36	}
37	37
38	38	public static Profile[] getAllProfiles() {
39		String[] profilesStrings = new File(Con~~fig.getPackageDataDir()~~ + File.separator + "profiles" + File.separator).list(new ProfileFilter());
	39	String[] profilesStrings = new File(ConverterOptions.CONF_DIR + File.separator + "profiles" + File.separator).list(new ProfileFilter());
40	40	Profile[] profiles = new Profile[profilesStrings.length];
41	41
42	42	for (int i = 0; i < profiles.length; i++)
43		profiles[i] = new Profile(new File(Con~~fig.getPackageDataDir()~~ + File.separator + "profiles" + File.separator + profilesStrings[i]));
	43	profiles[i] = new Profile(new File(ConverterOptions.CONF_DIR + File.separator + "profiles" + File.separator + profilesStrings[i]));
44	44
45	45	return profiles;

trunk/src/org/thestaticvoid/iriverter/VolumeDialog.java

r117	r133
56	56	gridLayout = new GridLayout();
57	57	gridLayout.horizontalSpacing = 6;
58		gridLayout.verticalSpacing = 0;
	58	gridLayout.verticalSpacing = 3;
59	59	gridLayout.numColumns = 3;
60	60	filterGroup.setLayout(gridLayout);

trunk/web/iriverter.jnlp

r122	r133
10	10	<icon href="iriverter.gif" />
11	11	<offline-allowed />
	12	<shortcut online="false">
	13	<desktop />
	14	<menu />
	15	</shortcut>
12	16	</information>
13	17

Navigation

Changeset 133

Legend:

Download in other formats: