Innerframe titles are now displayed in the main titlebar when maximised

git-svn-id: http://svn.dmdirc.com/trunk@215 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/Channel.java

@@ -123,7 +123,13 @@ public class Channel implements IChannelMessage, IChannelGotNames, IChannelTopic
     }
     
     private void updateTitle() {
-        frame.setTitle(channelInfo.getName()+" - "+channelInfo.getTopic());
+        String title = channelInfo.getName()+" - "+channelInfo.getTopic();
+        
+        frame.setTitle(title);
+        
+        if (frame.isMaximum() && MainFrame.getMainFrame().getActiveFrame().equals(frame)) {
+            MainFrame.getMainFrame().setTitle("DMDirc - "+title);
+        }
     }
     
     public void onChannelJoin(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient) {

src/uk/org/ownage/dmdirc/Raw.java

@@ -60,13 +60,13 @@ public class Raw implements IDataIn, IDataOut {
         MainFrame.getMainFrame().addChild(frame);
         
         try {
-        server.getParser().getCallbackManager().addCallback("OnDataIn", this);
-        server.getParser().getCallbackManager().addCallback("OnDataOut", this);
+            server.getParser().getCallbackManager().addCallback("OnDataIn", this);
+            server.getParser().getCallbackManager().addCallback("OnDataOut", this);
         } catch (CallbackNotFound ex) {
             Logger.error(ErrorLevel.FATAL, ex);
         }
     }
-
+    
     void close() {
         server.getParser().getCallbackManager().delCallback("OnDataIn", this);
         server.getParser().getCallbackManager().delCallback("OnDataOut", this);
@@ -76,11 +76,11 @@ public class Raw implements IDataIn, IDataOut {
         frame = null;
         server = null;
     }
-
+    
     public void onDataIn(IRCParser tParser, String sData) {
         frame.addLine("<<< "+sData);
     }
-
+    
     public void onDataOut(IRCParser tParser, String sData, boolean bFromParser) {
         frame.addLine(">>> "+sData);
     }

src/uk/org/ownage/dmdirc/ui/MainFrame.java

@@ -141,6 +141,13 @@ public class MainFrame extends javax.swing.JFrame implements WindowListener {
      */
     public void setMaximised(boolean max) {
         maximised = max;
+        
+        if (max && getActiveFrame() != null) {
+            setTitle("DMDirc - "+getActiveFrame().getTitle());
+        } else if (!max) {
+            setTitle("DMDirc");
+        }
+        
         checkWindowState();
     }
     
@@ -152,7 +159,7 @@ public class MainFrame extends javax.swing.JFrame implements WindowListener {
         
         toggleStateMenuItem.setEnabled(true);
         
-        if (getActiveFrame().isMaximum()) {
+        if (maximised) {
             toggleStateMenuItem.setText("Restore");
             toggleStateMenuItem.setMnemonic('r');
             toggleStateMenuItem.invalidate();