Author: jerome
Date: 2009-01-27 12:37:59 +0100 (Tue, 27 Jan 2009)
New Revision: 3536
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/WebBrowser/webBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
Log:
Fixed : D&D from online to lib is broken AND Rafraichissement de la librairie
d'attitunes.
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-27 10:54:57 UTC (rev 3535)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-01-27 11:37:59 UTC (rev 3536)
@@ -23,7 +23,6 @@
package com.tuxdroid.cc;
-import java.awt.Dimension;
import java.io.File;
import java.io.IOException;
import java.util.Vector;
@@ -166,73 +165,4 @@
public static void hideCc(){
CcCommons.CcFrame.setVisible(false);
}
-
-
- public static void getWorkingGUI(){
- new CcCommons.CreateWindow().start();
- }
-
-
- public static void startWorking(){
- new StartThread().start();
- }
-
-
- public static void stopWorking(){
- new StopThread().start();
- }
-
-
- private static class StartThread extends Thread{
-
- public void run(){
- workingFrame.setVisible(true);
- progress.setIndeterminate(true);
- try {
- Thread.sleep((long)8.0);
- } catch (InterruptedException e) {
- CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
- }
- //After 8 seconds if window is showed then mask it.
- new StopThread().start();
- }
- }
-
-
- private static class StopThread extends Thread{
-
- public void run(){
- workingFrame.setVisible(false);
- }
-
- }
-
-
- private static class CreateWindow extends Thread{
-
- public void run(){
- if(workingFrame == null){
-
- //Initialize frame.
- workingFrame = new JFrame();
- workingFrame.setUndecorated(true);
- workingFrame.setSize(250, 25);
-
workingFrame.setPreferredSize(workingFrame.getSize());
- Dimension dim =
java.awt.Toolkit.getDefaultToolkit ().getScreenSize();
- workingFrame.setLocation((dim.width /2) -
(workingFrame.getWidth() /2),
-
(dim.height /2) - (workingFrame.getHeight() /2));
- //Initialize progressbar.
- progress = new JProgressBar();
- progress.setSize(workingFrame.getSize());
- progress.setPreferredSize(progress.getSize());
- progress.setLocation(0, 0);
-
- //Adding progressbar.
- workingFrame.add(progress);
- workingFrame.pack();
- }
- }
-
- }
}
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-27 10:54:57 UTC (rev 3535)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-27 11:37:59 UTC (rev 3536)
@@ -236,7 +236,6 @@
onRadioConnected(null, null);
jFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- CcCommons.getWorkingGUI();
this.initialized = true;
CcCommons.tux.tts.setLocutor(CcCommons.settings.getSpeaker());
CcCommons.tux.tts.setPitch(CcCommons.settings.getPitch());
@@ -2658,11 +2657,10 @@
public void drop(DropTargetDropEvent arg0) {
//Drop to playlists.
- if(arg0.getSource().equals(this.dropTargPlaylist)){
+ if(arg0.getSource().equals(this.dropTargPlaylist))
+ {
playlistDragToIndex =
jListPlaylists.locationToIndex(arg0.getLocation());
if((pBrowser != null) && (pBrowser.isVisible())){
- //Showing working frame.
- CcCommons.startWorking();
//then copy and create a gadget/attitune
instance from website.
pBrowser.CopyFromWebsite( arg0, jContentPane,
fileBrowser);
CcInterface.copyToPlaylists = true;
@@ -2672,6 +2670,17 @@
return;
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.
+ pBrowser.CopyFromWebsite( arg0, jContentPane,
fileBrowser);
+ CcInterface.copyToPlaylists = false;
+ }
+ else
+ if(!arg0.isLocalTransfer())
+ return;
}
}
@@ -2680,6 +2689,10 @@
public void dragOver(DropTargetDragEvent arg0) {}
public void dropActionChanged(DropTargetDragEvent arg0) {}
+
+ /**
+ * This function is started when quitting the control center in order
to store configuration.
+ */
public void doneWhenExit()
{
if(CcCommons.type == CcConstants.TYPE_REMOTELIST) {
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-27 10:54:57 UTC (rev 3535)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
2009-01-27 11:37:59 UTC (rev 3536)
@@ -88,7 +88,7 @@
}
- public boolean CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser){
+ public void CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser){
webBrowser.downloadedGadget = true;
String title = CcCommons.language.messages.getMessageBoxTitle();
if (arg0.isDataFlavorSupported(DataFlavor.stringFlavor)) {
@@ -160,10 +160,10 @@
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/settings/Settings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2009-01-27 10:54:57 UTC (rev 3535)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2009-01-27 11:37:59 UTC (rev 3536)
@@ -268,7 +268,6 @@
*/
public void deleteFromPlaylists(String instancePath)
{
- System.out.println("From settings java class: " + instancePath);
writer.deleteFromPlaylists(instancePath);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-01-27 10:54:57 UTC (rev 3535)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-01-27 11:37:59 UTC (rev 3536)
@@ -144,7 +144,6 @@
//Unix browser function.
private void download(URL url) {
-
if(actualBrowser != JBrowser.UNIX) return;
else{
CcCommons.logger.append("Starting downloading at " +
url.toExternalForm(), true);
@@ -195,9 +194,9 @@
inputStream.close();
fileOutputStream.close();
} catch (IOException e) {
-
CcCommons.logger.appendError(e.getStackTrace());
String message =
CcCommons.language.messages.getURLErrorMessage();
JOptionPane.showMessageDialog(this,
message, title, JOptionPane.ERROR_MESSAGE);
+ return;
}
fileBrowser.updateAllAttitunesViews();
------------------------------------------------------------------------------
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
