Author: jerome
Date: 2008-09-17 17:21:05 +0200 (Wed, 17 Sep 2008)
New Revision: 1885
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.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/Listener/ColumnHeaderListener.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/GenericPlaylist.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.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/Renderer/LabelsListRenderer.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/MyHeaderRenderer.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
Log:
* Work with Bitstream Vera Sans font under linux and "Verdana" under windows (
possibility to test others font by changing font name into cc_main.java ).
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -25,13 +25,14 @@
import com.tuxdroid.cc.Utils.languages.Languages;
import com.tuxisalive.api.TuxAPI;
import com.tuxisalive.api.TuxAPIConst;
+
+import net.karmaLab.tools.SystemInformation;
public class cc_main{
public static void main(String[] args){
String ip = new Settings().getCurrentIPAdress();
TuxAPI tux = new TuxAPI(ip, 270);
- tux.event.handler.register("all", new TestAPI(), "onAllEvent");
tux.server.connect(TuxAPIConst.CLIENT_LEVEL_ROOT, "Test",
"myPasswd");
boolean tuxb = tux.server.getConnected();
@@ -39,7 +40,14 @@
if(tuxb){
try{
+ if(SystemInformation.isUnix()){
+ CcInterface.fontName = "Bitstream Vera Sans";
+ }
+ else{
+ CcInterface.fontName = "Verdana";
+ }
new CcInterface(tux);
+ System.out.println(CcInterface.fontName);
}
catch(Exception except){
except.printStackTrace();
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-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -118,10 +118,15 @@
import com.tuxisalive.api.SThread;
import com.tuxisalive.api.TuxAPI;
import com.tuxisalive.api.TuxAPIConst;
+
+import net.karmaLab.tools.SystemInformation;
+
-
public class CcInterface implements PropertyChangeListener, DropTargetListener{
- /** CcInterface Base frame **/
+ /** CcInterface Base frame **/
+
+ public static String fontName;
+
private JFrame jFrame = null; //
@jve:decl-index=0:visual-constraint="147,63"
/** CcInterface Panels **/
@@ -318,7 +323,7 @@
private void initInterface(){
//Getting CcInterface.
- //UIManager.put("EditorPane.font",new
javax.swing.plaf.FontUIResource(new Font("Verdana",Font.PLAIN,12)));
+ UIManager.put("EditorPane.font",new
javax.swing.plaf.FontUIResource(new Font(CcInterface.fontName,Font.PLAIN,12)));
getJFrame();
jTabbedPane.removeAll();
jTabbedPane.addTab(this.language.getPanelHelp(),
this.helpPanels.getLibrary(TuxHelpPanel.GADGETS));
@@ -1128,7 +1133,6 @@
return myfalseborder2;
}
-
/**
* This function initializes the "next" navigation button.
* @return nextButton.
@@ -1403,7 +1407,7 @@
private JPanel getMenuPanel() {
if (menuPanel == null) {
titleLabel =
functions.defineCommonsLabelProperties(titleLabel, language.getTitle(),
- null, null, null, new Rectangle(334, 5,
190, 16), new Font("Verdana", Font.BOLD, 12));
+ null, null, null, new Rectangle(334, 5,
190, 16), new Font(CcInterface.fontName, Font.BOLD, 12));
menuPanel = new JPanel();
menuPanel.setLayout(null);
menuPanel.setBounds(new Rectangle(0, 0, 833, 23));
@@ -1430,7 +1434,7 @@
jLabelPlaylists = new JLabel();
jLabelPlaylists.setBounds(new Rectangle(6, 124, 133,
16));
jLabelPlaylists.setForeground(Color.white);
- jLabelPlaylists.setFont(new Font("Verdana", Font.BOLD,
12));
+ jLabelPlaylists.setFont(new Font(CcInterface.fontName,
Font.BOLD, 12));
jLabelPlaylists.setIcon(new ImageIcon(
getClass().getResource("images/arrow_down.png")));
jLabelPlaylists.setText(language.getPlaylistsTitle());
@@ -1438,14 +1442,14 @@
jLabelOnline = new JLabel();
jLabelOnline.setBounds(new Rectangle(6, 62, 134, 16));
jLabelOnline.setForeground(Color.white);
- jLabelOnline.setFont(new Font("Verdana", Font.BOLD,
12));
+ jLabelOnline.setFont(new Font(CcInterface.fontName,
Font.BOLD, 12));
jLabelOnline.setIcon(new ImageIcon(
getClass().getResource("images/arrow_down.png")));
jLabelOnline.setText(language.getOnlineTitle());
jLabelOnline.addMouseListener(new
OnlineClickListener());
jLabelLibrary = new JLabel();
jLabelLibrary.setText(language.getLibraryTitle());
- jLabelLibrary.setFont(new Font("Verdana", Font.BOLD,
12));
+ jLabelLibrary.setFont(new Font(CcInterface.fontName,
Font.BOLD, 12));
jLabelLibrary.setBounds(new Rectangle(6, 5, 133, 16));
jLabelLibrary.setIcon(new ImageIcon(
getClass().getResource("images/arrow_down.png")));
@@ -1590,7 +1594,7 @@
if (jListLibrary == null) {
String[] listeItems = { " Gadgets", "
Attitunes" };
jListLibrary = new JList(listeItems);
- jListLibrary.setFont(new Font("Verdana", Font.PLAIN,
11));
+ jListLibrary.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
jListLibrary.setForeground(Color.white);
jListLibrary.setBounds(new Rectangle(2, 24, 140, 35));
jListLibrary.setBackground(new Color(143, 143, 143));
@@ -1678,7 +1682,8 @@
if (jListOnline == null) {
String[] listeItems = { " Gadgets", "
Attitunes" };
jListOnline = new JList(listeItems);
- jListOnline.setFont(new Font("Verdana", Font.PLAIN,
11));
+ jListOnline.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
+ System.out.println("jlistonline font: " +
jListOnline.getFont());
jListOnline.setForeground(Color.white);
jListOnline.setBounds(new Rectangle(2, 82, 140, 35));
jListOnline.setBackground(new Color(143, 143, 143));
@@ -1772,7 +1777,7 @@
"
"+language.getPlaylistsOptRemote(),
};
jListPlaylists = new JList(listeItems);
- jListPlaylists.setFont(new Font("Verdana", Font.PLAIN,
11));
+ jListPlaylists.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
jListPlaylists.setForeground(Color.white);
jListPlaylists.setBounds(new Rectangle(2, 144, 140,
66));
jListPlaylists.setBackground(new Color(143, 143, 143));
@@ -1909,7 +1914,7 @@
jTabbedPane.setBounds(new Rectangle(-1, 353, 766, 120));
jTabbedPane.setTabPlacement(JTabbedPane.TOP);
jTabbedPane.setForeground(new Color(51, 51, 51));
- jTabbedPane.setFont(new Font("Verdana", Font.BOLD, 11));
+ jTabbedPane.setFont(new Font(CcInterface.fontName,
Font.BOLD, 11));
jTabbedPane.setBackground(new Color(142, 142, 142));
jTabbedPane.setVisible(true);
this.unMaskGadgetsTabs();
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ColumnHeaderListener.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ColumnHeaderListener.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ColumnHeaderListener.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -32,6 +32,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.Renderer.MyHeaderRenderer;
public class ColumnHeaderListener extends MouseAdapter {
@@ -59,7 +60,7 @@
if (i != vColIndex){
JTableHeader header = table.getTableHeader();
header.setBackground(new Color(142,
142, 142));
- header.setFont(new Font("Verdana",
Font.BOLD, 11));
+ header.setFont(new
Font(CcInterface.fontName, Font.BOLD, 11));
TableColumn col =
columnModel.getColumn(i);
col.setHeaderRenderer(null);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/GenericPlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/GenericPlaylist.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/GenericPlaylist.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -32,6 +32,7 @@
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;
+import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.Renderer.ColorCellRenderer;
public class GenericPlaylist extends JTable{
@@ -73,9 +74,8 @@
setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION);
JTableHeader header = getTableHeader();
header.setBackground(new Color(142, 142, 142));
- header.setFont(new Font("Verdana", Font.BOLD, 12));
+ header.setFont(new Font(CcInterface.fontName, Font.BOLD, 12));
-
header.setReorderingAllowed(false);
setDragEnabled(true);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -161,7 +161,7 @@
jTable.setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION);
JTableHeader header = jTable.getTableHeader();
header.setBackground(new Color(142, 142, 142));
- header.setFont(new Font("Verdana", Font.BOLD, 11));
+ header.setFont(new Font(CcInterface.fontName,
Font.BOLD, 11));
header.addMouseListener(new ColumnHeaderListener());
TableColumnModel columnModel = jTable.getColumnModel();
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
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -68,6 +68,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.Listener.ColumnHeaderListener;
import com.tuxdroid.cc.Models.FiltreTriModel;
import com.tuxdroid.cc.Models.GadgetsTableModel;
@@ -181,7 +182,7 @@
jTable.setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION);
JTableHeader header = jTable.getTableHeader();
header.setBackground(new Color(142, 142, 142));
- header.setFont(new Font("Verdana", Font.BOLD, 11));
+ header.setFont(new Font(CcInterface.fontName,
Font.BOLD, 11));
header.addMouseListener(new ColumnHeaderListener());
TableColumnModel columnModel = jTable.getColumnModel();
TableColumn Column = columnModel.getColumn(0);
@@ -200,8 +201,9 @@
});
}
return jTable;
- }
+ }
+
public void update(Object[][] datasToDisplay, Object[][] datas){
//If they have a new value then create it.
this.privatesValues = datas;
@@ -351,6 +353,8 @@
String about = " Version : " + vals[5].toString() + " Author: " +
vals[2].toString();
JLabel gdgdescription = new JLabel(description);
+ gdgdescription.setSize(200, 200);
+ gdgdescription.setPreferredSize(gdgdescription.getSize());
JLabel gdgabout = new JLabel(about);
File icon = new File(vals[4].toString());
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/LabelsListRenderer.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/LabelsListRenderer.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/LabelsListRenderer.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -30,6 +30,8 @@
import javax.swing.JLabel;
import javax.swing.JList;
+import com.tuxdroid.cc.CcInterface;
+
public class LabelsListRenderer extends DefaultListCellRenderer{
private static final long serialVersionUID = 1L;
@@ -42,7 +44,7 @@
label.setOpaque(true);
String val =
((JLabel)super.getListCellRendererComponent(list,value,index,isSelected,cellHasFocus)).getText();
label.setText(val);
- label.setFont(new Font("Verdana", Font.PLAIN, 11));
+ label.setFont(new Font(CcInterface.fontName, Font.PLAIN, 11));
label.setForeground(Color.white);
if(isSelected){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/MyHeaderRenderer.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/MyHeaderRenderer.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Renderer/MyHeaderRenderer.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -30,6 +30,8 @@
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
+
+import com.tuxdroid.cc.CcInterface;
public class MyHeaderRenderer extends DefaultTableCellRenderer{
@@ -44,7 +46,7 @@
{
Component cell = super.getTableCellRendererComponent(table,
value, isSelected, hasFocus, row, column);
- cell.setFont(new Font("Verdana", Font.BOLD, 12));
+ cell.setFont(new Font(CcInterface.fontName, Font.BOLD, 12));
cell.setForeground(Color.white);
cell.setBackground(new Color(142,142,142));
super.setHorizontalAlignment(SwingConstants.CENTER);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -36,6 +36,7 @@
import javax.swing.JTextField;
import javax.swing.border.Border;
+import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.Utils.languages.Languages;
import com.tuxdroid.cc.swing.TuxDegradeePanel;
import com.tuxdroid.cc.swing.TuxRadioButton;
@@ -144,7 +145,7 @@
this.TTSMessage.setPreferredSize(this.TTSMessage.getSize());
this.TTSMessage.setBackground(new Color(241,241,241));
this.TTSMessage.setLocation(new Point(140, 46));
- this.TTSMessage.setFont(new Font("verdana", Font.BOLD, 12));
+ this.TTSMessage.setFont(new Font(CcInterface.fontName,
Font.BOLD, 12));
//adding component.
add(this.TTSMessage);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2008-09-17 15:16:45 UTC (rev 1884)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2008-09-17 15:21:05 UTC (rev 1885)
@@ -36,6 +36,7 @@
import java.util.GregorianCalendar;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetsContainer;
+import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.UI.MyScrollBarUI;
public class JConsole extends JFrame{
@@ -68,7 +69,7 @@
this.setPreferredSize(this.getSize());
area.setEditable(false);
area.setBackground(Color.black);
- area.setFont(new Font("Verdana", Font.BOLD, 10));
+ area.setFont(new Font(CcInterface.fontName, Font.BOLD, 10));
area.setForeground(Color.white);
//JFrame properties
-------------------------------------------------------------------------
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
