mirror of
https://github.com/igniterealtime/Spark.git
synced 2025-12-01 12:27:58 +00:00
SPARK-1306, reworked rendering issues in Appearance-Preference
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12500 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
committed by
wolf.posdorfer
parent
8beb84f0c6
commit
d94fae66d4
@ -19,19 +19,22 @@
|
|||||||
*/
|
*/
|
||||||
package org.jivesoftware.spark.ui.themes;
|
package org.jivesoftware.spark.ui.themes;
|
||||||
|
|
||||||
|
import java.awt.Image;
|
||||||
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JTabbedPane;
|
import javax.swing.JTabbedPane;
|
||||||
|
|
||||||
import org.jivesoftware.resource.Default;
|
import org.jivesoftware.resource.Default;
|
||||||
import org.jivesoftware.resource.Res;
|
import org.jivesoftware.resource.Res;
|
||||||
import org.jivesoftware.resource.SparkRes;
|
import org.jivesoftware.resource.SparkRes;
|
||||||
import org.jivesoftware.spark.component.VerticalFlowLayout;
|
import org.jivesoftware.spark.component.VerticalFlowLayout;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Holds the AppearanceTab and the ColorTab
|
||||||
|
* @author wolf.posdorfer
|
||||||
|
*
|
||||||
|
*/
|
||||||
public class MainThemePanel extends JPanel {
|
public class MainThemePanel extends JPanel {
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
private static final long serialVersionUID = 6014253744953992190L;
|
private static final long serialVersionUID = 6014253744953992190L;
|
||||||
|
|
||||||
private ThemePanel _themepanel;
|
private ThemePanel _themepanel;
|
||||||
@ -45,10 +48,12 @@ public class MainThemePanel extends JPanel {
|
|||||||
_colorpanel = new ColorPreferencePanel();
|
_colorpanel = new ColorPreferencePanel();
|
||||||
|
|
||||||
JTabbedPane tabs = new JTabbedPane();
|
JTabbedPane tabs = new JTabbedPane();
|
||||||
|
ImageIcon appe = new ImageIcon(SparkRes.getImageIcon(SparkRes.PALETTE_24x24_IMAGE).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
|
||||||
|
ImageIcon color = new ImageIcon(SparkRes.getImageIcon(SparkRes.COLOR_ICON).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
|
||||||
|
|
||||||
tabs.addTab(Res.getString("title.appearance.preferences"),SparkRes.getImageIcon(SparkRes.PALETTE_24x24_IMAGE), _themepanel);
|
tabs.addTab(Res.getString("title.appearance.preferences"),appe, _themepanel);
|
||||||
if(!Default.getBoolean("CHANGE_COLORS_DISABLED")){
|
if(!Default.getBoolean("CHANGE_COLORS_DISABLED")){
|
||||||
tabs.addTab(Res.getString("lookandfeel.color.label"),SparkRes.getImageIcon(SparkRes.COLOR_ICON),_colorpanel);
|
tabs.addTab(Res.getString("lookandfeel.color.label"),color,_colorpanel);
|
||||||
}
|
}
|
||||||
add(tabs);
|
add(tabs);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user