From 4e43468f280dab2b651729aac28f5995da0eb860 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Tue, 28 Nov 2006 16:09:24 +0000 Subject: [PATCH] all windows and dialogs through the gui which extend the SIPCommDialog and the SIPCommFrame should not set explicetly the center location as it is already set in the parent. --- .../communicator/impl/gui/GuiActivator.java | 2 +- .../gui/customcontrols/MessageDialog.java | 2 -- .../gui/customcontrols/SIPCommDialog.java | 10 ++++--- .../impl/gui/customcontrols/SIPCommFrame.java | 3 +- .../impl/gui/main/WelcomeWindow.java | 28 +------------------ .../AuthorizationRequestedDialog.java | 9 +----- .../AuthorizationResponseDialog.java | 9 +----- .../RequestAuthorizationDialog.java | 9 +----- .../AccountsConfigurationForm.java | 14 ---------- .../main/configforms/ConfigurationFrame.java | 9 +----- .../MoveSubcontactMessageDialog.java | 13 ++++++--- .../addcontact/AddContactWizard.java | 16 ----------- .../addgroup/CreateGroupDialog.java | 3 -- .../impl/gui/main/login/LoginManager.java | 4 --- .../impl/gui/main/menus/FileMenu.java | 7 ----- .../impl/gui/main/message/ChatWindow.java | 13 +-------- 16 files changed, 24 insertions(+), 127 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/GuiActivator.java b/src/net/java/sip/communicator/impl/gui/GuiActivator.java index 1e369302e..0bdfe9983 100644 --- a/src/net/java/sip/communicator/impl/gui/GuiActivator.java +++ b/src/net/java/sip/communicator/impl/gui/GuiActivator.java @@ -89,7 +89,7 @@ public void start(BundleContext bundleContext) throws Exception { WelcomeWindow welcomeWindow = new WelcomeWindow(communicatorMain, loginManager); - welcomeWindow.showWindow(); + welcomeWindow.setVisible(true); } finally { logger.logExit(); diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java index 325437d91..c29b289f2 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java @@ -66,8 +66,6 @@ public class MessageDialog public MessageDialog(Frame owner) { super(owner); - this.setLocationRelativeTo(owner); - this.setTitle(Messages.getString("removeContact")); this.setSize(Constants.MSG_DIALOG_WIDTH, Constants.MSG_DIALOG_HEIGHT); diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java index 66b5cd9c2..4d1cf652b 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java @@ -28,7 +28,7 @@ public SIPCommDialog(Dialog owner) this.addWindowListener(new DialogWindowAdapter()); - this.initInputMap(); + this.initInputMap(); } public SIPCommDialog(Frame owner) @@ -37,7 +37,7 @@ public SIPCommDialog(Frame owner) this.addWindowListener(new DialogWindowAdapter()); - this.initInputMap(); + this.initInputMap(); } private void initInputMap() @@ -129,7 +129,8 @@ private void saveSizeAndLocation() /** * Sets window size and position. */ - private void setSizeAndLocation() { + private void setSizeAndLocation() + { ConfigurationService configService = GuiActivator.getConfigurationService(); @@ -154,8 +155,9 @@ private void setSizeAndLocation() { if(x != null && y != null) this.setLocation(new Integer(x).intValue(), new Integer(y).intValue()); - else + else { this.setCenterLocation(); + } } /** diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java index dff8eda58..03e8f7268 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java @@ -37,7 +37,8 @@ public SIPCommFrame() imap = this.getRootPane().getInputMap( JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close"); + imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close"); + } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java index 0d7fc974f..bb5147814 100644 --- a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java @@ -111,33 +111,7 @@ public void windowClosing(WindowEvent e) { private void setTransparent(boolean transparent) { this.buttonPanel.setOpaque(!transparent); } - - /** - * Shows this window. - */ - public void showWindow() { - - this.pack(); - - this.setWindowLocation(); - - this.setVisible(true); - } - - /** - * Sets the location of this window. - */ - private void setWindowLocation() { - - int x = (int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() - - this.getWidth()) / 2; - - int y = (int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() - - this.getHeight()) / 2; - - this.setLocation(x, y); - } - + /** * Constructs the window background in order to have a background image. */ diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java index 922b675d3..fc41f72d5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java @@ -149,14 +149,7 @@ public AuthorizationRequestedDialog(MainFrame mainFrame, Contact contact, this.getContentPane().add(mainPanel); - this.setSize(new Dimension(550, 400)); - - this.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - this.getWidth()/2, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - this.getHeight()/2 - ); + this.setSize(new Dimension(550, 400)); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java index 004056ea1..8b50e8380 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java @@ -116,14 +116,7 @@ else if(responseCode.equals(AuthorizationResponse.REJECT)) { this.getContentPane().add(mainPanel); - this.setSize(new Dimension(400, 200)); - - this.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - this.getWidth()/2, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - this.getHeight()/2 - ); + this.setSize(new Dimension(400, 200)); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java index 98de7f6e0..ec220429d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java @@ -125,14 +125,7 @@ public RequestAuthorizationDialog(MainFrame mainFrame, Contact contact, this.getContentPane().add(mainPanel); - this.setSize(new Dimension(400, 300)); - - this.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - this.getWidth()/2, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - this.getHeight()/2 - ); + this.setSize(new Dimension(400, 300)); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java index 65f5dad48..0834fd891 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java @@ -220,13 +220,6 @@ public void actionPerformed(ActionEvent evt) { wizard.setTitle( Messages.getString("accountRegistrationWizard")); - wizard.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - 250, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - 100 - ); - wizard.newAccount(); wizard.showDialog(false); @@ -241,13 +234,6 @@ else if (sourceButton.equals(modifyButton)) { wizard.setTitle( Messages.getString("accountRegistrationWizard")); - wizard.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - 250, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - 100 - ); - ProtocolProviderService protocolProvider = (ProtocolProviderService)tableModel.getValueAt( accountsTable.getSelectedRow(), 0); diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java index f91fed8ff..b41b8a207 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java @@ -80,14 +80,7 @@ public void actionPerformed(ActionEvent e) } }); - this.getContentPane().add(buttonsPanel, BorderLayout.SOUTH); - - this.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - this.getWidth()/2, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - this.getHeight()/2 - ); + this.getContentPane().add(buttonsPanel, BorderLayout.SOUTH); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java index 36251ba00..2d027be04 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java @@ -34,7 +34,7 @@ public class MoveSubcontactMessageDialog = new JLabel(Messages.getString("moveSubcontact")); private JLabel iconLabel = new JLabel( - new ImageIcon(ImageLoader.getImage(ImageLoader.WARNING_ICON))); + new ImageIcon(ImageLoader.getImage(ImageLoader.INFO_ICON))); private JButton cancelButton = new JButton(Messages.getString("cancel")); @@ -65,8 +65,6 @@ public MoveSubcontactMessageDialog(MainFrame parentWindow, this.mainPanel.setPreferredSize( new Dimension(dialogWidth, dialogHeight)); - this.computeDialogLocation(mainFrame); - this.cancelButton.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { dispose(); @@ -105,7 +103,7 @@ public void actionPerformed(ActionEvent e) { * or the right side of the main application window. * @param parentWindow the main application window */ - private void computeDialogLocation(JFrame parentWindow) + private void setDialogLocation(JFrame parentWindow) { int dialogY = (int) Toolkit.getDefaultToolkit() .getScreenSize().getHeight()/2 - dialogHeight/2; @@ -126,4 +124,11 @@ protected void close(boolean isEscaped) { this.cancelButton.doClick(); } + + public void setVisible(boolean isVisible) + { + super.setVisible(isVisible); + + this.setDialogLocation(mainFrame); + } } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java index facd520e2..d0660b87d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java @@ -62,25 +62,9 @@ public AddContactWizard(MainFrame mainFrame) this.setCurrentPage(AddContactWizardPage1.IDENTIFIER); - this.centerWizard(); - this.mainFrame.getContactList().addMetaContactListListener(this); } - - /** - * Sets the location of the wizard at the center of the screen. - */ - public void centerWizard() - { - this.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - 250, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - 100 - ); - } - /** * Overrides the Wizard.showModalDialog method. */ diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java index f4ffb893f..2721f6fde 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java @@ -57,9 +57,6 @@ public CreateGroupDialog(MainFrame mainFrame) { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); this.setSize(520, 250); - - this.setLocation((int)screenSize.getWidth()/2 - getWidth()/2, - (int)screenSize.getHeight()/2 - getHeight()/2); this.init(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java index 139e9b311..7c66e80c4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java @@ -187,10 +187,6 @@ private void showAccountRegistrationWizard() wizard.setTitle(Messages.getString("accountRegistrationWizard")); - wizard.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width / 2 - 250, - Toolkit.getDefaultToolkit().getScreenSize().height / 2 - 100); - wizard.newAccount(noAccountFoundPage.getIdentifier()); wizard.showDialog(true); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java index a74fc2efb..33721d6e4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java @@ -112,13 +112,6 @@ public void actionPerformed(ActionEvent e) { wizard.setTitle( Messages.getString("accountRegistrationWizard")); - wizard.setLocation( - Toolkit.getDefaultToolkit().getScreenSize().width/2 - - 250, - Toolkit.getDefaultToolkit().getScreenSize().height/2 - - 100 - ); - wizard.newAccount(); wizard.showDialog(false); diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java index d7fa30773..897869ee3 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java @@ -130,18 +130,7 @@ public void init() { this.getContentPane().add(menusPanel, BorderLayout.NORTH); } - - /** - * Positions this window in the center of the screen. - */ - private void setCenterLocation() - { - this.setLocation(Toolkit.getDefaultToolkit().getScreenSize().width / 2 - - this.getWidth() / 2, - Toolkit.getDefaultToolkit().getScreenSize().height / 2 - - this.getHeight() / 2); - } - + /** * Returns the main application widnow. *