Menu
▾
▴
[JavaAmp-CVS] javaamp/src JavaAmp.java,1.20,1.21 Language.java,1.5,1.6 PreferencesDialog.java,1.7,1.8 Settings.java,1.7,1.8
|
From: WiESi <wi...@us...> - 2006-04-09 16:29:13
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22883/src Modified Files: JavaAmp.java Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Language.java 8 Apr 2006 15:38:03 -0000 1.5 +++ Language.java 9 Apr 2006 16:29:05 -0000 1.6 @@ -76,6 +76,7 @@ english.put("OPEN", "Open"); english.put("OPEN_FILES", "Open file(s)"); english.put("PAN", "Balance"); + english.put("PASSWORD", "Password:"); english.put("PAUSE", "Pause"); english.put("PHYSICALLY", "Physically"); english.put("PLAY", "Play"); @@ -122,6 +123,7 @@ english.put("UNABLE_OPEN_HTML", "Unable to open HTML file"); english.put("URL", "URL"); english.put("USED_TECHNOLOGIES", "Used technologies:"); + english.put("USER", "User:"); english.put("VALUE", "Value"); english.put("VISUALIZATION", "Visualization"); english.put("VOLUME", "Volume"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- PreferencesDialog.java 8 Apr 2006 18:13:56 -0000 1.7 +++ PreferencesDialog.java 9 Apr 2006 16:29:05 -0000 1.8 @@ -37,8 +37,11 @@ JTextField tfdProxyHost; JLabel lblProxyPort; JTextField tfdProxyPort; + JLabel lblProxyUser; + JTextField tfdProxyUser; + JLabel lblProxyPassword; + JPasswordField pfdProxyPassword; JCheckBox chbSplash; - JCheckBox chbMultiple; JCheckBox chbUpdate; JLabel lblShowIn; JCheckBox chbTaskbar; @@ -130,7 +133,7 @@ }); trePreferences.setSelectionModel(dtsm); scpPreferences = new JScrollPane(trePreferences, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, + JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scpPreferences.setBounds(10, 10, 150, 365); @@ -219,7 +222,7 @@ panInternet = new JPanel(null); panInternet.setBorder(BorderFactory.createTitledBorder( Language.get("INTERNET_SETTINGS"))); - panInternet.setBounds(10, 40, 375, 75); + panInternet.setBounds(10, 40, 375, 100); chbProxy = new JCheckBox(Language.get("ENABLE_PROXY")); chbProxy.setBounds(15, 15, 345, 20); panInternet.add(chbProxy); @@ -227,35 +230,44 @@ lblProxyHost.setBounds(15, 40, 70, 20); panInternet.add(lblProxyHost); tfdProxyHost = new JTextField(); - tfdProxyHost.setBounds(85, 40, 120, 20); + tfdProxyHost.setBounds(85, 40, 100, 20); panInternet.add(tfdProxyHost); lblProxyPort = new JLabel(Language.get("PROXY_PORT")); - lblProxyPort.setBounds(230, 40, 70, 20); + lblProxyPort.setBounds(190, 40, 70, 20); panInternet.add(lblProxyPort); tfdProxyPort = new JTextField(); - tfdProxyPort.setBounds(300, 40, 60, 20); + tfdProxyPort.setBounds(260, 40, 100, 20); panInternet.add(tfdProxyPort); + lblProxyUser = new JLabel(Language.get("USER")); + lblProxyUser.setBounds(15, 65, 70, 20); + panInternet.add(lblProxyUser); + tfdProxyUser = new JTextField(); + tfdProxyUser.setBounds(85, 65, 100, 20); + panInternet.add(tfdProxyUser); + lblProxyPassword = new JLabel(Language.get("PASSWORD")); + lblProxyPassword.setBounds(190, 65, 70, 20); + panInternet.add(lblProxyPassword); + pfdProxyPassword = new JPasswordField(); + pfdProxyPassword.setBounds(260, 65, 100, 20); + panInternet.add(pfdProxyPassword); panGenPref.add(panInternet); chbSplash = new JCheckBox(Language.get("SHOW_SPLASH")); - chbSplash.setBounds(10, 120, 370, 20); + chbSplash.setBounds(10, 145, 370, 20); panGenPref.add(chbSplash); - chbMultiple = new JCheckBox(Language.get("ALLOW_MULTIPLE")); - chbMultiple.setBounds(10, 140, 370, 20); - panGenPref.add(chbMultiple); chbUpdate = new JCheckBox(Language.get("CHECK_NEW")); - chbUpdate.setBounds(10, 160, 370, 20); + chbUpdate.setBounds(10, 165, 370, 20); panGenPref.add(chbUpdate); lblShowIn = new JLabel(Language.get("SHOW_JAVAAMP_IN")); - lblShowIn.setBounds(10, 180, 370, 20); + lblShowIn.setBounds(10, 185, 370, 20); panGenPref.add(lblShowIn); chbTaskbar = new JCheckBox(Language.get("TASKBAR")); - chbTaskbar.setBounds(30, 200, 350, 20); + chbTaskbar.setBounds(30, 205, 350, 20); panGenPref.add(chbTaskbar); chbSysTray = new JCheckBox(Language.get("SYSTRAY")); - chbSysTray.setBounds(30, 220, 350, 20); + chbSysTray.setBounds(30, 225, 350, 20); panGenPref.add(chbSysTray); chbScroll = new JCheckBox(Language.get("SCROLL_TITLE")); - chbScroll.setBounds(10, 240, 370, 20); + chbScroll.setBounds(10, 245, 370, 20); panGenPref.add(chbScroll); panPlaylist = new JPanel(null); @@ -366,8 +378,9 @@ tfdProxyPort.setText(Integer.toString(Settings.proxyPort)); else tfdProxyPort.setText(""); + tfdProxyUser.setText(Settings.proxyUser); + pfdProxyPassword.setText(Settings.proxyPassword); chbSplash.setSelected(Settings.splash); - chbMultiple.setSelected(Settings.multiple); chbUpdate.setSelected(Settings.update); chbTaskbar.setSelected(Settings.showInTaskbar); chbSysTray.setSelected(Settings.showInSysTray); @@ -391,8 +404,9 @@ catch(Exception e) { Settings.proxyPort = -1; } + Settings.proxyUser = tfdProxyUser.getText(); + Settings.proxyPassword = new String(pfdProxyPassword.getPassword()); Settings.splash = chbSplash.isSelected(); - Settings.multiple = chbMultiple.isSelected(); Settings.update = chbUpdate.isSelected(); Settings.showInTaskbar = chbTaskbar.isSelected(); Settings.showInSysTray = chbSysTray.isSelected(); Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- JavaAmp.java 8 Apr 2006 18:13:56 -0000 1.20 +++ JavaAmp.java 9 Apr 2006 16:29:05 -0000 1.21 @@ -1,4 +1,5 @@ import java.awt.*; +import java.io.*; import java.util.*; import javax.swing.*; import org.lwjgl.*; @@ -8,7 +9,7 @@ private final static long serialVersionUID = 0; public final static String VERSION = "0.0.5 pre"; - public final static String DATE = "Apr 08 2006"; + public final static String DATE = "April 09 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; @@ -22,6 +23,8 @@ Random random; public JavaAmp() throws Exception { + GraphicsLoader.startLoading(this); + Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { try { @@ -53,8 +56,6 @@ Language.loadLanguage(getClass(), langs[0]); } - GraphicsLoader.startLoading(this); - FMOD.create(); FSound.FSOUND_SetDriver(Settings.getDriver()); Settings.driver = FSound.FSOUND_GetDriverName( @@ -99,27 +100,17 @@ } public final static void error(Exception e) { + ByteArrayOutputStream str = new ByteArrayOutputStream(); e.printStackTrace(); - StringBuilder str = new StringBuilder(e.toString()); - str.append('\n'); - for(int i = 0; i < e.getStackTrace().length; i++) { - str.append(" at "); - str.append(e.getStackTrace()[i]); - str.append('\n'); - } + e.printStackTrace(new PrintStream(str)); Sys.alert("JavaAmp: Error", str.toString()); System.exit(1); } public final static void warning(Exception e) { + ByteArrayOutputStream str = new ByteArrayOutputStream(); e.printStackTrace(); - StringBuilder str = new StringBuilder(e.toString()); - str.append('\n'); - for(int i = 0; i < e.getStackTrace().length; i++) { - str.append(" at "); - str.append(e.getStackTrace()[i]); - str.append('\n'); - } + e.printStackTrace(new PrintStream(str)); Sys.alert("JavaAmp: Warning", str.toString()); } Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Settings.java 8 Apr 2006 18:13:56 -0000 1.7 +++ Settings.java 9 Apr 2006 16:29:05 -0000 1.8 @@ -37,8 +37,9 @@ static boolean proxyEnabled; static String proxyHost; static int proxyPort; + static String proxyUser; + static String proxyPassword; static boolean splash; - static boolean multiple; static boolean update; static boolean showInTaskbar; static boolean showInSysTray; @@ -82,8 +83,9 @@ proxyPort = getIntValue(p.get("ProxyPort"), -1); if(proxyPort < 0 || proxyPort > 65535) proxyPort = -1; + proxyUser = getStringValue(p.get("ProxyUser"), ""); + proxyPassword = getStringValue(p.get("ProxyPassword"), ""); splash = getBooleanValue(p.get("Splash"), true); - multiple = getBooleanValue(p.get("Multiple"), true); update = getBooleanValue(p.get("Update"), true); showInTaskbar = getBooleanValue(p.get("ShowInTaskbar"), true); showInSysTray = getBooleanValue(p.get("ShowInSysTray"), false); @@ -201,8 +203,9 @@ p.put("ProxyEnable", Boolean.toString(proxyEnabled)); p.put("ProxyHost", proxyHost); p.put("ProxyPort", Integer.toString(proxyPort)); + p.put("ProxyUser", proxyUser); + p.put("ProxyPassword", proxyPassword); p.put("Splash", Boolean.toString(splash)); - p.put("Multiple", Boolean.toString(multiple)); p.put("Update", Boolean.toString(update)); p.put("ShowInTaskbar", Boolean.toString(showInTaskbar)); p.put("ShowInSysTray", Boolean.toString(showInSysTray)); @@ -216,7 +219,7 @@ p.put("SpeakerMode", getStringByValue(speakermode, SPEAKER_MODES, SPEAKER_MODES_VALS, "STEREO")); p.put("MixerType", getStringByValue(mixertype, MIXER_TYPES, - MIXER_TYPES_VALS, "AUTODETECT")); + MIXER_TYPES_VALS, "QUALITY_AUTODETECT")); p.put("Driver", driver); p.put("PlayDialogVisible", Boolean.toString(playDialogVisible)); p.put("PlayDialogX", Integer.toString(playDialogX)); |
