diff options
| author |  Szymon Tomasz Stefanek | 2010-06-01 18:37:48 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2010-06-01 18:37:48 +0000 |
| commit | 3f235b42118f3e00293635bd5cb3ff2eedf631e2 (patch) | |
| tree | 034c11e68bd89ec0bf3553a50055994325b3449e /src | |
| parent | Fix link extraction (diff) | |
| download | KVIrc-3f235b42118f3e00293635bd5cb3ff2eedf631e2.tar.gz KVIrc-3f235b42118f3e00293635bd5cb3ff2eedf631e2.tar.bz2 KVIrc-3f235b42118f3e00293635bd5cb3ff2eedf631e2.zip | |
A couple of fixes for MacOSX
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4412 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_ircviewtools.cpp | 6 | ||||
| -rw-r--r-- | src/modules/notifier/notifiermessage.cpp | 14 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index 976590993..c54313c66 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -189,7 +189,11 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent) gl->addWidget(tw,1,0,1,2); gl->setSizeConstraint(QGridLayout::SetFixedSize); - m_pStringToFind->setFocus(); + +#ifndef COMPILE_ON_MAC + m_pStringToFind->setFocus(); // this makes MacOSX version of Qt go nuts and crash +#endif //!COMPILE_ON_MAC + tw->setCurrentIndex(tw->indexOf(w)); new QShortcut(QKeySequence(Qt::Key_Escape),this,SLOT(close()),0,Qt::WidgetShortcut); } diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp index 04d862ac2..eac356edc 100644 --- a/src/modules/notifier/notifiermessage.cpp +++ b/src/modules/notifier/notifiermessage.cpp @@ -38,9 +38,15 @@ KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString &szText) m_szText=szText; m_pPixmap=pPixmap; + m_pHBox = new QHBoxLayout(this); + m_pHBox->setSpacing(SPACING); + m_pHBox->setMargin(SPACING); + + //qDebug("NOTIFIER TEXT MESSAGE: \n%s\n",szText.toUtf8().data()); + if(bShowImages) { - m_pLabel0 = new QLabel(); + m_pLabel0 = new QLabel(this); m_pLabel0->setFixedSize(16,16); if(m_pPixmap) m_pLabel0->setPixmap(*m_pPixmap); @@ -49,15 +55,11 @@ KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString &szText) } - m_pLabel1 = new QLabel(); + m_pLabel1 = new QLabel(this); m_pLabel1->setTextFormat(Qt::RichText); m_pLabel1->setText(KviHtmlGenerator::convertToHtml(m_szText)); m_pLabel1->setWordWrap(true); - m_pHBox = new QHBoxLayout(this); - m_pHBox->setSpacing(SPACING); - m_pHBox->setMargin(SPACING); - if(bShowImages) { m_pHBox->setStretch(1,99); diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 8d44264bd..4e8359469 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -65,7 +65,7 @@ #include <QHeaderView> #include <QIcon> -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) #include <QStyleFactory> #include <QWindowsStyle> #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW @@ -1355,14 +1355,14 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) pal.setColor(QPalette::Disabled,QPalette::Button,QColor(98,98,180)); pal.setColor(QPalette::Disabled,QPalette::ButtonText,QColor(128,128,245)); -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - // Kill the WindowXP style which does not honor palette +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) + // Kill the WindowXP/Mac style which does not honor palette QStyle * pWindowsStyle = QStyleFactory::create("plastique"); if(!pWindowsStyle) { pWindowsStyle = QStyleFactory::create("windows"); if(!pWindowsStyle) - pWindowsStyle = QStyleFactory::create("motif"); // even motif is better.. :D + pWindowsStyle = QStyleFactory::create("motif"); } if(pWindowsStyle) m_pConnectCurrent->setStyle(pWindowsStyle); |