Do not override menu font size, use font as defined in Appearance settings, and fixed compiler warning

2 files changed, 2 insertions, 11 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index cc88555..93348f4 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -788,49 +788,49 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev)
       here = right; ohere = left;
     }
   }
 
   if (here == pntSel && scroll == scrollbar->value()) return; // not moved
 
   if ( word_selection_mode ) {
     if ( actSel < 2 || swapping ) {
       emit beginSelectionSignal( ohere.x(), ohere.y() );
     }
   } else if ( actSel < 2 ) {
     emit beginSelectionSignal( pntSel.x(), pntSel.y() );
   }
 
   actSel = 2; // within selection
   pntSel = here;
   emit extendSelectionSignal( here.x(), here.y() );
 }
 
 void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
 {
 //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
   if ( ev->button() == LeftButton)
   {
-    if (QABS(ev->x() - mouse_down_x) < 3 
+    if (QABS(ev->x() - mouse_down_x) < 3
 	&& QABS(ev->y() - mouse_down_y) < 3
 	&& ev->y() < qApp->desktop()->height()/8) {
       emit setFullScreen(false);
     }
 
     if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks);
     preserve_line_breaks = TRUE;
     actSel = 0;
 
     //FIXME: emits a release event even if the mouse is
     //       outside the range. The procedure used in `mouseMoveEvent'
     //       applies here, too.
 
     QPoint tL  = contentsRect().topLeft();
     int    tLx = tL.x();
     int    tLy = tL.y();
 
     if (!mouse_marks && !(ev->state() & ShiftButton))
       emit mouseSignal( 3, // release
                         (ev->x()-tLx-blX)/font_w + 1,
                         (ev->y()-tLy-bY)/font_h + 1 );
     releaseMouse();
   }
 }
@@ -1368,49 +1368,49 @@ void TEWidget::dropEvent(QDropEvent* event)
 
       if (bPopup)
         // m_drop->popup(pos() + event->pos());
   m_drop->popup(mapToGlobal(event->pos()));
       else
   {
     if (currentSession) {
       currentSession->getEmulation()->sendString(dropText.local8Bit());
     }
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
   }
     }
   }
   else if(QTextDrag::decode(event, dropText)) {
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
     if (currentSession) {
       currentSession->getEmulation()->sendString(dropText.local8Bit());
     }
     // Paste it
   }
 }
 #endif
 
 
-void TEWidget::drop_menu_activated(int item)
+void TEWidget::drop_menu_activated(int /*item*/)
 {
 #ifndef QT_NO_DRAGANDDROP
   switch (item)
   {
     case 0: // paste
       currentSession->getEmulation()->sendString(dropText.local8Bit());
 //    KWM::activate((Window)this->winId());
       break;
     case 1: // cd ...
       currentSession->getEmulation()->sendString("cd ");
       struct stat statbuf;
       if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
       {
         if ( !S_ISDIR(statbuf.st_mode) )
         {
 /*
           KURL url;
           url.setPath( dropText );
           dropText = url.directory( true, false ); // remove filename
 */
         }
       }
       dropText.replace(QRegExp(" "), "\\ "); // escape spaces
       currentSession->getEmulation()->sendString(dropText.local8Bit());
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index c5df47f..cbea7bd 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -489,57 +489,48 @@ void Konsole::init(const char* _pgm, QStrList & _args)
             }
         }
 
     }
 
     if (cfont < 0 || cfont >= (int)fonts.count())
     {
         cfont = 0;
     }
 
     // create terminal emulation framework ////////////////////////////////////
     nsessions = 0;
 
     tab = new EKNumTabWidget(this);
     //  tab->setMargin(tab->margin()-5);
     connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*)));
 
     // create terminal toolbar ////////////////////////////////////////////////
     setToolBarsMovable( FALSE );
     menuToolBar = new QToolBar( this );
     menuToolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar *menuBar = new QMenuBar( menuToolBar );
 
-    bool c7xx = false;
-    if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600)
-    {
-        c7xx = true;
-    }
-    QFont menuFont;
-    menuFont.setPointSize(c7xx? 18 : 10);
-    qApp->setFont(menuFont, true);
-
     setFont(cfont);
 
     configMenu = new QPopupMenu( this);
     colorMenu = new QPopupMenu( this);
     scrollMenu = new QPopupMenu( this);
     editCommandListMenu = new QPopupMenu( this);
 
     configMenu->insertItem(tr("Command List"), editCommandListMenu);
 
     bool listHidden;
     cfg.setGroup("Menubar");
     if( cfg.readEntry("Hidden","FALSE") == "TRUE")
     {
         ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" ));
         listHidden=TRUE;
     }
     else
     {
         ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" ));
         listHidden=FALSE;
     }
 
     cfg.setGroup("Tabs");