diff options
| author |  Elvio Basello | 2011-01-05 22:54:21 +0000 |
|---|---|---|
| committer | Elvio Basello | 2011-01-05 22:54:21 +0000 |
| commit | 12fba74234ec39059b1043c2febcc983fd7cbaf6 (patch) | |
| tree | ae5f7f58c546feac36742c2b12ae1a36cc24d5a1 /src/modules/window/libkviwindow.cpp | |
| parent | Another fix for the options instance generation script (diff) | |
| download | KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.gz KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.bz2 KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.zip | |
reworked icon stuff
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5301 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/window/libkviwindow.cpp')
| -rw-r--r-- | src/modules/window/libkviwindow.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index edb12774a..dfc105720 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1151,10 +1151,11 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("irc_context",KVS_PT_UINT,KVS_PF_OPTIONAL,uCtx) KVSM_PARAMETER("icon",KVS_PT_INT,KVS_PF_OPTIONAL,iIcon) KVSM_PARAMETERS_END(c) - iIcon = iIcon % KVI_NUM_SMALL_ICONS; + iIcon = iIcon % KviIconManager::IconCount; int iFlags = 0; - if(szFlags.contains('i'))iFlags |= UserWindow::HasInput; + if(szFlags.contains('i')) + iFlags |= UserWindow::HasInput; KviConsoleWindow * pConsole = 0; if(c->parameterList()->count() >= 3) @@ -1166,17 +1167,18 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) } } - UserWindow * wnd = new UserWindow( + UserWindow * pWnd = new UserWindow( c->window()->frame(), szCaption.toUtf8().data(), iIcon, pConsole, iFlags); - c->window()->frame()->addWindow(wnd,!szFlags.contains('m')); - if(szFlags.contains('m'))wnd->minimize(); + c->window()->frame()->addWindow(pWnd,!szFlags.contains('m')); + if(szFlags.contains('m')) + pWnd->minimize(); - c->returnValue()->setInteger(QString(wnd->id()).toUInt()); + c->returnValue()->setInteger(QString(pWnd->id()).toUInt()); return true; } |