summaryrefslogtreecommitdiff
authorzecke <zecke>2003-04-13 16:42:26 (UTC)
committer zecke <zecke>2003-04-13 16:42:26 (UTC)
commit3bd592876c43c11ed44b2f3725d4c7425ebceb09 (patch) (unidiff)
tree9396bed490c6b167e955977024021650e5509c30
parent78d427d8eceac5cb0a92e4f46b7aa3b784d2c214 (diff)
downloadopie-3bd592876c43c11ed44b2f3725d4c7425ebceb09.zip
opie-3bd592876c43c11ed44b2f3725d4c7425ebceb09.tar.gz
opie-3bd592876c43c11ed44b2f3725d4c7425ebceb09.tar.bz2
make it compile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 9c1167b..c324c35 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -747,49 +747,49 @@ void Konsole::colorMenuSelected(int iD)
747 } 747 }
748 if(iD==-16) {// White, Cyan 748 if(iD==-16) {// White, Cyan
749 background.setRgb(0x18,0xB2,0xB2); 749 background.setRgb(0x18,0xB2,0xB2);
750 foreground.setRgb(0xFF,0xFF,0xFF); 750 foreground.setRgb(0xFF,0xFF,0xFF);
751 cfg.writeEntry("Schema","16"); 751 cfg.writeEntry("Schema","16");
752 colorMenu->setItemChecked(-16,TRUE); 752 colorMenu->setItemChecked(-16,TRUE);
753 } 753 }
754 if(iD==-17) {// Black, Blue 754 if(iD==-17) {// Black, Blue
755 background.setRgb(0x00,0x00,0x00); 755 background.setRgb(0x00,0x00,0x00);
756 foreground.setRgb(0x18,0xB2,0xB2); 756 foreground.setRgb(0x18,0xB2,0xB2);
757 cfg.writeEntry("Schema","17"); 757 cfg.writeEntry("Schema","17");
758 colorMenu->setItemChecked(-17,TRUE); 758 colorMenu->setItemChecked(-17,TRUE);
759 } 759 }
760 if(iD==-18) {// Black, Gold 760 if(iD==-18) {// Black, Gold
761 background.setRgb(0x00,0x00,0x00); 761 background.setRgb(0x00,0x00,0x00);
762 foreground.setRgb(255,215,0); 762 foreground.setRgb(255,215,0);
763 cfg.writeEntry("Schema","18"); 763 cfg.writeEntry("Schema","18");
764 colorMenu->setItemChecked(-18,TRUE); 764 colorMenu->setItemChecked(-18,TRUE);
765 } 765 }
766#ifdef QT_QWS_OPIE 766#ifdef QT_QWS_OPIE
767 if(iD==-19) { 767 if(iD==-19) {
768// Custom 768// Custom
769 qDebug("do custom"); 769 qDebug("do custom");
770 if(fromMenu) { 770 if(fromMenu) {
771 ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color"); 771 OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color");
772 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, 772 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
773 SLOT(changeForegroundColor(const QColor&))); 773 SLOT(changeForegroundColor(const QColor&)));
774 penColorPopupMenu->exec(); 774 penColorPopupMenu->exec();
775 } 775 }
776 cfg.writeEntry("Schema","19"); 776 cfg.writeEntry("Schema","19");
777 if(!fromMenu) { 777 if(!fromMenu) {
778 foreground.setNamedColor(cfg.readEntry("foreground","")); 778 foreground.setNamedColor(cfg.readEntry("foreground",""));
779 background.setNamedColor(cfg.readEntry("background","")); 779 background.setNamedColor(cfg.readEntry("background",""));
780 } 780 }
781 fromMenu=FALSE; 781 fromMenu=FALSE;
782 colorMenu->setItemChecked(-19,TRUE); 782 colorMenu->setItemChecked(-19,TRUE);
783 } 783 }
784#endif 784#endif
785 for (i = 0; i < TABLE_COLORS; i++) { 785 for (i = 0; i < TABLE_COLORS; i++) {
786 if(i==0 || i == 10) { 786 if(i==0 || i == 10) {
787 m_table[i].color = foreground; 787 m_table[i].color = foreground;
788 } 788 }
789 else if(i==1 || i == 11) { 789 else if(i==1 || i == 11) {
790 m_table[i].color = background; m_table[i].transparent=0; 790 m_table[i].color = background; m_table[i].transparent=0;
791 } 791 }
792 else 792 else
793 m_table[i].color = defaultCt[i].color; 793 m_table[i].color = defaultCt[i].color;
794 } 794 }
795 } 795 }
@@ -999,49 +999,49 @@ void Konsole::parseCommandLine() {
999 cmd+=QString(qApp->argv()[j])+" "; 999 cmd+=QString(qApp->argv()[j])+" ";
1000 } 1000 }
1001 cmd.stripWhiteSpace(); 1001 cmd.stripWhiteSpace();
1002 system(cmd.latin1()); 1002 system(cmd.latin1());
1003 exit(0);//close(); 1003 exit(0);//close();
1004 } // end -e switch 1004 } // end -e switch
1005 } 1005 }
1006 startUp++; 1006 startUp++;
1007} 1007}
1008 1008
1009void Konsole::changeForegroundColor(const QColor &color) { 1009void Konsole::changeForegroundColor(const QColor &color) {
1010 Config cfg("Konsole"); 1010 Config cfg("Konsole");
1011 cfg.setGroup("Colors"); 1011 cfg.setGroup("Colors");
1012 int r, g, b; 1012 int r, g, b;
1013 color.rgb(&r,&g,&b); 1013 color.rgb(&r,&g,&b);
1014 foreground.setRgb(r,g,b); 1014 foreground.setRgb(r,g,b);
1015 1015
1016 cfg.writeEntry("foreground",color.name()); 1016 cfg.writeEntry("foreground",color.name());
1017 qDebug("foreground "+color.name()); 1017 qDebug("foreground "+color.name());
1018 cfg.write(); 1018 cfg.write();
1019 1019
1020qDebug("do other dialog"); 1020qDebug("do other dialog");
1021#ifdef QT_QWS_OPIE 1021#ifdef QT_QWS_OPIE
1022 1022
1023 ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color"); 1023 OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color");
1024 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, 1024 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
1025 SLOT(changeBackgroundColor(const QColor&))); 1025 SLOT(changeBackgroundColor(const QColor&)));
1026 penColorPopupMenu2->exec(); 1026 penColorPopupMenu2->exec();
1027#endif 1027#endif
1028} 1028}
1029 1029
1030void Konsole::changeBackgroundColor(const QColor &color) { 1030void Konsole::changeBackgroundColor(const QColor &color) {
1031 1031
1032 qDebug("Change background"); 1032 qDebug("Change background");
1033 Config cfg("Konsole"); 1033 Config cfg("Konsole");
1034 cfg.setGroup("Colors"); 1034 cfg.setGroup("Colors");
1035 int r, g, b; 1035 int r, g, b;
1036 color.rgb(&r,&g,&b); 1036 color.rgb(&r,&g,&b);
1037 background.setRgb(r,g,b); 1037 background.setRgb(r,g,b);
1038 cfg.writeEntry("background",color.name()); 1038 cfg.writeEntry("background",color.name());
1039 qDebug("background "+color.name()); 1039 qDebug("background "+color.name());
1040 cfg.write(); 1040 cfg.write();
1041} 1041}
1042 1042
1043void Konsole::doWrap() { 1043void Konsole::doWrap() {
1044int i; 1044int i;
1045#ifdef QT_QWS_OPIE 1045#ifdef QT_QWS_OPIE
1046i=-29; 1046i=-29;
1047#else 1047#else