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

Fix some missing color resources.

Browse Source
cusax-fix
Yana Stamcheva 17 years ago
parent 4448bf0d83
commit 4a881555fa
6 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File

3
resources/colors/colors.properties
Unescape View File

@ -139,6 +139,9 @@ service.gui.MAIN_WINDOW_BACKGROUND=FFFFFF
# Tooltip background color.
service.gui.TOOLTIP_BACKGROUND=E8E9EF
# The background color for toolbars.
service.gui.TOOL_BAR_BACKGROUND=414141
# Rollover color for the toolbar button.
service.gui.TOOL_BAR_ROLLOVER_BACKGROUND=414141

1
resources/languages/resources.properties
Unescape View File

@ -181,6 +181,7 @@ service.gui.LOGIN_WINDOW_TITLE=Login {0}
service.gui.LOGOFF_NOT_SUCCEEDED=An error occured while logging off with the following account: User name: {0}, Server name: {1}.
service.gui.ME=me
service.gui.MODIFY=Modify
service.gui.MORE=See more
service.gui.MOVE=Move
service.gui.MOVE_SUBCONTACT=M&ove contact
service.gui.MOVE_SUBCONTACT_MSG=Select the contact or the group, where you would like to move the selected contact.

27
src/net/java/sip/communicator/impl/gui/main/MainFrame.java
Unescape View File

@ -190,6 +190,19 @@ private void init()
{
menusPanel.add(new ExtendedQuickMenu(this), BorderLayout.SOUTH);
}
else
{
JLabel moreActionsLabel = new JLabel(moreActionsIcon);
moreActionsLabel.setToolTipText(GuiActivator.getResources()
.getI18NString("service.gui.OPEN_TOOLS"));
moreActionsLabel.addMouseListener(new ActionMenuMouseListener());
TransparentPanel moreActionsPanel
= new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
moreActionsPanel.add(moreActionsLabel);
centerPanel.add(moreActionsPanel, BorderLayout.NORTH);
}
this.setJMenuBar(menu);
@ -199,16 +212,6 @@ private void init()
northPanel.add(menusPanel, BorderLayout.CENTER);
northPanel.add(accountStatusPanel, BorderLayout.SOUTH);
JLabel moreActionsLabel = new JLabel(moreActionsIcon);
moreActionsLabel.setToolTipText(GuiActivator.getResources()
.getI18NString("service.gui.OPEN_TOOLS"));
moreActionsLabel.addMouseListener(new ActionMenuMouseListener());
TransparentPanel moreActionsPanel
= new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
moreActionsPanel.add(moreActionsLabel);
centerPanel.add(moreActionsPanel, BorderLayout.NORTH);
centerPanel.add(contactListPanel, BorderLayout.CENTER);
centerPanel.add(mainCallPanel, BorderLayout.SOUTH);
@ -1196,8 +1199,8 @@ public void paintComponent(Graphics g)
= ImageLoader.getImage(ImageLoader.WINDOW_TITLE_BAR);
g.drawImage(logoImage, 0, 0, null);
g.setColor(new Color(
GuiActivator.getResources().getColor("logoBarBackground")));
g.setColor(new Color(GuiActivator.getResources()
.getColor("service.gui.LOGO_BAR_BACKGROUND")));
Graphics2D g2 = (Graphics2D) g;

4
src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
Unescape View File

@ -895,8 +895,8 @@ public void paintComponent(Graphics g)
= ImageLoader.getImage(ImageLoader.WINDOW_TITLE_BAR);
g.drawImage(logoImage, 0, 0, null);
g.setColor(new Color(
GuiActivator.getResources().getColor("logoBarBackground")));
g.setColor(new Color(GuiActivator.getResources()
.getColor("service.gui.LOGO_BAR_BACKGROUND")));
Graphics2D g2 = (Graphics2D) g;

44
src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
Unescape View File

@ -113,27 +113,15 @@ public ExtendedMainToolBar(ChatWindow messageWindow)
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
this.setPreferredSize(new Dimension(300, DEFAULT_BUTTON_HEIGHT + 5));
// this.setBorder(BorderFactory.createEmptyBorder(2, 2, 5, 2));
// this.add(saveButton);
// this.add(printButton);
// this.addSeparator();
this.add(cutButton);
this.add(copyButton);
this.add(pasteButton);
this.add(settingsButton);
this.add(previousButton);
this.add(nextButton);
// this.add(sendFileButton);
this.add(historyButton);
this.add(addButton);
// this.addSeparator();
//
// this.add(fontButton);
this.saveButton.setName("save");
this.saveButton.setToolTipText(
GuiActivator.getResources().getI18NString("service.gui.SAVE")
@ -337,7 +325,8 @@ public ToolBarButton(Image iconImage)
this.setFont(getFont().deriveFont(Font.BOLD, 10f));
this.setForeground(new Color(
GuiActivator.getResources().getColor("toolBarForeground")));
GuiActivator.getResources()
.getColor("service.gui.TOOL_BAR_FOREGROUND")));
this.setVerticalTextPosition(SwingConstants.BOTTOM);
this.setHorizontalTextPosition(SwingConstants.CENTER);
@ -382,7 +371,7 @@ private void internalPaintComponent(Graphics g)
{
color = new Color(
GuiActivator.getResources()
.getColor("toolbarRolloverBackground"));
.getColor("service.gui.TOOL_BAR_ROLLOVER_BACKGROUND"));
g2.setColor(color);
@ -391,8 +380,8 @@ private void internalPaintComponent(Graphics g)
if (isMousePressed)
{
color = new Color(
GuiActivator.getResources().getColor("toolbarBackground"));
color = new Color(GuiActivator.getResources()
.getColor("service.gui.TOOL_BAR_BACKGROUND"));
g2.setColor(new Color( color.getRed(),
color.getGreen(),
@ -415,23 +404,17 @@ public void mouseClicked(MouseEvent e)
String buttonText = button.getName();
ChatPanel chatPanel = messageWindow.getCurrentChatPanel();
if (buttonText.equalsIgnoreCase("save")) {
// TODO: Implement the save operation in chat MainToolBar.
}
else if (buttonText.equalsIgnoreCase("print")) {
// TODO: Implement the print operation in chat MainToolBar.
}
else if (buttonText.equalsIgnoreCase("cut")) {
if (buttonText.equalsIgnoreCase("cut"))
{
chatPanel.cut();
}
else if (buttonText.equalsIgnoreCase("copy")) {
else if (buttonText.equalsIgnoreCase("copy"))
{
chatPanel.copy();
}
else if (buttonText.equalsIgnoreCase("paste")) {
else if (buttonText.equalsIgnoreCase("paste"))
{
chatPanel.paste();
}
else if (buttonText.equalsIgnoreCase("previous"))
@ -441,9 +424,6 @@ else if (buttonText.equalsIgnoreCase("previous"))
else if (buttonText.equalsIgnoreCase("next"))
{
chatPanel.loadNextPageFromHistory();
}
else if (buttonText.equalsIgnoreCase("sendFile")) {
}
else if (buttonText.equalsIgnoreCase("history"))
{
@ -528,7 +508,7 @@ public void paintComponent(Graphics g)
g2.setColor(new Color(
GuiActivator.getResources()
.getColor("service.gui.DESKTOP_BACKGROUND")));
.getColor("service.gui.MAIN_WINDOW_BACKGROUND")));
g2.drawRect(0, this.getHeight() - 2, this.getWidth(), 2);
}

8
src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
Unescape View File

@ -451,7 +451,8 @@ public ToolBarButton(Image iconImage)
this.setFont(getFont().deriveFont(Font.BOLD, 10f));
this.setForeground(new Color(
GuiActivator.getResources().getColor("toolBarForeground")));
GuiActivator.getResources()
.getColor("service.gui.TOOL_BAR_FOREGROUND")));
this.setVerticalTextPosition(SwingConstants.BOTTOM);
this.setHorizontalTextPosition(SwingConstants.CENTER);
@ -496,7 +497,7 @@ private void internalPaintComponent(Graphics g)
{
color = new Color(
GuiActivator.getResources()
.getColor("toolbarRolloverBackground"));
.getColor("service.gui.TOOL_BAR_ROLLOVER_BACKGROUND"));
g2.setColor(color);
@ -506,7 +507,8 @@ private void internalPaintComponent(Graphics g)
if (isMousePressed)
{
color = new Color(
GuiActivator.getResources().getColor("toolbarBackground"));
GuiActivator.getResources()
.getColor("service.gui.TOOL_BAR_BACKGROUND"));
g2.setColor(new Color( color.getRed(),
color.getGreen(),

Write Preview
Loading…
Cancel
Save