diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/AntialiasingManager.java b/src/net/java/sip/communicator/impl/gui/utils/AntialiasingManager.java similarity index 90% rename from src/net/java/sip/communicator/impl/gui/main/utils/AntialiasingManager.java rename to src/net/java/sip/communicator/impl/gui/utils/AntialiasingManager.java index 1c5c3a2fd..6dc6c144f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/AntialiasingManager.java +++ b/src/net/java/sip/communicator/impl/gui/utils/AntialiasingManager.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.awt.Graphics; import java.awt.Graphics2D; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/BrowserLauncher.java b/src/net/java/sip/communicator/impl/gui/utils/BrowserLauncher.java similarity index 97% rename from src/net/java/sip/communicator/impl/gui/main/utils/BrowserLauncher.java rename to src/net/java/sip/communicator/impl/gui/utils/BrowserLauncher.java index cacf4f1c8..f347fff8b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/BrowserLauncher.java +++ b/src/net/java/sip/communicator/impl/gui/utils/BrowserLauncher.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; ///////////////////////////////////////////////////////// // Bare Bones Browser Launch // diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java b/src/net/java/sip/communicator/impl/gui/utils/Constants.java similarity index 97% rename from src/net/java/sip/communicator/impl/gui/main/utils/Constants.java rename to src/net/java/sip/communicator/impl/gui/utils/Constants.java index fc4bcb5f5..0c3713873 100755 --- a/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java +++ b/src/net/java/sip/communicator/impl/gui/utils/Constants.java @@ -5,14 +5,13 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.applet.Applet; import java.applet.AudioClip; import java.awt.Color; import java.awt.Font; import java.awt.Image; -import java.awt.image.BufferedImage; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -21,12 +20,8 @@ import java.util.Hashtable; import java.util.Map; -import javax.imageio.ImageIO; import javax.swing.text.html.StyleSheet; -import sun.applet.AppletAudioClip; - -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader.ImageID; import net.java.sip.communicator.service.protocol.PresenceStatus; import net.java.sip.communicator.service.protocol.icqconstants.IcqStatusEnum; @@ -112,7 +107,7 @@ public class Constants { public static final String FONT_NAME = "Verdana"; - public static final String FONT_SIZE = "12"; + public static final String FONT_SIZE = "10"; public static final String FONT_IN_MSG_COLOR = "#ef7b1e"; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java similarity index 93% rename from src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java rename to src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index eefb1a910..4c3f4b22c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.awt.Image; import java.awt.image.BufferedImage; @@ -28,6 +28,31 @@ public class ImageLoader { private static Hashtable loadedImages = new Hashtable(); + /*------------------------------------------------------------------------ + * =========================LOOK AND FEEL IMAGES========================== + * ----------------------------------------------------------------------- + */ + public static final ImageID BUTTON_LEFT = new ImageID("BUTTON_LEFT"); + public static final ImageID BUTTON_MIDDLE = new ImageID("BUTTON_MIDDLE"); + public static final ImageID BUTTON_RIGHT = new ImageID("BUTTON_RIGHT"); + + public static final ImageID BUTTON_ROLLOVER_LEFT + = new ImageID("BUTTON_ROLLOVER_LEFT"); + public static final ImageID BUTTON_ROLLOVER_MIDDLE + = new ImageID("BUTTON_ROLLOVER_MIDDLE"); + public static final ImageID BUTTON_ROLLOVER_RIGHT + = new ImageID("BUTTON_ROLLOVER_RIGHT"); + + public static final ImageID SPLITPANE_HORIZONTAL + = new ImageID("SPLITPANE_HORIZONTAL"); + + public static final ImageID SPLITPANE_VERTICAL + = new ImageID("SPLITPANE_VERTICAL"); + + /*------------------------------------------------------------------------ + * ============================APPLICATION ICONS ========================= + * ----------------------------------------------------------------------- + */ public static final ImageID EMPTY_16x16_ICON = new ImageID("EMPTY_16x16_ICON"); @@ -58,15 +83,9 @@ public class ImageLoader { public static final ImageID CALL_ROLLOVER_BUTTON_BG = new ImageID("CALL_ROLLOVER_BUTTON_BG"); - public static final ImageID CALL_PRESSED_BUTTON_BG - = new ImageID("CALL_PRESSED_BUTTON_BG"); - public static final ImageID HANGUP_ROLLOVER_BUTTON_BG = new ImageID("HANGUP_ROLLOVER_BUTTON_BG"); - public static final ImageID HANGUP_PRESSED_BUTTON_BG - = new ImageID("HANGUP_PRESSED_BUTTON_BG"); - public static final ImageID STATUS_SELECTOR_BOX = new ImageID("STATUS_SELECTOR_BOX"); @@ -495,7 +514,7 @@ public static Image getImage(ImageID imageID) { image = (BufferedImage)loadedImages.get(imageID); } - else { + else { String path = Images.getString(imageID.getId()); try { diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/Images.java b/src/net/java/sip/communicator/impl/gui/utils/Images.java similarity index 87% rename from src/net/java/sip/communicator/impl/gui/main/utils/Images.java rename to src/net/java/sip/communicator/impl/gui/utils/Images.java index 456f0a550..6bc92dd83 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/Images.java +++ b/src/net/java/sip/communicator/impl/gui/utils/Images.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.util.Locale; import java.util.MissingResourceException; @@ -13,7 +13,7 @@ public class Images { - private static final String BUNDLE_NAME = "net.java.sip.communicator.impl.gui.main.utils.images"; + private static final String BUNDLE_NAME = "net.java.sip.communicator.impl.gui.utils.images"; private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(BUNDLE_NAME); diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/MyHTMLEditorKit.java b/src/net/java/sip/communicator/impl/gui/utils/MyHTMLEditorKit.java similarity index 96% rename from src/net/java/sip/communicator/impl/gui/main/utils/MyHTMLEditorKit.java rename to src/net/java/sip/communicator/impl/gui/utils/MyHTMLEditorKit.java index 21c65bb48..4f27e1bea 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/MyHTMLEditorKit.java +++ b/src/net/java/sip/communicator/impl/gui/utils/MyHTMLEditorKit.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import javax.swing.text.Document; import javax.swing.text.Element; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java b/src/net/java/sip/communicator/impl/gui/utils/MyImageView.java similarity index 99% rename from src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java rename to src/net/java/sip/communicator/impl/gui/utils/MyImageView.java index 3564125e1..f955f4053 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java +++ b/src/net/java/sip/communicator/impl/gui/utils/MyImageView.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.awt.Color; import java.awt.Component; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/SelectorBoxItem.java b/src/net/java/sip/communicator/impl/gui/utils/SelectorBoxItem.java similarity index 91% rename from src/net/java/sip/communicator/impl/gui/main/utils/SelectorBoxItem.java rename to src/net/java/sip/communicator/impl/gui/utils/SelectorBoxItem.java index fc9d271d6..18264aeda 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/SelectorBoxItem.java +++ b/src/net/java/sip/communicator/impl/gui/utils/SelectorBoxItem.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.awt.Image; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/Smily.java b/src/net/java/sip/communicator/impl/gui/utils/Smily.java similarity index 83% rename from src/net/java/sip/communicator/impl/gui/main/utils/Smily.java rename to src/net/java/sip/communicator/impl/gui/utils/Smily.java index b11e0adbc..49c4fc1d4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/Smily.java +++ b/src/net/java/sip/communicator/impl/gui/utils/Smily.java @@ -5,11 +5,9 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; -import java.awt.Image; - -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader.ImageID; +import net.java.sip.communicator.impl.gui.utils.ImageLoader.ImageID; public class Smily { diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/StringUtils.java b/src/net/java/sip/communicator/impl/gui/utils/StringUtils.java similarity index 88% rename from src/net/java/sip/communicator/impl/gui/main/utils/StringUtils.java rename to src/net/java/sip/communicator/impl/gui/utils/StringUtils.java index e1ea8c963..3bb03daa3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/StringUtils.java +++ b/src/net/java/sip/communicator/impl/gui/utils/StringUtils.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.utils; +package net.java.sip.communicator.impl.gui.utils; import java.util.ArrayList; import java.util.regex.Matcher; diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/images.properties b/src/net/java/sip/communicator/impl/gui/utils/images.properties similarity index 93% rename from src/net/java/sip/communicator/impl/gui/main/utils/images.properties rename to src/net/java/sip/communicator/impl/gui/utils/images.properties index 322faa452..4ac594a39 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/images.properties +++ b/src/net/java/sip/communicator/impl/gui/utils/images.properties @@ -8,9 +8,7 @@ QUICK_MENU_BUTTON_ROLLOVER_BG=net/java/sip/communicator/impl/gui/resources/butto CALL_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/callButton.png HANGUP_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/hangupButton.png CALL_ROLLOVER_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/callButtonRollover.png -CALL_PRESSED_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/callButtonPressed.png HANGUP_ROLLOVER_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/hangupButtonRollover.png -HANGUP_PRESSED_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/hangupButtonPressed.png STATUS_SELECTOR_BOX=net/java/sip/communicator/impl/gui/resources/buttons/combobox.png BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/dialButtonBg.png BUTTON_ROLLOVER_BG=net/java/sip/communicator/impl/gui/resources/buttons/dialButtonRolloverBg.png @@ -143,4 +141,15 @@ SELECTED_TAB_BG=net/java/sip/communicator/impl/gui/resources/common/notebook3.pn TAB_BG=net/java/sip/communicator/impl/gui/resources/common/notebook2.png SELECTED_CLOSABLE_TAB_BG=net/java/sip/communicator/impl/gui/resources/common/closableTabSelected.png -CLOSABLE_TAB_BG=net/java/sip/communicator/impl/gui/resources/common/closableTab.png \ No newline at end of file +CLOSABLE_TAB_BG=net/java/sip/communicator/impl/gui/resources/common/closableTab.png + +BUTTON_LEFT=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGLeft.png +BUTTON_MIDDLE=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGMiddle.png +BUTTON_RIGHT=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGRight.png + +BUTTON_ROLLOVER_LEFT=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgLeft.png +BUTTON_ROLLOVER_MIDDLE=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgMiddle.png +BUTTON_ROLLOVER_RIGHT=net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgRight.png + +SPLITPANE_HORIZONTAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneHorizontal.png +SPLITPANE_VERTICAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneVertical.png \ No newline at end of file