Author: jerome
Date: 2008-08-22 17:56:16 +0200 (Fri, 22 Aug 2008)
New Revision: 1572
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
Log:
* fixed a bug.
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
2008-08-22 15:04:12 UTC (rev 1571)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-22 15:56:16 UTC (rev 1572)
@@ -1246,11 +1246,13 @@
if(type == CcInterface.TYPE_GADGETS){
//display gadgets thumbnail view.
scroll_fileBrowser_thumbnailGadgets.setVisible(false);
- scroll_fileBrowser_gadgets.setVisible(true);
+ scroll_fileBrowser_gadgets.setVisible(true);
+ this.showGadgetLatestProperties();
}
else if (type == CcInterface.TYPE_ATTITUNES){
scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
- scroll_fileBrowser_attitunes.setVisible(true);
+ scroll_fileBrowser_attitunes.setVisible(true);
+ this.showAttituneLatestProperties();
}
else{
view = VIEW_THUMBNAIL;
@@ -1274,13 +1276,15 @@
//display gadgets thumbnail view.
scroll_fileBrowser_gadgets.setVisible(false);
scroll_fileBrowser_thumbnailGadgets.setVisible(true);
-
scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
+
scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
+ this.showGadgetLatestProperties();
jFrame.repaint();
}
else if (type == CcInterface.TYPE_ATTITUNES){
scroll_fileBrowser_attitunes.setVisible(false);
-
scroll_fileBrowser_thumbnailAttitunes.setVisible(true);
+
scroll_fileBrowser_thumbnailAttitunes.setVisible(true);
+ this.showAttituneLatestProperties();
}
else{
@@ -1430,6 +1434,54 @@
this.leftSize = jLeftPanel.getHeight();
}
return jLeftPanel;
+ }
+
+
+
+ public void showAttituneLatestProperties(){
+ if(view == CcInterface.VIEW_LIST){
+ if(file_browser.getAttitunesViewSelectedIndex() != -1){
+ maskAllTabs();
+
if(this.savedProperties.containsKey("attitune")){
+ JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune");
+
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
+ }
+ } else this.maskGadgetsTabs();
+ }
+ else if(view == CcInterface.VIEW_THUMBNAIL){
+ if(file_browser.thumbnailAttitunes.haveSelectedThumb()){
+ maskAllTabs();
+
if(this.savedProperties.containsKey("attitune-thumbnail")){
+ JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune-thumbnail");
+
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
+ }
+ } else maskGadgetsTabs();
+ }
+ }
+
+
+
+ public void showGadgetLatestProperties(){
+ if(view == CcInterface.VIEW_LIST){
+ if(file_browser.getListViewSelectedIndex() != -1){
+ maskAllTabs();
+ if(this.savedProperties.containsKey("gadget")){
+ JPanel[] panels = (JPanel[])
this.savedProperties.get("gadget");
+
this.jTabbedPane.add(language.getPanelSummary(), panels[0]);
+
this.jTabbedPane.add(language.getPanelHelp(), panels[1]);
+ }
+ } else this.maskGadgetsTabs();
+ }
+ else if(view == CcInterface.VIEW_THUMBNAIL){
+ if(file_browser.thumbnailGadgets.haveSelectedThumb()){
+ maskAllTabs();
+
if(this.savedProperties.containsKey("gadget-thumbnail")){
+ JPanel[] panels = (JPanel[])
this.savedProperties.get("gadget-thumbnail");
+
this.jTabbedPane.add(language.getPanelSummary(), panels[0]);
+
this.jTabbedPane.add(language.getPanelHelp(), panels[1]);
+ }
+ }else this.maskGadgetsTabs();
+ }
}
/**
@@ -1456,14 +1508,8 @@
scroll_fileBrowser_thumbnailGadgets.setVisible(true);
}
type = CcInterface.TYPE_GADGETS;
- this.maskAllTabs();
- if(((file_browser.getListViewSelectedIndex() != -1) ||
-
file_browser.thumbnailGadgets.haveSelectedThumb()) &
-
this.savedProperties.containsKey("gadget")){
- JPanel[] panels = (JPanel[])
this.savedProperties.get("gadget");
-
this.jTabbedPane.add(language.getPanelSummary(), panels[0]);
- this.jTabbedPane.add(language.getPanelHelp(),
panels[1]);
- }else this.maskGadgetsTabs();
+ this.showGadgetLatestProperties();
+
}
else if (index == 1){
if(view == CcInterface.VIEW_LIST){
@@ -1474,15 +1520,8 @@
scroll_fileBrowser_thumbnailGadgets.setVisible(false);
scroll_fileBrowser_thumbnailAttitunes.setVisible(true);
}
- type = CcInterface.TYPE_ATTITUNES;
- this.maskAllTabs();
- if(((file_browser.getAttitunesViewSelectedIndex() !=
-1) ||
-
file_browser.thumbnailAttitunes.haveSelectedThumb()) &
-
this.savedProperties.containsKey("attitune")){
- JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune");
-
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
- }
- else this.maskGadgetsTabs();
+ type = CcInterface.TYPE_ATTITUNES;
+ this.showAttituneLatestProperties();
}
this.setControlsConsistanceEnabled(true);
jTabbedPane.setEnabled(true);
@@ -1983,18 +2022,32 @@
this.maskAllTabs();
this.jTabbedPane.addTab(language.getPanelSummary(),
panel);
this.savedProperties.put("attitune", new
JPanel[]{panel});
+
+ if(this.view == CcInterface.VIEW_LIST){
+ this.savedProperties.put("attitune", new
JPanel[]{panel});
+ }
+ else if(this.view == CcInterface.VIEW_THUMBNAIL){
+ this.savedProperties.put("attitune-thumbnail",
new JPanel[]{panel});
+ }
}
//A gadget selection changed event has been reveived.
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
- System.out.println("vue: " + this.view);
+
Object obj = (Object)arg0.getNewValue();
JPanel[] readOnlyPanels = (JPanel[])obj;
this.maskAllTabs();
this.jTabbedPane.addTab(language.getPanelSummary(),
(JPanel)readOnlyPanels[0]);
this.jTabbedPane.addTab(language.getPanelHelp(),
(JPanel)readOnlyPanels[1]);
- this.savedProperties.put("gadget", new
JPanel[]{(JPanel)readOnlyPanels[0],
-
(JPanel)readOnlyPanels[1]});
+
+ if(this.view == CcInterface.VIEW_LIST){
+ this.savedProperties.put("gadget", new
JPanel[]{(JPanel)readOnlyPanels[0],
+ (JPanel)readOnlyPanels[1]});
+ }
+ else if(this.view == CcInterface.VIEW_THUMBNAIL){
+ this.savedProperties.put("gadget-thumbnail",
new JPanel[]{(JPanel)readOnlyPanels[0],
+ (JPanel)readOnlyPanels[1]});
+ }
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-stopped")){
-------------------------------------------------------------------------
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
