Author: jerome
Date: 2009-02-06 16:02:31 +0100 (Fri, 06 Feb 2009)
New Revision: 3584
Added:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/CancelButton.java
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/images/empty-button.png
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/Properties.java
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages.properties
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_en.properties
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_es.properties
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_fr.properties
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_nl.properties
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/LinkButton.java
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/Presentation.java
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/ccp_main.java
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/images/bg-tour.png
Log:
* Fixed: #25 ?\226?\128?\148 tooltip gfx and button layout.
Added:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/CancelButton.java
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/CancelButton.java
(rev 0)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/CancelButton.java
2009-02-06 15:02:31 UTC (rev 3584)
@@ -0,0 +1,68 @@
+/* This file is part of "TuxDroid Control Center".
+ * Copyright 2008, kysoh
+ * Author : Conan Jerome
+ * eMail : [email protected]
+ * Site : http://www.kysoh.com/
+ *
+ * "TuxDroid Control Center" is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "TuxDroid Control Center" is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with "TuxDroid Control Center"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.event.MouseAdapter;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+public class CancelButton extends JButton{
+
+ private static final long serialVersionUID = 1L;
+ private String text = "";
+ private Color color = Color.white;
+
+ public CancelButton(String text, final JFrame parent){
+ super();
+ this.text = text;
+ this.setContentAreaFilled(false);
+ this.setFocusable(false);
+ this.setBorderPainted(false);
+ this.setIcon(new
ImageIcon(ccp_main.class.getResource("images/empty-button.png")));
+
+ this.addMouseListener(new MouseAdapter(){
+
+ public void mousePressed(java.awt.event.MouseEvent
event){
+ color = new Color(255, 119, 29);
+ }
+
+ public void mouseReleased(java.awt.event.MouseEvent
event){
+ color = Color.white;
+ parent.dispose();
+ }
+ });
+
+ }
+
+
+ public void paintComponent(Graphics g){
+ g.drawImage(new
ImageIcon(ccp_main.class.getResource("images/empty-button.png")).getImage(), 0,
0, this);
+ g.setColor(this.color);
+ g.setFont(new Font(FontSet.getFontName(), Font.BOLD, 11));
+ g.drawString(text, (this.getWidth() / 2) - (text.length() * 3)
, 30);
+ g.dispose();
+ }
+}
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/Properties.java
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/Properties.java
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/Properties.java
2009-02-06 15:02:31 UTC (rev 3584)
@@ -51,6 +51,11 @@
}
+ public String getCancelButtonText()
+ {
+ return captions.getString("cancelButtonText");
+ }
+
public String getUrl()
{
return captions.getString("url");
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages.properties
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages.properties
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages.properties
2009-02-06 15:02:31 UTC (rev 3584)
@@ -1,3 +1,4 @@
-linkButtonText=Click here to view the quick video tour
+linkButtonText=Quick video tour
+cancelButtonText=Close window
showStartingPage= Show this startup window again.
url=http://kysoh.com/download/help/index.html
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_en.properties
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_en.properties
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_en.properties
2009-02-06 15:02:31 UTC (rev 3584)
@@ -1,3 +1,4 @@
-linkButtonText=Click here to view the quick video tour
+linkButtonText=Quick video tour
+cancelButtonText=Close window
showStartingPage= Show this startup window again.
url=http://kysoh.com/download/help/index.html
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_es.properties
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_es.properties
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_es.properties
2009-02-06 15:02:31 UTC (rev 3584)
@@ -1,3 +1,4 @@
-linkButtonText=Pulse aqui para ver la introduccion.
+linkButtonText=Video vista rapida
+cancelButtonText=Cerrar ventana
showStartingPage= Mostar siempre al iniciar.
url=http://kysoh.com/download/help/index.html
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_fr.properties
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_fr.properties
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_fr.properties
2009-02-06 15:02:31 UTC (rev 3584)
@@ -1,3 +1,4 @@
-linkButtonText=Cliquez ici pour voir la d�mo.
+linkButtonText=Voir la d�mo.
+cancelButtonText=Fermer la fen�tre
showStartingPage= Montrer cette aide au d�marrage.
url=http://kysoh.com/download/help/index-fr.html
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_nl.properties
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_nl.properties
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/I18N/languages_nl.properties
2009-02-06 15:02:31 UTC (rev 3584)
@@ -1,3 +1,4 @@
-linkButtonText=Klik hier voor de korte video tour
+linkButtonText=Korte video tour
+cancelButtonText=Venster sluiten
showStartingPage= Toon dit start venster volgende keer opnieuw.
url=http://kysoh.com/download/help/index-nl.html
\ No newline at end of file
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/LinkButton.java
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/LinkButton.java
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/LinkButton.java
2009-02-06 15:02:31 UTC (rev 3584)
@@ -61,7 +61,7 @@
g.drawImage(new
ImageIcon(ccp_main.class.getResource("images/empty-button.png")).getImage(), 0,
0, this);
g.setColor(this.color);
g.setFont(new Font(FontSet.getFontName(), Font.BOLD, 11));
- g.drawString(text, (this.getWidth() / 2) - (text.length() * 3)
- 6 , 34);
+ g.drawString(text, (this.getWidth() / 2) - (text.length() * 3)
, 30);
g.dispose();
}
}
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/Presentation.java
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/Presentation.java
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/Presentation.java
2009-02-06 15:02:31 UTC (rev 3584)
@@ -43,7 +43,7 @@
public Presentation(){
//Create interface.
setLayout(null);
- setSize(new Dimension(400, 460));
+ setSize(new Dimension(430, 460));
setPreferredSize(getSize());
setOpaque(true);
}
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/ccp_main.java
===================================================================
---
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/ccp_main.java
2009-02-06 13:41:16 UTC (rev 3583)
+++
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/ccp_main.java
2009-02-06 15:02:31 UTC (rev 3584)
@@ -43,6 +43,7 @@
public JCheckBox atStartup;
private LinkButton linkButton;
+ private CancelButton cancelButton;
public File settings;
public final JFrame frame;
public TuxAPI tux;
@@ -98,7 +99,7 @@
FontSet.setAllFonts();
frame = new JFrame("Tux Droid Control Center");
- frame.setSize(new Dimension(400, 460));
+ frame.setSize(new Dimension(430, 460));
frame.setPreferredSize(frame.getSize());
frame.setLocationRelativeTo(frame.getParent());
@@ -130,7 +131,7 @@
atStartup = new JCheckBox();
atStartup.setUI(new javax.swing.plaf.metal.MetalButtonUI());
atStartup.setText(properties.getStartupText());
- atStartup.setSize(300, 20);
+ atStartup.setSize(400, 20);
atStartup.setPreferredSize(atStartup.getSize());
atStartup.setLocation(10, 400);
atStartup.setOpaque(true);
@@ -158,12 +159,18 @@
});
this.linkButton = new
LinkButton(properties.getLinkButtonText(), properties.getUrl());
- linkButton.setSize(318, 61);
+ linkButton.setSize(177, 52);
linkButton.setPreferredSize(linkButton.getSize());
- linkButton.setLocation(40, 345);
+ linkButton.setLocation(26, 345);
+ this.cancelButton = new
CancelButton(properties.getCancelButtonText(), this.frame);
+ cancelButton.setSize(177, 52);
+ cancelButton.setPreferredSize(linkButton.getSize());
+ cancelButton.setLocation(224, 345);
+
p.add(atStartup);
p.add(linkButton);
+ p.add(cancelButton);
this.playAttitune(properties.getLanguage());
frame.add(p);
frame.setResizable(false);
@@ -219,6 +226,6 @@
*/
public static void main(String[] args)
{
- new ccp_main("en", "US");
+ new ccp_main("nl", "NL");
}
}
Modified:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/images/bg-tour.png
===================================================================
(Binary files differ)
Added:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/images/empty-button.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/control_center_presentation/trunk/control_center_presentation/src/images/empty-button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
