fixed bug in transparent color schemebeing shown properly, and added custom color. Still a bug when using the 'more' option, cant figure out, I think its in colorpopupmenu

3 files changed, 85 insertions, 19 deletions

diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index de0cfa1..6b7af27 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -31,20 +31,20 @@ INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 REQUIRES  = embeddedkonsole
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
-	 ../../../i18n/en/embeddedkonsole.ts \
-	 ../../../i18n/es/embeddedkonsole.ts \
-	 ../../../i18n/fr/embeddedkonsole.ts \
-	 ../../../i18n/hu/embeddedkonsole.ts \
-	 ../../../i18n/ja/embeddedkonsole.ts \
-	 ../../../i18n/ko/embeddedkonsole.ts \
-	 ../../../i18n/no/embeddedkonsole.ts \
-	 ../../../i18n/pl/embeddedkonsole.ts \
-	 ../../../i18n/pt/embeddedkonsole.ts \
-	 ../../../i18n/pt_BR/embeddedkonsole.ts \
-	 ../../../i18n/sl/embeddedkonsole.ts \
-	 ../../../i18n/zh_CN/embeddedkonsole.ts \
-	 ../../../i18n/zh_TW/embeddedkonsole.ts
+   ../../../i18n/en/embeddedkonsole.ts \
+   ../../../i18n/es/embeddedkonsole.ts \
+   ../../../i18n/fr/embeddedkonsole.ts \
+   ../../../i18n/hu/embeddedkonsole.ts \
+   ../../../i18n/ja/embeddedkonsole.ts \
+   ../../../i18n/ko/embeddedkonsole.ts \
+   ../../../i18n/no/embeddedkonsole.ts \
+   ../../../i18n/pl/embeddedkonsole.ts \
+   ../../../i18n/pt/embeddedkonsole.ts \
+   ../../../i18n/pt_BR/embeddedkonsole.ts \
+   ../../../i18n/sl/embeddedkonsole.ts \
+   ../../../i18n/zh_CN/embeddedkonsole.ts \
+   ../../../i18n/zh_TW/embeddedkonsole.ts
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index b0d28fc..8b1e066 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -54,6 +54,8 @@
 #include "keytrans.h"
 #include "commandeditdialog.h"
 
+#include <opie/colorpopupmenu.h>
+
 class EKNumTabBar : public QTabBar {
 public:
     void numberTabs()
@@ -206,6 +208,8 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   n_keytab = 0;
   n_render = 0;
   startUp=0;
+  fromMenu = FALSE;
+
   setCaption( tr("Terminal") );
   setIcon( Resource::loadPixmap( "konsole" ) );
 
@@ -288,11 +292,12 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   colorMenu->insertItem(tr( "White on Cyan"));
   colorMenu->insertItem(tr( "Blue on Black"));
   colorMenu->insertItem(tr( "Amber on Black"));
+  colorMenu->insertItem(tr( "Custom"));
   configMenu->insertItem(tr( "Colors") ,colorMenu);
 
   connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
   connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) ));
-  connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuSelected(int) ));
+  connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) ));
   connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int)));
   connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int)));
   menuBar->insertItem( tr("Font"), fontList );
@@ -614,6 +619,11 @@ void Konsole::switchSession(QWidget* w) {
   }
 }
 
+void Konsole::colorMenuIsSelected(int iD) {
+    fromMenu = TRUE;
+    colorMenuSelected(iD); 
+}
+
 /// -------------------------------   some new stuff by L.J. Potter
 void Konsole::colorMenuSelected(int iD)
 { // this is NOT pretty, elegant or anything else besides functional
@@ -622,8 +632,8 @@ void Konsole::colorMenuSelected(int iD)
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Colors");
-    QColor foreground;
-    QColor background;
+//     QColor foreground;
+//     QColor background;
     colorMenu->setItemChecked(lastSelectedMenu,FALSE);
     ColorEntry m_table[TABLE_COLORS];
     const ColorEntry * defaultCt=te->getdefaultColorTable();
@@ -634,7 +644,7 @@ void Konsole::colorMenuSelected(int iD)
             m_table[i].color = defaultCt[i].color;
             if(i==1 || i == 11)
                 m_table[i].transparent=1;
-            cfg.writeEntry("Schema","98");
+            cfg.writeEntry("Schema","9");
             colorMenu->setItemChecked(-9,TRUE);
         }
     } else {
@@ -712,6 +722,22 @@ void Konsole::colorMenuSelected(int iD)
             cfg.writeEntry("Schema","18");
             colorMenu->setItemChecked(-18,TRUE);
         }
+        if(iD==-19) {// Custom
+            qDebug("do custom");
+            if(fromMenu) {
+            ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color");
+            connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
+                    SLOT(changeForegroundColor(const QColor&)));
+            penColorPopupMenu->exec();
+            }
+            cfg.writeEntry("Schema","19");
+            if(!fromMenu) {
+                foreground.setNamedColor(cfg.readEntry("foreground",""));
+                background.setNamedColor(cfg.readEntry("background",""));
+            }
+            fromMenu=FALSE;
+            colorMenu->setItemChecked(-19,TRUE);
+        }
 
         for (i = 0; i < TABLE_COLORS; i++)  {
             if(i==0 || i == 10) {
@@ -727,6 +753,7 @@ void Konsole::colorMenuSelected(int iD)
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
+    
 }
 
 void Konsole::configMenuSelected(int iD)
@@ -885,3 +912,36 @@ void Konsole::parseCommandLine() {
     }
     startUp++;
 }
+
+void Konsole::changeForegroundColor(const QColor &color) {
+    Config cfg("Konsole");
+    cfg.setGroup("Colors");
+    int r, g, b;
+    color.rgb(&r,&g,&b);
+    foreground.setRgb(r,g,b);
+//     QString colors;
+//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
+    cfg.writeEntry("foreground",color.name());
+    cfg.write();
+
+qDebug("do other dialog");
+ ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
+    connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
+            SLOT(changeBackgroundColor(const QColor&)));
+   penColorPopupMenu2->exec();
+    
+}
+
+void Konsole::changeBackgroundColor(const QColor &color) {
+
+    qDebug("Change background");
+    Config cfg("Konsole");
+    cfg.setGroup("Colors");
+    int r, g, b;
+    color.rgb(&r,&g,&b);
+    background.setRgb(r,g,b);
+//     QString colors;
+//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
+    cfg.writeEntry("background",color.name());
+    cfg.write();
+}
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h
index 40edaec..0bf3fb3 100644
--- a/core/apps/embeddedkonsole/konsole.h
+++ b/core/apps/embeddedkonsole/konsole.h
@@ -32,6 +32,7 @@
 #include <qtabwidget.h>
 #include <qpe/qpetoolbar.h>
 #include <qcombobox.h>
+#include <qcolor.h>
 
 #include "MyPty.h"
 #include "TEWidget.h"
@@ -62,6 +63,7 @@ private slots:
   void fontChanged(int);
   void configMenuSelected(int );
   void colorMenuSelected(int);
+  void colorMenuIsSelected(int);
   void enterCommand(int);
   void hitEnter();
   void hitSpace();
@@ -76,6 +78,8 @@ private slots:
   void scrollMenuSelected(int);
   void editCommandListMenuSelected(int);
   void parseCommandLine();
+    void changeForegroundColor(const QColor &);
+    void changeBackgroundColor(const QColor &);
 private:
   void init(const char* _pgm, QStrList & _args);
   void initSession(const char* _pgm, QStrList & _args);
@@ -85,7 +89,9 @@ private:
   QSize calcSize(int columns, int lines);
   TEWidget* getTe();
   QStringList commands;
-  
+  QLabel * msgLabel;
+  QColor foreground, background;
+bool fromMenu;
 private:
   class VTFont 
   {