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

Merge branch '1.0-local' into trunk-local

Browse Source 
* 1.0-local:
  Clean up extra "stuff" around JButtons on config screens and fix a few typos
cusax-fix
scmerger 17 years ago
parent 4564cf5307
commit b24a837947
5 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
Unescape View File

@ -150,10 +150,12 @@ private Component createEncodingControls(int type)
key = "impl.media.configform.UP";
final JButton upButton = new JButton(resources.getI18NString(key));
upButton.setMnemonic(resources.getI18nMnemonic(key));
upButton.setOpaque(false);
key = "impl.media.configform.DOWN";
final JButton downButton = new JButton(resources.getI18NString(key));
downButton.setMnemonic(resources.getI18nMnemonic(key));
downButton.setOpaque(false);
Container buttonBar = new TransparentPanel(new GridLayout(0, 1));
buttonBar.add(upButton);

20
src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigurationPanel.java
Unescape View File

@ -46,19 +46,8 @@ public AutoAwayConfigurationPanel()
*/
private Component init()
{
JPanel autoStatusPanel = new TransparentPanel(new BorderLayout());
// Title : automatic status
JLabel autoStatusLabel
= new JLabel(AutoAwayActivator.getResources()
.getI18NString("plugin.autoaway.AUTO_STATUS"));
Font bold = autoStatusLabel.getFont().deriveFont(Font.BOLD);
autoStatusLabel.setFont(bold);
JPanel fieldsPanel = new TransparentPanel(new BorderLayout(5, 5));
fieldsPanel.setBorder(BorderFactory.createEmptyBorder(10, 30, 0, 0));
fieldsPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
enable = new SIPCommCheckBox(AutoAwayActivator.getResources()
.getI18NString("plugin.autoaway.ENABLE_CHANGE_STATUS"));
@ -74,10 +63,9 @@ public void actionPerformed(ActionEvent e)
}
});
JPanel timerPanel =
new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
// Texte
// Text
timerPanel.add(new JLabel(
AutoAwayActivator.getResources()
.getI18NString("plugin.autoaway.AWAY_MINUTES")));
@ -94,11 +82,9 @@ public void stateChanged(ChangeEvent e)
});
fieldsPanel.add(timerPanel, BorderLayout.WEST);
autoStatusPanel.add(autoStatusLabel, BorderLayout.NORTH);
autoStatusPanel.add(fieldsPanel, BorderLayout.CENTER);
Container mainPanel = new TransparentPanel(new BorderLayout());
mainPanel.add(autoStatusPanel, BorderLayout.NORTH);
mainPanel.add(fieldsPanel, BorderLayout.NORTH);
return mainPanel;
}

27
src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
Unescape View File

@ -52,7 +52,7 @@ public class NotificationConfigurationPanel
"Description of event" };
private JButton activate;
private JButton desactivate;
private JButton deactivate;
private JCheckBox playSoundCheckBox;
private JButton playSoundButton;
private JTextField soundFileTextField;
@ -134,12 +134,14 @@ public NotificationConfigurationPanel()
activate = new JButton(Resources.getString("service.gui.ACTIVATE"));
activate.setMinimumSize(new Dimension(150,30));
activate.setPreferredSize(new Dimension(150,30));
activate.setOpaque(false);
activate.addActionListener(this);
desactivate = new JButton(
deactivate = new JButton(
Resources.getString("service.gui.DEACTIVATE"));
desactivate.setMinimumSize(new Dimension(150,30));
desactivate.setPreferredSize(new Dimension(150,30));
desactivate.addActionListener(this);
deactivate.setMinimumSize(new Dimension(150,30));
deactivate.setPreferredSize(new Dimension(150,30));
deactivate.setOpaque(false);
deactivate.addActionListener(this);
playSoundCheckBox = new SIPCommCheckBox(
Resources.getString("plugin.notificationconfig.PLAY_SOUND"));
@ -150,6 +152,7 @@ public NotificationConfigurationPanel()
"plugin.notificationconfig.PLAY_ICON")));
playSoundButton.setMinimumSize(new Dimension(50,30));
playSoundButton.setPreferredSize(new Dimension(50,30));
playSoundButton.setOpaque(false);
playSoundButton.addActionListener(this);
soundFileTextField = new JTextField();
soundFileTextField.setMinimumSize(new Dimension(250,30));
@ -192,7 +195,7 @@ public NotificationConfigurationPanel()
constraints.insets = new Insets(0,0,10,0);
activateDescactivatePanel.add(activate);
activateDescactivatePanel.add(desactivate);
activateDescactivatePanel.add(deactivate);
actionsLayout.setConstraints(activateDescactivatePanel, constraints);
actions.add(activateDescactivatePanel);
@ -371,7 +374,7 @@ private void updatePanel(NotificationsTableEntry tmpNTE)
{
noListener = true;
activate.setEnabled(!tmpNTE.getEnabled());
desactivate.setEnabled(tmpNTE.getEnabled());
deactivate.setEnabled(tmpNTE.getEnabled());
programCheckBox.setSelected(tmpNTE.getProgram());
programFileChooser.setEnabled(tmpNTE.getProgram());
programFileTextField.setEnabled(tmpNTE.getProgram());
@ -394,17 +397,17 @@ public void actionPerformed(ActionEvent e)
tmpNTE.setEnabled(true);
this.updateTableRow(tmpNTE, index);
activate.setEnabled(false);
desactivate.setEnabled(true);
deactivate.setEnabled(true);
tmpNTE.setModify(true);
}
else if(e.getSource() == desactivate)
else if(e.getSource() == deactivate)
{
NotificationsTableEntry tmpNTE
= (NotificationsTableEntry) dataVector.elementAt(index);
tmpNTE.setEnabled(false);
this.updateTableRow(tmpNTE, index);
activate.setEnabled(true);
desactivate.setEnabled(false);
deactivate.setEnabled(false);
tmpNTE.setModify(true);
}
else if(e.getSource() == soundFileChooser)
@ -1039,7 +1042,7 @@ public void updateTable()
if(!it.hasNext())
{
activate.setEnabled(false);
desactivate.setEnabled(false);
deactivate.setEnabled(false);
programCheckBox.setSelected(false);
programFileChooser.setEnabled(false);
programFileTextField.setEnabled(false);
@ -1160,7 +1163,7 @@ public void mouseClicked(MouseEvent me)
NotificationsTableEntry tmpNTE
= (NotificationsTableEntry) dataVector.elementAt(index);
activate.setEnabled(!tmpNTE.getEnabled());
desactivate.setEnabled(tmpNTE.getEnabled());
deactivate.setEnabled(tmpNTE.getEnabled());
if(tmpNTE.getProgram()
&& tmpNTE.getProgramFile().trim().length() > 0)
{

6
src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
Unescape View File

@ -79,6 +79,12 @@ public ManageButtonsPanel(JTable pluginTable)
this.showSysBundlesCheckBox
.addChangeListener(new ShowSystemBundlesChangeListener());
this.newButton.setOpaque(false);
this.activateButton.setOpaque(false);
this.deactivateButton.setOpaque(false);
this.uninstallButton.setOpaque(false);
this.updateButton.setOpaque(false);
this.buttonsPanel.add(newButton);
this.buttonsPanel.add(activateButton);
this.buttonsPanel.add(deactivateButton);

1
src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
Unescape View File

@ -60,6 +60,7 @@ public NewBundleDialog ()
this.installButton.addActionListener(this);
this.cancelButton.addActionListener(this);
this.fileChooserButton.addActionListener(this);
this.fileChooserButton.setOpaque(false);
this.dataPanel.add(bundlePathLabel, BorderLayout.WEST);

Write Preview
Loading…
Cancel
Save