Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.26
|
From: Carlos <ma...@us...> - 2007-10-22 18:10:44
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26310/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Atualização de icons, tabs, charts e etc. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Index.java 17 Oct 2007 23:15:04 -0000 1.25 --- Index.java 22 Oct 2007 18:10:46 -0000 1.26 *************** *** 12,15 **** --- 12,16 ---- package net.sf.tails.swing.frame; + import java.awt.Dimension; import java.awt.event.ActionEvent; import java.io.BufferedOutputStream; *************** *** 28,31 **** --- 29,33 ---- import javax.swing.JProgressBar; import javax.swing.ScrollPaneConstants; + import javax.swing.SwingConstants; import javax.swing.table.DefaultTableModel; *************** *** 46,49 **** --- 48,52 ---- private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages"); private static final ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons"); + private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders"); private static final long serialVersionUID = 1L; *************** *** 65,68 **** --- 68,76 ---- private javax.swing.JPanel criteriaPanel; + private javax.swing.JSeparator separator3; + private javax.swing.JSeparator separator4; + private javax.swing.JSeparator separator5; + private javax.swing.JSeparator separator6; + private javax.swing.JSeparator separator7; private javax.swing.JButton newStockAnalysisButton; private javax.swing.JButton newReportButton; *************** *** 74,77 **** --- 82,87 ---- private javax.swing.JButton cleanConsoleButton; private javax.swing.JButton completeGraphButton; + private javax.swing.JButton moveLeftButton; + private javax.swing.JButton moveRightButton; private javax.swing.JButton helpButton; private javax.swing.JScrollPane reportScrollPane; *************** *** 120,127 **** newReportMenuItem = new javax.swing.JMenuItem(); openMenuItem = new javax.swing.JMenuItem(); ! separator1 = new javax.swing.JSeparator(); saveMenuItem = new javax.swing.JMenuItem(); saveAsMenuItem = new javax.swing.JMenuItem(); ! separator2 = new javax.swing.JSeparator(); exitMenuItem = new javax.swing.JMenuItem(); consoleScrollPane = new javax.swing.JScrollPane(); --- 130,137 ---- newReportMenuItem = new javax.swing.JMenuItem(); openMenuItem = new javax.swing.JMenuItem(); ! separator1 = new javax.swing.JSeparator(SwingConstants.HORIZONTAL); saveMenuItem = new javax.swing.JMenuItem(); saveAsMenuItem = new javax.swing.JMenuItem(); ! separator2 = new javax.swing.JSeparator(SwingConstants.HORIZONTAL); exitMenuItem = new javax.swing.JMenuItem(); consoleScrollPane = new javax.swing.JScrollPane(); *************** *** 132,135 **** --- 142,150 ---- criteriaPanel = new javax.swing.JPanel(); + separator3 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator4 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator5 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator6 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator7 = new javax.swing.JSeparator(SwingConstants.VERTICAL); newStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_STOCKANALYSIS"))); newReportButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_REPORT"))); *************** *** 141,144 **** --- 156,161 ---- cleanConsoleButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("CONSOLE"))); completeGraphButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("GRAPH"))); + moveLeftButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_LEFT"))); + moveRightButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_RIGHT"))); helpButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HELP"))); *************** *** 161,171 **** directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! directoryFileChooser.setCurrentDirectory(new File("Data/StockAnalysis")); xlsFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! xlsFileChooser.setCurrentDirectory(new File("Data/Xls")); htmlFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! htmlFileChooser.setCurrentDirectory(new File("Data/Html")); reportScrollPane.setAutoscrolls(true); --- 178,188 ---- directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! directoryFileChooser.setCurrentDirectory(new File(folderBundle.getString("STOCKANALYSIS_DIR"))); xlsFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! xlsFileChooser.setCurrentDirectory(new File(folderBundle.getString("XLS_DIR"))); htmlFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! htmlFileChooser.setCurrentDirectory(new File(folderBundle.getString("HTML_DIR"))); reportScrollPane.setAutoscrolls(true); *************** *** 182,187 **** if (stockAnalysis != null) { - //stockAnalysis.getSlicer().getSeries().getTick(stockAnalysis.getSlicer().getSeries().getBegin()).getDateName() + - //" - " + stockAnalysis.getSlicer().getSeries().getTick(stockAnalysis.getSlicer().getSeries().getEnd()).getDateName()); reportTable.setAutoCreateRowSorter(true); --- 199,202 ---- *************** *** 194,198 **** seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); ! chartsPane.addTab(stockAnalysis.getStock().getName(), seriesPanel); if (stockAnalysis.getReports().size() > 0) --- 209,213 ---- seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); ! chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); if (stockAnalysis.getReports().size() > 0) *************** *** 202,206 **** criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", criteriaPanel); } } --- 217,221 ---- criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } } *************** *** 215,221 **** javax.swing.JLabel noChartsLabel = new javax.swing.JLabel(); noChartsLabel.setText("- No Charts Available"); ! chartsPane.addTab("Charts", noChartsLabel); } reportScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); reportScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); --- 230,247 ---- javax.swing.JLabel noChartsLabel = new javax.swing.JLabel(); noChartsLabel.setText("- No Charts Available"); ! chartsPane.addTab("Charts", new ImageIcon(iconBundle.getString("SERIES_TAB")), noChartsLabel); } + separator3.setMinimumSize(new Dimension(1, 25)); + separator4.setMinimumSize(new Dimension(1, 25)); + separator5.setMinimumSize(new Dimension(1, 25)); + separator6.setMinimumSize(new Dimension(1, 25)); + separator7.setMinimumSize(new Dimension(1, 25)); + separator3.setMaximumSize(new Dimension(1, 25)); + separator4.setMaximumSize(new Dimension(1, 25)); + separator5.setMaximumSize(new Dimension(1, 25)); + separator6.setMaximumSize(new Dimension(1, 25)); + separator7.setMaximumSize(new Dimension(1, 25)); + reportScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); reportScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); *************** *** 305,308 **** --- 331,352 ---- }); + completeGraphButton.setToolTipText("Move Left"); + completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25)); + completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25)); + completeGraphButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + moveLeftButtonActionPerformed(evt); + } + }); + + completeGraphButton.setToolTipText("Move Right"); + completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25)); + completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25)); + completeGraphButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + moveRightButtonActionPerformed(evt); + } + }); + helpButton.setToolTipText("Help"); helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); *************** *** 401,405 **** .addGap(2) .addComponent(newReportButton) ! .addGap(2) .addComponent(openStockAnalysisButton) .addGap(2) --- 445,451 ---- .addGap(2) .addComponent(newReportButton) ! .addGap(4) ! .addComponent(separator3) ! .addGap(4) .addComponent(openStockAnalysisButton) .addGap(2) *************** *** 407,419 **** .addGap(2) .addComponent(saveAsStockAnalysisButton) ! .addGap(2) .addComponent(exportHTMLButton) .addGap(2) .addComponent(exportXLSButton) ! .addGap(2) ! .addComponent(cleanConsoleButton) ! .addGap(2) .addComponent(completeGraphButton) .addGap(2) .addComponent(helpButton) .addGap(200) --- 453,477 ---- .addGap(2) .addComponent(saveAsStockAnalysisButton) ! .addGap(4) ! .addComponent(separator4) ! .addGap(4) .addComponent(exportHTMLButton) .addGap(2) .addComponent(exportXLSButton) ! .addGap(4) ! .addComponent(separator5) ! .addGap(4) .addComponent(completeGraphButton) .addGap(2) + .addComponent(moveLeftButton) + .addGap(2) + .addComponent(moveRightButton) + .addGap(4) + .addComponent(separator6) + .addGap(4) + .addComponent(cleanConsoleButton) + .addGap(4) + .addComponent(separator7) + .addGap(4) .addComponent(helpButton) .addGap(200) *************** *** 427,438 **** .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(newStockAnalysisButton) ! .addComponent(newReportButton) .addComponent(openStockAnalysisButton) .addComponent(saveStockAnalysisButton) .addComponent(saveAsStockAnalysisButton) .addComponent(exportHTMLButton) .addComponent(exportXLSButton) .addComponent(cleanConsoleButton) .addComponent(completeGraphButton) .addComponent(helpButton) .addComponent(reportProgress)) --- 485,503 ---- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(newStockAnalysisButton) ! .addComponent(newReportButton) ! .addComponent(separator3) .addComponent(openStockAnalysisButton) .addComponent(saveStockAnalysisButton) .addComponent(saveAsStockAnalysisButton) + .addComponent(separator4) .addComponent(exportHTMLButton) .addComponent(exportXLSButton) + .addComponent(separator5) .addComponent(cleanConsoleButton) + .addComponent(separator6) .addComponent(completeGraphButton) + .addComponent(moveLeftButton) + .addComponent(moveRightButton) + .addComponent(separator7) .addComponent(helpButton) .addComponent(reportProgress)) *************** *** 451,455 **** } ! protected void cleanConsoleButtonActionPerformed(ActionEvent evt) { consoleArea.setText(""); } --- 516,530 ---- } ! protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! ! } ! ! protected void moveRightButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! ! } ! ! protected void cleanConsoleButtonActionPerformed(ActionEvent evt) { consoleArea.setText(""); } *************** *** 570,574 **** chartsPane.removeAll(); ! chartsPane.addTab(analysis.getStock().getName(), seriesPanel); if (analysis.getReports().size() > 0) --- 645,649 ---- chartsPane.removeAll(); ! chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); if (analysis.getReports().size() > 0) *************** *** 578,582 **** criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", criteriaPanel); } --- 653,657 ---- criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } |
