[Jrisk-cvs] SF.net SVN: domination-code:[2598] Domination
Brought to you by:
yuranet
|
From: <yu...@us...> - 2024-12-07 19:40:25
|
Revision: 2598
http://sourceforge.net/p/domination/code/2598
Author: yuranet
Date: 2024-12-07 19:40:22 +0000 (Sat, 07 Dec 2024)
Log Message:
-----------
show currupt file popup
Modified Paths:
--------------
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
Domination/swingUI/lib/SwingME.jar
Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2024-12-07 19:34:15 UTC (rev 2597)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2024-12-07 19:40:22 UTC (rev 2598)
@@ -180,7 +180,7 @@
map.setMapUrl(file);
map.setName(file);
riskmaps.add(map);
-/*
+
// we are not in UI thread here, in Desktop mode we may not have a UI at all yet
OptionPane.showConfirmDialog(new ActionListener() {
public void actionPerformed(String actionCommand) {
@@ -188,8 +188,8 @@
RiskUtil.streamOpener.deleteMapFile(file);
}
}
- }, "Error with: " + file + ". Delete?", "Map Error", OptionPane.OK_CANCEL_OPTION);
- */
+ }, "Error in file: " + file + ". Delete?", "Map Error", OptionPane.OK_CANCEL_OPTION);
+
}
}
Modified: Domination/swingUI/lib/SwingME.jar
===================================================================
(Binary files differ)
Modified: Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java 2024-12-07 19:34:15 UTC (rev 2597)
+++ Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java 2024-12-07 19:40:22 UTC (rev 2598)
@@ -36,7 +36,9 @@
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.JCheckBox;
+import javax.swing.JComponent;
import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
import javax.swing.event.MouseInputAdapter;
import net.yura.domination.audio.GameSound;
import net.yura.domination.engine.ColorUtil;
@@ -459,6 +461,13 @@
flashPanel.add(fpRight,BorderLayout.EAST);
getContentPane().add( flashPanel );
+
+ this.getRootPane().registerKeyboardAction(new ActionListener() {//this, is a JFrame
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ savebutton.doClick();
+ }
+ }, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), JComponent.WHEN_IN_FOCUSED_WINDOW );
}
public void setExtraAction(Action action) {
|