author | drw <drw> | 2004-04-06 15:52:02 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-06 15:52:02 (UTC) |
commit | 31a82304d62ab4943c0926c35cce552e2164eaf4 (patch) (unidiff) | |
tree | 9c87a50ef57475a765dc16c26100372026dbdda2 | |
parent | e97648cdac8aba383e69e87c2d60644eb3bcc18d (diff) | |
download | opie-31a82304d62ab4943c0926c35cce552e2164eaf4.zip opie-31a82304d62ab4943c0926c35cce552e2164eaf4.tar.gz opie-31a82304d62ab4943c0926c35cce552e2164eaf4.tar.bz2 |
Do not override menu font size, use font as defined in Appearance settings, and fixed compiler warning
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 2 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 9 |
2 files changed, 1 insertions, 10 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 | |||
@@ -1389,7 +1389,7 @@ void TEWidget::dropEvent(QDropEvent* event) | |||
1389 | #endif | 1389 | #endif |
1390 | 1390 | ||
1391 | 1391 | ||
1392 | void TEWidget::drop_menu_activated(int item) | 1392 | void TEWidget::drop_menu_activated(int /*item*/) |
1393 | { | 1393 | { |
1394 | #ifndef QT_NO_DRAGANDDROP | 1394 | #ifndef QT_NO_DRAGANDDROP |
1395 | switch (item) | 1395 | switch (item) |
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 | |||
@@ -510,15 +510,6 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
510 | 510 | ||
511 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); | 511 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
512 | 512 | ||
513 | bool c7xx = false; | ||
514 | if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600) | ||
515 | { | ||
516 | c7xx = true; | ||
517 | } | ||
518 | QFont menuFont; | ||
519 | menuFont.setPointSize(c7xx? 18 : 10); | ||
520 | qApp->setFont(menuFont, true); | ||
521 | |||
522 | setFont(cfont); | 513 | setFont(cfont); |
523 | 514 | ||
524 | configMenu = new QPopupMenu( this); | 515 | configMenu = new QPopupMenu( this); |