svn commit: r3306 - trunk/src/net/java/sip/communicator: impl/gui/utils impl/protocol/gibberish impl/protocol/icq impl/protocol/irc impl/protocol/j...

yanas at dev.java.net yanas at dev.java.net
Mon Dec 10 21:26:00 CET 2007


Author: yanas
Date: 2007-12-10 20:25:59+0000
New Revision: 3306

Removed:
   trunk/src/net/java/sip/communicator/plugin/branding/WindowBackground.java
Modified:
   trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java
   trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties
   trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
   trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java
   trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java
   trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java
   trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java
   trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
   trunk/src/net/java/sip/communicator/plugin/branding/Constants.java
   trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
   trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties
   trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties
   trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java
   trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java
   trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
   trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java
   trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java

Log:
image paths fixed

Modified: trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java&p2=trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/gui/utils/Constants.java	2007-12-10 20:25:59+0000
@@ -344,7 +344,7 @@
      * The default path, where chat window styles could be found.
      */
     public static final String DEFAULT_STYLE_PATH
-        = "net/java/sip/communicator/impl/gui/resources/styles";
+        = "resources/styles";
 
     /*
      * ======================================================================

Modified: trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties&p2=trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties	(original)
+++ trunk/src/net/java/sip/communicator/impl/gui/utils/images.properties	2007-12-10 20:25:59+0000
@@ -1,214 +1,191 @@
 SIP_COMMUNICATOR_LOGO=resources/images/logo/sc_logo16x16.png
-EMPTY_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/emptyIcon16x16.png
+EMPTY_16x16_ICON=resources/images/impl/gui/common/emptyIcon16x16.png
 
-ACCOUNT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/addAccount.png
-QUICK_MENU_ADD_ICON=net/java/sip/communicator/impl/gui/resources/buttons/addContactIcon.png
-QUICK_MENU_CONFIGURE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/configureIcon.png
-QUICK_MENU_INFO_ICON=net/java/sip/communicator/impl/gui/resources/buttons/infoIcon.png
-QUICK_MENU_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/quickMenuButtonBg.png
-QUICK_MENU_BUTTON_ROLLOVER_BG=net/java/sip/communicator/impl/gui/resources/buttons/quickMenuButtonRolloverBg.png
-QUICK_MENU_SHOW_OFFLINE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/showOffline.png
-QUICK_MENU_SOUND_ON_ICON=net/java/sip/communicator/impl/gui/resources/buttons/soundOn.png
-QUICK_MENU_SOUND_OFF_ICON=net/java/sip/communicator/impl/gui/resources/buttons/soundOff.png
-
-SEARCH_ICON=net/java/sip/communicator/impl/gui/resources/buttons/searchIcon.png
-SEARCH_ICON_16x16=net/java/sip/communicator/impl/gui/resources/common/searchIcon16x16.png
-CALL_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/callButton.png
-CALL_BUTTON_PRESSED_BG=net/java/sip/communicator/impl/gui/resources/buttons/callButtonPressed.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
-HANGUP_ROLLOVER_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/hangupButtonRollover.png
-HANGUP_BUTTON_PRESSED_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
-ONE_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/one.png
-TWO_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/two.png
-THREE_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/three.png
-FOUR_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/four.png
-FIVE_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/five.png
-SIX_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/six.png
-SEVEN_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/seven.png
-EIGHT_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/eight.png
-NINE_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/nine.png
-STAR_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/star.png
-ZERO_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/zero.png
-DIEZ_DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/diez.png
-DEFAULT_USER_PHOTO=net/java/sip/communicator/impl/gui/resources/common/personPhoto.png
-DEFAULT_CHAT_USER_PHOTO=net/java/sip/communicator/impl/gui/resources/common/personPhotoChat.png
-CALL_PANEL_MINIMIZE_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/callPanelMinimizeButton.png
-CALL_PANEL_RESTORE_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/callPanelRestoreButton.png
-CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/callPanelMinimizeButtonRollover.png
-CALL_PANEL_RESTORE_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/callPanelRestoreButtonRollover.png
-ADD_TO_CHAT_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/addToChat.png
-ADD_TO_CHAT_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/addToChatRollover.png
-ADD_TO_CHAT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/addToChatIcon.png
-TOOLBAR_DIVIDER=net/java/sip/communicator/impl/gui/resources/buttons/toolbarDivider.png
-RIGHT_ARROW_ICON=net/java/sip/communicator/impl/gui/resources/common/rightArrow.png
-RIGHT_ARROW_ROLLOVER_ICON=net/java/sip/communicator/impl/gui/resources/common/rightArrowRollover.png
-BOTTOM_ARROW_ICON=net/java/sip/communicator/impl/gui/resources/common/bottomArrow.png
-BOTTOM_ARROW_ROLLOVER_ICON=net/java/sip/communicator/impl/gui/resources/common/bottomArrowRollover.png
-ALIGN_LEFT_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignLeft.png
-ALIGN_RIGHT_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignRight.png
-ALIGN_CENTER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignCenter.png
-ALIGN_LEFT_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignLeftRollover.png
-ALIGN_RIGHT_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignRightRollover.png
-ALIGN_CENTER_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/alignCenterRollover.png
-TEXT_BOLD_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textBold.png
-TEXT_ITALIC_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textItalic.png
-TEXT_UNDERLINED_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textUnderlined.png
-TEXT_BOLD_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textBoldRollover.png
-TEXT_ITALIC_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textItalicRollover.png
-TEXT_UNDERLINED_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/textUnderlinedRollover.png
-DIAL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/dialButton.png
-INVITE_DIALOG_ICON=net/java/sip/communicator/impl/gui/resources/common/inviteDialogIcon.png
-
-MSG_TOOLBAR_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/msgToolbarBg.png
-MSG_TOOLBAR_ROLLOVER_BUTTON_BG=net/java/sip/communicator/impl/gui/resources/buttons/msgToolBarRolloverBg.png
-COPY_ICON=net/java/sip/communicator/impl/gui/resources/buttons/copy.png
-CUT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/cut.png
-PASTE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/paste.png
-SMILIES_ICON=net/java/sip/communicator/impl/gui/resources/buttons/smiley.png
-SAVE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/save.png
-PRINT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/print.png
-CLOSE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/close.png
-QUIT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/quit.png
-PREVIOUS_ICON=net/java/sip/communicator/impl/gui/resources/buttons/previous.png
-NEXT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/next.png
-HISTORY_ICON=net/java/sip/communicator/impl/gui/resources/buttons/history.png
-SEND_FILE_ICON=net/java/sip/communicator/impl/gui/resources/buttons/sendFile.png
-FONT_ICON=net/java/sip/communicator/impl/gui/resources/buttons/fontIcon.png
-
-CHAT_CONTACT_INFO_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatInfoButton.png
-CHAT_CONTACT_INFO_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatInfoButtonRollover.png
-CHAT_CONTACT_CALL_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatCallButton.png
-CHAT_CONTACT_CALL_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatCallButtonRollover.png
-CHAT_CONTACT_SEND_FILE_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatSendFile.png
-CHAT_SEND_FILE_ROLLOVER_BUTTON=net/java/sip/communicator/impl/gui/resources/buttons/chatSendFileRollover.png
-
-WARNING_ICON=net/java/sip/communicator/impl/gui/resources/common/warning.png
-ERROR_ICON=net/java/sip/communicator/impl/gui/resources/common/error.png
-INFO_ICON=net/java/sip/communicator/impl/gui/resources/common/info.png
-
-SEND_MESSAGE_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/sendMessage16x16.png
-CALL_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/call16x16.png
-DELETE_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/delete16x16.png
-HISTORY_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/history16x16.png
-SEND_FILE_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/sendFile16x16.png
-GROUPS_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/groups16x16.png
-INFO_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/userInfo16x16.png
-ADD_CONTACT_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/addContact16x16.png
-RENAME_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/rename16x16.png
-REMOVE_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/remove16x16.png
-ADD_GROUP_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/addGroup16x16.png
-MORE_INFO_ICON=net/java/sip/communicator/impl/gui/resources/common/moreInfo.png
-TOOLBAR_DRAG_ICON=net/java/sip/communicator/impl/gui/resources/common/toolbarDragIcon.png
-ADD_GROUP_ICON=net/java/sip/communicator/impl/gui/resources/common/addGroup.png
-MOVE_CONTACT=net/java/sip/communicator/impl/gui/resources/common/moveContact.png
-
-ICQ_32x32=net/java/sip/communicator/impl/gui/resources/protocols/icq/Icq.png
-ICQ_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/icq/cr16-action-icq_connecting-1.gif
-ICQ_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/icq/Icq16.png
-MSN_32x32=net/java/sip/communicator/impl/gui/resources/protocols/msn/Msn.png
-MSN_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/msn/Msn16.png
-MSN_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/msn/msn16x16-connecting.gif
-AIM_32x32=net/java/sip/communicator/impl/gui/resources/protocols/aim/Aim.png
-AIM_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/aim/Aim16.png
-YAHOO_32x32=net/java/sip/communicator/impl/gui/resources/protocols/yahoo/Yahoo.png
-YAHOO_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/yahoo/Yahoo16.png
-YAHOO_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/yahoo/yahoo16x16-connecting.gif
-JABBER_32x32=net/java/sip/communicator/impl/gui/resources/protocols/jabber/Jabber2.png
-JABBER_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/jabber/jabber16x16-connecting.gif
-JABBER_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/jabber/Jabber16.png
-SKYPE_32x32=net/java/sip/communicator/impl/gui/resources/protocols/skype/Skype.png
-SKYPE_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/skype/Skype16.png
-SIP_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/sip/sip16x16.png
-SIP_32x32=net/java/sip/communicator/impl/gui/resources/protocols/sip/sip.png
-SIP_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/sip/sip-connecting.gif
-GIBBERISH_32x32=net/java/sip/communicator/impl/gui/resources/protocols/gibberish/gibberish64.png
-GIBBERISH_CONNECTING=net/java/sip/communicator/impl/gui/resources/protocols/gibberish/cr16-action-icq_connecting-1.gif
-GIBBERISH_LOGO=net/java/sip/communicator/impl/gui/resources/protocols/gibberish/gibberish16.png
-
-SMILEY1=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley1.gif
-SMILEY2=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley2.gif
-SMILEY3=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley3.gif
-SMILEY4=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley4.gif
-SMILEY5=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley5.gif
-SMILEY6=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley6.gif
-SMILEY7=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley7.gif
-SMILEY8=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley8.gif
-SMILEY9=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley9.gif
-SMILEY10=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley10.gif
-SMILEY11=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley11.gif
-SMILEY12=net/java/sip/communicator/impl/gui/resources/common/smilies/default/smiley12.gif
-
-LOGIN_WINDOW_LOGO=net/java/sip/communicator/impl/gui/resources/common/loginWindowLogo.png
-AUTH_WINDOW_BACKGROUND=net/java/sip/communicator/impl/gui/resources/common/passWindowBackground.png
-
-USER_ONLINE_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/online.png
-USER_OFFLINE_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/offline.png
-USER_AWAY_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/away.png
-USER_NA_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/na.png
-USER_DND_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/dnd.png
-USER_FFC_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/freeForChat.png
-USER_OCCUPIED_ICON=net/java/sip/communicator/impl/gui/resources/common/statusicons/occupied.png
-
-CLOSE_TAB_ICON=net/java/sip/communicator/impl/gui/resources/buttons/closeTab.png
-CLOSE_TAB_SELECTED_ICON=net/java/sip/communicator/impl/gui/resources/buttons/closeTabSelected.png
-
-SELECTED_TAB_LEFT_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/selectedTabLeft.png
-SELECTED_TAB_MIDDLE_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/selectedTabMiddle.png
-SELECTED_TAB_RIGHT_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/selectedTabRight.png
-TAB_LEFT_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/tabLeft.png
-TAB_MIDDLE_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/tabMiddle.png
-TAB_RIGHT_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/tabRight.png
-DELETE_TEXT_ICON=net/java/sip/communicator/impl/gui/resources/lookandfeel/delete.png
-DELETE_TEXT_ROLLOVER_ICON=net/java/sip/communicator/impl/gui/resources/lookandfeel/deleteRollover.png
-
-SELECTED_CLOSABLE_TAB_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/closableTabSelected.png
-CLOSABLE_TAB_BG=net/java/sip/communicator/impl/gui/resources/lookandfeel/closableTab.png
-
-BUTTON=net/java/sip/communicator/impl/gui/resources/lookandfeel/button1.png
-BUTTON_ROLLOVER=net/java/sip/communicator/impl/gui/resources/lookandfeel/button2.png
-TOGGLE_BUTTON_PRESSED=net/java/sip/communicator/impl/gui/resources/lookandfeel/button3.png
-TOGGLE_BUTTON=net/java/sip/communicator/impl/gui/resources/lookandfeel/button4.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
-
-SCROLLBAR_HORIZONTAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_horiz2.png
-SCROLLBAR_VERTICAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_vert1.png
-SCROLLBAR_THUMB_HORIZONTAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/horizThumbHandle.png
-SCROLLBAR_THUMB_VERTICAL=net/java/sip/communicator/impl/gui/resources/lookandfeel/vertThumbHandle.png
-
-ADD_CONTACT_WIZARD_ICON=net/java/sip/communicator/impl/gui/resources/common/addContactWizardIcon.png
-RENAME_DIALOG_ICON=net/java/sip/communicator/impl/gui/resources/common/renameDialogIcon.png
-
-BROWSER_ICON=net/java/sip/communicator/impl/gui/resources/common/browser16x16.png
-
-AUTHORIZATION_ICON=net/java/sip/communicator/impl/gui/resources/common/padlock.gif
-
-INCOMING_CALL=net/java/sip/communicator/impl/gui/resources/common/incomingCall.png
-OUTGOING_CALL=net/java/sip/communicator/impl/gui/resources/common/outgoingCall.png
-
-EXCLAMATION_MARK=net/java/sip/communicator/impl/gui/resources/common/exclamationMark.png
-
-ABOUT_WINDOW_BACKGROUND=net/java/sip/communicator/impl/gui/resources/common/aboutWindowBackground.png
-
-OPENED_GROUP=net/java/sip/communicator/impl/gui/resources/common/openedGroup.png
-CLOSED_GROUP=net/java/sip/communicator/impl/gui/resources/common/closedGroup.png
-
-CHAT_ROOM_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/chatRoom16x16.png
-CHAT_SERVER_16x16_ICON=net/java/sip/communicator/impl/gui/resources/common/multiUserChatServer16x16.png
-
-MESSAGE_RECEIVED_ICON=net/java/sip/communicator/impl/gui/resources/common/envelope.png
-
-REASON_DIALOG_ICON=net/java/sip/communicator/impl/gui/resources/common/reasonDialogIcon.png
-
-JOIN_ICON=net/java/sip/communicator/impl/gui/resources/common/join.png
-JOIN_AS_ICON=net/java/sip/communicator/impl/gui/resources/common/join.png
-LEAVE_ICON=net/java/sip/communicator/impl/gui/resources/common/leave.png
+ACCOUNT_ICON=resources/images/impl/gui/buttons/addAccount.png
+QUICK_MENU_ADD_ICON=resources/images/impl/gui/buttons/addContactIcon.png
+QUICK_MENU_CONFIGURE_ICON=resources/images/impl/gui/buttons/configureIcon.png
+QUICK_MENU_INFO_ICON=resources/images/impl/gui/buttons/infoIcon.png
+QUICK_MENU_BUTTON_BG=resources/images/impl/gui/buttons/quickMenuButtonBg.png
+QUICK_MENU_BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/quickMenuButtonRolloverBg.png
+QUICK_MENU_SHOW_OFFLINE_ICON=resources/images/impl/gui/buttons/showOffline.png
+QUICK_MENU_SOUND_ON_ICON=resources/images/impl/gui/buttons/soundOn.png
+QUICK_MENU_SOUND_OFF_ICON=resources/images/impl/gui/buttons/soundOff.png
+
+SEARCH_ICON=resources/images/impl/gui/buttons/searchIcon.png
+SEARCH_ICON_16x16=resources/images/impl/gui/common/searchIcon16x16.png
+CALL_BUTTON_BG=resources/images/impl/gui/buttons/callButton.png
+CALL_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/callButtonPressed.png
+HANGUP_BUTTON_BG=resources/images/impl/gui/buttons/hangupButton.png
+CALL_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/callButtonRollover.png
+HANGUP_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/hangupButtonRollover.png
+HANGUP_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/hangupButtonPressed.png
+STATUS_SELECTOR_BOX=resources/images/impl/gui/buttons/combobox.png
+BUTTON_BG=resources/images/impl/gui/buttons/dialButtonBg.png
+BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialButtonRolloverBg.png
+ONE_DIAL_BUTTON=resources/images/impl/gui/buttons/one.png
+TWO_DIAL_BUTTON=resources/images/impl/gui/buttons/two.png
+THREE_DIAL_BUTTON=resources/images/impl/gui/buttons/three.png
+FOUR_DIAL_BUTTON=resources/images/impl/gui/buttons/four.png
+FIVE_DIAL_BUTTON=resources/images/impl/gui/buttons/five.png
+SIX_DIAL_BUTTON=resources/images/impl/gui/buttons/six.png
+SEVEN_DIAL_BUTTON=resources/images/impl/gui/buttons/seven.png
+EIGHT_DIAL_BUTTON=resources/images/impl/gui/buttons/eight.png
+NINE_DIAL_BUTTON=resources/images/impl/gui/buttons/nine.png
+STAR_DIAL_BUTTON=resources/images/impl/gui/buttons/star.png
+ZERO_DIAL_BUTTON=resources/images/impl/gui/buttons/zero.png
+DIEZ_DIAL_BUTTON=resources/images/impl/gui/buttons/diez.png
+DEFAULT_USER_PHOTO=resources/images/impl/gui/common/personPhoto.png
+DEFAULT_CHAT_USER_PHOTO=resources/images/impl/gui/common/personPhotoChat.png
+CALL_PANEL_MINIMIZE_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButton.png
+CALL_PANEL_RESTORE_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButton.png
+CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButtonRollover.png
+CALL_PANEL_RESTORE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButtonRollover.png
+ADD_TO_CHAT_BUTTON=resources/images/impl/gui/buttons/addToChat.png
+ADD_TO_CHAT_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/addToChatRollover.png
+ADD_TO_CHAT_ICON=resources/images/impl/gui/buttons/addToChatIcon.png
+TOOLBAR_DIVIDER=resources/images/impl/gui/buttons/toolbarDivider.png
+RIGHT_ARROW_ICON=resources/images/impl/gui/common/rightArrow.png
+RIGHT_ARROW_ROLLOVER_ICON=resources/images/impl/gui/common/rightArrowRollover.png
+BOTTOM_ARROW_ICON=resources/images/impl/gui/common/bottomArrow.png
+BOTTOM_ARROW_ROLLOVER_ICON=resources/images/impl/gui/common/bottomArrowRollover.png
+ALIGN_LEFT_BUTTON=resources/images/impl/gui/buttons/alignLeft.png
+ALIGN_RIGHT_BUTTON=resources/images/impl/gui/buttons/alignRight.png
+ALIGN_CENTER_BUTTON=resources/images/impl/gui/buttons/alignCenter.png
+ALIGN_LEFT_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignLeftRollover.png
+ALIGN_RIGHT_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignRightRollover.png
+ALIGN_CENTER_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignCenterRollover.png
+TEXT_BOLD_BUTTON=resources/images/impl/gui/buttons/textBold.png
+TEXT_ITALIC_BUTTON=resources/images/impl/gui/buttons/textItalic.png
+TEXT_UNDERLINED_BUTTON=resources/images/impl/gui/buttons/textUnderlined.png
+TEXT_BOLD_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/textBoldRollover.png
+TEXT_ITALIC_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/textItalicRollover.png
+TEXT_UNDERLINED_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/textUnderlinedRollover.png
+DIAL_BUTTON=resources/images/impl/gui/buttons/dialButton.png
+INVITE_DIALOG_ICON=resources/images/impl/gui/common/inviteDialogIcon.png
+
+MSG_TOOLBAR_BUTTON_BG=resources/images/impl/gui/buttons/msgToolbarBg.png
+MSG_TOOLBAR_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/msgToolBarRolloverBg.png
+COPY_ICON=resources/images/impl/gui/buttons/copy.png
+CUT_ICON=resources/images/impl/gui/buttons/cut.png
+PASTE_ICON=resources/images/impl/gui/buttons/paste.png
+SMILIES_ICON=resources/images/impl/gui/buttons/smiley.png
+SAVE_ICON=resources/images/impl/gui/buttons/save.png
+PRINT_ICON=resources/images/impl/gui/buttons/print.png
+CLOSE_ICON=resources/images/impl/gui/buttons/close.png
+QUIT_ICON=resources/images/impl/gui/buttons/quit.png
+PREVIOUS_ICON=resources/images/impl/gui/buttons/previous.png
+NEXT_ICON=resources/images/impl/gui/buttons/next.png
+HISTORY_ICON=resources/images/impl/gui/buttons/history.png
+SEND_FILE_ICON=resources/images/impl/gui/buttons/sendFile.png
+FONT_ICON=resources/images/impl/gui/buttons/fontIcon.png
+
+CHAT_CONTACT_INFO_BUTTON=resources/images/impl/gui/buttons/chatInfoButton.png
+CHAT_CONTACT_INFO_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatInfoButtonRollover.png
+CHAT_CONTACT_CALL_BUTTON=resources/images/impl/gui/buttons/chatCallButton.png
+CHAT_CONTACT_CALL_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatCallButtonRollover.png
+CHAT_CONTACT_SEND_FILE_BUTTON=resources/images/impl/gui/buttons/chatSendFile.png
+CHAT_SEND_FILE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatSendFileRollover.png
+
+WARNING_ICON=resources/images/impl/gui/common/warning.png
+ERROR_ICON=resources/images/impl/gui/common/error.png
+INFO_ICON=resources/images/impl/gui/common/info.png
+
+SEND_MESSAGE_16x16_ICON=resources/images/impl/gui/common/sendMessage16x16.png
+CALL_16x16_ICON=resources/images/impl/gui/common/call16x16.png
+DELETE_16x16_ICON=resources/images/impl/gui/common/delete16x16.png
+HISTORY_16x16_ICON=resources/images/impl/gui/common/history16x16.png
+SEND_FILE_16x16_ICON=resources/images/impl/gui/common/sendFile16x16.png
+GROUPS_16x16_ICON=resources/images/impl/gui/common/groups16x16.png
+INFO_16x16_ICON=resources/images/impl/gui/common/userInfo16x16.png
+ADD_CONTACT_16x16_ICON=resources/images/impl/gui/common/addContact16x16.png
+RENAME_16x16_ICON=resources/images/impl/gui/common/rename16x16.png
+REMOVE_16x16_ICON=resources/images/impl/gui/common/remove16x16.png
+ADD_GROUP_16x16_ICON=resources/images/impl/gui/common/addGroup16x16.png
+MORE_INFO_ICON=resources/images/impl/gui/common/moreInfo.png
+TOOLBAR_DRAG_ICON=resources/images/impl/gui/common/toolbarDragIcon.png
+ADD_GROUP_ICON=resources/images/impl/gui/common/addGroup.png
+MOVE_CONTACT=resources/images/impl/gui/common/moveContact.png
+
+SMILEY1=resources/images/impl/gui/common/smilies/default/smiley1.gif
+SMILEY2=resources/images/impl/gui/common/smilies/default/smiley2.gif
+SMILEY3=resources/images/impl/gui/common/smilies/default/smiley3.gif
+SMILEY4=resources/images/impl/gui/common/smilies/default/smiley4.gif
+SMILEY5=resources/images/impl/gui/common/smilies/default/smiley5.gif
+SMILEY6=resources/images/impl/gui/common/smilies/default/smiley6.gif
+SMILEY7=resources/images/impl/gui/common/smilies/default/smiley7.gif
+SMILEY8=resources/images/impl/gui/common/smilies/default/smiley8.gif
+SMILEY9=resources/images/impl/gui/common/smilies/default/smiley9.gif
+SMILEY10=resources/images/impl/gui/common/smilies/default/smiley10.gif
+SMILEY11=resources/images/impl/gui/common/smilies/default/smiley11.gif
+SMILEY12=resources/images/impl/gui/common/smilies/default/smiley12.gif
+
+LOGIN_WINDOW_LOGO=resources/images/impl/gui/common/loginWindowLogo.png
+AUTH_WINDOW_BACKGROUND=resources/images/impl/gui/common/passWindowBackground.png
+
+USER_ONLINE_ICON=resources/images/impl/gui/common/statusicons/online.png
+USER_OFFLINE_ICON=resources/images/impl/gui/common/statusicons/offline.png
+USER_AWAY_ICON=resources/images/impl/gui/common/statusicons/away.png
+USER_NA_ICON=resources/images/impl/gui/common/statusicons/na.png
+USER_DND_ICON=resources/images/impl/gui/common/statusicons/dnd.png
+USER_FFC_ICON=resources/images/impl/gui/common/statusicons/freeForChat.png
+USER_OCCUPIED_ICON=resources/images/impl/gui/common/statusicons/occupied.png
+
+CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
+CLOSE_TAB_SELECTED_ICON=resources/images/impl/gui/buttons/closeTabSelected.png
+
+SELECTED_TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/selectedTabLeft.png
+SELECTED_TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/selectedTabMiddle.png
+SELECTED_TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/selectedTabRight.png
+TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/tabLeft.png
+TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/tabMiddle.png
+TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/tabRight.png
+DELETE_TEXT_ICON=resources/images/impl/gui/lookandfeel/delete.png
+DELETE_TEXT_ROLLOVER_ICON=resources/images/impl/gui/lookandfeel/deleteRollover.png
+
+SELECTED_CLOSABLE_TAB_BG=resources/images/impl/gui/lookandfeel/closableTabSelected.png
+CLOSABLE_TAB_BG=resources/images/impl/gui/lookandfeel/closableTab.png
+
+BUTTON=resources/images/impl/gui/lookandfeel/button1.png
+BUTTON_ROLLOVER=resources/images/impl/gui/lookandfeel/button2.png
+TOGGLE_BUTTON_PRESSED=resources/images/impl/gui/lookandfeel/button3.png
+TOGGLE_BUTTON=resources/images/impl/gui/lookandfeel/button4.png
+
+SPLITPANE_HORIZONTAL=resources/images/impl/gui/lookandfeel/splitpaneHorizontal.png
+SPLITPANE_VERTICAL=resources/images/impl/gui/lookandfeel/splitpaneVertical.png
+
+SCROLLBAR_HORIZONTAL=resources/images/impl/gui/lookandfeel/scrollbar_horiz2.png
+SCROLLBAR_VERTICAL=resources/images/impl/gui/lookandfeel/scrollbar_vert1.png
+SCROLLBAR_THUMB_HORIZONTAL=resources/images/impl/gui/lookandfeel/horizThumbHandle.png
+SCROLLBAR_THUMB_VERTICAL=resources/images/impl/gui/lookandfeel/vertThumbHandle.png
+
+ADD_CONTACT_WIZARD_ICON=resources/images/impl/gui/common/addContactWizardIcon.png
+RENAME_DIALOG_ICON=resources/images/impl/gui/common/renameDialogIcon.png
+
+BROWSER_ICON=resources/images/impl/gui/common/browser16x16.png
+
+AUTHORIZATION_ICON=resources/images/impl/gui/common/padlock.gif
+
+INCOMING_CALL=resources/images/impl/gui/common/incomingCall.png
+OUTGOING_CALL=resources/images/impl/gui/common/outgoingCall.png
+
+EXCLAMATION_MARK=resources/images/impl/gui/common/exclamationMark.png
+
+ABOUT_WINDOW_BACKGROUND=resources/images/impl/gui/common/aboutWindowBackground.png
+
+OPENED_GROUP=resources/images/impl/gui/common/openedGroup.png
+CLOSED_GROUP=resources/images/impl/gui/common/closedGroup.png
+
+CHAT_ROOM_16x16_ICON=resources/images/impl/gui/common/chatRoom16x16.png
+CHAT_SERVER_16x16_ICON=resources/images/impl/gui/common/multiUserChatServer16x16.png
+
+MESSAGE_RECEIVED_ICON=resources/images/impl/gui/common/envelope.png
+
+REASON_DIALOG_ICON=resources/images/impl/gui/common/reasonDialogIcon.png
+
+JOIN_ICON=resources/images/impl/gui/common/join.png
+JOIN_AS_ICON=resources/images/impl/gui/common/join.png
+LEAVE_ICON=resources/images/impl/gui/common/leave.png
 
-WINDOW_LOGO=net/java/sip/communicator/impl/gui/resources/common/windowLogo.png
+WINDOW_LOGO=resources/images/impl/gui/common/windowLogo.png
 
-STATUS_SEPARATOR_ICON=net/java/sip/communicator/impl/gui/resources/common/statusSeparator1.png
\ No newline at end of file
+STATUS_SEPARATOR_ICON=resources/images/impl/gui/common/statusSeparator1.png
\ No newline at end of file

Modified: trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java	2007-12-10 20:25:59+0000
@@ -31,7 +31,7 @@
         = new GibberishStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/gibberish/gibberish-offline.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-offline.png"));
 
     /**
      * An Occupied status. Indicates that the user has connectivity and
@@ -41,7 +41,7 @@
         = new GibberishStatusEnum(
             20
             , "Occupied"
-            , loadIcon("resources/images/gibberish/gibberish-occupied.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-occupied.png"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -51,7 +51,7 @@
         = new GibberishStatusEnum(
             30
             , "Do Not Disturb",
-            loadIcon("resources/images/gibberish/gibberish-dnd.png"));
+            loadIcon("resources/images/protocol/gibberish/gibberish-dnd.png"));
 
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -63,7 +63,7 @@
         = new GibberishStatusEnum(
             35
             , "Not Available"
-            , loadIcon("resources/images/gibberish/gibberish-na.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-na.png"));
 
     /**
      * The Away status. Indicates that the user has connectivity but might
@@ -73,7 +73,7 @@
         = new GibberishStatusEnum(
             40
             , "Away"
-            , loadIcon("resources/images/gibberish/gibberish-away.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-away.png"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -84,7 +84,7 @@
         = new GibberishStatusEnum(
             45
             , "Invisible"
-            , loadIcon( "resources/images/gibberish/gibberish-invisible.png"));
+            , loadIcon( "resources/images/protocol/gibberish/gibberish-invisible.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -94,7 +94,7 @@
         = new GibberishStatusEnum(
             65
             , "Online"
-            , loadIcon("resources/images/gibberish/gibberish-online.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-online.png"));
 
     /**
      * The Free For Chat status. Indicates that the user is eager to
@@ -104,7 +104,7 @@
         = new GibberishStatusEnum(
             85
             , "Free For Chat"
-            , loadIcon("resources/images/gibberish/gibberish-ffc.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-ffc.png"));
 
     /**
      * Initialize the list of supported status states.

Modified: trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java	2007-12-10 20:25:59+0000
@@ -37,10 +37,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/gibberish/gibberish-online.png"));
+            loadIcon("resources/images/protocol/gibberish/gibberish-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/gibberish/gibberish64x64.png"));
+            loadIcon("resources/images/protocol/gibberish/gibberish64x64.png"));
     }
         
     /**
@@ -76,7 +76,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/gibberish/gibberish-online.png");
+        return loadIcon("resources/images/protocol/gibberish/gibberish-online.png");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/aim/aim16x16-online.png"));
+            loadIcon("resources/images/protocol/aim/aim16x16-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/aim/aim64x64.png"));
+            loadIcon("resources/images/protocol/aim/aim64x64.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/aim/cr16-action-aim_connecting.gif");
+        return loadIcon("resources/images/protocol/aim/cr16-action-aim_connecting.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/icq/icq16x16-online.png"));
+            loadIcon("resources/images/protocol/icq/icq16x16-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/icq/icq64x64.png"));
+            loadIcon("resources/images/protocol/icq/icq64x64.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/icq/cr16-action-icq_connecting-1.gif");
+        return loadIcon("resources/images/protocol/icq/cr16-action-icq_connecting-1.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java	2007-12-10 20:25:59+0000
@@ -32,7 +32,7 @@
         = new IrcStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/irc/cr16-action-irc_offline.png"));
+            , loadIcon("resources/images/protocol/irc/cr16-action-irc_offline.png"));
 
     /**
      * The Away status. Indicates that the user has connectivity but might
@@ -42,7 +42,7 @@
         = new IrcStatusEnum(
             40
             , "Away"
-            , loadIcon("resources/images/gibberish/gibberish-away.png"));
+            , loadIcon("resources/images/protocol/gibberish/gibberish-away.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -52,7 +52,7 @@
         = new IrcStatusEnum(
             65
             , "Online"
-            , loadIcon("resources/images/irc/cr16-action-irc_online.png"));
+            , loadIcon("resources/images/protocol/irc/cr16-action-irc_online.png"));
 
     /**
      * Initialize the list of supported status states.

Modified: trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java	2007-12-10 20:25:59+0000
@@ -30,10 +30,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/irc/cr16-action-irc_online.png"));
+            loadIcon("resources/images/protocol/irc/cr16-action-irc_online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/irc/cr32-app-irc_protocol.png"));
+            loadIcon("resources/images/protocol/irc/cr32-app-irc_protocol.png"));
     }
  
     /**
@@ -69,7 +69,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/irc/cr16-action-irc_connecting-1.gif");
+        return loadIcon("resources/images/protocol/irc/cr16-action-irc_connecting-1.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolIconJabberImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/jabber/jabber16x16-online.png"));
+            loadIcon("resources/images/protocol/jabber/jabber16x16-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_48x48,
-            loadIcon("resources/images/jabber/jabber48x48.png"));
+            loadIcon("resources/images/protocol/jabber/jabber48x48.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/jabber/jabber16x16-connecting.gif");
+        return loadIcon("resources/images/protocol/jabber/jabber16x16-connecting.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            loadIcon("resources/images/msn/msn16x16.png"));
+            loadIcon("resources/images/protocol/msn/msn16x16.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/msn/msn64x64.png"));
+            loadIcon("resources/images/protocol/msn/msn64x64.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/msn/msn16x16-connecting.gif");
+        return loadIcon("resources/images/protocol/msn/msn16x16-connecting.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java	2007-12-10 20:25:59+0000
@@ -38,10 +38,10 @@
     static 
     {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/rss/rss-online.png"));
+            loadIcon("resources/images/protocol/rss/rss-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/rss/rss64x64.png"));
+            loadIcon("resources/images/protocol/rss/rss64x64.png"));
     }
         
     /**
@@ -77,7 +77,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/rss/rss-online.png");
+        return loadIcon("resources/images/protocol/rss/rss-online.png");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java	2007-12-10 20:25:59+0000
@@ -31,7 +31,7 @@
         = new RssStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/rss/rss-offline.png"));
+            , loadIcon("resources/images/protocol/rss/rss-offline.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -41,7 +41,7 @@
         = new RssStatusEnum(
             65
             , "Online"
-            , loadIcon("resources/images/rss/rss-online.png"));
+            , loadIcon("resources/images/protocol/rss/rss-online.png"));
 
     /**
      * Initialize the list of supported status states.

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/ProtocolIconSipImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            loadIcon("resources/images/sip/sip16x16.png"));
+            loadIcon("resources/images/protocol/sip/sip16x16.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/sip/sip64x64.png"));
+            loadIcon("resources/images/protocol/sip/sip64x64.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/sip/sip-connecting.gif");
+        return loadIcon("resources/images/protocol/sip/sip-connecting.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java	2007-12-10 20:25:59+0000
@@ -31,7 +31,7 @@
         = new SipStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/sip/sip16x16-offline.png"));
+            , loadIcon("resources/images/protocol/sip/sip16x16-offline.png"));
 
     /**
      * The busy status. Indicates that the user has connectivity but is doing
@@ -41,7 +41,7 @@
         = new SipStatusEnum(
             30,
             "Busy (DND)",
-            loadIcon("resources/images/sip/sip16x16-busy.png"));
+            loadIcon("resources/images/protocol/sip/sip16x16-busy.png"));
     
     /**
      * The On the phone status. Indicates that the user is talking to the phone.
@@ -50,7 +50,7 @@
         = new SipStatusEnum(
             37,
             "On the phone",
-            loadIcon("resources/images/sip/sip16x16-phone.png"));
+            loadIcon("resources/images/protocol/sip/sip16x16-phone.png"));
     
     /**
      * The Away  status. Indicates that the user has connectivity but might
@@ -60,7 +60,7 @@
         = new SipStatusEnum(
             40,
             "Away",
-            loadIcon("resources/images/sip/sip16x16-away.png"));
+            loadIcon("resources/images/protocol/sip/sip16x16-away.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -70,7 +70,7 @@
         = new SipStatusEnum(
             65
             , "Online"
-            , loadIcon("resources/images/sip/sip16x16-online.png"));
+            , loadIcon("resources/images/protocol/sip/sip16x16-online.png"));
     
     /**
      * The Unknown status. Indicate that we don't know if the user is present
@@ -79,7 +79,7 @@
     public static final SipStatusEnum UNKNOWN = new SipStatusEnum(
             1,
             "Unknown",
-            loadIcon("resources/images/sip/sip16x16-offline.png"));
+            loadIcon("resources/images/protocol/sip/sip16x16-offline.png"));
 
     /**
      * Initialize the list of supported status states.

Modified: trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java	2007-12-10 20:25:59+0000
@@ -35,10 +35,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/ssh/ssh-online.png"));
+            loadIcon("resources/images/protocol/ssh/ssh-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/ssh/ssh64x64.png"));
+            loadIcon("resources/images/protocol/ssh/ssh64x64.png"));
     }
         
     /**
@@ -77,7 +77,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/ssh/ssh-online.png");
+        return loadIcon("resources/images/protocol/ssh/ssh-online.png");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java	2007-12-10 20:25:59+0000
@@ -36,7 +36,7 @@
             = new SSHStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/ssh/ssh-offline.png"));
+            , loadIcon("resources/images/protocol/ssh/ssh-offline.png"));
     
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -48,7 +48,7 @@
             = new SSHStatusEnum(
             35
             , "Not Available"
-            , loadIcon("resources/images/ssh/ssh-na.png"));
+            , loadIcon("resources/images/protocol/ssh/ssh-na.png"));
     
     /**
      * The Connecting status. Indicate that the user is connecting to remote
@@ -58,7 +58,7 @@
             = new SSHStatusEnum(
             55
             , "Connecting"            
-            , loadIcon("resources/images/ssh/ssh-connecting.png"));
+            , loadIcon("resources/images/protocol/ssh/ssh-connecting.png"));
    
     /**
      * The Online status. Indicate that the user is able and willing to

Modified: trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java	2007-12-10 20:25:59+0000
@@ -29,10 +29,10 @@
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            loadIcon("resources/images/yahoo/yahoo16x16.png"));
+            loadIcon("resources/images/protocol/yahoo/yahoo16x16.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/yahoo/yahoo64x64.png"));
+            loadIcon("resources/images/protocol/yahoo/yahoo64x64.png"));
     }
  
     /**
@@ -68,7 +68,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/yahoo/yahoo16x16-connecting.gif");
+        return loadIcon("resources/images/protocol/yahoo/yahoo16x16-connecting.gif");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java	2007-12-10 20:25:59+0000
@@ -32,10 +32,10 @@
     static 
     {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            loadIcon("resources/images/zeroconf/zeroconf-online.png"));
+            loadIcon("resources/images/protocol/zeroconf/zeroconf-online.png"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            loadIcon("resources/images/zeroconf/zeroconf-color-64.png"));
+            loadIcon("resources/images/protocol/zeroconf/zeroconf-color-64.png"));
     }
         
     /**
@@ -74,7 +74,7 @@
      */
     public byte[] getConnectingIcon()
     {
-        return loadIcon("resources/images/zeroconf/zeroconf-online.png");
+        return loadIcon("resources/images/protocol/zeroconf/zeroconf-online.png");
     }
     
     /**

Modified: trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java	2007-12-10 20:25:59+0000
@@ -32,7 +32,7 @@
         = new ZeroconfStatusEnum(
             0
             , "Offline"
-            , loadIcon("resources/images/zeroconf/zeroconf-offline.png"));
+            , loadIcon("resources/images/protocol/zeroconf/zeroconf-offline.png"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -42,7 +42,7 @@
         = new ZeroconfStatusEnum(
             30
             ,"Do Not Disturb",//, "Do Not Disturb",
-            loadIcon("resources/images/zeroconf/zeroconf-dnd.png"));
+            loadIcon("resources/images/protocol/zeroconf/zeroconf-dnd.png"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -53,7 +53,7 @@
         = new ZeroconfStatusEnum(
             45
             , "Invisible"
-            , loadIcon( "resources/images/zeroconf/zeroconf-invisible.png"));
+            , loadIcon( "resources/images/protocol/zeroconf/zeroconf-invisible.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -63,7 +63,7 @@
         = new ZeroconfStatusEnum(
             65
             ,"Available"//, "Online"
-            , loadIcon("resources/images/zeroconf/zeroconf-online.png"));
+            , loadIcon("resources/images/protocol/zeroconf/zeroconf-online.png"));
 
 
     /**

Modified: trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/aimaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -16,5 +16,5 @@
 proxyPassword=Proxy password
 error=Error
 
-protocolIcon=resources/images/aim/aim16x16-online.png
-pageImage=resources/images/aim/aim64x64.png
+protocolIcon=resources/images/protocol/aim/aim16x16-online.png
+pageImage=resources/images/protocol/aim/aim64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java&p2=trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/branding/AboutWindow.java	2007-12-10 20:25:59+0000
@@ -142,7 +142,8 @@
             try

             {

                 bgImage = ImageIO.read(WindowBackground.class

-                        .getResource("resources/aboutWindowBackground.png"));

+                        .getResource(

+                            BrandingResources.getString("aboutWindowBg")));

             }

             catch (IOException e)

             {


Modified: trunk/src/net/java/sip/communicator/plugin/branding/Constants.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/branding/Constants.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/branding/Constants.java&p2=trunk/src/net/java/sip/communicator/plugin/branding/Constants.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/branding/Constants.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/branding/Constants.java	2007-12-10 20:25:59+0000
@@ -53,8 +53,8 @@
      */

     public static void loadSimpleStyle(StyleSheet style)

     {

-        InputStream is = Constants.class

-                .getResourceAsStream("resources/defaultStyle.css");

+        InputStream is = Constants.class.getClassLoader()

+                .getResourceAsStream(BrandingResources.getString("textStyle"));

 

         Reader r = new BufferedReader(new InputStreamReader(is));

         try


Modified: trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java&p2=trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java	2007-12-10 20:25:59+0000
@@ -2,7 +2,9 @@
 
 import java.awt.*;
 import java.awt.event.*;
+import java.io.*;
 
+import javax.imageio.*;
 import javax.swing.*;
 
 public class WelcomeWindow extends JDialog
@@ -162,4 +164,50 @@
         }
     }
 
+    /**
+     * Constructs the window background in order to have a background image.
+     */
+    private class WindowBackground
+        extends JPanel
+    {
+        private Image bgImage;
+
+        public WindowBackground()
+        {
+            this.setOpaque(true);
+            
+            try
+            {
+                bgImage = ImageIO.read(WindowBackground.class.getClassLoader()
+                    .getResource(BrandingResources.getString("splashScreenBg")));
+            }
+            catch (IOException e)
+            {
+                e.printStackTrace();
+            }
+
+            this.setPreferredSize(new Dimension(bgImage.getWidth(this), bgImage
+                .getHeight(this)));
+        }
+
+        protected void paintComponent(Graphics g)
+        {
+            super.paintComponent(g);
+
+            Graphics2D g2 = (Graphics2D) g;
+
+            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+
+            g2.drawImage(bgImage, 0, 0, null);
+
+            g2.setColor(new Color(255, 255, 255, 170));
+
+            g2.fillRect(0, 0, getWidth(), getHeight());
+            
+            g2.setColor(new Color(150, 150, 150));
+            
+            g2.drawRoundRect(0, 0, getWidth() - 1, getHeight() - 1, 5, 5);
+        }
+    }
 }

Removed: trunk/src/net/java/sip/communicator/plugin/branding/WindowBackground.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/branding/WindowBackground.java?view=auto&rev=3305

Modified: trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties&p2=trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/branding/brandingResources.properties	2007-12-10 20:25:59+0000
@@ -1,4 +1,7 @@
 productName=SIP Communicator
 productWebSite=http://sip-communicator.org
 fontName=Verdana
-fontSize=12
\ No newline at end of file
+fontSize=12
+aboutWindowBg=resources/images/plugin/branding/aboutWindowBackground.png
+splashScreenBg=resources/images/plugin/branding/splashScreenBackground.png
+textStyle=resources/styles/defaultStyle.css
\ No newline at end of file

Modified: trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -7,5 +7,5 @@
 existingAccount=* The account you entered is already installed.
 error=Error
 
-protocolIcon=resources/images/gibberish/gibberish-online.png
-pageImage=resources/images/gibberish/gibberish64x64.png
+protocolIcon=resources/images/protocol/gibberish/gibberish-online.png
+pageImage=resources/images/protocol/gibberish/gibberish64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -16,5 +16,5 @@
 proxyPassword=Proxy password
 error=Error
 
-protocolIcon=resources/images/icq/icq16x16-online.png
-pageImage=resources/images/icq/icq64x64.png
+protocolIcon=resources/images/protocol/icq/icq16x16-online.png
+pageImage=resources/images/protocol/icq/icq64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/ircaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -15,5 +15,5 @@
 existingAccount=* The account you entered is already installed.
 error=Error
 
-protocolIcon=resources/images/irc/cr16-action-irc_online.png
-pageImage=resources/images/irc/cr64-app-irc_protocol.png
\ No newline at end of file
+protocolIcon=resources/images/protocol/irc/cr16-action-irc_online.png
+pageImage=resources/images/protocol/irc/cr64-app-irc_protocol.png
\ No newline at end of file

Modified: trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -33,5 +33,5 @@
 
 commentsFile=net/java/sip/communicator/plugin/jabberaccregwizz/resources/servercomments.xml
 
-protocolIcon=resources/images/jabber/jabber16x16-online.png
-pageImage=resources/images/jabber/jabber48x48.png
+protocolIcon=resources/images/protocol/jabber/jabber16x16-online.png
+pageImage=resources/images/protocol/jabber/jabber48x48.png

Modified: trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -7,5 +7,5 @@
 existingAccount=* The account you entered is already installed.
 error=Error
 
-protocolIcon=resources/images/msn/msn16x16.png
-pageImage=resources/images/msn/msn64x64.png
+protocolIcon=resources/images/protocol/msn/msn16x16.png
+pageImage=resources/images/protocol/msn/msn64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/rssaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -8,5 +8,5 @@
 rssAccountInfoTitle=RSS Account Information
 rssAccountAttention=Please read attentively the information provided below!
 
-protocolIcon=resources/images/rss/rss-online.png
-pageImage=resources/images/rss/rss64x64.png
+protocolIcon=resources/images/protocol/rss/rss-online.png
+pageImage=resources/images/protocol/rss/rss64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -20,5 +20,5 @@
 subscriptionExpiration=Default subscription duration (in s.)
 presenceOptions=Presence Options
 
-protocolIcon=resources/images/sip/sip16x16.png
-pageImage=resources/images/sip/sip64x64.png
+protocolIcon=resources/images/protocol/sip/sip16x16.png
+pageImage=resources/images/protocol/sip/sip64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/sshaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -7,5 +7,5 @@
 existingAccount=* The account you entered is already installed.
 error=Error
 
-protocolIcon=resources/images/ssh/ssh-online.png
-pageImage=resources/images/ssh/ssh64x64.png
+protocolIcon=resources/images/protocol/ssh/ssh-online.png
+pageImage=resources/images/protocol/ssh/ssh64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -7,5 +7,5 @@
 existingAccount=* The account you entered is already installed.
 error=Error
 
-protocolIcon=resources/images/yahoo/yahoo16x16.png
-pageImage=resources/images/yahoo/yahoo64x64.png
+protocolIcon=resources/images/protocol/yahoo/yahoo16x16.png
+pageImage=resources/images/protocol/yahoo/yahoo64x64.png

Modified: trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/resources.properties	2007-12-10 20:25:59+0000
@@ -8,5 +8,5 @@
 existingAccount=* A Bonjour account already exists. You can only install a single Bonjour account.
 error=Error
 
-protocolIcon=resources/images/zeroconf/zeroconf-color-16.png
-pageImage=resources/images/zeroconf/zeroconf-color-64.png
+protocolIcon=resources/images/protocol/zeroconf/zeroconf-color-16.png
+pageImage=resources/images/protocol/zeroconf/zeroconf-color-64.png

Modified: trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java&p2=trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/service/protocol/aimconstants/AimStatusEnum.java	2007-12-10 20:25:59+0000
@@ -29,7 +29,7 @@
      */
     public static final AimStatusEnum ONLINE
         = new AimStatusEnum(65, "Online",
-                loadIcon("resources/images/aim/aim16x16-online.png"));
+                loadIcon("resources/images/protocol/aim/aim16x16-online.png"));
 
     /**
      * The Invisible AIM status. Indicates that the user has connectivity even
@@ -38,7 +38,7 @@
      */
     public static final AimStatusEnum INVISIBLE
         = new AimStatusEnum(45, "Invisible",
-                loadIcon("resources/images/aim/aim16x16-invisible.png"));
+                loadIcon("resources/images/protocol/aim/aim16x16-invisible.png"));
 
     /**
      * The Away AIM status. Indicates that the user has connectivity but might
@@ -46,7 +46,7 @@
      */
     public static final AimStatusEnum AWAY
         = new AimStatusEnum(40, "Away",
-                loadIcon("resources/images/aim/aim16x16-away.png"));
+                loadIcon("resources/images/protocol/aim/aim16x16-away.png"));
 
     /**
      * The Offline AIM status. Indicates the user does not seem to be connected
@@ -54,7 +54,7 @@
      */
     public static final AimStatusEnum OFFLINE
         = new AimStatusEnum(0, "Offline",
-                loadIcon("resources/images/aim/aim16x16-offline.png"));
+                loadIcon("resources/images/protocol/aim/aim16x16-offline.png"));
 
     /**
      * The minimal set of states that any AIM implementation must support.

Modified: trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java&p2=trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java	2007-12-10 20:25:59+0000
@@ -35,7 +35,7 @@
      */
     public static final IcqStatusEnum FREE_FOR_CHAT
         = new IcqStatusEnum(85, "Free For Chat",
-                loadIcon("resources/images/icq/icq16x16-ffc.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-ffc.png"));
 
     /**
      * The Online ICQ status. Indicate that the user is able and willing to
@@ -43,7 +43,7 @@
      */
     public static final IcqStatusEnum ONLINE
         = new IcqStatusEnum(65, "Online",
-                loadIcon("resources/images/icq/icq16x16-online.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-online.png"));
 
     /**
      * The Invisible ICQ status. Indicates that the user has connectivity even
@@ -52,7 +52,7 @@
      */
     public static final IcqStatusEnum INVISIBLE
         = new IcqStatusEnum(45, "Invisible",
-                loadIcon("resources/images/icq/icq16x16-invisible.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-invisible.png"));
 
     /**
      * The Away ICQ status. Indicates that the user has connectivity but might
@@ -60,7 +60,7 @@
      */
     public static final IcqStatusEnum AWAY
         = new IcqStatusEnum(40, "Away",
-                loadIcon("resources/images/icq/icq16x16-away.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-away.png"));
 
 
     /**
@@ -71,7 +71,7 @@
      */
     public static final IcqStatusEnum NOT_AVAILABLE
         = new IcqStatusEnum(35, "Not Available",
-                loadIcon("resources/images/icq/icq16x16-na.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-na.png"));
 
     /**
      * The DND ICQ status. Indicates that the user has connectivity but prefers
@@ -79,7 +79,7 @@
      */
     public static final IcqStatusEnum DO_NOT_DISTURB
         = new IcqStatusEnum(30, "Do Not Disturb",
-                loadIcon("resources/images/icq/icq16x16-dnd.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-dnd.png"));
 
     /**
      * The Occupied ICQ status. Indicates that the user has connectivity and
@@ -87,7 +87,7 @@
      */
     public static final IcqStatusEnum OCCUPIED
         = new IcqStatusEnum(25, "Occupied",
-                loadIcon("resources/images/icq/icq16x16-occupied.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-occupied.png"));
 
     /**
      * The Offline ICQ status. Indicates the user does not seem to be connected
@@ -95,7 +95,7 @@
      */
     public static final IcqStatusEnum OFFLINE
         = new IcqStatusEnum(0, "Offline",
-                loadIcon("resources/images/icq/icq16x16-offline.png"));
+                loadIcon("resources/images/protocol/icq/icq16x16-offline.png"));
 
     /**
      * The minimal set of states that any ICQ implementation must support.

Modified: trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java&p2=trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java	2007-12-10 20:25:59+0000
@@ -34,7 +34,7 @@
      */
     public static final JabberStatusEnum FREE_FOR_CHAT
         = new JabberStatusEnum(85, "Free For Chat",
-                loadIcon("resources/images/jabber/jabber16x16-ffc.png"));
+                loadIcon("resources/images/protocol/jabber/jabber16x16-ffc.png"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -42,7 +42,7 @@
      */
     public static final JabberStatusEnum AVAILABLE
         = new JabberStatusEnum(65, "Available",
-                loadIcon("resources/images/jabber/jabber16x16-online.png"));
+                loadIcon("resources/images/protocol/jabber/jabber16x16-online.png"));
 
     /**
      * The Away  status. Indicates that the user has connectivity but might
@@ -50,7 +50,7 @@
      */
     public static final JabberStatusEnum AWAY
         = new JabberStatusEnum(40, "Away",
-                loadIcon("resources/images/jabber/jabber16x16-away.png"));
+                loadIcon("resources/images/protocol/jabber/jabber16x16-away.png"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -58,7 +58,7 @@
      */
     public static final JabberStatusEnum DO_NOT_DISTURB
         = new JabberStatusEnum(30, "Do Not Disturb",
-                loadIcon("resources/images/jabber/jabber16x16-dnd.png"));
+                loadIcon("resources/images/protocol/jabber/jabber16x16-dnd.png"));
 
     /**
      * The Offline status. Indicates the user does not seem to be connected
@@ -66,7 +66,7 @@
      */
     public static final JabberStatusEnum OFFLINE
         = new JabberStatusEnum(0, "Offline",
-                loadIcon("resources/images/jabber/jabber16x16-offline.png"));
+                loadIcon("resources/images/protocol/jabber/jabber16x16-offline.png"));
 
     /**
      * The minimal set of states that any implementation must support.

Modified: trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java&p2=trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java	2007-12-10 20:25:59+0000
@@ -34,14 +34,14 @@
      */
     public static final MsnStatusEnum ONLINE
         = new MsnStatusEnum(65, "Online",
-                loadIcon("resources/images/msn/msn16x16-online.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-online.png"));
 
     /**
      * The Idle status. Indicates that the user is not using the messanger.
      */
     public static final MsnStatusEnum IDLE
         = new MsnStatusEnum(55, "Idle",
-                loadIcon("resources/images/msn/msn16x16-na.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-na.png"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -50,7 +50,7 @@
      */
     public static final MsnStatusEnum HIDE
         = new MsnStatusEnum(45, "Hide",
-                loadIcon("resources/images/msn/msn16x16-invisible.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-invisible.png"));
 
     /**
      * The Away  status. Indicates that the user has connectivity but might
@@ -58,21 +58,21 @@
      */
     public static final MsnStatusEnum AWAY
         = new MsnStatusEnum(40, "Away",
-                loadIcon("resources/images/msn/msn16x16-away.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-away.png"));
 
     /**
      * The Out to lunch status. Indicates that the user is eating.
      */
     public static final MsnStatusEnum OUT_TO_LUNCH
         = new MsnStatusEnum(39, "Out to lunch",
-                loadIcon("resources/images/msn/msn16x16-lunch.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-lunch.png"));
 
     /**
      * The On the phone status. Indicates that the user is talking to the phone.
      */
     public static final MsnStatusEnum ON_THE_PHONE
         = new MsnStatusEnum(37, "On the phone",
-                loadIcon("resources/images/msn/msn16x16-phone.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-phone.png"));
 
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -82,7 +82,7 @@
      */
     public static final MsnStatusEnum BE_RIGHT_BACK
         = new MsnStatusEnum(35, "Be Right Back",
-                loadIcon("resources/images/msn/msn16x16-brb.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-brb.png"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -90,7 +90,7 @@
      */
     public static final MsnStatusEnum BUSY
         = new MsnStatusEnum(30, "Busy",
-                loadIcon("resources/images/msn/msn16x16-busy.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-busy.png"));
 
     /**
      * The Offline status. Indicates the user does not seem to be connected
@@ -98,7 +98,7 @@
      */
     public static final MsnStatusEnum OFFLINE
         = new MsnStatusEnum(0, "Offline",
-                loadIcon("resources/images/msn/msn16x16-offline.png"));
+                loadIcon("resources/images/protocol/msn/msn16x16-offline.png"));
 
     /**
      * The minimal set of states that any implementation must support.

Modified: trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java?view=diff&rev=3306&p1=trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java&p2=trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java&r1=3305&r2=3306
==============================================================================
--- trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java	(original)
+++ trunk/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java	2007-12-10 20:25:59+0000
@@ -34,14 +34,14 @@
      */
     public static final YahooStatusEnum AVAILABLE
         = new YahooStatusEnum(65, "Available",
-                loadIcon("resources/images/yahoo/yahoo16x16-online.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-online.png"));
 
     /**
      * The Idle status. Indicates that the user is not using the messanger.
      */
     public static final YahooStatusEnum IDLE
         = new YahooStatusEnum(55, "Idle",
-                loadIcon("resources/images/yahoo/yahoo16x16-idle.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-idle.png"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -50,7 +50,7 @@
      */
     public static final YahooStatusEnum INVISIBLE
         = new YahooStatusEnum(45, "Invisible",
-                loadIcon("resources/images/yahoo/yahoo16x16-invisible.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-invisible.png"));
 
     /**
      * The STEPPED_OUT  status. Indicates that the user has connectivity but might
@@ -58,28 +58,28 @@
      */
     public static final YahooStatusEnum STEPPED_OUT
         = new YahooStatusEnum(40, "Stepped out",
-                loadIcon("resources/images/yahoo/yahoo16x16-away.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-away.png"));
 
     /**
      * The Out to lunch status. Indicates that the user is eating.
      */
     public static final YahooStatusEnum OUT_TO_LUNCH
         = new YahooStatusEnum(39, "Out to lunch",
-                loadIcon("resources/images/yahoo/yahoo16x16-lunch.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-lunch.png"));
 
     /**
      * The Not at home status. Indicates that the user is not at home.
      */
     public static final YahooStatusEnum NOT_AT_HOME
         = new YahooStatusEnum(38, "Not at home",
-                loadIcon("resources/images/yahoo/yahoo16x16-na.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-na.png"));
     
     /**
      * The On the phone status. Indicates that the user is talking to the phone.
      */
     public static final YahooStatusEnum ON_THE_PHONE
         = new YahooStatusEnum(37, "On the phone",
-                loadIcon("resources/images/yahoo/yahoo16x16-phone.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-phone.png"));
 
     /**
      * The Not at desk status. Indicates that the user is not at his desk, but 
@@ -87,7 +87,7 @@
      */
     public static final YahooStatusEnum NOT_AT_DESK
         = new YahooStatusEnum(36, "Not at desk",
-                loadIcon("resources/images/yahoo/yahoo16x16-na.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-na.png"));
     
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -97,14 +97,14 @@
      */
     public static final YahooStatusEnum BE_RIGHT_BACK
         = new YahooStatusEnum(35, "Be Right Back",
-                loadIcon("resources/images/yahoo/yahoo16x16-away.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-away.png"));
 
     /**
      * The Not in office status. Indicates that the user is out of the office.
      */
     public static final YahooStatusEnum NOT_IN_OFFICE
         = new YahooStatusEnum(34, "Not in office",
-                loadIcon("resources/images/yahoo/yahoo16x16-na.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-na.png"));
     
     /**
      * The On vacation status. Indicates that the user is somewhere on the 
@@ -112,7 +112,7 @@
      */
     public static final YahooStatusEnum ON_VACATION
         = new YahooStatusEnum(33, "On vacation",
-                loadIcon("resources/images/yahoo/yahoo16x16-vacation.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-vacation.png"));
     
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -120,7 +120,7 @@
      */
     public static final YahooStatusEnum BUSY
         = new YahooStatusEnum(30, "Busy",
-                loadIcon("resources/images/yahoo/yahoo16x16-busy.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-busy.png"));
 
     /**
      * The Offline status. Indicates the user does not seem to be connected
@@ -128,7 +128,7 @@
      */
     public static final YahooStatusEnum OFFLINE
         = new YahooStatusEnum(0, "Offline",
-                loadIcon("resources/images/yahoo/yahoo16x16-offline.png"));
+                loadIcon("resources/images/protocol/yahoo/yahoo16x16-offline.png"));
 
     /**
      * The minimal set of states that any implementation must support.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe at sip-communicator.dev.java.net
For additional commands, e-mail: commits-help at sip-communicator.dev.java.net





More information about the commits mailing list