1 files changed, 71 insertions, 9 deletions

diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h
index 7d5a908..37babbb 100644
--- a/core/apps/embeddedkonsole/konsole.h
+++ b/core/apps/embeddedkonsole/konsole.h
@@ -46,24 +46,43 @@ class Konsole : public QMainWindow
     Q_OBJECT
 
 public:
-  static QString appName() { return QString::fromLatin1("embeddedkonsole"); }
+
+    static QString appName()
+    {
+        return QString::fromLatin1("embeddedkonsole");
+    }
 
   Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+    Konsole(const char * name, const char* pgm, QStrList & _args, int histon);
   ~Konsole();
   void setColLin(int columns, int lines);
   QToolBar *secondToolBar;
   void show();
-  void setColor();
+    void setColor(int);
   int lastSelectedMenu;
   int startUp;
+
+public slots:
+    void changeFontSize(int);
+    void toggleFullScreen();
+    void setFullScreen(bool);
+    void changeSession(int);
+    void cycleZoom();
+    void newSession();
+
 private slots:
   void setDocument(const QString &);
-  void doneSession(TESession*,int);
+    void doneSession(TEWidget*,int);
+    void changeTitle(TEWidget*,QString);
   void changeColumns(int);
-  void fontChanged(int);
+    void setFont(int);
+    //  void fontChanged(int);
   void configMenuSelected(int );
   void colorMenuSelected(int);
   void colorMenuIsSelected(int);
+    void tabMenuSelected(int);
+    void sessionListSelected(int);
+
   void enterCommand(int);
   void hitEnter();
   void hitSpace();
@@ -72,7 +91,6 @@ private slots:
   void hitUp();
   void hitDown();
   void switchSession(QWidget *);
-  void newSession();
   void changeCommand(const QString &, int);
   void initCommandList();
   void scrollMenuSelected(int);
@@ -80,6 +98,10 @@ private slots:
   void parseCommandLine();
     void changeForegroundColor(const QColor &);
     void changeBackgroundColor(const QColor &);
+
+    void historyDialog();
+    void fullscreenTimeout();
+
 private:
     void doWrap();
   void init(const char* _pgm, QStrList & _args);
@@ -87,46 +109,86 @@ private:
   void runSession(TESession* s);
   void setColorPixmaps();
   void setHistory(bool);
+    void setColors(QColor foreground, QColor background);
+    int findFont(QString name, int size, bool exact = false);
   QSize calcSize(int columns, int lines);
   TEWidget* getTe();
   QStringList commands;
   QLabel * msgLabel;
   QColor foreground, background;
 bool fromMenu;
+
+    bool fullscreen;
+
 private:
   class VTFont
   {
   public:
-    VTFont(QString name, QFont& font)
+        VTFont(QString name, QFont& font, QString family, int familyNum, int size)
     {
       this->name = name;
       this->font = font;
+            this->family = family;
+            this->size = size;
+            this->familyNum = familyNum;
     }
 
     QFont& getFont()
     {
       return font;
     }
-
     QString getName()
     {
       return name;
     }
+        int getSize()
+        {
+            return(size);
+        }
+        QString getFamily()
+        {
+            return(family);
+        }
+        int getFamilyNum()
+        {
+            return(familyNum);
+        }
 
   private:
-    QString name;
     QFont font;
+        QString name;
+        QString family;
+        int familyNum;
+        int size;
   };
 
   EKNumTabWidget* tab;
+    int tabPos;
   int nsessions;
   QList<VTFont> fonts;
   int cfont;
   QCString se_pgm;
   QStrList se_args;
 
-  QPopupMenu *fontList,*configMenu,*colorMenu,*scrollMenu,*editCommandListMenu;
+    QToolBar *menuToolBar;
+    QToolBar *toolBar;
   QComboBox *commonCombo;
+
+    QPopupMenu *fontList,*configMenu,*colorMenu,*scrollMenu,*editCommandListMenu;
+    QPopupMenu *sessionList, *tabMenu;
+
+    int sm_none, sm_left, sm_right;
+    int cm_beep, cm_wrap;
+    int cm_default;
+    int cm_bw, cm_wb, cm_gb, cm_bt, cm_br, cm_rb, cm_gy, cm_bm, cm_mb, cm_cw, cm_wc, cm_bb, cm_ab;
+    int tm_top, tm_bottom, tm_hidden;
+    int ec_edit, ec_cmdlist, ec_quick;
+
+    bool show_fullscreen_msg;
+    QTimer *fullscreen_timer;
+    QLabel *fullscreen_msg;
+
+
     // history scrolling I think
   bool        b_scroll;