Author: jerome
Date: 2008-08-25 08:37:09 +0200 (Mon, 25 Aug 2008)
New Revision: 1576
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/Utils/SimpleAlertSettings.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/XMLWriter.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ZIP.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
Log:
* Added "Disable" alert button.
* Modified TgfGenerator..
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-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-25 06:37:09 UTC (rev 1576)
@@ -1277,7 +1277,6 @@
scroll_fileBrowser_thumbnailGadgets.setVisible(true);
scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
this.showGadgetLatestProperties();
- jFrame.repaint();
}
else if (type == CcInterface.TYPE_ATTITUNES){
@@ -1444,7 +1443,7 @@
if(this.savedProperties.containsKey("attitune")){
JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune");
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
- }
+ }else this.maskGadgetsTabs();
} else this.maskGadgetsTabs();
}
else if(view == CcInterface.VIEW_THUMBNAIL){
@@ -1453,7 +1452,7 @@
if(this.savedProperties.containsKey("attitune-thumbnail")){
JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune-thumbnail");
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
- }
+ }else this.maskGadgetsTabs();
} else maskGadgetsTabs();
}
}
@@ -2495,8 +2494,9 @@
this.schedulerGadgetCommand =
null;
}
}
+ this.fromSheduler = true;
}
- this.fromSheduler = true;
+
}
else if(arg0.getPropertyName().equalsIgnoreCase("gadget-talk")){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
2008-08-25 06:37:09 UTC (rev 1576)
@@ -46,7 +46,8 @@
private Languages language;
//Time settings components.
JRadioButton EveryButton = null;
- JRadioButton FixedTimeButton = null;
+ JRadioButton FixedTimeButton = null;
+ JRadioButton enabled = null;
ButtonGroup GroupAlertSettings;
@@ -70,8 +71,8 @@
h.setSize(new Dimension(20, 20));
minutes.setPreferredSize(minutes.getSize());
h.setPreferredSize(h.getSize());
- minutes.setLocation(new Point(144, 22));
- h.setLocation(new Point(144, 48));
+ minutes.setLocation(new Point(144, 44));
+ h.setLocation(new Point(144, 68));
setLayout(null);
//Adding components.
add(this.getEveryButton());
@@ -80,10 +81,10 @@
add(this.getFixedTimeButton());
add(this.getFixedTimeHoursEntry());
add(h);
- add(this.getFixedMinutesEntry());
-
this.GroupAlertSettings.setSelected(this.EveryButton.getModel(), true);
+ add(this.getFixedMinutesEntry());
+ add(this.getEnabledButton());
+ this.GroupAlertSettings.setSelected(this.enabled.getModel(),
true);
setVisible(true);
- this.repaint();
}
//Gets EveryButton.
@@ -94,7 +95,7 @@
EveryButton.setSize(new Dimension(100, 20));
EveryButton.setPreferredSize(EveryButton.getSize());
GroupAlertSettings.add(EveryButton);
- EveryButton.setLocation(new Point(14, 22));
+ EveryButton.setLocation(new Point(14, 44));
EveryButton.setOpaque(true);
EveryButton.setFocusPainted(false);
EveryButton.setBorderPainted(false);
@@ -112,7 +113,7 @@
FixedTimeButton.setSize(new Dimension(100, 20));
FixedTimeButton.setPreferredSize(FixedTimeButton.getSize());
GroupAlertSettings.add(FixedTimeButton);
- FixedTimeButton.setLocation(new Point(14, 48));
+ FixedTimeButton.setLocation(new Point(14, 70));
FixedTimeButton.setOpaque(true);
FixedTimeButton.setFocusPainted(false);
FixedTimeButton.setBorderPainted(false);
@@ -120,6 +121,24 @@
}
return FixedTimeButton;
+ }
+
+
+ //Get "enabled" radio button.
+ public JRadioButton getEnabledButton(){
+ if(enabled == null){
+ this.enabled = new JRadioButton(new TuxRadioButton());
+ this.enabled.setText(language.getEnabledAlert());
+ this.enabled.setSize(new Dimension(100, 20));
+ this.enabled.setPreferredSize(this.enabled.getSize());
+ GroupAlertSettings.add(this.enabled);
+ this.enabled.setLocation(new Point(14, 18));
+ this.enabled.setOpaque(true);
+ this.enabled.setFocusPainted(false);
+ this.enabled.setBorderPainted(false);
+ this.enabled.setContentAreaFilled(false);
+ }
+ return enabled;
}
@@ -129,7 +148,7 @@
EveryEntry = new JTextField("10");
EveryEntry.setSize(new Dimension(26, 20));
EveryEntry.setPreferredSize(EveryEntry.getSize());
- EveryEntry.setLocation(new Point(114, 22));
+ EveryEntry.setLocation(new Point(114, 44));
EveryEntry.addKeyListener(new
TimeKeyListener(TimeKeyListener.MINS_TYPE));
EveryEntry.setOpaque(true);
EveryEntry.setBackground(new Color(241,241,241));
@@ -144,7 +163,7 @@
FixedTimeHoursEntry = new JTextField("13");
FixedTimeHoursEntry.setSize(new Dimension(26, 20));
FixedTimeHoursEntry.setPreferredSize(FixedTimeHoursEntry.getSize());
- FixedTimeHoursEntry.setLocation(new Point(114, 48));
+ FixedTimeHoursEntry.setLocation(new Point(114, 69));
FixedTimeHoursEntry.addKeyListener(new
TimeKeyListener(TimeKeyListener.HOURS_TYPE));
FixedTimeHoursEntry.setOpaque(true);
FixedTimeHoursEntry.setBackground(new
Color(241,241,241));
@@ -159,7 +178,7 @@
FixedMinutesEntry = new JTextField("00");
FixedMinutesEntry.setSize(new Dimension(26, 20));
FixedMinutesEntry.setPreferredSize(FixedMinutesEntry.getSize());
- FixedMinutesEntry.setLocation(new Point(152, 48));
+ FixedMinutesEntry.setLocation(new Point(152, 69));
FixedMinutesEntry.addKeyListener(new
TimeKeyListener(TimeKeyListener.MINS_TYPE));
FixedMinutesEntry.setOpaque(true);
FixedMinutesEntry.setBackground(new Color(241,241,241));
@@ -176,8 +195,8 @@
}
else
if(this.GroupAlertSettings.getSelection().equals(FixedTimeButton.getModel())){
return "fixed";
- }
- return "";
+ }
+ else return "disable";
}
@@ -226,6 +245,9 @@
else if(type.equals("fixed")){
this.GroupAlertSettings.setSelected(this.FixedTimeButton.getModel(), true);
}
+ else if(type.equals("disable")){
+
this.GroupAlertSettings.setSelected(this.enabled.getModel(), true);
+ }
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/XMLWriter.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/XMLWriter.java
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/XMLWriter.java
2008-08-25 06:37:09 UTC (rev 1576)
@@ -261,7 +261,7 @@
public void setDefaultAlertConfig(Document document, Element parent){
//adding default configuration.
Element attConf = document.createElement("configuration");
- attConf.setAttribute("type", "every");
+ attConf.setAttribute("type", "disable");
attConf.setAttribute("hours", "00");
attConf.setAttribute("minutes", "10");
attConf.setAttribute("action", "tts");
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ZIP.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ZIP.java
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/ZIP.java
2008-08-25 06:37:09 UTC (rev 1576)
@@ -125,7 +125,7 @@
FileOutputStream out = new FileOutputStream(dst
.getAbsolutePath()
+ File.separator + zen.getName());
- // transfere les byte compresse vers le fichier de sortie
+ //transfere les byte compresse vers le fichier de sortie
byte[] buf = new byte[MAX_PAQUET_SIZE];
int offset;
while ((offset = zis.read(buf)) > 0)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-25 06:37:09 UTC (rev 1576)
@@ -349,5 +349,9 @@
public String getAttituneVersionCaption(){
return this.get("attituneVersion", "Version");
+ }
+
+ public String getEnabledAlert(){
+ return this.get("alertDisabled", "Disable");
}
}
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-25 06:37:09 UTC (rev 1576)
@@ -64,6 +64,7 @@
alertPanelSchedulConfTTS=TTS message
alertPanelSchedulConStartGdg=Start gadget
alertPanelSchedulConTTSMessage=Something changed
+alertDisabled=Disable
menuToolsAdvancedItem=Advanced
tableCategory=Category
attituneVersion=Version
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-24 12:28:27 UTC (rev 1575)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-25 06:37:09 UTC (rev 1576)
@@ -63,7 +63,8 @@
alertConfStartAtTime=D�marrer �
alertPanelSchedulConfTTS=message TTS
alertPanelSchedulConStartGdg=Lancer gadget
-alertPanelSchedulConTTSMessage=Il y a du nouveau.
+alertPanelSchedulConTTSMessage=Il y a du nouveau
+alertDisabled=D�sactiv�e
menuToolsAdvancedItem=Avanc�
tableCategory=Cat�gorie
attituneVersion=Version
\ No newline at end of file
-------------------------------------------------------------------------
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
