fixed problem with commandlist and very long commands messing up the combo width, so you couldn't edit.

1 files changed, 4 insertions, 6 deletions

diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index f154bb8..653652a 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -274,49 +274,49 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); a->addTo( toolbar );
   a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolbar );
   a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolbar );
   a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolbar );
   a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
   a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); a->addTo( toolbar );
 /*
   a = new QAction( tr("Up"), Resource::loadPixmap( "up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
 */
 
   secondToolBar = new QPEToolBar( this );
   secondToolBar->setHorizontalStretchable( TRUE );
 
   commonCombo = new QComboBox( secondToolBar );
-
+  commonCombo->setMaximumWidth(236);
   configMenu->insertItem( "Edit Command List");
   if( listHidden) {
       secondToolBar->hide();
       configMenu->setItemEnabled(-20 ,FALSE);
   }
   
   cfg.setGroup("Commands");
   commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
 
   for (int i = 0; commonCmds[i] != NULL; i++) {
       commonCombo->insertItem( commonCmds[i], i );
       tmp = cfg.readEntry( QString::number(i),"");
       if(tmp != "")
           commonCombo->changeItem( tmp,i );
   }
 
   connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
 
       // create applications /////////////////////////////////////////////////////
   setCentralWidget(tab);
 
   // load keymaps ////////////////////////////////////////////////////////////
   KeyTrans::loadAll();
   for (int i = 0; i < KeyTrans::count(); i++)
@@ -556,50 +556,49 @@ TEWidget* Konsole::getTe() {
     return (TEWidget *) tab->currentPage();
   } else {
     return 0;
   }
 }
 
 void Konsole::switchSession(QWidget* w) {
   TEWidget* te = (TEWidget *) w;
 
   QFont teFnt = te->getVTFont();
   for(uint i = 0; i < fonts.count(); i++) {
     VTFont *fnt = fonts.at(i);
     bool cf = fnt->getFont() == teFnt;
     fontList->setItemChecked(i, cf);
     if (cf) {
       cfont = i;
     }
   }
 }
 
 /// -------------------------------   some new stuff by L.J. Potter
 void Konsole::colorMenuSelected(int iD)
 { // this is NOT pretty, elegant or anything else besides functional
 //        QString temp;
-//        temp.sprintf("%d", iD);
-//      qDebug(temp);
+//        qDebug( temp.sprintf("%d", iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     QColor foreground;
     QColor background;
     colorMenu->setItemChecked(lastSelectedMenu,FALSE);
     ColorEntry m_table[TABLE_COLORS];
     const ColorEntry * defaultCt=te->getdefaultColorTable();
       /////////// fore back
     int i;
     if(iD==-8) { // default default
         for (i = 0; i < TABLE_COLORS; i++)  {
             m_table[i].color = defaultCt[i].color;
             if(i==1 || i == 11)
                 m_table[i].transparent=1;
             cfg.writeEntry("Schema","8");
             colorMenu->setItemChecked(-8,TRUE);
         }
     } else {
         if(iD==-5) { // green black
             foreground.setRgb(0x18,255,0x18);
             background.setRgb(0x00,0x00,0x00);
             cfg.writeEntry("Schema","5");
             colorMenu->setItemChecked(-5,TRUE);
@@ -664,51 +663,50 @@ void Konsole::colorMenuSelected(int iD)
             background.setRgb(0x00,0x00,0x00);
             foreground.setRgb(0x18,0xB2,0xB2);
             cfg.writeEntry("Schema","16");
             colorMenu->setItemChecked(-16,TRUE);
         }
 
         for (i = 0; i < TABLE_COLORS; i++)  {
             if(i==0 || i == 10) {
                 m_table[i].color = foreground;
             }
             else if(i==1 || i == 11) {
                 m_table[i].color = background; m_table[i].transparent=0;
             }
             else
                 m_table[i].color = defaultCt[i].color;
         }
     }
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
 }
 
 void Konsole::configMenuSelected(int iD)
 {
-//      QString temp;
-//      temp.sprintf("%d",iD);
-//      qDebug(temp);
+    QString temp;
+    qDebug( temp.sprintf("%d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     if( iD  == -2) {
         if(!secondToolBar->isHidden()) {
             secondToolBar->hide();
             configMenu->changeItem( iD,"Show Command List");
             cfg.writeEntry("Hidden","TRUE");
             configMenu->setItemEnabled(-20 ,FALSE);
         } else {
             secondToolBar->show();
             configMenu->changeItem( iD,"Hide Command List");
             cfg.writeEntry("Hidden","FALSE");
             configMenu->setItemEnabled(-20 ,TRUE);
 
             if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") {
                 configMenu->setItemChecked(-20,TRUE);
                 commonCombo->setEditable( TRUE );
             } else {
                 configMenu->setItemChecked(-20,FALSE);
                 commonCombo->setEditable( FALSE );
             }
         }
     }