Changeset 5615
Legend:
- Unmodified
- Added
- Removed
-
trunk/SRC/org/openmicroscopy/shoola/env/data/views/calls/ThumbnailSetLoader.java
r5605 r5615 270 270 toHandle.add(l); 271 271 index = 0; 272 l = null; 272 273 } 273 274 } -
trunk/SRC/org/openmicroscopy/shoola/util/ui/login/ScreenLogin.java
r5609 r5615 28 28 import java.awt.Cursor; 29 29 import java.awt.Dimension; 30 import java.awt.FlowLayout;31 30 import java.awt.Font; 32 import java.awt.GridBagConstraints;33 import java.awt.GridBagLayout;34 31 import java.awt.Image; 35 32 import java.awt.Insets; … … 46 43 import java.util.prefs.Preferences; 47 44 import javax.swing.BorderFactory; 48 import javax.swing.Box;49 45 import javax.swing.BoxLayout; 50 46 import javax.swing.Icon; … … 58 54 import javax.swing.JTextPane; 59 55 60 61 56 //Third-party libraries 57 import layout.TableLayout; 62 58 63 59 //Application-internal dependencies … … 118 114 119 115 /** The size of the font for the text. */ 120 private static final int TEXT_FONT_SIZE = 1 8;116 private static final int TEXT_FONT_SIZE = 16; 121 117 122 118 /** The login text. */ 123 private static final String TEXT_LOGIN = " PleaseLog In";119 private static final String TEXT_LOGIN = "Log In"; 124 120 125 121 /** The username text. */ … … 298 294 configButton.setBorderPainted(false); 299 295 configButton.setBorder(null); 300 configButton.setMargin(new Insets( 0, 0, 0, 0));296 configButton.setMargin(new Insets(1, 1, 1, 1)); 301 297 configButton.setFocusPainted(false); 302 298 configButton.setContentAreaFilled(false); … … 344 340 JPanel panel = new JPanel(); 345 341 panel.setOpaque(false); 346 panel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); 342 //panel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); 343 347 344 JLabel label = UIUtilities.setTextFont(s); 348 345 label.setForeground(TEXT_COLOR); 349 346 label.setDisplayedMnemonic(mnemonic); 350 351 label.setLabelFor(field);352 347 label.setOpaque(false); 348 //label.setLabelFor(field); 349 353 350 panel.add(label); 354 351 panel.add(field); … … 365 362 JPanel topPanel = new JPanel(); 366 363 topPanel.setOpaque(false); 364 /* 367 365 JTextPane pleaseLogIn = UIUtilities.buildTextPane(TEXT_LOGIN, 368 366 TEXT_COLOR); … … 403 401 //c.gridy++; 404 402 topPanel.add(namePanel, c); 403 */ 405 404 return topPanel; 406 405 } … … 415 414 { 416 415 JPanel mainPanel = new JPanel(); 416 int g = 3; 417 mainPanel.setBorder(BorderFactory.createEmptyBorder(g, g, g, g)); 417 418 mainPanel.setOpaque(false); 419 double[][] size = {{TableLayout.PREFERRED, TableLayout.FILL, 420 TableLayout.PREFERRED, 421 TableLayout.FILL, TableLayout.FILL, TableLayout.PREFERRED}, 422 {TableLayout.PREFERRED, TableLayout.PREFERRED, 423 TableLayout.PREFERRED, TableLayout.PREFERRED}}; 424 TableLayout layout = new TableLayout(size); 425 426 mainPanel.setLayout(layout); 427 JTextPane pleaseLogIn = UIUtilities.buildTextPane(TEXT_LOGIN, 428 TEXT_COLOR); 429 Font f = pleaseLogIn.getFont(); 430 pleaseLogIn.setFont(f.deriveFont(Font.BOLD, TEXT_FONT_SIZE)); 431 418 432 versionInfo = UIUtilities.buildTextPane(version, TEXT_COLOR); 419 Font f = versionInfo.getFont(); 420 Font newFont = f.deriveFont(VERSION_FONT_STYLE, VERSION_FONT_SIZE); 421 versionInfo.setFont(newFont); 422 423 JPanel controls = new JPanel(); 424 controls.setOpaque(false); 425 controls.add(login); 426 controls.add(cancel); 427 433 f = versionInfo.getFont(); 434 versionInfo.setFont(f.deriveFont(VERSION_FONT_STYLE, VERSION_FONT_SIZE)); 435 428 436 JPanel p = new JPanel(); 429 437 p.setOpaque(false); 430 p.add(versionInfo); 431 mainPanel.setLayout(new GridBagLayout()); 432 GridBagConstraints c = new GridBagConstraints(); 433 c.anchor = GridBagConstraints.FIRST_LINE_START; 434 c.fill = GridBagConstraints.HORIZONTAL; 435 //c.weightx = 0.2; 436 c.gridx = 0; 437 c.gridy = 0; 438 c.gridwidth = 2; 439 mainPanel.add(buildTopPanel(), c); 440 c.gridy++; 441 //mainPanel.add(Box.createVerticalStrut(5), c); 442 //c.gridy++; 443 c.gridwidth = 1; 444 c.gridx++; 445 mainPanel.add(UIUtilities.buildComponentPanelRight(controls, 0, 0, 446 false), c); 447 c.gridx = 0; 448 c.anchor = GridBagConstraints.LAST_LINE_START; 449 mainPanel.add(UIUtilities.buildComponentPanel(versionInfo, 0, 5, false), 450 c); 438 p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS)); 439 p.add(serverTextPane); 440 p.add(connectionSpeedText); 441 mainPanel.add(pleaseLogIn, "0, 0, l, c"); 442 mainPanel.add(UIUtilities.buildComponentPanelRight(p, 0, 0, false), 443 "0, 1, 4, 1"); 444 mainPanel.add(configButton, "5, 1, c, c"); 445 446 //second row 447 JTextPane l = UIUtilities.buildTextPane(USER_TEXT, TEXT_COLOR); 448 449 mainPanel.add(l, "0, 2, l, c"); 450 mainPanel.add(user, 451 "1, 2, 2, 2"); 452 l = UIUtilities.buildTextPane(" "+PASSWORD_TEXT, TEXT_COLOR); 453 mainPanel.add(l, "3, 2, r, c"); 454 mainPanel.add(pass, "4, 2, 5, 2"); 455 //third row 456 mainPanel.add(versionInfo, "0, 3, l, c"); 457 458 JPanel cPanel = new JPanel(); 459 cPanel.setOpaque(false); 460 cPanel.add(login); 461 cPanel.add(cancel); 462 463 mainPanel.add(UIUtilities.buildComponentPanelRight(cPanel, 0, 0, false), 464 "2, 3, 5, 3"); 451 465 return mainPanel; 452 466 } -
trunk/launch/OMEROinsight_windows.bat
r4972 r5615 19 19 rem 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 20 20 rem 21 rem -----------------------------------------------------------------------------21 rem ---------------------------------------------------------------------------- 22 22 23 23 rem If you have problems with memory errors you may need to change the "start"
