author | mickeyl <mickeyl> | 2004-02-24 16:38:13 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-24 16:38:13 (UTC) |
commit | 576cbdd9af5eabbece53e1622aa3b4a3569276e0 (patch) (unidiff) | |
tree | 9ecf01336c72739c77b8c339d63822009885c88d /core/apps/embeddedkonsole/konsole.cpp | |
parent | f02547005d26a1f3816f5475116bbdf094a31ccb (diff) | |
download | opie-576cbdd9af5eabbece53e1622aa3b4a3569276e0.zip opie-576cbdd9af5eabbece53e1622aa3b4a3569276e0.tar.gz opie-576cbdd9af5eabbece53e1622aa3b4a3569276e0.tar.bz2 |
s/Qkonsole/Konsole/
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 46c0203..3289a04 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -11,24 +11,25 @@ | |||
11 | /* */ | 11 | /* */ |
12 | /* The material contained in here more or less directly orginates from */ | 12 | /* The material contained in here more or less directly orginates from */ |
13 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ | 13 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ |
14 | /* */ | 14 | /* */ |
15 | /* ---------------------------------------------------------------------- */ | 15 | /* ---------------------------------------------------------------------- */ |
16 | /* */ | 16 | /* */ |
17 | /* Ported Konsole to Qt/Embedded */ | 17 | /* Ported Konsole to Qt/Embedded */ |
18 | /* */ | 18 | /* */ |
19 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 19 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
20 | /* */ | 20 | /* */ |
21 | /* -------------------------------------------------------------------------- */ | 21 | /* -------------------------------------------------------------------------- */ |
22 | // enhancements added by L.J. Potter <ljp@llornkcor.com> | 22 | // enhancements added by L.J. Potter <ljp@llornkcor.com> |
23 | // enhancements added by Phillip Kuhn | ||
23 | //#define QT_QWS_OPIE | 24 | //#define QT_QWS_OPIE |
24 | 25 | ||
25 | #include <stdlib.h> | 26 | #include <stdlib.h> |
26 | 27 | ||
27 | #ifdef QT_QWS_OPIE | 28 | #ifdef QT_QWS_OPIE |
28 | #include <opie2/ocolorpopupmenu.h> | 29 | #include <opie2/ocolorpopupmenu.h> |
29 | #endif | 30 | #endif |
30 | 31 | ||
31 | #include <qpe/resource.h> | 32 | #include <qpe/resource.h> |
32 | 33 | ||
33 | #include <qdir.h> | 34 | #include <qdir.h> |
34 | #include <qevent.h> | 35 | #include <qevent.h> |
@@ -252,25 +253,25 @@ class HistoryList : public QList<HistoryItem> | |||
252 | int c2 = ((HistoryItem*)item2)->count; | 253 | int c2 = ((HistoryItem*)item2)->count; |
253 | if (c1 > c2) | 254 | if (c1 > c2) |
254 | return(1); | 255 | return(1); |
255 | if (c1 < c2) | 256 | if (c1 < c2) |
256 | return(-1); | 257 | return(-1); |
257 | return(0); | 258 | return(0); |
258 | } | 259 | } |
259 | }; | 260 | }; |
260 | 261 | ||
261 | void Konsole::initCommandList() | 262 | void Konsole::initCommandList() |
262 | { | 263 | { |
263 | // qDebug("Konsole::initCommandList"); | 264 | // qDebug("Konsole::initCommandList"); |
264 | Config cfg("Qkonsole"); | 265 | Config cfg( "Konsole" ); |
265 | cfg.setGroup("Commands"); | 266 | cfg.setGroup("Commands"); |
266 | // commonCombo->setInsertionPolicy(QComboBox::AtCurrent); | 267 | // commonCombo->setInsertionPolicy(QComboBox::AtCurrent); |
267 | commonCombo->clear(); | 268 | commonCombo->clear(); |
268 | 269 | ||
269 | if (cfg.readEntry("ShellHistory","TRUE") == "TRUE") | 270 | if (cfg.readEntry("ShellHistory","TRUE") == "TRUE") |
270 | { | 271 | { |
271 | QString histfilename = QString(getenv("HOME")) + "/.bash_history"; | 272 | QString histfilename = QString(getenv("HOME")) + "/.bash_history"; |
272 | histfilename = cfg.readEntry("ShellHistoryPath",histfilename); | 273 | histfilename = cfg.readEntry("ShellHistoryPath",histfilename); |
273 | QFile histfile(histfilename); | 274 | QFile histfile(histfilename); |
274 | // note: compiler barfed on: | 275 | // note: compiler barfed on: |
275 | // QFile histfile(QString(getenv("HOME")) + "/.bash_history"); | 276 | // QFile histfile(QString(getenv("HOME")) + "/.bash_history"); |
276 | if (histfile.open( IO_ReadOnly )) | 277 | if (histfile.open( IO_ReadOnly )) |
@@ -362,25 +363,25 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
362 | signal(SIGTSTP, sig_handler); | 363 | signal(SIGTSTP, sig_handler); |
363 | 364 | ||
364 | b_scroll = TRUE; // histon; | 365 | b_scroll = TRUE; // histon; |
365 | n_keytab = 0; | 366 | n_keytab = 0; |
366 | n_render = 0; | 367 | n_render = 0; |
367 | startUp=0; | 368 | startUp=0; |
368 | fromMenu = FALSE; | 369 | fromMenu = FALSE; |
369 | fullscreen = false; | 370 | fullscreen = false; |
370 | 371 | ||
371 | setCaption( "Qkonsole" ); | 372 | setCaption( "Qkonsole" ); |
372 | setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) ); | 373 | setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) ); |
373 | 374 | ||
374 | Config cfg("Qkonsole"); | 375 | Config cfg( "Konsole" ); |
375 | cfg.setGroup("Font"); | 376 | cfg.setGroup("Font"); |
376 | QString tmp; | 377 | QString tmp; |
377 | 378 | ||
378 | // initialize the list of allowed fonts /////////////////////////////////// | 379 | // initialize the list of allowed fonts /////////////////////////////////// |
379 | 380 | ||
380 | QString cfgFontName = cfg.readEntry("FontName","Lcfont"); | 381 | QString cfgFontName = cfg.readEntry("FontName","Lcfont"); |
381 | int cfgFontSize = cfg.readNumEntry("FontSize",18); | 382 | int cfgFontSize = cfg.readNumEntry("FontSize",18); |
382 | 383 | ||
383 | cfont = -1; | 384 | cfont = -1; |
384 | 385 | ||
385 | // this code causes repeated access to all the font files | 386 | // this code causes repeated access to all the font files |
386 | // which does slow down startup | 387 | // which does slow down startup |
@@ -775,25 +776,25 @@ Konsole::~Konsole() | |||
775 | 776 | ||
776 | void | 777 | void |
777 | Konsole::historyDialog() | 778 | Konsole::historyDialog() |
778 | { | 779 | { |
779 | QDialog *d = new QDialog ( this, "histdlg", true ); | 780 | QDialog *d = new QDialog ( this, "histdlg", true ); |
780 | // d-> setCaption ( tr( "History" )); | 781 | // d-> setCaption ( tr( "History" )); |
781 | 782 | ||
782 | QBoxLayout *lay = new QVBoxLayout ( d, 4, 4 ); | 783 | QBoxLayout *lay = new QVBoxLayout ( d, 4, 4 ); |
783 | 784 | ||
784 | QLabel *l = new QLabel ( tr( "History Lines:" ), d ); | 785 | QLabel *l = new QLabel ( tr( "History Lines:" ), d ); |
785 | lay-> addWidget ( l ); | 786 | lay-> addWidget ( l ); |
786 | 787 | ||
787 | Config cfg("Qkonsole"); | 788 | Config cfg( "Konsole" ); |
788 | cfg.setGroup("History"); | 789 | cfg.setGroup("History"); |
789 | int hist = cfg.readNumEntry("history_lines",300); | 790 | int hist = cfg.readNumEntry("history_lines",300); |
790 | int avg_line = cfg.readNumEntry("avg_line_length",60); | 791 | int avg_line = cfg.readNumEntry("avg_line_length",60); |
791 | 792 | ||
792 | QSpinBox *spin = new QSpinBox ( 1, 100000, 20, d ); | 793 | QSpinBox *spin = new QSpinBox ( 1, 100000, 20, d ); |
793 | spin-> setValue ( hist ); | 794 | spin-> setValue ( hist ); |
794 | spin-> setWrapping ( true ); | 795 | spin-> setWrapping ( true ); |
795 | spin-> setButtonSymbols ( QSpinBox::PlusMinus ); | 796 | spin-> setButtonSymbols ( QSpinBox::PlusMinus ); |
796 | lay-> addWidget ( spin ); | 797 | lay-> addWidget ( spin ); |
797 | 798 | ||
798 | if ( d-> exec ( ) == QDialog::Accepted ) | 799 | if ( d-> exec ( ) == QDialog::Accepted ) |
799 | { | 800 | { |
@@ -918,25 +919,25 @@ void Konsole::setFont(int f) | |||
918 | int size = font->getSize(); | 919 | int size = font->getSize(); |
919 | printf("familyNum = %d size = %d count=%d\n", familyNum, size, | 920 | printf("familyNum = %d size = %d count=%d\n", familyNum, size, |
920 | fontList->count()); | 921 | fontList->count()); |
921 | for(int i = 0; i < (int)fontList->count(); i++) | 922 | for(int i = 0; i < (int)fontList->count(); i++) |
922 | { | 923 | { |
923 | fontList->setItemChecked(i + 1000, i == familyNum); | 924 | fontList->setItemChecked(i + 1000, i == familyNum); |
924 | } | 925 | } |
925 | for(int i = 0; i < (int)fonts.count(); i++) | 926 | for(int i = 0; i < (int)fonts.count(); i++) |
926 | { | 927 | { |
927 | fontList->setItemChecked(i, fonts.at(i)->getFamilyNum() == familyNum | 928 | fontList->setItemChecked(i, fonts.at(i)->getFamilyNum() == familyNum |
928 | && fonts.at(i)->getSize() == size); | 929 | && fonts.at(i)->getSize() == size); |
929 | } | 930 | } |
930 | Config cfg("Qkonsole"); | 931 | Config cfg( "Konsole" ); |
931 | cfg.setGroup("Font"); | 932 | cfg.setGroup("Font"); |
932 | QString ss = "Session"+ QString::number(tab->currentPageIndex()+1); | 933 | QString ss = "Session"+ QString::number(tab->currentPageIndex()+1); |
933 | if (tab->currentPageIndex() == 0) | 934 | if (tab->currentPageIndex() == 0) |
934 | { | 935 | { |
935 | cfg.writeEntry("FontName", fonts.at(cfont)->getFamily()); | 936 | cfg.writeEntry("FontName", fonts.at(cfont)->getFamily()); |
936 | cfg.writeEntry("FontSize", fonts.at(cfont)->getSize()); | 937 | cfg.writeEntry("FontSize", fonts.at(cfont)->getSize()); |
937 | } | 938 | } |
938 | cfg.writeEntry("FontName"+ss, fonts.at(cfont)->getFamily()); | 939 | cfg.writeEntry("FontName"+ss, fonts.at(cfont)->getFamily()); |
939 | cfg.writeEntry("FontSize"+ss, fonts.at(cfont)->getSize()); | 940 | cfg.writeEntry("FontSize"+ss, fonts.at(cfont)->getSize()); |
940 | } | 941 | } |
941 | } | 942 | } |
942 | 943 | ||
@@ -1163,25 +1164,25 @@ void Konsole::changeTitle(TEWidget* te, QString newTitle ) | |||
1163 | if (te == getTe()) | 1164 | if (te == getTe()) |
1164 | { | 1165 | { |
1165 | setCaption(newTitle + " - QKonsole"); | 1166 | setCaption(newTitle + " - QKonsole"); |
1166 | } | 1167 | } |
1167 | } | 1168 | } |
1168 | 1169 | ||
1169 | 1170 | ||
1170 | void Konsole::newSession() | 1171 | void Konsole::newSession() |
1171 | { | 1172 | { |
1172 | if(nsessions < 15) | 1173 | if(nsessions < 15) |
1173 | { // seems to be something weird about 16 tabs on the Zaurus.... memory? | 1174 | { // seems to be something weird about 16 tabs on the Zaurus.... memory? |
1174 | TEWidget* te = new TEWidget(tab); | 1175 | TEWidget* te = new TEWidget(tab); |
1175 | Config cfg("Qkonsole"); | 1176 | Config cfg( "Konsole" ); |
1176 | cfg.setGroup("Menubar"); | 1177 | cfg.setGroup("Menubar"); |
1177 | 1178 | ||
1178 | // FIXME use more defaults from config file | 1179 | // FIXME use more defaults from config file |
1179 | te->useBeep=cfg.readBoolEntry("useBeep",0); | 1180 | te->useBeep=cfg.readBoolEntry("useBeep",0); |
1180 | 1181 | ||
1181 | // te->setBackgroundMode(PaletteBase); //we want transparent!! | 1182 | // te->setBackgroundMode(PaletteBase); //we want transparent!! |
1182 | 1183 | ||
1183 | cfg.setGroup("Font"); | 1184 | cfg.setGroup("Font"); |
1184 | QString sn = "Session" + QString::number(nsessions+1); | 1185 | QString sn = "Session" + QString::number(nsessions+1); |
1185 | printf("read font session %s\n", sn.latin1()); | 1186 | printf("read font session %s\n", sn.latin1()); |
1186 | QString fontName = cfg.readEntry("FontName"+sn, | 1187 | QString fontName = cfg.readEntry("FontName"+sn, |
1187 | cfg.readEntry("FontName", | 1188 | cfg.readEntry("FontName", |
@@ -1402,25 +1403,25 @@ void Konsole::colorMenuIsSelected(int iD) | |||
1402 | } | 1403 | } |
1403 | 1404 | ||
1404 | /// ------------------------------- some new stuff by L.J. Potter | 1405 | /// ------------------------------- some new stuff by L.J. Potter |
1405 | 1406 | ||
1406 | 1407 | ||
1407 | void Konsole::colorMenuSelected(int iD) | 1408 | void Konsole::colorMenuSelected(int iD) |
1408 | { | 1409 | { |
1409 | // this is NOT pretty, elegant or anything else besides functional | 1410 | // this is NOT pretty, elegant or anything else besides functional |
1410 | // QString temp; | 1411 | // QString temp; |
1411 | // qDebug( temp.sprintf("colormenu %d", iD)); | 1412 | // qDebug( temp.sprintf("colormenu %d", iD)); |
1412 | 1413 | ||
1413 | TEWidget* te = getTe(); | 1414 | TEWidget* te = getTe(); |
1414 | Config cfg("Qkonsole"); | 1415 | Config cfg( "Konsole" ); |
1415 | cfg.setGroup("Colors"); | 1416 | cfg.setGroup("Colors"); |
1416 | 1417 | ||
1417 | ColorEntry m_table[TABLE_COLORS]; | 1418 | ColorEntry m_table[TABLE_COLORS]; |
1418 | const ColorEntry * defaultCt=te->getdefaultColorTable(); | 1419 | const ColorEntry * defaultCt=te->getdefaultColorTable(); |
1419 | 1420 | ||
1420 | int i; | 1421 | int i; |
1421 | 1422 | ||
1422 | // te->color_menu_item = iD; | 1423 | // te->color_menu_item = iD; |
1423 | 1424 | ||
1424 | colorMenu->setItemChecked(cm_ab,FALSE); | 1425 | colorMenu->setItemChecked(cm_ab,FALSE); |
1425 | colorMenu->setItemChecked(cm_bb,FALSE); | 1426 | colorMenu->setItemChecked(cm_bb,FALSE); |
1426 | colorMenu->setItemChecked(cm_wc,FALSE); | 1427 | colorMenu->setItemChecked(cm_wc,FALSE); |
@@ -1586,25 +1587,25 @@ void Konsole::setColors(QColor foreground, QColor background) | |||
1586 | { | 1587 | { |
1587 | m_table[i].color = background; | 1588 | m_table[i].color = background; |
1588 | m_table[i].transparent=0; | 1589 | m_table[i].transparent=0; |
1589 | } | 1590 | } |
1590 | else | 1591 | else |
1591 | m_table[i].color = defaultCt[i].color; | 1592 | m_table[i].color = defaultCt[i].color; |
1592 | } | 1593 | } |
1593 | te->setColorTable(m_table); | 1594 | te->setColorTable(m_table); |
1594 | } | 1595 | } |
1595 | 1596 | ||
1596 | void Konsole::tabMenuSelected(int id) | 1597 | void Konsole::tabMenuSelected(int id) |
1597 | { | 1598 | { |
1598 | Config cfg("Qkonsole"); | 1599 | Config cfg( "Konsole" ); |
1599 | cfg.setGroup("Tabs"); | 1600 | cfg.setGroup("Tabs"); |
1600 | tabMenu->setItemChecked(tabPos, false); | 1601 | tabMenu->setItemChecked(tabPos, false); |
1601 | if (id == tm_bottom) | 1602 | if (id == tm_bottom) |
1602 | { | 1603 | { |
1603 | printf("set bottom tab\n"); | 1604 | printf("set bottom tab\n"); |
1604 | tab->getTabBar()->show(); | 1605 | tab->getTabBar()->show(); |
1605 | tab->setTabPosition(QTabWidget::Bottom); | 1606 | tab->setTabPosition(QTabWidget::Bottom); |
1606 | tab->getTabBar()->show(); | 1607 | tab->getTabBar()->show(); |
1607 | cfg.writeEntry("Position","Bottom"); | 1608 | cfg.writeEntry("Position","Bottom"); |
1608 | } | 1609 | } |
1609 | else if (id == tm_top) | 1610 | else if (id == tm_top) |
1610 | { | 1611 | { |
@@ -1623,25 +1624,25 @@ void Konsole::tabMenuSelected(int id) | |||
1623 | } | 1624 | } |
1624 | tabMenu->setItemChecked(id, true); | 1625 | tabMenu->setItemChecked(id, true); |
1625 | tabPos = id; | 1626 | tabPos = id; |
1626 | } | 1627 | } |
1627 | 1628 | ||
1628 | 1629 | ||
1629 | void Konsole::configMenuSelected(int iD) | 1630 | void Konsole::configMenuSelected(int iD) |
1630 | { | 1631 | { |
1631 | // QString temp; | 1632 | // QString temp; |
1632 | // qDebug( temp.sprintf("configmenu %d",iD)); | 1633 | // qDebug( temp.sprintf("configmenu %d",iD)); |
1633 | 1634 | ||
1634 | TEWidget* te = getTe(); | 1635 | TEWidget* te = getTe(); |
1635 | Config cfg("Qkonsole"); | 1636 | Config cfg( "Konsole" ); |
1636 | cfg.setGroup("Menubar"); | 1637 | cfg.setGroup("Menubar"); |
1637 | if(iD == cm_wrap) | 1638 | if(iD == cm_wrap) |
1638 | { | 1639 | { |
1639 | cfg.setGroup("ScrollBar"); | 1640 | cfg.setGroup("ScrollBar"); |
1640 | bool b=cfg.readBoolEntry("HorzScroll",0); | 1641 | bool b=cfg.readBoolEntry("HorzScroll",0); |
1641 | b=!b; | 1642 | b=!b; |
1642 | cfg.writeEntry("HorzScroll", b ); | 1643 | cfg.writeEntry("HorzScroll", b ); |
1643 | cfg.write(); | 1644 | cfg.write(); |
1644 | doWrap(); | 1645 | doWrap(); |
1645 | if(cfg.readNumEntry("Position",2) == 0) | 1646 | if(cfg.readNumEntry("Position",2) == 0) |
1646 | { | 1647 | { |
1647 | te->setScrollbarLocation(1); | 1648 | te->setScrollbarLocation(1); |
@@ -1657,61 +1658,61 @@ void Konsole::configMenuSelected(int iD) | |||
1657 | cfg.setGroup("Menubar"); | 1658 | cfg.setGroup("Menubar"); |
1658 | bool b=cfg.readBoolEntry("useBeep",0); | 1659 | bool b=cfg.readBoolEntry("useBeep",0); |
1659 | b=!b; | 1660 | b=!b; |
1660 | cfg.writeEntry("useBeep", b ); | 1661 | cfg.writeEntry("useBeep", b ); |
1661 | cfg.write(); | 1662 | cfg.write(); |
1662 | configMenu->setItemChecked(cm_beep,b); | 1663 | configMenu->setItemChecked(cm_beep,b); |
1663 | te->useBeep=b; | 1664 | te->useBeep=b; |
1664 | } | 1665 | } |
1665 | } | 1666 | } |
1666 | 1667 | ||
1667 | void Konsole::changeCommand(const QString &text, int c) | 1668 | void Konsole::changeCommand(const QString &text, int c) |
1668 | { | 1669 | { |
1669 | Config cfg("Qkonsole"); | 1670 | Config cfg( "Konsole" ); |
1670 | cfg.setGroup("Commands"); | 1671 | cfg.setGroup("Commands"); |
1671 | if(commonCmds[c] != text) | 1672 | if(commonCmds[c] != text) |
1672 | { | 1673 | { |
1673 | cfg.writeEntry(QString::number(c),text); | 1674 | cfg.writeEntry(QString::number(c),text); |
1674 | commonCombo->clearEdit(); | 1675 | commonCombo->clearEdit(); |
1675 | commonCombo->setCurrentItem(c); | 1676 | commonCombo->setCurrentItem(c); |
1676 | } | 1677 | } |
1677 | } | 1678 | } |
1678 | 1679 | ||
1679 | void Konsole::setColor(int sess) | 1680 | void Konsole::setColor(int sess) |
1680 | { | 1681 | { |
1681 | Config cfg("Qkonsole"); | 1682 | Config cfg( "Konsole" ); |
1682 | cfg.setGroup("Colors"); | 1683 | cfg.setGroup("Colors"); |
1683 | QColor foreground, background; | 1684 | QColor foreground, background; |
1684 | QString ss = QString("Session") + QString::number(sess); | 1685 | QString ss = QString("Session") + QString::number(sess); |
1685 | foreground.setRgb(cfg.readNumEntry("foregroundRed"+ss, | 1686 | foreground.setRgb(cfg.readNumEntry("foregroundRed"+ss, |
1686 | cfg.readNumEntry("foregroundRed",0xff)), | 1687 | cfg.readNumEntry("foregroundRed",0xff)), |
1687 | cfg.readNumEntry("foregroundGreen"+ss, | 1688 | cfg.readNumEntry("foregroundGreen"+ss, |
1688 | cfg.readNumEntry("foregroundGreen",0xff)), | 1689 | cfg.readNumEntry("foregroundGreen",0xff)), |
1689 | cfg.readNumEntry("foregroundBlue"+ss, | 1690 | cfg.readNumEntry("foregroundBlue"+ss, |
1690 | cfg.readNumEntry("foregroundBlue",0xff))); | 1691 | cfg.readNumEntry("foregroundBlue",0xff))); |
1691 | background.setRgb(cfg.readNumEntry("backgroundRed"+ss, | 1692 | background.setRgb(cfg.readNumEntry("backgroundRed"+ss, |
1692 | cfg.readNumEntry("backgroundRed",0)), | 1693 | cfg.readNumEntry("backgroundRed",0)), |
1693 | cfg.readNumEntry("backgroundGreen"+ss, | 1694 | cfg.readNumEntry("backgroundGreen"+ss, |
1694 | cfg.readNumEntry("backgroundGreen",0)), | 1695 | cfg.readNumEntry("backgroundGreen",0)), |
1695 | cfg.readNumEntry("backgroundBlue"+ss, | 1696 | cfg.readNumEntry("backgroundBlue"+ss, |
1696 | cfg.readNumEntry("backgroundBlue",0))); | 1697 | cfg.readNumEntry("backgroundBlue",0))); |
1697 | setColors(foreground, background); | 1698 | setColors(foreground, background); |
1698 | } | 1699 | } |
1699 | 1700 | ||
1700 | void Konsole::scrollMenuSelected(int index) | 1701 | void Konsole::scrollMenuSelected(int index) |
1701 | { | 1702 | { |
1702 | // qDebug( "scrollbar menu %d",index); | 1703 | // qDebug( "scrollbar menu %d",index); |
1703 | 1704 | ||
1704 | TEWidget* te = getTe(); | 1705 | TEWidget* te = getTe(); |
1705 | Config cfg("Qkonsole"); | 1706 | Config cfg( "Konsole" ); |
1706 | cfg.setGroup("ScrollBar"); | 1707 | cfg.setGroup("ScrollBar"); |
1707 | 1708 | ||
1708 | if(index == sm_none) | 1709 | if(index == sm_none) |
1709 | { | 1710 | { |
1710 | te->setScrollbarLocation(0); | 1711 | te->setScrollbarLocation(0); |
1711 | cfg.writeEntry("Position",0); | 1712 | cfg.writeEntry("Position",0); |
1712 | } | 1713 | } |
1713 | else if(index == sm_left) | 1714 | else if(index == sm_left) |
1714 | { | 1715 | { |
1715 | te->setScrollbarLocation(1); | 1716 | te->setScrollbarLocation(1); |
1716 | cfg.writeEntry("Position",1); | 1717 | cfg.writeEntry("Position",1); |
1717 | } | 1718 | } |
@@ -1740,25 +1741,25 @@ void Konsole::scrollMenuSelected(int index) | |||
1740 | // } | 1741 | // } |
1741 | // break; | 1742 | // break; |
1742 | 1743 | ||
1743 | void Konsole::editCommandListMenuSelected(int iD) | 1744 | void Konsole::editCommandListMenuSelected(int iD) |
1744 | { | 1745 | { |
1745 | // QString temp; | 1746 | // QString temp; |
1746 | // qDebug( temp.sprintf("edit command list %d",iD)); | 1747 | // qDebug( temp.sprintf("edit command list %d",iD)); |
1747 | 1748 | ||
1748 | // FIXME: more cleanup needed here | 1749 | // FIXME: more cleanup needed here |
1749 | 1750 | ||
1750 | 1751 | ||
1751 | TEWidget* te = getTe(); | 1752 | TEWidget* te = getTe(); |
1752 | Config cfg("Qkonsole"); | 1753 | Config cfg( "Konsole" ); |
1753 | cfg.setGroup("Menubar"); | 1754 | cfg.setGroup("Menubar"); |
1754 | if( iD == ec_cmdlist) | 1755 | if( iD == ec_cmdlist) |
1755 | { | 1756 | { |
1756 | if(!secondToolBar->isHidden()) | 1757 | if(!secondToolBar->isHidden()) |
1757 | { | 1758 | { |
1758 | secondToolBar->hide(); | 1759 | secondToolBar->hide(); |
1759 | configMenu->changeItem( iD,tr( "Show Command List" )); | 1760 | configMenu->changeItem( iD,tr( "Show Command List" )); |
1760 | cfg.writeEntry("Hidden","TRUE"); | 1761 | cfg.writeEntry("Hidden","TRUE"); |
1761 | configMenu->setItemEnabled(ec_edit ,FALSE); | 1762 | configMenu->setItemEnabled(ec_edit ,FALSE); |
1762 | configMenu->setItemEnabled(ec_quick ,FALSE); | 1763 | configMenu->setItemEnabled(ec_quick ,FALSE); |
1763 | } | 1764 | } |
1764 | else | 1765 | else |
@@ -1856,61 +1857,61 @@ void Konsole::parseCommandLine() | |||
1856 | cmd+=QString(qApp->argv()[j])+" "; | 1857 | cmd+=QString(qApp->argv()[j])+" "; |
1857 | } | 1858 | } |
1858 | cmd.stripWhiteSpace(); | 1859 | cmd.stripWhiteSpace(); |
1859 | system(cmd.latin1()); | 1860 | system(cmd.latin1()); |
1860 | exit(0);//close(); | 1861 | exit(0);//close(); |
1861 | } // end -e switch | 1862 | } // end -e switch |
1862 | } | 1863 | } |
1863 | startUp++; | 1864 | startUp++; |
1864 | } | 1865 | } |
1865 | 1866 | ||
1866 | void Konsole::changeForegroundColor(const QColor &color) | 1867 | void Konsole::changeForegroundColor(const QColor &color) |
1867 | { | 1868 | { |
1868 | Config cfg("Qkonsole"); | 1869 | Config cfg( "Konsole" ); |
1869 | cfg.setGroup("Colors"); | 1870 | cfg.setGroup("Colors"); |
1870 | int r, g, b; | 1871 | int r, g, b; |
1871 | color.rgb(&r,&g,&b); | 1872 | color.rgb(&r,&g,&b); |
1872 | foreground.setRgb(r,g,b); | 1873 | foreground.setRgb(r,g,b); |
1873 | 1874 | ||
1874 | cfg.writeEntry("foreground",color.name()); | 1875 | cfg.writeEntry("foreground",color.name()); |
1875 | qDebug("foreground "+color.name()); | 1876 | qDebug("foreground "+color.name()); |
1876 | cfg.write(); | 1877 | cfg.write(); |
1877 | 1878 | ||
1878 | qDebug("do other dialog"); | 1879 | qDebug("do other dialog"); |
1879 | #ifdef QT_QWS_OPIE | 1880 | #ifdef QT_QWS_OPIE |
1880 | 1881 | ||
1881 | Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color"); | 1882 | Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color"); |
1882 | connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, | 1883 | connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, |
1883 | SLOT(changeBackgroundColor(const QColor&))); | 1884 | SLOT(changeBackgroundColor(const QColor&))); |
1884 | penColorPopupMenu2->exec(); | 1885 | penColorPopupMenu2->exec(); |
1885 | #endif | 1886 | #endif |
1886 | } | 1887 | } |
1887 | 1888 | ||
1888 | void Konsole::changeBackgroundColor(const QColor &color) | 1889 | void Konsole::changeBackgroundColor(const QColor &color) |
1889 | { | 1890 | { |
1890 | 1891 | ||
1891 | qDebug("Change background"); | 1892 | qDebug("Change background"); |
1892 | Config cfg("Qkonsole"); | 1893 | Config cfg( "Konsole" ); |
1893 | cfg.setGroup("Colors"); | 1894 | cfg.setGroup("Colors"); |
1894 | int r, g, b; | 1895 | int r, g, b; |
1895 | color.rgb(&r,&g,&b); | 1896 | color.rgb(&r,&g,&b); |
1896 | background.setRgb(r,g,b); | 1897 | background.setRgb(r,g,b); |
1897 | cfg.writeEntry("background",color.name()); | 1898 | cfg.writeEntry("background",color.name()); |
1898 | qDebug("background "+color.name()); | 1899 | qDebug("background "+color.name()); |
1899 | cfg.write(); | 1900 | cfg.write(); |
1900 | } | 1901 | } |
1901 | 1902 | ||
1902 | void Konsole::doWrap() | 1903 | void Konsole::doWrap() |
1903 | { | 1904 | { |
1904 | Config cfg("Qkonsole"); | 1905 | Config cfg( "Konsole" ); |
1905 | cfg.setGroup("ScrollBar"); | 1906 | cfg.setGroup("ScrollBar"); |
1906 | TEWidget* te = getTe(); | 1907 | TEWidget* te = getTe(); |
1907 | if( !cfg.readBoolEntry("HorzScroll",0)) | 1908 | if( !cfg.readBoolEntry("HorzScroll",0)) |
1908 | { | 1909 | { |
1909 | te->setWrapAt(0); | 1910 | te->setWrapAt(0); |
1910 | configMenu->setItemChecked( cm_wrap,TRUE); | 1911 | configMenu->setItemChecked( cm_wrap,TRUE); |
1911 | } | 1912 | } |
1912 | else | 1913 | else |
1913 | { | 1914 | { |
1914 | // te->setWrapAt(90); | 1915 | // te->setWrapAt(90); |
1915 | te->setWrapAt(120); | 1916 | te->setWrapAt(120); |
1916 | configMenu->setItemChecked( cm_wrap,FALSE); | 1917 | configMenu->setItemChecked( cm_wrap,FALSE); |