From 520c72bcce05dfa532cff1a0bcc665ca2406df54 Mon Sep 17 00:00:00 2001 From: Noldor Date: Thu, 22 May 2008 21:46:20 +0000 Subject: options module QT4 port (wip) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1843 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/options/container.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/modules/options/container.cpp') diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index 19b7e3d0d..e6d7dc8be 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -33,13 +33,15 @@ #include #include #include +#include extern KviOptionsInstanceManager * g_pOptionsInstanceManager; KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal) -: QDialog(par,"container","options") +: QDialog(par) { + setObjectName("container"); m_pOptionsWidget = 0; setModal(bModal); } @@ -53,7 +55,8 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) { QGridLayout * g = new QGridLayout(this); - g->addMultiCellWidget(w,0,0,0,2); + g->addWidget(w,0,0,1,3); + //g->addMultiCellWidget(w,0,0,0,2); QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); @@ -74,11 +77,11 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) g->setRowStretch(0,1); g->setColumnStretch(0,1); - KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->className()); + KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className()); if(e) { //KviStr caption(KviStr::Format,"%s - KVIrc",e->szName); - setIcon(*(g_pIconManager->getSmallIcon(e->iIcon))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon)))); setWindowTitle(e->szName); } m_pOptionsWidget = w; -- cgit v1.3.1-10-gc9f91