Author: jerome
Date: 2008-09-18 15:46:37 +0200 (Thu, 18 Sep 2008)
New Revision: 1906
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/Object/Playlist/GenericPlaylist.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumb.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumbnail.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
Log:
* Fixed fonts and text sizes.
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-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -42,8 +42,6 @@
try{
if(SystemInformation.isUnix()){
CcInterface.fontName = "Bitstream Vera Sans";
- //CcInterface.fontName = "Nimbus Sans L";
- //CcInterface.fontName = "DejaVu Sans ";
}
else{
CcInterface.fontName = "Verdana";
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-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -752,7 +752,7 @@
jContentPane.setBackground(new Color(142, 142, 142));
jContentPane.setPreferredSize(new Dimension(605, 306));
jContentPane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
- jContentPane.setFont(new Font("Dialog", Font.PLAIN,
12));
+ jContentPane.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 12));
//Set fileBrowser components preferencies.
scroll_fileBrowser_gadgets.setBounds(new Rectangle(141,
105, 620, 246));
@@ -797,11 +797,15 @@
//Set speaker selection menu
JMenu speaker = new JMenu();
+ speaker.setFont(new Font(CcInterface.fontName, Font.PLAIN, 11));
if(!tux.radio.getConnected()) return;
speaker = new JMenu(language.getMenuViewSpeaker());
this.interfaceMenusLang.updateLocutors();
for(JMenuItem items :
this.interfaceMenusLang.getTuxLocutorsMenus())
+ {
+ items.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
speaker.add(items);
+ }
popupFileMenu.add(speaker);
}
@@ -813,7 +817,9 @@
//Create sub menus languages.
JMenu languages = new
JMenu(language.getMenuViewLanguage());
+ languages.setFont(new
Font(CcInterface.fontName, Font.PLAIN, 11));
for(JMenuItem items :
this.interfaceMenusLang.getInterfaceLanguagesMenus()){
+ items.setFont(new
Font(CcInterface.fontName, Font.PLAIN, 11));
languages.add(items);
}
popupFileMenu.add(languages);
@@ -827,8 +833,11 @@
//Create pitch menu.
final int pitchValue = settings.getPitch();
final JMenu pitch = new
JMenu(language.getPitchMenuCaption());
+ pitch.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
final JMenuItem plus = new JMenuItem(pitchValue + " " +
language.getPitchCaptionPlus());
+ plus.setFont(new Font(CcInterface.fontName, Font.PLAIN,
11));
final JMenuItem minder = new JMenuItem(pitchValue + "
" + language.getPitchCaptionMinder());
+ minder.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
pitch.add(plus);
pitch.add(minder);
@@ -865,6 +874,7 @@
final String path = language.getMenuSubDirectory();
//Add exit menu item that allow to exit application.
exit = new JMenuItem(language.getMenuFileExit());
+ exit.setFont(new Font(CcInterface.fontName, Font.PLAIN,
11));
exit.addMouseListener(new ExitSubMenuListener(path));
popupFileMenu.add(exit);
//Create a menu listener com.tuxdroid.cc.Listener.
@@ -919,6 +929,7 @@
//Adding items.
JMenuItem help = new
JMenuItem(language.getMenuHelpOnlineHelp());
+ help.setFont(new Font(CcInterface.fontName, Font.PLAIN,
11));
help.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/getting-started";));
//Create a new MenuListener.
@@ -930,13 +941,14 @@
JMenuItem onlineFaq = new
JMenuItem(language.getMenuHelpOnlineFAQ());
onlineFaq.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/documentation/faq";));
+ onlineFaq.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
-
JMenuItem reportBug = new
JMenuItem(language.getMenuHelpReportBug());
reportBug.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/developers/users-reports";));
+ reportBug.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
-
JMenuItem about = new
JMenuItem(language.getMenuHelpAbout());
+ about.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
about.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
new About(language, new
Point(jFrame.getLocationOnScreen().x
@@ -956,6 +968,7 @@
//Adding help menus to an "online" menu.
JMenu online = new
JMenu(this.language.getOnlineMenuCaption());
+ online.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
online.add(onlineFaq);
online.add(reportBug);
online.add(help);
@@ -994,17 +1007,21 @@
if(!(this.toolsMenus.size() <= 0))
for(JMenuItem item : this.toolsMenus){
+ item.setFont(new
Font(CcInterface.fontName, Font.PLAIN, 11));
popupmenu1.add(item);
}
popupmenu1.addSeparator();
JMenu advancedMenu = new
JMenu(language.getToolMenuAdvanced());
+ advancedMenu.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
//Adding ip selection menu item.
JMenuItem port = new
JMenuItem(language.getIpSelectionCaption());
+ port.setFont(new Font(CcInterface.fontName, Font.PLAIN,
11));
port.addMouseListener(new IPSelectionListener());
//Adding show debugger function.
JMenuItem debugger = new
JMenuItem(language.showDebuggerCaption());
+ debugger.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
debugger.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
file_browser.showDebugger(true);
@@ -1037,21 +1054,24 @@
popupmenu2.addPopupMenuListener(new MenuListener(one,
two, three, viewMenu));
//Show list view menu option.
- JMenuItem showlist = new
JMenuItem(language.getMenuViewListView());
+ JMenuItem showlist = new
JMenuItem(language.getMenuViewListView());
+ showlist.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
showlist.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
showListView();
}
});
//Show thumbnail view menu option.
- JMenuItem showthumb = new
JMenuItem(language.getMenuViewThumbnailView());
+ JMenuItem showthumb = new
JMenuItem(language.getMenuViewThumbnailView());
+ showthumb.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
showthumb.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
showThumbnailView();
}
});
//Adding "show/Hide bottom frame functionnality"
- JMenuItem showHideBottomFrame = new
JMenuItem(language.getMenuViewShowProperties());
+ JMenuItem showHideBottomFrame = new
JMenuItem(language.getMenuViewShowProperties());
+ showHideBottomFrame.setFont(new
Font(CcInterface.fontName, Font.PLAIN, 11));
showHideBottomFrame.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
HideBottomPanel();
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-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/GenericPlaylist.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -93,6 +93,7 @@
}
}
});
+ this.setFont(new Font(CcInterface.fontName, Font.PLAIN, 11));
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-09-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -22,6 +22,7 @@
package com.tuxdroid.cc.Object.PseudoFileBrowser;
+import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Image;
import java.beans.PropertyChangeEvent;
@@ -210,7 +211,9 @@
String description = obj[0].toString();
this.getAttitunesDescriptionsPanel();
JLabel desc = new JLabel(description);
+ desc.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
JLabel detail = new JLabel(obj[2].toString());
+ detail.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
desc.setIcon(new ImageIcon((URL)obj[1]));
this.attituneDescription.add(desc);
this.attituneDescription.add(detail);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumb.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumb.java
2008-09-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumb.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -116,7 +116,6 @@
try {
Thread.sleep(3);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumbnail.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumbnail.java
2008-09-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/Thumbnail.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -23,6 +23,7 @@
package com.tuxdroid.cc.Object.Thumbnail;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.Point;
import java.awt.dnd.DropTarget;
import java.awt.image.ImageObserver;
@@ -35,6 +36,8 @@
import javax.swing.JLabel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
+
+import com.tuxdroid.cc.CcInterface;
public class Thumbnail extends JComponent implements ImageObserver,
PropertyChangeListener {
@@ -90,7 +93,8 @@
label.setHorizontalAlignment(SwingConstants.CENTER);
label.setLocation(new Point(((this.getWidth() / 2) -
(label.getWidth() / 2)) ,
(this.getHeight() - label.getHeight())
- 10));
- label.setText(Name);
+ label.setText(Name);
+ label.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
}
return label;
}
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-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -185,7 +185,8 @@
}
});
- this.mask();
+ this.mask();
+ jTable.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
}
return jTable;
}
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-18 13:15:35 UTC (rev 1905)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-09-18 13:46:37 UTC (rev 1906)
@@ -179,7 +179,8 @@
jTable.setShowHorizontalLines(false);
jTable.setShowGrid(false);
jTable.getTableHeader().setReorderingAllowed(false);
-
jTable.setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION);
+
jTable.setSelectionMode(DefaultListSelectionModel.SINGLE_SELECTION);
+ jTable.setFont(new Font(CcInterface.fontName,
Font.PLAIN, 11));
JTableHeader header = jTable.getTableHeader();
header.setBackground(new Color(142, 142, 142));
header.setFont(new Font(CcInterface.fontName,
Font.BOLD, 11));
@@ -353,14 +354,15 @@
String about = " Version : " + vals[5].toString() + " Author: " +
vals[2].toString();
JLabel gdgdescription = new JLabel(description);
+ gdgdescription.setFont(new Font(CcInterface.fontName, Font.PLAIN, 11));
gdgdescription.setSize(200, 200);
gdgdescription.setPreferredSize(gdgdescription.getSize());
JLabel gdgabout = new JLabel(about);
+ gdgabout.setFont(new Font(CcInterface.fontName, Font.PLAIN, 11));
File icon = new File(vals[4].toString());
//Image iconImage = image.ImgResize(new
ImageIcon(icon.getAbsolutePath()).getImage(), 48, 48);
gdgdescription.setIcon(new ImageIcon(icon.getAbsolutePath()));
- gdgdescription.setSize(new Dimension(200, 200));
gdgdescription.setPreferredSize(gdgdescription.getSize());
//adding description.
-------------------------------------------------------------------------
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
