author | llornkcor <llornkcor> | 2002-12-08 13:39:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-12-08 13:39:34 (UTC) |
commit | 76fda4ee71e83d46f31a77b6d433cefdf24b3e73 (patch) (unidiff) | |
tree | 7f42eaa5b101bd1433ba39d926c41e9ff1fd1a97 /core/apps/embeddedkonsole/konsole.cpp | |
parent | a88b210e6895614027c821bb5cedabc9b06117d3 (diff) | |
download | opie-76fda4ee71e83d46f31a77b6d433cefdf24b3e73.zip opie-76fda4ee71e83d46f31a77b6d433cefdf24b3e73.tar.gz opie-76fda4ee71e83d46f31a77b6d433cefdf24b3e73.tar.bz2 |
moved font menu to options due to wrapping of the toolbar when using languages other than english that tend to have many characters in words :)
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 275a9a8..eda3135 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -297,20 +297,21 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
297 | colorMenu->insertItem(tr( "Amber on Black")); | 297 | colorMenu->insertItem(tr( "Amber on Black")); |
298 | 298 | ||
299 | #ifdef QT_QWS_OPIE | 299 | #ifdef QT_QWS_OPIE |
300 | colorMenu->insertItem(tr( "Custom")); | 300 | colorMenu->insertItem(tr( "Custom")); |
301 | #endif | 301 | #endif |
302 | 302 | ||
303 | configMenu->insertItem( tr("Font"), fontList ); | ||
303 | configMenu->insertItem(tr( "Colors") ,colorMenu); | 304 | configMenu->insertItem(tr( "Colors") ,colorMenu); |
304 | 305 | ||
305 | connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); | 306 | connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); |
306 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); | 307 | connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); |
307 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); | 308 | connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); |
308 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); | 309 | connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); |
309 | connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); | 310 | connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); |
310 | menuBar->insertItem( tr("Font"), fontList ); | 311 | |
311 | menuBar->insertItem( tr("Options"), configMenu ); | 312 | menuBar->insertItem( tr("Options"), configMenu ); |
312 | 313 | ||
313 | QPEToolBar *toolbar = new QPEToolBar( this ); | 314 | QPEToolBar *toolbar = new QPEToolBar( this ); |
314 | 315 | ||
315 | QAction *a; | 316 | QAction *a; |
316 | 317 | ||
@@ -663,15 +664,16 @@ void Konsole::colorMenuIsSelected(int iD) { | |||
663 | colorMenuSelected(iD); | 664 | colorMenuSelected(iD); |
664 | } | 665 | } |
665 | 666 | ||
666 | /// ------------------------------- some new stuff by L.J. Potter | 667 | /// ------------------------------- some new stuff by L.J. Potter |
667 | void Konsole::colorMenuSelected(int iD) | 668 | void Konsole::colorMenuSelected(int iD) |
668 | { // this is NOT pretty, elegant or anything else besides functional | 669 | { // this is NOT pretty, elegant or anything else besides functional |
669 | // QString temp; | 670 | // QString temp; |
670 | // qDebug( temp.sprintf("colormenu %d", iD)); | 671 | // qDebug( temp.sprintf("colormenu %d", iD)); |
671 | TEWidget* te = getTe(); | 672 | |
673 | TEWidget* te = getTe(); | ||
672 | Config cfg("Konsole"); | 674 | Config cfg("Konsole"); |
673 | cfg.setGroup("Colors"); | 675 | cfg.setGroup("Colors"); |
674 | // QColor foreground; | 676 | // QColor foreground; |
675 | // QColor background; | 677 | // QColor background; |
676 | colorMenu->setItemChecked(lastSelectedMenu,FALSE); | 678 | colorMenu->setItemChecked(lastSelectedMenu,FALSE); |
677 | ColorEntry m_table[TABLE_COLORS]; | 679 | ColorEntry m_table[TABLE_COLORS]; |
@@ -796,15 +798,16 @@ void Konsole::colorMenuSelected(int iD) | |||
796 | update(); | 798 | update(); |
797 | 799 | ||
798 | } | 800 | } |
799 | 801 | ||
800 | void Konsole::configMenuSelected(int iD) | 802 | void Konsole::configMenuSelected(int iD) |
801 | { | 803 | { |
802 | // QString temp; | 804 | // QString temp; |
803 | // qDebug( temp.sprintf("configmenu %d",iD)); | 805 | // qDebug( temp.sprintf("configmenu %d",iD)); |
804 | TEWidget* te = getTe(); | 806 | |
807 | TEWidget* te = getTe(); | ||
805 | Config cfg("Konsole"); | 808 | Config cfg("Konsole"); |
806 | cfg.setGroup("Menubar"); | 809 | cfg.setGroup("Menubar"); |
807 | int i,j; | 810 | int i,j; |
808 | #ifdef QT_QWS_OPIE | 811 | #ifdef QT_QWS_OPIE |
809 | i=-29;j=-30; | 812 | i=-29;j=-30; |
810 | #else | 813 | #else |
@@ -868,13 +871,14 @@ void Konsole::setColor() | |||
868 | int scheme = cfg.readNumEntry("Schema",1); | 871 | int scheme = cfg.readNumEntry("Schema",1); |
869 | if(scheme != 1) colorMenuSelected( -scheme); | 872 | if(scheme != 1) colorMenuSelected( -scheme); |
870 | } | 873 | } |
871 | 874 | ||
872 | void Konsole::scrollMenuSelected(int index) | 875 | void Konsole::scrollMenuSelected(int index) |
873 | { | 876 | { |
874 | qDebug( "scrollbar menu %d",index); | 877 | // qDebug( "scrollbar menu %d",index); |
878 | |||
875 | TEWidget* te = getTe(); | 879 | TEWidget* te = getTe(); |
876 | Config cfg("Konsole"); | 880 | Config cfg("Konsole"); |
877 | cfg.setGroup("ScrollBar"); | 881 | cfg.setGroup("ScrollBar"); |
878 | int i,j,k; | 882 | int i,j,k; |
879 | #ifdef QT_QWS_OPIE | 883 | #ifdef QT_QWS_OPIE |
880 | i=-25;j=-26;k=-27; | 884 | i=-25;j=-26;k=-27; |