sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

*** empty log message ***

Browse Source
cusax-fix
Yana Stamcheva 20 years ago
parent c631eeb1f1
commit afc2127276
6 changed files with 191 additions and 134 deletions
Show Stats Download Patch File Download Diff File

179
src/net/java/sip/communicator/impl/gui/main/utils/Constants.java
Unescape View File

@ -12,10 +12,13 @@
import java.awt.Image;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Map;
import javax.imageio.ImageIO;
import net.java.sip.communicator.impl.gui.main.customcontrols.StatusIcon;
import net.java.sip.communicator.service.protocol.icqconstants.IcqStatusEnum;
import net.java.sip.communicator.util.Logger;
/**
@ -27,9 +30,9 @@
public class Constants {
/*
* ========================================================================
* ------------------------ SIZE CONSTANTS --------------------------------
* ========================================================================
* =======================================================================
* ------------------------ SIZE CONSTANTS -------------------------------
* =======================================================================
*/
public static final int MAINFRAME_HEIGHT = 180;
@ -65,41 +68,41 @@ public class Constants {
public static final int CONFIG_FRAME_MAX_HEIGHT = 600;
/*
* ========================================================================
* =======================================================================
* -------------------- FONTS AND COLOR CONSTANTS ------------------------
* ========================================================================
* =======================================================================
*/
public static final Color CONTACTPANEL_SELECTED_START_COLOR
= new Color(151, 169, 198);
= new Color(151, 169, 198);
public static final Color CONTACTPANEL_SELECTED_END_COLOR
= new Color(209, 212, 225);
= new Color(209, 212, 225);
public static final Color CONTACTPANEL_MOVER_START_COLOR
= new Color(230, 230, 230);
= new Color(230, 230, 230);
public static final Color CONTACTPANEL_MOVER_END_COLOR
= new Color(255, 255, 255);
= new Color(255, 255, 255);
public static final Color CONTACTPANEL_LINES_COLOR
= new Color(154, 154, 154);
= new Color(154, 154, 154);
public static final Color MSG_WINDOW_BORDER_COLOR
= new Color(142, 160, 188);
= new Color(142, 160, 188);
public static final Color CONTACTPANEL_BORDER_COLOR
= new Color(131, 149, 178);
= new Color(131, 149, 178);
public static final Color TOOLBAR_SEPARATOR_COLOR
= new Color(200, 200, 200);
= new Color(200, 200, 200);
public static final Color TRANSPARENT_WHITE_COLOR
= new Color(255, 255, 255, 60);
= new Color(255, 255, 255, 60);
/*
* =========================================================================
* ---------------------- MESSAGE WINDOW FONT CONSTANTS ---------------------
* =========================================================================
* =======================================================================
* ---------------------- MESSAGE WINDOW FONT CONSTANTS ------------------
* =======================================================================
*/
public static final String FONT_NAME = "Verdana";
@ -112,36 +115,45 @@ public class Constants {
public static final String FONT_CHAT_HEADER_COLOR = "c6d0e1";
public static final Font FONT = new Font( Constants.FONT_NAME,
Font.PLAIN,
new Integer(Constants.FONT_SIZE).intValue());
public static final Font FONT
= new Font( Constants.FONT_NAME,
Font.PLAIN,
new Integer(Constants.FONT_SIZE).intValue());
/*
* =========================================================================
* ------------------------ STATUS LABELS ---------------------------------
* ========================================================================
* =======================================================================
* ------------------------ STATUS LABELS --------------------------------
* =======================================================================
*/
public static final String ONLINE_STATUS = "Online";
public static final IcqStatusEnum ONLINE_STATUS
= IcqStatusEnum.ONLINE;
public static final String OFFLINE_STATUS = "Offline";
public static final IcqStatusEnum OFFLINE_STATUS
= IcqStatusEnum.OFFLINE;
public static final String OCCUPIED_STATUS = "Occupied";
public static final IcqStatusEnum OCCUPIED_STATUS
= IcqStatusEnum.OCCUPIED;
public static final String CHAT_STATUS = "Free for chat";
public static final IcqStatusEnum CHAT_STATUS
= IcqStatusEnum.FREE_FOR_CHAT;
public static final String AWAY_STATUS = "Away";
public static final IcqStatusEnum AWAY_STATUS
= IcqStatusEnum.AWAY;
public static final String NA_STATUS = "Not available";
public static final IcqStatusEnum NA_STATUS
= IcqStatusEnum.NOT_AVAILABLE;
public static final String INVISIBLE_STATUS = "Invisible";
public static final IcqStatusEnum INVISIBLE_STATUS
= IcqStatusEnum.INVISIBLE;
public static final String DND_STATUS = "Do not disturb";
public static final IcqStatusEnum DND_STATUS
= IcqStatusEnum.DO_NOT_DISTURB;
/*
* =========================================================================
* ------------------------ PROTOCOL NAMES --------------------------------
* ========================================================================
* =======================================================================
* ------------------------ PROTOCOL NAMES -------------------------------
* =======================================================================
*/
public static final String ICQ = "ICQ";
@ -159,9 +171,9 @@ public class Constants {
public static final String SIP = "SIP";
/*
* ========================================================================
* =======================================================================
* ------------------------ OTHER CONSTANTS ------------------------------
* ========================================================================
* =======================================================================
*/
public static final int RIGHT_SHIFT_STATUS_ICON = 2;
@ -210,90 +222,85 @@ public static Image getProtocolIcon(String protocolName) {
* @return an ArrayList of all status Icons for the given protocol.
*/
public static ArrayList getProtocolStatusIcons(String protocolName) {
ArrayList protocolStatusList = new ArrayList();
public static Map getProtocolStatusIcons(String protocolName) {
Map protocolStatusList = new Hashtable();
if (protocolName.equals(Constants.SIP)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_ONLINE_ICON))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.SIP_ONLINE_ICON));
protocolStatusList.add(new SelectorBoxItem(CHAT_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_CHAT_ICON))));
protocolStatusList.put(CHAT_STATUS,
ImageLoader.getImage(ImageLoader.SIP_CHAT_ICON));
protocolStatusList.put(AWAY_STATUS,
ImageLoader.getImage(ImageLoader.SIP_AWAY_ICON));
protocolStatusList.add(new SelectorBoxItem(AWAY_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_AWAY_ICON))));
protocolStatusList.put(OCCUPIED_STATUS,
ImageLoader.getImage(ImageLoader.SIP_OCCUPIED_ICON));
protocolStatusList.add(new SelectorBoxItem(OCCUPIED_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_OCCUPIED_ICON))));
protocolStatusList.put(NA_STATUS,
ImageLoader.getImage(ImageLoader.SIP_NA_ICON));
protocolStatusList.add(new SelectorBoxItem(NA_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_NA_ICON))));
protocolStatusList.put(DND_STATUS,
ImageLoader.getImage(ImageLoader.SIP_DND_ICON));
protocolStatusList.add(new SelectorBoxItem(DND_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_DND_ICON))));
protocolStatusList.put(OFFLINE_STATUS,
ImageLoader.getImage(ImageLoader.SIP_OFFLINE_ICON));
protocolStatusList.add(new SelectorBoxItem(OFFLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_OFFLINE_ICON))));
protocolStatusList.add(new SelectorBoxItem(INVISIBLE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SIP_INVISIBLE_ICON))));
protocolStatusList.put(INVISIBLE_STATUS,
ImageLoader.getImage(ImageLoader.SIP_INVISIBLE_ICON));
} else if (protocolName.equals(Constants.ICQ)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_LOGO));
protocolStatusList.add(new SelectorBoxItem(CHAT_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO),
ImageLoader.getImage(ImageLoader.ICQ_FF_CHAT_ICON))));
protocolStatusList.put(CHAT_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_FF_CHAT_ICON));
protocolStatusList.add(new SelectorBoxItem(AWAY_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO),
ImageLoader.getImage(ImageLoader.ICQ_AWAY_ICON))));
protocolStatusList.put(AWAY_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_AWAY_ICON));
protocolStatusList.add(new SelectorBoxItem(NA_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO),
ImageLoader.getImage(ImageLoader.ICQ_NA_ICON))));
protocolStatusList.put(NA_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_NA_ICON));
protocolStatusList.add(new SelectorBoxItem(DND_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO),
ImageLoader.getImage(ImageLoader.ICQ_DND_ICON))));
protocolStatusList.put(DND_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_DND_ICON));
protocolStatusList.add(new SelectorBoxItem(OCCUPIED_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_LOGO),
ImageLoader.getImage(ImageLoader.ICQ_OCCUPIED_ICON))));
protocolStatusList.put(OCCUPIED_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_OCCUPIED_ICON));
protocolStatusList.add(new SelectorBoxItem(OFFLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_OFFLINE_ICON))));
protocolStatusList.put(OFFLINE_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_OFFLINE_ICON));
protocolStatusList.add(new SelectorBoxItem(INVISIBLE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.ICQ_INVISIBLE_ICON))));
protocolStatusList.put(INVISIBLE_STATUS,
ImageLoader.getImage(ImageLoader.ICQ_INVISIBLE_ICON));
} else if (protocolName.equals(Constants.MSN)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.MSN_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.MSN_LOGO));
} else if (protocolName.equals(Constants.AIM)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.AIM_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.AIM_LOGO));
} else if (protocolName.equals(Constants.YAHOO)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.YAHOO_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.YAHOO_LOGO));
} else if (protocolName.equals(Constants.JABBER)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.JABBER_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.JABBER_LOGO));
} else if (protocolName.equals(Constants.SKYPE)) {
protocolStatusList.add(new SelectorBoxItem(ONLINE_STATUS, new StatusIcon(
ImageLoader.getImage(ImageLoader.SKYPE_LOGO))));
protocolStatusList.put(ONLINE_STATUS,
ImageLoader.getImage(ImageLoader.SKYPE_LOGO));
}
return protocolStatusList;

37
src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java
Unescape View File

@ -225,22 +225,22 @@ public class ImageLoader {
// ///////////////////// Chat contact icons ////////////////////////////////
public static final ImageID CHAT_CONTACT_INFO_BUTTON
= new ImageID("CHAT_CONTACT_INFO_BUTTON");
= new ImageID("CHAT_CONTACT_INFO_BUTTON");
public static final ImageID CHAT_CONTACT_INFO_ROLLOVER_BUTTON
= new ImageID("CHAT_CONTACT_INFO_ROLLOVER_BUTTON");
= new ImageID("CHAT_CONTACT_INFO_ROLLOVER_BUTTON");
public static final ImageID CHAT_CONTACT_CALL_BUTTON
= new ImageID("CHAT_CONTACT_CALL_BUTTON");
= new ImageID("CHAT_CONTACT_CALL_BUTTON");
public static final ImageID CHAT_CONTACT_CALL_ROLLOVER_BUTTON
= new ImageID("CHAT_CONTACT_CALL_ROLLOVER_BUTTON");
= new ImageID("CHAT_CONTACT_CALL_ROLLOVER_BUTTON");
public static final ImageID CHAT_CONTACT_SEND_FILE_BUTTON
= new ImageID("CHAT_CONTACT_SEND_FILE_BUTTON");
= new ImageID("CHAT_CONTACT_SEND_FILE_BUTTON");
public static final ImageID CHAT_SEND_FILE_ROLLOVER_BUTTON
= new ImageID("CHAT_SEND_FILE_ROLLOVER_BUTTON");
= new ImageID("CHAT_SEND_FILE_ROLLOVER_BUTTON");
// ///////////////////// Optionpane icons /////////////////////////////
@ -250,35 +250,38 @@ public class ImageLoader {
// //////////////////// RightButton menu icons ////////////////////////
public static final ImageID SEND_MESSAGE_16x16_ICON
= new ImageID("SEND_MESSAGE_16x16_ICON");
= new ImageID("SEND_MESSAGE_16x16_ICON");
public static final ImageID DELETE_16x16_ICON
= new ImageID("DELETE_16x16_ICON");
= new ImageID("DELETE_16x16_ICON");
public static final ImageID HISTORY_16x16_ICON
= new ImageID("HISTORY_16x16_ICON");
= new ImageID("HISTORY_16x16_ICON");
public static final ImageID SEND_FILE_16x16_ICON
= new ImageID("SEND_FILE_16x16_ICON");
= new ImageID("SEND_FILE_16x16_ICON");
public static final ImageID GROUPS_16x16_ICON
= new ImageID("GROUPS_16x16_ICON");
= new ImageID("GROUPS_16x16_ICON");
public static final ImageID INFO_16x16_ICON
= new ImageID("INFO_16x16_ICON");
= new ImageID("INFO_16x16_ICON");
public static final ImageID ADD_CONTACT_16x16_ICON
= new ImageID("ADD_CONTACT_16x16_ICON");
= new ImageID("ADD_CONTACT_16x16_ICON");
public static final ImageID RENAME_16x16_ICON
= new ImageID("RENAME_16x16_ICON");
= new ImageID("RENAME_16x16_ICON");
public static final ImageID MORE_INFO_ICON
= new ImageID("MORE_INFO_ICON");
= new ImageID("MORE_INFO_ICON");
public static final ImageID TOOLBAR_DRAG_ICON
= new ImageID("TOOLBAR_DRAG_ICON");
= new ImageID("TOOLBAR_DRAG_ICON");
public static final ImageID LOGIN_WINDOW_LOGO
= new ImageID("LOGIN_WINDOW_LOGO");
/*
* =========================================================================
* --------------------- PROTOCOLS STATUS ICONS ---------------------------

2
src/net/java/sip/communicator/impl/gui/main/utils/images.properties
Unescape View File

@ -125,4 +125,6 @@ SMILY10=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smil
SMILY11=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily11.gif
SMILY12=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smily12.gif
LOGIN_WINDOW_LOGO=net/java/sip/communicator/impl/gui/resources/common/loginWindowLogo.png

BIN
src/net/java/sip/communicator/impl/gui/resources/common/loginWindowLogo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/net/java/sip/communicator/impl/gui/resources/common/moreInfo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 319 B

107
src/net/java/sip/communicator/impl/gui/resources/common/src/moreInfo.svg
Unescape View File

@ -6,17 +6,62 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2049"
id="svg1313"
sodipodi:version="0.32"
inkscape:version="0.42.2"
sodipodi:docbase="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/src"
sodipodi:docname="moreInfo.svg">
<defs
id="defs2051" />
id="defs1315">
<linearGradient
id="linearGradient14399">
<stop
style="stop-color:#143e7b;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop14401" />
<stop
style="stop-color:#93aacc;stop-opacity:0.65486723;"
offset="1.0000000"
id="stop14403" />
</linearGradient>
<linearGradient
id="linearGradient7006">
<stop
id="stop2072"
offset="0.0000000"
style="stop-color:#ababab;stop-opacity:1.0000000;" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop7010" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7006"
id="radialGradient1337"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.960188,1.020581,-1.083150,0.787034,162.7926,-55.49827)"
cx="85.434807"
cy="148.08812"
fx="85.434807"
fy="148.08812"
r="4.2038088" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7006"
id="linearGradient1341"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.707898,0.000000,0.000000,0.381771,-65.67867,-46.12566)"
x1="102.08191"
y1="148.02791"
x2="108.17109"
y2="148.02791" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@ -25,18 +70,14 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="8.0000000"
inkscape:cy="8.0000000"
inkscape:cx="8"
inkscape:cy="8"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="724"
inkscape:window-height="509"
inkscape:window-x="0"
inkscape:window-y="186" />
inkscape:document-units="px" />
<metadata
id="metadata2054">
id="metadata1318">
<rdf:RDF>
<cc:Work
rdf:about="">
@ -50,28 +91,32 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g2048"
transform="matrix(0.000000,0.812451,-0.812451,0.000000,40.11538,390.2256)"
<rect
style="opacity:1.0000000;fill:url(#linearGradient1341);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#143e7b;stroke-width:0.34720781;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
id="rect33516"
width="2.7695508"
height="4.9787350"
x="6.7400293"
y="7.8975677"
ry="0.67025214"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/moreInfo.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000">
<path
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/moreInfo.png"
sodipodi:nodetypes="cccc"
id="rect2776"
d="M -474.11003,39.094237 L -470.75831,42.543896 C -470.62386,42.682240 -470.39608,42.689235 -470.25774,42.554778 L -466.80808,39.192177"
style="opacity:1.0000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#646464;stroke-width:0.69646108;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
<path
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/moreInfo.png"
sodipodi:nodetypes="cccc"
id="path4233"
d="M -474.11162,36.406254 L -470.75990,39.855913 C -470.62544,39.994258 -470.39766,40.001252 -470.25931,39.866794 L -466.80965,36.504194"
style="opacity:1.0000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#646464;stroke-width:0.69646108;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
</g>
inkscape:export-ydpi="90.000000" />
<path
sodipodi:type="arc"
style="opacity:1.0000000;fill:url(#radialGradient1337);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#143e7b;stroke-width:0.75817871;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
id="path33520"
sodipodi:cx="85.999420"
sodipodi:cy="148.24525"
sodipodi:rx="3.9848089"
sodipodi:ry="3.9848089"
d="M 89.984229,148.24525 A 3.9848089,3.9848089 0 1 1 89.984059,148.20844"
sodipodi:start="0.0000000"
sodipodi:end="6.2739468"
sodipodi:open="true"
transform="matrix(0.481029,0.000000,0.000000,0.435978,-33.33900,-59.72077)"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/moreInfo.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Write Preview
Loading…
Cancel
Save