Author: jerome
Date: 2009-01-29 14:07:29 +0100 (Thu, 29 Jan 2009)
New Revision: 3544
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
Log:
* Fixed : #123 ?\226?\128?\148 D&D from online to playlists, gadget downloaded
but doesn't appear in favorites list
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -69,7 +69,6 @@
public static boolean differAlertsStartup = false;
public static boolean startupTTSAllowad = true;
- public static JFrame workingFrame;
public static JProgressBar progress;
//Fixed files.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -1784,13 +1784,17 @@
this.setPlayerControlsConsistants(true);
}
//An update event has been received.
- else if(arg0.getPropertyName().equalsIgnoreCase("updated")){
+ else if(arg0.getPropertyName().equalsIgnoreCase("updated")){
if(CcInterface.copyToPlaylists){
-
this.fileBrowser.setAddedAsSelected(pBrowser.getDownloadType());
- this.addToPlaylist(pBrowser.getDownloadName());
- CcInterface.copyToPlaylists = false;
- this.jListOnline.clearSelection();
+
if(pBrowser.getDownloadType().equals("attitune"))
+ {
+ CcCommons.type =
CcConstants.TYPE_ATTITUNES;
+
this.fileBrowser.setAddedAsSelected(pBrowser.getDownloadType());
+
this.addToPlaylist(pBrowser.getDownloadName());
+ CcInterface.copyToPlaylists = false;
+ this.jListOnline.clearSelection();
+ }
}
}
//An error reading attitune has been received.
@@ -1849,20 +1853,25 @@
}
else
if(arg0.getPropertyName().equalsIgnoreCase("deployement-terminated")){
- if(CcInterface.copyToPlaylists){
-
this.fileBrowser.setAddedAsSelected(pBrowser.getDownloadType());
- this.addToPlaylist(null);
- CcInterface.copyToPlaylists = false;
- this.jListOnline.clearSelection();
- this.jFrame.pack();
- }
+
if(!this.initialized){
new ServicesLauncher().start();
this.initInterface();
}
}
+ else
if(arg0.getPropertyName().equalsIgnoreCase("new-gadget-added")){
+
+ if(CcInterface.copyToPlaylists){
+ CcCommons.type = CcConstants.TYPE_GADGETS;
+
this.fileBrowser.setAddedAsSelected(pBrowser.getDownloadType());
+ this.jListOnline.clearSelection();
+ this.addToPlaylist((String)arg0.getNewValue());
+ }
+
+ }
+
else
if(arg0.getPropertyName().equalsIgnoreCase("Remote-Value-Changed")){
Object[] dat = (Object[])arg0.getNewValue();
String path = dat[1].toString();
@@ -2662,24 +2671,23 @@
playlistDragToIndex =
jListPlaylists.locationToIndex(arg0.getLocation());
if((pBrowser != null) && (pBrowser.isVisible())){
//then copy and create a gadget/attitune
instance from website.
+ CcInterface.copyToPlaylists = true;
pBrowser.CopyFromWebsite( arg0, jContentPane,
fileBrowser);
- CcInterface.copyToPlaylists = true;
}
else
+ {
if(!arg0.isLocalTransfer())
return;
- if(!CcInterface.copyToPlaylists)
- {
this.addToPlaylist(null);
- }
+ }
}
else if (arg0.getSource().equals(this.dropTargLibrary))
{
if((pBrowser != null) && (pBrowser.isVisible())){
//then copy and create a gadget/attitune
instance from website.
+ CcInterface.copyToPlaylists = false;
pBrowser.CopyFromWebsite( arg0, jContentPane,
fileBrowser);
- CcInterface.copyToPlaylists = false;
}
else
if(!arg0.isLocalTransfer())
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -205,7 +205,8 @@
this.gadgetsListView.update(this.GadgetsDatasToDisplay,
FileBrowser.GadgetsDatas);
this.thumbnailGadgets.updateThumbs(gadgetsListView);
}
- catch(Exception except){}
+ catch(Exception except){}
+ changes.firePropertyChange("new-gadget-added",
null, this.gdgFramework.getLastAddedGadget());
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
@@ -873,10 +874,16 @@
}
- public void setAddedAsSelected(String downloadType) {
- if(downloadType.equals("gadget")){
+ public void setAddedAsSelected(String downloadType)
+ {
+ if(downloadType == null)
+ {
this.gadgetsListView.setSelectedIndex(this.gadgetsListView.jTable.getRowCount()
-1);
+ this.attitunesListView.setSelectedIndex(0);
}
+ else if(downloadType.equals("gadget")){
+
this.gadgetsListView.setSelectedIndex(this.gadgetsListView.jTable.getRowCount()
-1);
+ }
else if(downloadType.equals("attitune")){
this.attitunesListView.setSelectedIndex(0);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -452,6 +452,16 @@
panels.add(scroll);
return panels;
+ }
+
+
+ /**
+ * Return the latest index into the list.
+ * @return
+ */
+ public int getLastIndex()
+ {
+ return this.privatesValues.length -1;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -88,7 +88,7 @@
}
- public void CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser){
+ public boolean CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser){
webBrowser.downloadedGadget = true;
String title = CcCommons.language.messages.getMessageBoxTitle();
if (arg0.isDataFlavorSupported(DataFlavor.stringFlavor)) {
@@ -114,10 +114,12 @@
else{
if(url.getFile().endsWith(".tgf")){
+ downloadKind = "gadget";
directory =
CcCommons.MyTuxGadgetsDirectory;
}
else if(url.getFile().endsWith(".att")){
directory =
CcCommons.MyTuxAttitunesDirectory;
+ downloadKind = "attitune";
}
//Getting right name.
String name = url.getPath();
@@ -149,7 +151,9 @@
fileOutputStream.close();
if(f.getAbsolutePath().endsWith(".tgf"))
+ {
this.downloadKind = "gadget";
+ }
else if(f.getAbsolutePath().endsWith(".att")){
this.downloadName = f.getName();
this.downloadKind = "attitune";
@@ -160,10 +164,11 @@
JOptionPane.showMessageDialog(parent, message,
title, JOptionPane.ERROR_MESSAGE);
} catch (IOException e) {
JOptionPane.showMessageDialog(parent, message,
title, JOptionPane.ERROR_MESSAGE);
- return;
}
+
}
fileBrowser.updateAllAttitunesViews();
+ return true;
}
public String getDownloadType(){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-01-28 12:59:33 UTC (rev 3543)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-01-29 13:07:29 UTC (rev 3544)
@@ -142,7 +142,8 @@
gadget.getInterpreter();
gadget.getInterpreter();
GadgetObject gadgetPanel = new GadgetObject(gadget,
console);
- console.add("Gadget added : " +
gadget.getDescription().getName());
+ console.add("Gadget added : " +
gadget.getDescription().getName());
+ lastAdded = gadget.getDescription().getTranslatedName();
changes.firePropertyChange("New-Gadget-Added", null,
gadgetPanel);
}
@@ -192,7 +193,7 @@
@SuppressWarnings("unused")
private boolean GadgetRunning = false;
-
+ private String lastAdded;
public GadgetsFramework(){
super();
@@ -230,6 +231,16 @@
private void stop() {
container.shutdown();
+ }
+
+
+ /**
+ * Return the latest added gadget name.
+ * @return
+ */
+ public String getLastAddedGadget()
+ {
+ return this.lastAdded;
}
public void propertyChange(PropertyChangeEvent arg0) {
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
