summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-07-07 15:42:29 (UTC)
committer llornkcor <llornkcor>2002-07-07 15:42:29 (UTC)
commit1d6f229e63930e7af2b691a4715dd94649257048 (patch) (side-by-side diff)
tree2189c3cf19019ad38a45847efdef572ed06d5a2d
parentb61380e31f6fa19acb20c5c603441d9ff64e344e (diff)
downloadopie-1d6f229e63930e7af2b691a4715dd94649257048.zip
opie-1d6f229e63930e7af2b691a4715dd94649257048.tar.gz
opie-1d6f229e63930e7af2b691a4715dd94649257048.tar.bz2
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
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xcore/apps/embeddedkonsole/embeddedkonsole.pro28
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp68
-rw-r--r--core/apps/embeddedkonsole/konsole.h8
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
@@ -33,3 +33,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopie
REQUIRES = embeddedkonsole
@@ -37,14 +37,14 @@ 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
@@ -56,2 +56,4 @@
+#include <opie/colorpopupmenu.h>
+
class EKNumTabBar : public QTabBar {
@@ -208,2 +210,4 @@ void Konsole::init(const char* _pgm, QStrList & _args)
startUp=0;
+ fromMenu = FALSE;
+
setCaption( tr("Terminal") );
@@ -290,2 +294,3 @@ void Konsole::init(const char* _pgm, QStrList & _args)
colorMenu->insertItem(tr( "Amber on Black"));
+ colorMenu->insertItem(tr( "Custom"));
configMenu->insertItem(tr( "Colors") ,colorMenu);
@@ -294,3 +299,3 @@ void Konsole::init(const char* _pgm, QStrList & _args)
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)));
@@ -616,2 +621,7 @@ void Konsole::switchSession(QWidget* w) {
+void Konsole::colorMenuIsSelected(int iD) {
+ fromMenu = TRUE;
+ colorMenuSelected(iD);
+}
+
/// ------------------------------- some new stuff by L.J. Potter
@@ -624,4 +634,4 @@ void Konsole::colorMenuSelected(int iD)
cfg.setGroup("Colors");
- QColor foreground;
- QColor background;
+// QColor foreground;
+// QColor background;
colorMenu->setItemChecked(lastSelectedMenu,FALSE);
@@ -636,3 +646,3 @@ void Konsole::colorMenuSelected(int iD)
m_table[i].transparent=1;
- cfg.writeEntry("Schema","98");
+ cfg.writeEntry("Schema","9");
colorMenu->setItemChecked(-9,TRUE);
@@ -714,2 +724,18 @@ void Konsole::colorMenuSelected(int iD)
}
+ 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);
+ }
@@ -729,2 +755,3 @@ void Konsole::colorMenuSelected(int iD)
update();
+
}
@@ -887 +914,34 @@ void Konsole::parseCommandLine() {
}
+
+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
@@ -34,2 +34,3 @@
#include <qcombobox.h>
+#include <qcolor.h>
@@ -64,2 +65,3 @@ private slots:
void colorMenuSelected(int);
+ void colorMenuIsSelected(int);
void enterCommand(int);
@@ -78,2 +80,4 @@ private slots:
void parseCommandLine();
+ void changeForegroundColor(const QColor &);
+ void changeBackgroundColor(const QColor &);
private:
@@ -87,3 +91,5 @@ private:
QStringList commands;
-
+ QLabel * msgLabel;
+ QColor foreground, background;
+bool fromMenu;
private: