aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/qcommon/Q2DataDialog.java
diff options
context:
space:
mode:
authorHolger Zickner <[email protected]>2005-05-26 16:56:33 +0000
committerHolger Zickner <[email protected]>2005-05-26 16:56:33 +0000
commitc96baeae8717b80e23afabd4abdfb5aff0e8cbcc (patch)
tree5d0849dc34b79ed36c1f59353ac6ea5ae5361071 /src/jake2/qcommon/Q2DataDialog.java
parent152b65e3999ba7a618cdf934c830351f2f76cff2 (diff)
merge last changes from 0.9.4 branch
Diffstat (limited to 'src/jake2/qcommon/Q2DataDialog.java')
-rw-r--r--src/jake2/qcommon/Q2DataDialog.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jake2/qcommon/Q2DataDialog.java b/src/jake2/qcommon/Q2DataDialog.java
index 16c1bf5..2d28629 100644
--- a/src/jake2/qcommon/Q2DataDialog.java
+++ b/src/jake2/qcommon/Q2DataDialog.java
@@ -2,7 +2,7 @@
* Q2DataDialog.java
* Copyright (C) 2003
*
- * $Id: Q2DataDialog.java,v 1.13 2005-05-12 12:52:50 hzi Exp $
+ * $Id: Q2DataDialog.java,v 1.14 2005-05-26 16:56:32 hzi Exp $
*/
package jake2.qcommon;
@@ -35,7 +35,7 @@ public class Q2DataDialog extends javax.swing.JDialog {
int x = (mode.getWidth() - getWidth()) / 2;
int y = (mode.getHeight() - getHeight()) / 2;
setLocation(x, y);
- dir = home + sep + "jake2" + sep + "baseq2";
+ dir = home + sep + "Jake2" + sep + "baseq2";
jTextField1.setText(dir);
}
@@ -183,7 +183,7 @@ public class Q2DataDialog extends javax.swing.JDialog {
}
private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {
-
+ dir = jTextField1.getText();
if (dir != null) {
Cvar.Set("cddir", dir);
FS.setCDDir();
@@ -227,7 +227,7 @@ public class Q2DataDialog extends javax.swing.JDialog {
private InstallPanel installPanel;
private NotFoundPanel notFoundPanel;
private JLabel status;
- private javax.swing.JTextField jTextField1;
+ javax.swing.JTextField jTextField1;
private javax.swing.JButton okButton;
// End of variables declaration//GEN-END:variables
@@ -441,7 +441,7 @@ public class Q2DataDialog extends javax.swing.JDialog {
public InstallPanel(Q2DataDialog d) {
initComponents();
- String dir = Q2DataDialog.home + Q2DataDialog.sep + "jake2";
+ String dir = Q2DataDialog.home + Q2DataDialog.sep + "Jake2";
destDir.setText(dir);
initMirrors();
parent = d;
@@ -760,7 +760,7 @@ public class Q2DataDialog extends javax.swing.JDialog {
void endInstall(String message) {
parent.notFoundPanel.message.setText(message);
- parent.dir = destDir + "/baseq2";
+ parent.jTextField1.setText(destDir + "/baseq2");
parent.showChooseDialog();
parent.okButtonActionPerformed(null);
}