From: WiESi <wi...@us...> - 2006-04-09 18:23:11
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25975/src Modified Files: Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Language.java 9 Apr 2006 16:29:05 -0000 1.6 +++ Language.java 9 Apr 2006 18:22:57 -0000 1.7 @@ -27,7 +27,7 @@ english.put("DELETE", "Delete"); english.put("DIRECTORY", "Directory"); english.put("DOCKING", "Enable window docking"); - english.put("DOCKINGD", "Docking distance (pixels):"); + english.put("DOCKINGD", "Docking at (pixels):"); english.put("ENABLE_PROXY", "Enable proxy"); english.put("ENTER_URL", "Enter URL:"); english.put("EQF_FILES", "EQF files"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- PreferencesDialog.java 9 Apr 2006 16:29:05 -0000 1.8 +++ PreferencesDialog.java 9 Apr 2006 18:22:57 -0000 1.9 @@ -54,7 +54,8 @@ JComboBox cmbLookAndFeel; JCheckBox chbDocking; JLabel lblDockingD; - JTextField tfdDockingD; + JSlider sliDockingD; + JLabel lblDockingDPixels; JPanel panPlugins; JPanel panSoundOutput; JPanel panVisualization; @@ -286,7 +287,6 @@ panAppearance.setBorder(BorderFactory.createTitledBorder( Language.get("APPEARANCE"))); panAppearance.setBounds(170, 10, 395, 400); - lblLookAndFeel = new JLabel(Language.get("LOOK_AND_FEEL")); lblLookAndFeel.setBounds(10, 15, 90, 20); panAppearance.add(lblLookAndFeel); @@ -323,11 +323,20 @@ chbDocking.setBounds(10, 40, 370, 20); panAppearance.add(chbDocking); lblDockingD = new JLabel(Language.get("DOCKINGD")); - lblDockingD.setBounds(10, 65, 140, 20); + lblDockingD.setBounds(10, 65, 100, 20); panAppearance.add(lblDockingD); - tfdDockingD = new JTextField(); - tfdDockingD.setBounds(150, 65, 50, 20); - panAppearance.add(tfdDockingD); + sliDockingD = new JSlider(1, 50); + sliDockingD.setBounds(110, 65, 200, 20); + sliDockingD.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblDockingDPixels.setText(Integer.toString( + sliDockingD.getValue())); + } + }); + panAppearance.add(sliDockingD); + lblDockingDPixels = new JLabel(); + lblDockingDPixels.setBounds(320, 65, 60, 20); + panAppearance.add(lblDockingDPixels); panPlugins = new JPanel(null); panPlugins.setBorder(BorderFactory.createTitledBorder( @@ -387,7 +396,7 @@ chbScroll.setSelected(Settings.scrollTitle); cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); chbDocking.setSelected(Settings.docking); - tfdDockingD.setText(Integer.toString(Settings.dockingd)); + sliDockingD.setValue(Settings.dockingd); // TODO ... setVisible(true); } @@ -413,14 +422,7 @@ Settings.scrollTitle = chbScroll.isSelected(); Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); Settings.docking = chbDocking.isSelected(); - try { - Settings.dockingd = Integer.parseInt(tfdDockingD.getText()); - if(Settings.dockingd < 0 || Settings.dockingd > 50) - Settings.dockingd = 10; - } - catch(Exception e) { - Settings.dockingd = 10; - } + Settings.dockingd = sliDockingD.getValue(); // TODO ... setVisible(false); } Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Settings.java 9 Apr 2006 16:29:05 -0000 1.8 +++ Settings.java 9 Apr 2006 18:22:57 -0000 1.9 @@ -94,8 +94,8 @@ "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); docking = getBooleanValue(p.get("Docking"), true); dockingd = getIntValue(p.get("DockingDistance"), 10); - if(dockingd < 0) - dockingd = 0; + if(dockingd < 1) + dockingd = 1; else if(dockingd > 50) dockingd = 50; mixrate = getIntValue(p.get("MixRate"), 44100); |