From 835879fe78e6ad8f808b076a8c76e8e7e15ba9a7 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sun, 25 Sep 2011 21:53:27 -0400 Subject: [PATCH] reformatted chat panel and game message - you can now see both areas at the same time --- .../main/java/mage/client/chat/ChatPanel.form | 28 +++++-------- .../main/java/mage/client/chat/ChatPanel.java | 41 ++++++++----------- .../main/java/mage/client/game/GamePanel.java | 21 ++++++---- 3 files changed, 43 insertions(+), 47 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.form b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.form index b7fe000f28e..a10f24dbdfa 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.form +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.form @@ -16,14 +16,14 @@ - - + + - + @@ -36,25 +36,21 @@ - + - + + - - - - + - - - - + + @@ -79,10 +75,8 @@ - - - - + + diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java index ca912330b14..57361257ee4 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java @@ -257,11 +257,9 @@ class TableModel extends AbstractTableModel { private void initComponents() { txtMessage = new javax.swing.JTextField(); - jTabbedPane1 = new javax.swing.JTabbedPane(); + jSplitPane1 = new javax.swing.JSplitPane(); jScrollPane1 = new javax.swing.JScrollPane(); - //txtConversation = new JTextArea(); txtConversation = new ColorPane(); - //txtConversation = new JTextPane(); jScrollPane2 = new javax.swing.JScrollPane(); jTable1 = new javax.swing.JTable(); @@ -271,45 +269,43 @@ class TableModel extends AbstractTableModel { } }); - jTabbedPane1.setTabPlacement(javax.swing.JTabbedPane.BOTTOM); + jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); + jSplitPane1.setResizeWeight(0.25); - //txtConversation.setColumns(20); +// txtConversation.setColumns(20); txtConversation.setOpaque(false); - //txtConversation.setEditable(false); - txtConversation.setFont(new java.awt.Font("Arial", 0, 14)); - //txtConversation.enableInputMethods(false); - //txtConversation.setLineWrap(true); - //txtConversation.setRows(5); - //txtConversation.setWrapStyleWord(true); - +// txtConversation.setEditable(false); + txtConversation.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N +// txtConversation.setLineWrap(true); +// txtConversation.setRows(5); +// txtConversation.setWrapStyleWord(true); jScrollPane1.setViewportView(txtConversation); jScrollPane1.setBorder(new EmptyBorder(0,0,0,0)); - jTabbedPane1.addTab("chat", jScrollPane1); + jSplitPane1.setLeftComponent(jScrollPane2); jTable1.setModel(this.tableModel); jTable1.setToolTipText("Connected players"); jTable1.setGridColor(new java.awt.Color(255, 255, 255)); jScrollPane2.setViewportView(jTable1); - jTabbedPane1.addTab("players", jScrollPane2); + jSplitPane1.setBottomComponent(jScrollPane1); + jSplitPane1.setDividerLocation(150 + jSplitPane1.getInsets().bottom); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(txtMessage, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE) - .addComponent(jTabbedPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE) + .addComponent(txtMessage, javax.swing.GroupLayout.DEFAULT_SIZE, 183, Short.MAX_VALUE) + .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 183, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 294, Short.MAX_VALUE) + .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(txtMessage, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) ); - - jTabbedPane1.getAccessibleContext().setAccessibleName("chat"); }// //GEN-END:initComponents private void simplifyComponents() { @@ -327,7 +323,7 @@ class TableModel extends AbstractTableModel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(txtMessage, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) ); - jTabbedPane1 = null; + jTable1 = null; jScrollPane2 = null; } @@ -376,10 +372,9 @@ class TableModel extends AbstractTableModel { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane2; - private javax.swing.JTabbedPane jTabbedPane1; + private javax.swing.JSplitPane jSplitPane1; private javax.swing.JTable jTable1; - //private javax.swing.JTextArea txtConversation; - private ColorPane txtConversation; + private ColorPane txtConversation; private javax.swing.JTextField txtMessage; // End of variables declaration//GEN-END:variables diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 2260d9fdb14..bc241c053cf 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -590,7 +590,8 @@ public class GamePanel extends javax.swing.JPanel { userChatPanel.useExtendedView(ChatPanel.VIEW_MODE.CHAT); gameChatPanel.setConnectedChat(userChatPanel); gameChatPanel.disableInput(); - jTabbedPane1 = new JTabbedPane(); +// jTabbedPane1 = new JTabbedPane(); + jSplitPane2 = new javax.swing.JSplitPane(); hand.setCardDimension(getHandCardDimension()); handCards = new HashMap(); @@ -859,10 +860,15 @@ public class GamePanel extends javax.swing.JPanel { hand.setZone(Constants.Zone.HAND.toString()); HandContainer handContainer = new HandContainer(hand); - jTabbedPane1.setTabPlacement(javax.swing.JTabbedPane.BOTTOM); - jTabbedPane1.addTab("Game", gameChatPanel); - jTabbedPane1.addTab("Chat", userChatPanel); - jTabbedPane1.setSelectedIndex(1); + jSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); + jSplitPane2.setResizeWeight(0.5); + jSplitPane2.setLeftComponent(userChatPanel); + jSplitPane2.setBottomComponent(gameChatPanel); + +// jTabbedPane1.setTabPlacement(javax.swing.JTabbedPane.BOTTOM); +// jTabbedPane1.addTab("Game", gameChatPanel); +// jTabbedPane1.addTab("Chat", userChatPanel); +// jTabbedPane1.setSelectedIndex(1); javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); @@ -891,7 +897,7 @@ public class GamePanel extends javax.swing.JPanel { jSplitPane1.setLeftComponent(jPanel3); gameChatPanel.setMinimumSize(new java.awt.Dimension(100, 48)); - jSplitPane1.setRightComponent(jTabbedPane1); + jSplitPane1.setRightComponent(jSplitPane2); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -1070,7 +1076,8 @@ public class GamePanel extends javax.swing.JPanel { private Map handCards; private mage.client.cards.Cards stack; - private JTabbedPane jTabbedPane1; +// private JTabbedPane jTabbedPane1; + private javax.swing.JSplitPane jSplitPane2; private Border emptyBorder = new EmptyBorder(0,0,0,0); private Color prevBGColor; private final static Color DEFAULT_FOREGROUND_COLOR = Color.BLACK;