From fd45655f22f7fcf196b485024fd0962b997bc671 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Mon, 6 Nov 2006 23:48:37 +0000
Subject: [PATCH] Temporary updates to konsole-part to make it build with new
 session interface.  Will get back to this once the changes in the main
 Konsole application are done.

svn path=/branches/work/konsole-split-view/; revision=602856
---
 konsole/SPLIT-VIEW-TODO  |  6 +++++-
 konsole/konsole_part.cpp | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/konsole/SPLIT-VIEW-TODO b/konsole/SPLIT-VIEW-TODO
index 0e5f80f2..431be6cb 100644
--- a/konsole/SPLIT-VIEW-TODO
+++ b/konsole/SPLIT-VIEW-TODO
@@ -5,11 +5,15 @@ TODO before merging with /trunk
 - [DONE] Single top-bottom split-view menu action
 - [DONE] Use correct color scheme in terminal display
 
+- Fix all the parts of konsole_part marked "SPLIT-VIEW Fix"
+
 - Prompt user when closing a session.  Ensure the same close prompt
   is shown no matter how the user closes the session.
 
 - Ensure that when a new session is created, new views are created in all active containers.
-  
+ 
+- Update colour scheme of all views when user selects a new scheme via the Settings menu.
+
 - Tab context menu
     - Send Input to All Sessions
 
diff --git a/konsole/konsole_part.cpp b/konsole/konsole_part.cpp
index b98eadcd..bacd01ed 100644
--- a/konsole/konsole_part.cpp
+++ b/konsole/konsole_part.cpp
@@ -523,8 +523,11 @@ void konsolePart::applyProperties()
    se->setAddToUtmp( config->readEntry("AddToUtmp", QVariant(true)).toBool());
    delete config;
 
-   se->widget()->setVTFont( defaultFont );
-   se->setSchemaNo( curr_schema );
+   //SPLIT-VIEW Fix
+   //se->widget()->setVTFont( defaultFont );
+   se->primaryView()->setVTFont( defaultFont );
+
+   //se->setSchemaNo( curr_schema );
    slotSetEncoding();
 }
 
@@ -609,7 +612,8 @@ void konsolePart::saveProperties()
   } else {
     config->writeEntry("bellmode",n_bell);
     config->writeEntry("BlinkingCursor", te->blinkingCursor());
-    config->writeEntry("defaultfont", (se->widget())->getVTFont());
+    //SPLIT-VIEW Fix
+    config->writeEntry("defaultfont", (se->primaryView())->getVTFont());
     config->writeEntry("history", se->history().getSize());
     config->writeEntry("historyenabled", b_histEnabled);
     config->writeEntry("keytab",n_keytab);
@@ -652,11 +656,14 @@ void konsolePart::slotSelectScrollbar()
 void konsolePart::slotSelectFont() {
    if ( !se ) return;
 
-   QFont font = se->widget()->getVTFont();
+   //SPLIT-VIEW Fix
+   //QFont font = se->widget()->getVTFont();
+   QFont font = se->primaryView()->getVTFont();
    if ( KFontDialog::getFont( font, true ) != QDialog::Accepted )
       return;
 
-   se->widget()->setVTFont( font );
+   se->primaryView()->setVTFont( font );
+   //se->widget()->setVTFont( font );
 }
 
 void konsolePart::biggerFont(void) {
@@ -763,7 +770,9 @@ void konsolePart::setSchema(ColorSchema* s)
   }
 
   te->setColorTable(s->table());
-  se->setSchemaNo(s->numb());
+  
+  //SPLIT-VIEW Fix
+  //se->setSchemaNo(s->numb());
 }
 
 void konsolePart::notifySize(int /* columns */, int /* lines */)