Author: jerome
Date: 2008-11-26 18:43:41 +0100 (Wed, 26 Nov 2008)
New Revision: 2853
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
Log:
* Fixed : #153 ?\226?\128?\148 mulitple gadget java processes keep running
after closing cc.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-11-26 17:08:11 UTC (rev 2852)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-11-26 17:43:41 UTC (rev 2853)
@@ -92,6 +92,7 @@
import com.tuxdroid.cc.control.CCRemoteActions;
import com.tuxdroid.cc.gadget.GadgetObject;
import com.tuxdroid.cc.gadget.GadgetsCommandsUtils;
+import com.tuxdroid.cc.gadget.GadgetsFramework;
import com.tuxdroid.cc.swing.About;
import com.tuxdroid.cc.swing.JStatusBar;
import com.tuxdroid.cc.swing.TuxBorder;
@@ -1698,6 +1699,7 @@
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-stopped")){
+ this.playflag = !this.playflag;
this.setFrameworkBusy(false);
playflag = true;
playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
@@ -2206,31 +2208,35 @@
}
else
if(arg0.getPropertyName().equalsIgnoreCase("gadget-double-click")){
- playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/stop_down.png")));
- this.setFrameworkBusy(true);
- //Deleting remote control context.
- CCRemoteActions.deleteContext();
- if(CcCommons.view == CcConstants.VIEW_LIST){
- boolean played =
fileBrowser.playGadget(CcConstants.VIEW_LIST);
- if(!played){
- playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
- }
- else{
- playflag = !playflag;
-
setPlayerControlsConsistants(false);
- }
+
+ if (!playflag)
+ return;
+
+ playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/stop_down.png")));
+ this.setFrameworkBusy(true);
+ //Deleting remote control context.
+ CCRemoteActions.deleteContext();
+ if(CcCommons.view == CcConstants.VIEW_LIST){
+ boolean played =
fileBrowser.playGadget(CcConstants.VIEW_LIST);
+ if(!played){
+ playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
}
-
else{
- boolean played =
fileBrowser.playGadget(CcConstants.VIEW_THUMBNAIL);
- if(!played){
- playflag = !playflag;
- playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
- }
- else{
-
setPlayerControlsConsistants(false);
- }
+ playflag = !playflag;
+ setPlayerControlsConsistants(false);
}
+ }
+
+ else{
+ boolean played =
fileBrowser.playGadget(CcConstants.VIEW_THUMBNAIL);
+ if(!played){
+ playflag = !playflag;
+ playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
+ }
+ else{
+ setPlayerControlsConsistants(false);
+ }
+ }
}
else
if(arg0.getPropertyName().equalsIgnoreCase("attitune-double-click")){
@@ -2255,6 +2261,9 @@
else
if(arg0.getPropertyName().equalsIgnoreCase("remote-double-click")){
+ if (!playflag)
+ return;
+
playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/stop_down.png")));
this.setFrameworkBusy(true);
//Deleting remote control context.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
