diff options
62 files changed, 622 insertions, 486 deletions
diff --git a/doc/TODO-docs b/doc/TODO-docs index 1a848fd08..e3bd468a1 100644 --- a/doc/TODO-docs +++ b/doc/TODO-docs @@ -298,7 +298,7 @@ videoinput.h KviHtmlGenerator.cpp KviHtmlGenerator.h KviIconManager.cpp - KviIconManager.h ++-KviIconManager.h KviInternalCommand.cpp KviInternalCommand.h KviIpcSentinel.cpp diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp index a48788dcc..dd301e440 100644 --- a/src/kvirc/kernel/KviAction.cpp +++ b/src/kvirc/kernel/KviAction.cpp @@ -84,7 +84,7 @@ void KviAction::registerAccelerator() { if(!m_szKeySequence.isEmpty()) { - m_pAccel = new QShortcut(m_szKeySequence,g_pFrame,0,0,Qt::ApplicationShortcut); + m_pAccel = new QShortcut(m_szKeySequence,g_pMainWindow,0,0,Qt::ApplicationShortcut); connect(m_pAccel,SIGNAL(activated()),this,SLOT(activate())); //no way to have Ctrl+Alt+Key events fired as no-ambiguous, probably qt bug connect(m_pAccel,SIGNAL(activatedAmbiguously()),this,SLOT(activate())); @@ -95,8 +95,8 @@ void KviAction::unregisterAccelerator() { if(m_pAccel != 0) { - if(g_pFrame) - g_pFrame->releaseShortcut(m_pAccel->id()); + if(g_pMainWindow) + g_pMainWindow->releaseShortcut(m_pAccel->id()); m_pAccel = 0; } } @@ -160,16 +160,16 @@ void KviAction::setup() connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); if(m_uFlags & InternalWindowMask) { - connect(g_pFrame,SIGNAL(activeWindowChanged()),this,SLOT(activeWindowChanged())); + connect(g_pMainWindow,SIGNAL(activeWindowChanged()),this,SLOT(activeWindowChanged())); if((m_uFlags & WindowOnlyIfUsersSelected) && (m_uFlags & (WindowChannel | WindowConsole | WindowQuery))) - connect(g_pFrame,SIGNAL(activeWindowSelectionStateChanged(bool)),this,SLOT(activeWindowSelectionStateChanged(bool))); + connect(g_pMainWindow,SIGNAL(activeWindowSelectionStateChanged(bool)),this,SLOT(activeWindowSelectionStateChanged(bool))); activeWindowChanged(); } else { if(m_uFlags & NeedsConnection) { - connect(g_pFrame,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); - connect(g_pFrame,SIGNAL(activeContextStateChanged()),this,SLOT(activeContextStateChanged())); - KviIrcContext * pContext = g_pFrame->activeContext(); + connect(g_pMainWindow,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); + connect(g_pMainWindow,SIGNAL(activeContextStateChanged()),this,SLOT(activeContextStateChanged())); + KviIrcContext * pContext = g_pMainWindow->activeContext(); if(!pContext) setEnabled(false); else { @@ -189,8 +189,8 @@ void KviAction::setup() } else { if(m_uFlags & NeedsContext) { - connect(g_pFrame,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); - if(!g_pFrame->activeContext()) + connect(g_pMainWindow,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); + if(!g_pMainWindow->activeContext()) setEnabled(false); else setEnabled(true); @@ -218,7 +218,7 @@ void KviAction::activeWindowChanged() { if(m_uFlags & NeedsContext) { - if(!g_pFrame->activeContext()) + if(!g_pMainWindow->activeContext()) { if(isEnabled()) setEnabled(false); @@ -228,7 +228,7 @@ void KviAction::activeWindowChanged() if(m_uFlags & NeedsConnection) { - switch(g_pFrame->activeContext()->state()) + switch(g_pMainWindow->activeContext()->state()) { case KviIrcContext::LoggingIn: if(!(m_uFlags & EnableAtLogin)) @@ -388,7 +388,7 @@ void KviAction::activeWindowSelectionStateChanged(bool bSelectedNow) void KviAction::activeContextChanged() { // works only if NeedsContext is specified! - KviIrcContext * pContext = g_pFrame->activeContext(); + KviIrcContext * pContext = g_pMainWindow->activeContext(); if(pContext) { if(m_uFlags & NeedsConnection) @@ -404,7 +404,7 @@ void KviAction::activeContextChanged() void KviAction::activeContextStateChanged() { - KviIrcContext * pContext = g_pFrame->activeContext(); + KviIrcContext * pContext = g_pMainWindow->activeContext(); if(pContext) { switch(pContext->state()) diff --git a/src/kvirc/kernel/KviAction.h b/src/kvirc/kernel/KviAction.h index dca0d1d08..5d2c08d89 100644 --- a/src/kvirc/kernel/KviAction.h +++ b/src/kvirc/kernel/KviAction.h @@ -129,10 +129,6 @@ public: * * It can be 0, but using a QObject will help in deleting this action :) * \param szName Internal name of this action, in form [module.]name - * - * The action name is INTERNAL: it should be never shown to the user. If it contains a dot - * then the part before the dot is considered to be a module name to be loaded when the - * module is loaded. * \param szVisibleName Permanent visible name, visible at least in the action drawer * \param szDescription What this action does * \param pCategory One of KviActionManager::category*() or 0 (default category), not owned! @@ -140,10 +136,31 @@ public: * \param szSmallIconId The small icon associated to the action (16x16) * \param uFlags The flags of the action, like needs and configuration * \param szKeySequence The shortcut to activate the action + * \note The action name is INTERNAL: it should be never shown to the user. If it + * contains a dot then the part before the dot is considered to be a module name to be + * loaded when the module is loaded. * \return KviAction */ KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory = NULL, const QString & szBigIconId = QString(), const QString & szSmallIconId = QString(), unsigned int uFlags = 0, const QString & szKeySequence = QString()); + /** + * \brief Constructs the action object + * \param pParent The parent object + * + * It can be 0, but using a QObject will help in deleting this action :) + * \param szName Internal name of this action, in form [module.]name + * \param szVisibleName Permanent visible name, visible at least in the action drawer + * \param szDescription What this action does + * \param pCategory One of KviActionManager::category*() or 0 (default category), not owned! + * \param szBigIconId The big icon associated to the action (32x32) + * \param eIcon The small icon associated to the action (16x16) + * \param uFlags The flags of the action, like needs and configuration + * \param szKeySequence The shortcut to activate the action + * \note The action name is INTERNAL: it should be never shown to the user. If it + * contains a dot then the part before the dot is considered to be a module name to be + * loaded when the module is loaded. + * \return KviAction + */ KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory = NULL, const QString & szBigIconId = QString(), const KviIconManager::SmallIcon eIcon = KviIconManager::None, unsigned int uFlags = 0, const QString & szKeySequence = QString()); /** diff --git a/src/kvirc/kernel/KviActionManager.cpp b/src/kvirc/kernel/KviActionManager.cpp index de2f1876d..456d94448 100644 --- a/src/kvirc/kernel/KviActionManager.cpp +++ b/src/kvirc/kernel/KviActionManager.cpp @@ -249,7 +249,7 @@ bool KviActionManager::registerAction(KviAction * a) if(m_pActions->find(a->name()))return false; connect(a,SIGNAL(destroyed()),this,SLOT(actionDestroyed())); m_pActions->insert(a->name(),a); - if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed! + if(g_pMainWindow)a->registerAccelerator(); // otherwise it is delayed! return true; } diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 17fbbc868..246318c5d 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -550,7 +550,7 @@ void KviApplication::setup() //KVI_SPLASH_SET_TEXT(__tr2qs("Have fun! :)")) if(KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart)) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_SERVERSJOIN_OPEN); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_SERVERSJOIN_OPEN); destroySplashScreen(); @@ -563,7 +563,7 @@ void KviApplication::setup() void KviApplication::frameDestructorCallback() { - // here we should kill anything that depends on g_pFrame, g_pActiveWindow and related being non zero... + // here we should kill anything that depends on g_pMainWindow, g_pActiveWindow and related being non zero... // kill all the objects, while we have windows... if(KviKvsKernel::instance()) @@ -592,8 +592,8 @@ KviApplication::~KviApplication() delete g_pCtcpPageDialog; // if we still have a frame: kill it - if(g_pFrame) - delete g_pFrame; + if(g_pMainWindow) + delete g_pMainWindow; g_pActiveWindow = 0; // .. but it should be already 0 anyway // execute pending deletes (this may still contain some UI elements) @@ -749,6 +749,7 @@ Let's see the scheme to understand which is choosen: if(!pWnd) return; + QString szEvent = "incomingMessage"; QString szText = __tr2qs("Message arriving from %1:\n\n").arg(pWnd->target()); szText += KviMircCntrl::stripControlBytes(szMsg); @@ -758,14 +759,15 @@ Let's see the scheme to understand which is choosen: QPixmap * pIcon = g_pIconManager->getSmallIcon(KviIconManager::KVIrc); - KNotification * pNotify = new KNotification("kvirc"); + KNotification * pNotify = new KNotification(szEvent,KNotification::CloseWhenWidgetActivated,this); pNotify->setFlags(KNotification::Persistent); + pNotify->setTitle(__tr2qs("KVIrc messaging system")); pNotify->setText(szText); pNotify->setActions(actions); pNotify->setPixmap(*pIcon); - connect(pNotify,SIGNAL(activated()),this,SLOT(slotOpenInbox())); - connect(pNotify,SIGNAL(action1Activated()),this,SLOT(slotOpenInbox())); + connect(pNotify,SIGNAL(activated()),this,SLOT(showParentFrame())); + connect(pNotify,SIGNAL(action1Activated()),this,SLOT(showParentFrame())); connect(pNotify,SIGNAL(action2Activated()),pNotify,SLOT(close())); connect(pNotify,SIGNAL(ignored()),pNotify,SLOT(close())); @@ -823,6 +825,33 @@ Let's see the scheme to understand which is choosen: #endif // COMPILE_KDE_SUPPORT } +void KviApplication::showParentFrame() +{ + if(!g_pMainWindow) + return; + + if(g_pMainWindow->isMinimized()) + { + g_pMainWindow->setWindowState(g_pMainWindow->windowState() & (~Qt::WindowMinimized | Qt::WindowActive)); + + if(KVI_OPTION_BOOL(KviOption_boolFrameIsMaximized)) + g_pMainWindow->showMaximized(); + else + g_pMainWindow->show(); + } else if(!g_pMainWindow->isVisible()) + { + //restore mainwindow + if(KVI_OPTION_BOOL(KviOption_boolFrameIsMaximized)) + g_pMainWindow->showMaximized(); + else + g_pMainWindow->show(); + } else { + qDebug("- frame is visible: maximized state=%d, hiding",g_pMainWindow->isMaximized()); + KVI_OPTION_BOOL(KviOption_boolFrameIsMaximized) = g_pMainWindow->isMaximized(); + g_pMainWindow->hide(); + } +} + QTextCodec * KviApplication::defaultTextCodec() { QTextCodec * pCodec = 0; @@ -872,7 +901,7 @@ void KviApplication::loadDefaultScript(QString szItem) #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) szCmd.replace("\\","\\\\"); #endif - KviKvsScript::run(szCmd,g_pFrame->firstConsole()); + KviKvsScript::run(szCmd,g_pMainWindow->firstConsole()); } void KviApplication::checkSuggestRestoreDefaultScript() @@ -1004,9 +1033,9 @@ void KviApplication::destroyIpcSentinel() void KviApplication::ipcMessage(char * pcMessage) { - if(!g_pFrame) + if(!g_pMainWindow) return; - KviConsoleWindow * pConsole = g_pFrame->firstConsole(); + KviConsoleWindow * pConsole = g_pMainWindow->firstConsole(); if(!pConsole) return; if(_OUTPUT_VERBOSE) @@ -1283,8 +1312,8 @@ void KviApplication::createGlobalBackgrounds(QPixmap * pix) (float)((float)KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) / (float)100), KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade))); } - if(g_pFrame - )g_pFrame->updatePseudoTransparency(); + if(g_pMainWindow) + g_pMainWindow->updatePseudoTransparency(); } #endif //COMPILE_PSEUDO_TRANSPARENCY @@ -1349,8 +1378,8 @@ void KviApplication::updatePseudoTransparency() KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) = false; //update widgets - if(g_pFrame) - g_pFrame->updatePseudoTransparency(); + if(g_pMainWindow) + g_pMainWindow->updatePseudoTransparency(); } #endif //COMPILE_PSEUDO_TRANSPARENCY } @@ -1366,7 +1395,7 @@ void KviApplication::triggerUpdateGui() void KviApplication::updateGui() { m_bUpdateGuiPending = false; - g_pFrame->applyOptions(); + g_pMainWindow->applyOptions(); } void KviApplication::updateApplicationFont() @@ -1374,12 +1403,12 @@ void KviApplication::updateApplicationFont() if(KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont)) { setFont(KVI_OPTION_FONT(KviOption_fontApplication)); - if(g_pFrame) - g_pFrame->setFont(font()); + if(g_pMainWindow) + g_pMainWindow->setFont(font()); } else { setFont(m_fntDefaultFont); - if(g_pFrame) - g_pFrame->setFont(m_fntDefaultFont); + if(g_pMainWindow) + g_pMainWindow->setFont(m_fntDefaultFont); } } @@ -1607,15 +1636,15 @@ void KviApplication::autoConnectToServers() void KviApplication::createFrame() { - if(g_pFrame) + if(g_pMainWindow) qDebug("WARNING: Creating the main frame twice!"); - g_pFrame = new KviMainWindow(); - g_pFrame->createNewConsole(true); + g_pMainWindow = new KviMainWindow(); + g_pMainWindow->createNewConsole(true); if(m_szExecAfterStartup.hasData()) { // FIXME, this should be a QString - KviKvsScript::run(m_szExecAfterStartup.ptr(),g_pFrame->firstConsole()); + KviKvsScript::run(m_szExecAfterStartup.ptr(),g_pMainWindow->firstConsole()); m_szExecAfterStartup = ""; } @@ -1626,19 +1655,19 @@ void KviApplication::createFrame() } if(KVI_OPTION_BOOL(KviOption_boolShowDockExtension)) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); if(KVI_OPTION_BOOL(KviOption_boolStartupMinimized)) - g_pFrame->showMinimized(); + g_pMainWindow->showMinimized(); else - g_pFrame->show(); + g_pMainWindow->show(); } void KviApplication::destroyFrame() { m_bClosingDown=true; - if(g_pFrame) - g_pFrame->deleteLater(); + if(g_pMainWindow) + g_pMainWindow->deleteLater(); g_pActiveWindow = 0; } @@ -1828,14 +1857,14 @@ void KviApplication::unregisterWindow(KviWindow * pWnd) KviConsoleWindow * KviApplication::activeConsole() { - if(!g_pFrame) + if(!g_pMainWindow) return 0; if(g_pActiveWindow) { if(g_pActiveWindow->console()) return g_pActiveWindow->console(); } - return g_pFrame->firstConsole(); + return g_pMainWindow->firstConsole(); } diff --git a/src/kvirc/kernel/KviApplication.h b/src/kvirc/kernel/KviApplication.h index 5e45519c2..efd88ba55 100644 --- a/src/kvirc/kernel/KviApplication.h +++ b/src/kvirc/kernel/KviApplication.h @@ -328,13 +328,6 @@ protected: void frameDestructorCallback(); void heartbeat(kvi_time_t tNow); virtual void timerEvent(QTimerEvent *e); -public slots: - // KviApplication.cpp : Slots - void saveConfiguration(); - void updateGui(); - void updatePseudoTransparency(); - void restoreDefaultScript(); - void addRecentUrl(const QString& text); private: void createSplashScreen(); void destroySplashScreen(); @@ -357,18 +350,26 @@ private: // KviApplication.cpp : GUI stuff void updateApplicationFont(); -#ifdef COMPILE_PSEUDO_TRANSPARENCY - void createGlobalBackgrounds(QPixmap * pix); - void destroyPseudoTransparency(); -#endif //COMPILE_PSEUDO_TRANSPARENCY -private: // KviApplication.cpp : parts of setup() void loadRecentEntries(); #ifndef COMPILE_NO_IPC void createIpcSentinel(); void destroyIpcSentinel(); -#endif //!COMPILE_NO_IPC +#endif // COMPILE_NO_IPC void createFrame(); + +#ifdef COMPILE_PSEUDO_TRANSPARENCY + void createGlobalBackgrounds(QPixmap * pix); + void destroyPseudoTransparency(); +#endif //COMPILE_PSEUDO_TRANSPARENCY +public slots: + // KviApplication.cpp : Slots + void saveConfiguration(); + void updateGui(); + void updatePseudoTransparency(); + void restoreDefaultScript(); + void addRecentUrl(const QString& text); + void showParentFrame(); signals: void reloadImages(); void updateNotifier(); diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp index 2a06f016d..aa391f5d2 100644 --- a/src/kvirc/kernel/KviCoreActions.cpp +++ b/src/kvirc/kernel/KviCoreActions.cpp @@ -367,7 +367,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_CASCADEWINDOWS, - g_pFrame->mdiManager(), + g_pMainWindow->mdiManager(), SLOT(cascadeMaximized()), __tr2qs("Cascade windows"), __tr2qs("Arranges the MDI windows in a maximized-cascade fashion"), @@ -379,7 +379,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_TILEWINDOWS, - g_pFrame->mdiManager(), + g_pMainWindow->mdiManager(), SLOT(tile()), __tr2qs("Tile windows"), __tr2qs("Tiles the MDI windows with the currently selected tile method"), @@ -391,7 +391,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_MINIMIZEALLWINDOWS, - g_pFrame->mdiManager(), + g_pMainWindow->mdiManager(), SLOT(minimizeAll()), __tr2qs("Minimize all windows"), __tr2qs("Minimized all the currently visible MDI windows"), @@ -403,7 +403,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_NEWIRCCONTEXT, - g_pFrame, + g_pMainWindow, SLOT(newConsole()), __tr2qs("New IRC Context"), __tr2qs("Creates a new IRC context console"), @@ -442,11 +442,11 @@ KviIrcContextDisplayAction::KviIrcContextDisplayAction(QObject * pParent) void KviIrcContextDisplayAction::setup() { KviAction::setup(); - connect(g_pFrame,SIGNAL(activeConnectionServerInfoChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionLagChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionServerInfoChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionLagChanged()),this,SLOT(activeContextStateChanged())); } bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *) @@ -552,7 +552,7 @@ void KviConnectAction::activeContextStateChanged() QPixmap * p; QString txt; - KviIrcContext * c = g_pFrame->activeContext(); + KviIrcContext * c = g_pMainWindow->activeContext(); if(c) { switch(c->state()) @@ -604,7 +604,7 @@ void KviConnectAction::setup() void KviConnectAction::activate() { - KviIrcContext * c = g_pFrame->activeContext(); + KviIrcContext * c = g_pMainWindow->activeContext(); if(c) c->connectOrDisconnect(); } @@ -612,7 +612,7 @@ void KviConnectAction::activate() bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) { if(!setupDone())setup(); - KviIrcContext * c = g_pFrame->activeContext(); + KviIrcContext * c = g_pMainWindow->activeContext(); int id; @@ -1007,7 +1007,7 @@ void KviGoAwayAction::activeContextStateChanged() QPixmap * p; QString txt; - KviIrcContext * c = g_pFrame->activeContext(); + KviIrcContext * c = g_pMainWindow->activeContext(); if(c) { if(c->state() == KviIrcContext::Connected) @@ -1052,13 +1052,13 @@ void KviGoAwayAction::setup() KviKvsAction::setup(); m_szAwayString = __tr2qs("Enter Away Mode"); m_szBackString = __tr2qs("Leave Away Mode"); - connect(g_pFrame,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pMainWindow,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); } bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) { if(!setupDone())setup(); - KviIrcContext * c = g_pFrame->activeContext(); + KviIrcContext * c = g_pMainWindow->activeContext(); int id; QString t; if(c) diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index 4d11d1598..b9312d7ac 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -41,6 +41,38 @@ #include <QIcon> #include <QDir> +/* + @doc: image_id + @title: + The image identifier + @keyterms: + image identifier, using builtin images, how kvirc locates image files + @type: + language + @short: + Semantics of the <image_id> parameter + @body: + Some KVIrc commands and functions accept + the <image_id> as a parameter. + The <image_id> indicates an image to be displayed + by some gui element. Since KVIrc has a set of + builtin icons, we want the user to be able to use it :).[br] + The <image_id> can be either a signed integer number + or a filename.[br] + If it is a signed integer it is interpreted as + index of the internal KVIrc image to use: + positive integers (starting at 0) indicate + small (16x16) icons (the ones used in the view widget).[br] + If <image_id> is anything else than a signed integer, + it is interpreted as a filename. + The filename can be an absolute file path or a relative one. + In this last case KVIrc will look for the file in a predefined set + of directories: First in the local "pics" directory (usually + in ~/kvirc-version/pics/), then in the local "incoming" directory, + then in the global "pics" directory, then in the user home (~) + and in the current directory.[br] +*/ + // KviApplication.cpp extern QPixmap * g_pUserChanStatePixmap; extern QPixmap * g_pActivityMeterPixmap; @@ -368,14 +400,14 @@ static const char * g_szIconNames[KviIconManager::IconCount] = }; KviIconWidget::KviIconWidget() -: QWidget(0 /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize*/) +: QWidget(0) { setObjectName("global_icon_widget"); init(); } -KviIconWidget::KviIconWidget(QWidget * par) -: QWidget(par) +KviIconWidget::KviIconWidget(QWidget * pPar) +: QWidget(pPar) { setObjectName("global_icon_widget"); init(); @@ -386,32 +418,33 @@ void KviIconWidget::init() setWindowTitle(__tr2qs("Icon Table")); setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::IconManager)))); - int rows = KviIconManager::IconCount / 20; - if((rows * 20) < KviIconManager::IconCount) - rows++; - QGridLayout * g = new QGridLayout(this); + int iRows = KviIconManager::IconCount / 20; + if((iRows * 20) < KviIconManager::IconCount) + iRows++; + + QGridLayout * pLayout = new QGridLayout(this); int i; - for(i = 0;i < 20;i++) + for(i = 0; i < 20; i++) { - KviCString tmp(KviCString::Format,"%d",i); - QLabel * l = new QLabel(tmp.ptr(),this); - g->addWidget(l,0,i + 1); + KviCString szTmp(KviCString::Format,"%d",i); + QLabel * pLabel = new QLabel(szTmp.ptr(),this); + pLayout->addWidget(pLabel,0,i + 1); } - for(i = 0;i < rows;i++) + for(i = 0; i < iRows; i++) { - KviCString tmp(KviCString::Format,"%d",i * 20); - QLabel * l = new QLabel(tmp.ptr(),this); - g->addWidget(l,i + 1,0); + KviCString szTmp(KviCString::Format,"%d",i * 20); + QLabel * pLabel = new QLabel(szTmp.ptr(),this); + pLayout->addWidget(pLabel,i + 1,0); } - for(i = 0;i < KviIconManager::IconCount; i++) + for(i = 0; i < KviIconManager::IconCount; i++) { - KviCString tmp(KviCString::Format,"%d",i); - QLabel * l = new QLabel(this); - l->setObjectName(tmp.ptr()); - l->setPixmap(*(g_pIconManager->getSmallIcon(i))); - g->addWidget(l,(i / 20) + 1,(i % 20) + 1); - l->installEventFilter(this); - l->setAcceptDrops(true); + KviCString szTmp(KviCString::Format,"%d",i); + QLabel * pLabel = new QLabel(this); + pLabel->setObjectName(szTmp.ptr()); + pLabel->setPixmap(*(g_pIconManager->getSmallIcon(i))); + pLabel->installEventFilter(this); + pLabel->setAcceptDrops(true); + pLayout->addWidget(pLabel,(i / 20) + 1,(i % 20) + 1); } } @@ -419,54 +452,55 @@ KviIconWidget::~KviIconWidget() { } -void KviIconWidget::closeEvent(QCloseEvent * e) +void KviIconWidget::closeEvent(QCloseEvent * pEvent) { - e->ignore(); + pEvent->ignore(); emit closed(); } -bool KviIconWidget::eventFilter(QObject * o,QEvent *e) +bool KviIconWidget::eventFilter(QObject * pObject, QEvent * pEvent) { - if(e->type() == QEvent::MouseButtonPress) + if(pEvent->type() == QEvent::MouseButtonPress) { - if(o->inherits("QLabel")) + if(pObject->inherits("QLabel")) { - KviCString szName = ((QLabel *)o)->objectName(); + KviCString szName = ((QLabel *)pObject)->objectName(); bool bOk; int iVal = szName.toInt(&bOk); - if(bOk)emit selected(iVal); + if(bOk) + emit selected(iVal); if(parentWidget() && isVisible() && parentWidget()->inherits("KviTalPopupMenu")) { parentWidget()->close(); return true; } else { - if(const QPixmap * pix = ((QLabel *)o)->pixmap()) + if(const QPixmap * pPix = ((QLabel *)pObject)->pixmap()) { - QDrag *drobj = new QDrag(this); - QMimeData *mimeData = new QMimeData; + QDrag * pDrag = new QDrag(this); + QMimeData * pMime = new QMimeData; - mimeData->setText(o->objectName()); - mimeData->setImageData(*pix); - drobj->setMimeData(mimeData); - drobj->setPixmap(*pix); + pMime->setText(pObject->objectName()); + pMime->setImageData(*pPix); + pDrag->setMimeData(pMime); + pDrag->setPixmap(*pPix); } } } - } else if(e->type() == QEvent::DragEnter) + } else if(pEvent->type() == QEvent::DragEnter) { - ((QDragEnterEvent *)e)->setAccepted(true); + ((QDragEnterEvent *)pEvent)->setAccepted(true); return true; } - return QWidget::eventFilter(o,e); + return QWidget::eventFilter(pObject,pEvent); } -KviCachedPixmap::KviCachedPixmap(QPixmap * ptr,const QString &szPath) +KviCachedPixmap::KviCachedPixmap(QPixmap * pPix, const QString & szPath) { m_szPath = szPath; m_tLastAccess = kvi_unixTime(); - m_pPixmap = ptr; + m_pPixmap = pPix; m_uSize = m_pPixmap->width() * m_pPixmap->height() * (m_pPixmap->depth() / 8); } @@ -498,14 +532,14 @@ KviIconManager::KviIconManager() m_pIconWidget = 0; - QString buffer; + QString szBuffer; // Load the userchanstate image - g_pApp->findImage(buffer,KVI_USERCHANSTATE_IMAGE_NAME); - g_pUserChanStatePixmap = new QPixmap(buffer); + g_pApp->findImage(szBuffer,KVI_USERCHANSTATE_IMAGE_NAME); + g_pUserChanStatePixmap = new QPixmap(szBuffer); - g_pApp->findImage(buffer,KVI_ACTIVITYMETER_IMAGE_NAME); - g_pActivityMeterPixmap = new QPixmap(buffer); + g_pApp->findImage(szBuffer,KVI_ACTIVITYMETER_IMAGE_NAME); + g_pActivityMeterPixmap = new QPixmap(szBuffer); m_pIconNames = 0; } @@ -515,7 +549,9 @@ KviIconManager::~KviIconManager() delete g_pUserChanStatePixmap; delete g_pActivityMeterPixmap; - if(m_pIconWidget)delete m_pIconWidget; + if(m_pIconWidget) + delete m_pIconWidget; + int i; for(i=0; i < KviIconManager::IconCount; i++) @@ -927,208 +963,181 @@ void KviIconManager::iconWidgetClosed() m_pIconWidget = 0; } -/* - @doc: image_id - @title: - The image identifier - @keyterms: - image identifier, using builtin images, how kvirc locates image files - @type: - language - @short: - Semantics of the <image_id> parameter - @body: - Some KVIrc commands and functions accept - the <image_id> as a parameter. - The <image_id> indicates an image to be displayed - by some gui element. Since KVIrc has a set of - builtin icons, we want the user to be able to use it :).[br] - The <image_id> can be either a signed integer number - or a filename.[br] - If it is a signed integer it is interpreted as - index of the internal KVIrc image to use: - positive integers (starting at 0) indicate - small (16x16) icons (the ones used in the view widget).[br] - If <image_id> is anything else than a signed integer, - it is interpreted as a filename. - The filename can be an absolute file path or a relative one. - In this last case KVIrc will look for the file in a predefined set - of directories: First in the local "pics" directory (usually - in ~/kvirc-version/pics/), then in the local "incoming" directory, - then in the global "pics" directory, then in the user home (~) - and in the current directory.[br] -*/ - -KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString &szName) +KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString & szName) { - if(szName.isEmpty())return 0; + if(szName.isEmpty()) + return 0; - KviCachedPixmap * p = m_pCachedImages->find(szName); + KviCachedPixmap * pCache = m_pCachedImages->find(szName); - if(p) + if(pCache) { - p->updateLastAccessTime(); - return p; + pCache->updateLastAccessTime(); + return pCache; } - QPixmap * pix = 0; + QPixmap * pPix = 0; QString szRetPath; if(g_pApp->findImage(szRetPath,szName)) { - pix = new QPixmap(szRetPath); - if(pix->isNull()) + pPix = new QPixmap(szRetPath); + if(pPix->isNull()) { - delete pix; // it is not an valid image!!! (really bad situation...) - pix = 0; + delete pPix; // it is not an valid image!!! (really bad situation...) + pPix = 0; return 0; } } else { return 0; } - p = new KviCachedPixmap(pix,QString(szRetPath)); - addToCache(szName,p); + pCache = new KviCachedPixmap(pPix,QString(szRetPath)); + addToCache(szName,pCache); - return p; + return pCache; } -KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &szName,int iMaxWidth,int iMaxHeight) +KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString & szName, int iMaxWidth, int iMaxHeight) { - if(szName.isEmpty())return 0; + if(szName.isEmpty()) + return 0; - KviCachedPixmap * p = m_pCachedImages->find(szName); + KviCachedPixmap * pCache = m_pCachedImages->find(szName); - if(p) + if(pCache) { - p->updateLastAccessTime(); - return p; + pCache->updateLastAccessTime(); + return pCache; } - QPixmap * pix = 0; + QPixmap * pPix = 0; QString szRetPath; if(g_pApp->findImage(szRetPath,szName)) { - pix = new QPixmap(szRetPath); - if(pix->isNull()) + pPix = new QPixmap(szRetPath); + if(pPix->isNull()) { - delete pix; // it is not an valid image!!! (really bad situation...) - pix = 0; + delete pPix; // it is not an valid image!!! (really bad situation...) + pPix = 0; return 0; } - if((pix->width() > iMaxWidth) || (pix->height() > iMaxHeight)) + if((pPix->width() > iMaxWidth) || (pPix->height() > iMaxHeight)) { // scale to fit int scaleW = iMaxWidth; int scaleH; - scaleH = (pix->height() * iMaxWidth) / pix->width(); + scaleH = (pPix->height() * iMaxWidth) / pPix->width(); if(scaleH > iMaxHeight) { scaleH = iMaxHeight; - scaleW = (scaleH * pix->width()) / pix->height(); + scaleW = (scaleH * pPix->width()) / pPix->height(); } - QImage img = pix->toImage(); - *pix = QPixmap::fromImage(img.scaled(scaleW,scaleH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)); + QImage img = pPix->toImage(); + *pPix = QPixmap::fromImage(img.scaled(scaleW,scaleH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)); } } else { return 0; } - p = new KviCachedPixmap(pix,QString(szRetPath)); - addToCache(szName,p); + pCache = new KviCachedPixmap(pPix,QString(szRetPath)); + addToCache(szName,pCache); - return p; + return pCache; } -void KviIconManager::addToCache(const QString &szName,KviCachedPixmap * p) +void KviIconManager::addToCache(const QString & szName, KviCachedPixmap * pCache) { - if((m_uCacheTotalSize + p->size()) >= m_uCacheMaxSize)cacheCleanup(); + if((m_uCacheTotalSize + pCache->size()) >= m_uCacheMaxSize) + cacheCleanup(); - m_pCachedImages->insert(szName,p); - m_uCacheTotalSize += p->size(); + m_pCachedImages->insert(szName,pCache); + m_uCacheTotalSize += pCache->size(); } -QPixmap * KviIconManager::getImage(const QString &id,bool bCanBeNumber,QString* pRetPath) +QPixmap * KviIconManager::getImage(const QString & szId, bool bCanBeNumber, QString * pszRetPath) { - if(id.isEmpty()) + if(szId.isEmpty()) return NULL; if(bCanBeNumber) { bool bOk; - int idx = id.toInt(&bOk); + int iIdx = szId.toInt(&bOk); if(bOk) { // was a number : this is not a filename - if(idx >= 0) - return getSmallIcon(idx % KviIconManager::IconCount); + if(iIdx >= 0) + return getSmallIcon(iIdx % KviIconManager::IconCount); } else { - if(id.startsWith("$icon")) + if(szId.startsWith("$icon")) { - QString szTmp = id.trimmed(); + QString szTmp = szId.trimmed(); szTmp.replace("$icon(",""); szTmp.replace(")",""); szTmp = szTmp.trimmed(); szTmp.replace("\"",""); - idx = getSmallIconIdFromName(szTmp.trimmed()); - if(idx >= 0) - return getSmallIcon(idx % KviIconManager::IconCount); + iIdx = getSmallIconIdFromName(szTmp.trimmed()); + if(iIdx >= 0) + return getSmallIcon(iIdx % KviIconManager::IconCount); } } } - KviCachedPixmap * p = getPixmapWithCache(id); - if(!p) + KviCachedPixmap * pCache = getPixmapWithCache(szId); + if(!pCache) return NULL; - if(pRetPath) - *pRetPath = p->path(); + if(pszRetPath) + *pszRetPath = pCache->path(); - return p->pixmap(); + return pCache->pixmap(); } - -QPixmap * KviIconManager::getBigIcon(const QString &szName) +QPixmap * KviIconManager::getBigIcon(const QString & szName) { - QPixmap * p = getPixmap(szName); - if(p)return p; + QPixmap * pPix = getPixmap(szName); + if(pPix) + return pPix; bool bOk; - int idx = szName.toInt(&bOk); - if(bOk && (idx >= 0)) + int iIdx = szName.toInt(&bOk); + if(bOk && (iIdx >= 0)) { // was a number : this is not a filename // it was a small icon: scale it and cache it - QString tmpName = szName; - tmpName += ".scaled16to32"; - p = getPixmap(tmpName); - if(p)return p; - p = getSmallIcon(idx % KviIconManager::IconCount); - if(p) + QString szTmpName = szName; + szTmpName += ".scaled16to32"; + pPix = getPixmap(szTmpName); + if(pPix) + return pPix; + pPix = getSmallIcon(iIdx % KviIconManager::IconCount); + if(pPix) { - QImage tmpi = p->toImage(); - QImage tmp2 = tmpi.scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); - QPixmap *pix=new QPixmap(); - *pix = QPixmap::fromImage(tmp2); - KviCachedPixmap * cp = new KviCachedPixmap(pix,QString()); - addToCache(tmpName,cp); - return cp->pixmap(); + QImage tmp = pPix->toImage(); + QImage tmp2 = tmp.scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); + QPixmap * pPix2 = new QPixmap(); + *pPix2 = QPixmap::fromImage(tmp2); + KviCachedPixmap * pCache = new KviCachedPixmap(pPix2,QString()); + addToCache(szTmpName,pCache); + return pCache->pixmap(); } } - p = getPixmap("kvi_bigicon_unknown.png"); - if(p)return p; - KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(32,32),QString()); - addToCache(szName,cp); - return cp->pixmap(); + pPix = getPixmap("kvi_bigicon_unknown.png"); + if(pPix) + return pPix; + KviCachedPixmap * pCache = new KviCachedPixmap(new QPixmap(32,32),QString()); + addToCache(szName,pCache); + return pCache->pixmap(); } -void KviIconManager::urlToCachedFileName(QString &szFName) +void KviIconManager::urlToCachedFileName(QString & szFName) { szFName.replace(":","_"); szFName.replace(";","_"); @@ -1143,15 +1152,15 @@ void KviIconManager::urlToCachedFileName(QString &szFName) //cut filenames to 255 chars, trying to preserve file name/extension (bug #616) if(szFName.size()>255) { - QString ext = szFName.right(55); + QString szExt = szFName.right(55); szFName.truncate(200); - szFName.append(ext); + szFName.append(szExt); } } -KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString &szName) +KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString & szName) { - QString szP,szN; + QString szP, szN; if(szLocalPath.isEmpty()) { @@ -1188,31 +1197,31 @@ KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString & //if(!p)return 0; - KviAvatar* result = 0; + KviAvatar * pResult = 0; if(KviFileUtils::fileExists(szP)) { if(KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)) { - result = new KviAvatar(szP,szN, - QSize( - KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadWidth), - KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadHeight) - ) - ); + pResult = new KviAvatar(szP,szN, + QSize( + KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadWidth), + KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadHeight) + ) + ); } else { - result = new KviAvatar(szP,szN); + pResult = new KviAvatar(szP,szN); } } //Can't load it - if(result && !result->isValid()) + if(pResult && !pResult->isValid()) { - delete result; - result = 0; + delete pResult; + pResult = 0; } - return result; + return pResult; } void KviIconManager::clearCache() @@ -1225,30 +1234,27 @@ void KviIconManager::reloadImages() clearCache(); for(int i=0; i < KviIconManager::IconCount; i++) { - if(m_smallIcons[i])delete m_smallIcons[i]; + if(m_smallIcons[i]) + delete m_smallIcons[i]; m_smallIcons[i] = 0; } } -QPixmap * KviIconManager::loadSmallIcon(int idx) +QPixmap * KviIconManager::loadSmallIcon(int iIdx) { - if(idx >= KviIconManager::IconCount) + if(iIdx >= KviIconManager::IconCount) return 0; - if(idx < 0) + if(iIdx < 0) return 0; QString szPath; - QString buffer; - KviQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[idx]); + QString szBuffer; + KviQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[iIdx]); - g_pApp->findSmallIcon(buffer,szPath); - m_smallIcons[idx] = new QPixmap(buffer); + g_pApp->findSmallIcon(szBuffer,szPath); + m_smallIcons[iIdx] = new QPixmap(szBuffer); - //if(m_smallIcon[idx]->isNull()) - //{ - // // load an "unknown" image ?.. but should never happen - //} - return m_smallIcons[idx]; + return m_smallIcons[iIdx]; } void KviIconManager::cacheCleanup() diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h index 554a9b885..1fc522b73 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -35,8 +35,6 @@ #include <QObject> #include <QWidget> - - #define KVI_BIGICON_DISCONNECTED "kvi_bigicon_disconnected.png" #define KVI_BIGICON_CONNECTING "kvi_bigicon_connecting.png" #define KVI_BIGICON_CONNECTED "kvi_bigicon_connected.png" @@ -75,65 +73,119 @@ #define KVI_REFRESH_IMAGE_NAME "kvi_icon_refresh.png" -class KviIconManager; - class KVIRC_API KviCachedPixmap { public: - // the pixmap MUST be allocated with new QPixmap() - // this calss takes the ownership - KviCachedPixmap(QPixmap * ptr,const QString &szPath); + /** + * \brief Constructs the KviCachedPixmap object + * \param pPix The image object + * \param szPath The path of the image + * \warning The pixmap MUST be allocated with new QPixmap(). This calss takes the ownership + * \return KviCachedPixmap + */ + KviCachedPixmap(QPixmap * pPix, const QString & szPath); + + /** + * \brief Destroys the KviCachedPixmap object + */ ~KviCachedPixmap(); private: - QString m_szPath; - kvi_time_t m_tLastAccess; - QPixmap * m_pPixmap; - unsigned int m_uSize; + QString m_szPath; + kvi_time_t m_tLastAccess; + QPixmap * m_pPixmap; + unsigned int m_uSize; public: - QPixmap * pixmap(){ return m_pPixmap; }; + /** + * \brief Returns the image + * \return QPixmap * + */ + QPixmap * pixmap(){ return m_pPixmap; }; + + /** + * \brief Returns the path of the image + * \return const QString & + */ const QString & path(){ return m_szPath; }; - unsigned int size(){ return m_uSize; }; - kvi_time_t lastAccessTime(){ return m_tLastAccess; }; - void updateLastAccessTime(); + + /** + * \brief Returns the size of the image + * \return unsigned int + */ + unsigned int size(){ return m_uSize; }; + + /** + * \brief Returns the time the image was last accessed + * \return kvi_time_t + */ + kvi_time_t lastAccessTime(){ return m_tLastAccess; }; + + /** + * \brief Updates the time the image was last accessed + * \return void + */ + void updateLastAccessTime(); }; class KVIRC_API KviIconWidget : public QWidget { Q_OBJECT public: + /** + * \brief Constructs the icon table widget + * \return KviIconWidget + */ KviIconWidget(); - KviIconWidget(QWidget * par); + + /** + * \brief Constructs the icon table widget + * \param pPar The parent object + * \return KviIconWidget + */ + KviIconWidget(QWidget * pPar); + + /** + * \brief Destroys the icon table widget + */ ~KviIconWidget(); protected: + /** + * \brief Initializes the table containing the icons + * \return void + */ void init(); - virtual void closeEvent(QCloseEvent *e); - virtual bool eventFilter(QObject * o,QEvent *e); + virtual void closeEvent(QCloseEvent * pEvent); + virtual bool eventFilter(QObject * pObject, QEvent * pEvent); signals: + /** + * \brief Emitted when we close the table widget + * \return void + */ void closed(); + + /** + * \brief Emitted when we select an icon from the table + * \param iIcon The index of the icon selected + * \return void + */ void selected(int iIcon); }; - -// -// This class manages the images used by KVIrc. -// -// We handle three types of images: builtin small icons, builtin big icons and generic images. -// -// The builtin small icons are in the pics/coresmall directory (this is to optimize the directory size -// since it's a linear search...), are 16x16 in size and are indexed by numbers in a way that their -// access is really fast. The icons used here are used mostly in KviIrcView (but not exclusively). -// -// The generic images are just "any" image that the underlying Qt engine -// is able to load. They are loaded by (relative) path and -// cached by name. -// -// The builtin big icons are (actually) just generic images -// that are eventually scaled to 32x32 if needed. One can request -// a builtin small icon indexed by number to be scaled -// to the size of 32x32 as a big icon too. -// - +/** +* \class KviIconManager +* \brief This class manages the images used by KVIrc. +* +* We handle three types of images: builtin small icons, builtin big icons and generic images. +* The builtin small icons are in the pics/coresmall directory (this is to optimize the directory +* size since it's a linear search...), are 16x16 in size and are indexed by numbers in a way that +* their access is really fast. The icons used here are used mostly in KviIrcView (but not +* exclusively). +* The builtin big icons are (actually) just generic images that are eventually scaled to 32x32 +* if needed. One can request a builtin small icon indexed by number to be scaled to the size of +* 32x32 as a big icon too. +* The generic images are just "any" image that the underlying Qt engine is able to load. They are +* loaded by (relative) path and cached by name. +*/ class KVIRC_API KviIconManager : public QObject { Q_OBJECT @@ -494,22 +546,53 @@ public: // a default 32x32 image is returned QPixmap * getBigIcon(const QString & szName); - // this one never fails... if the icon isn't there - // then a default 16x16 image is returned + /** + * \brief Returns the small icon + * \param eIcon The icon to get + * \note This one never fails... if the icon isn't there, then a default 16x16 image + * is returned + * \return QPixmap * + */ QPixmap * getSmallIcon(SmallIcon eIcon){ return eIcon < IconCount ? (m_smallIcons[eIcon] ? m_smallIcons[eIcon] : loadSmallIcon(eIcon) ) : 0; }; - // provided for convenience + /** + * \brief Returns the small icon + * \param iIcon The icon to get + * \note This one never fails... if the icon isn't there, then a default 16x16 image + * is returned. This is provided for convenience + * \return QPixmap * + */ QPixmap * getSmallIcon(int iIcon){ return iIcon < IconCount ? (m_smallIcons[iIcon] ? m_smallIcons[iIcon] : loadSmallIcon(iIcon)) : 0; }; - KviIconManager::SmallIcon iconName(int iIcon); - + /** + * \brief Returns the name of the small icon + * \param eIcon The icon to get + * \return const char * + */ const char * getSmallIconName(SmallIcon eIcon); - // provided for convenience + /** + * \brief Returns the name of the small icon + * \param iIcon The icon to get + * \note This is provided for convenience + * \return const char * + */ const char * getSmallIconName(int iIcon); + /** + * \brief Returns the name of the small icon + * \param iIcon The icon to get + * \return KviIconManager::SmallIcon + */ + KviIconManager::SmallIcon iconName(int iIcon); + QString getSmallIconResourceName(SmallIcon eIcon); + /** + * \brief Returns the index of the small icon + * \param szName The name of the icon + * \return int + */ int getSmallIconIdFromName(const QString & szName); // if szLocalPath is empty then szName can be the identification diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index 7b76ae001..b3ed02b62 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -112,7 +112,7 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarg KviIrcConnection::~KviIrcConnection() { if(m_bIdentdAttached) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); m_bIdentdAttached = false; if(m_pLocalhostDns) @@ -300,7 +300,7 @@ void KviIrcConnection::start() m_eState = Connecting; if(KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolUseIdentServiceOnlyOnConnect)) { - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_START); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_START); m_bIdentdAttached=true; } m_pLink->start(); @@ -502,7 +502,7 @@ void KviIrcConnection::linkTerminated() { if(m_bIdentdAttached) { - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); m_bIdentdAttached=false; } m_eState = Idle; @@ -533,7 +533,7 @@ void KviIrcConnection::linkAttemptFailed(int iError) { if(m_bIdentdAttached) { - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); m_bIdentdAttached=false; } m_eState = Idle; @@ -1453,7 +1453,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) if(m_bIdentdAttached) { - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); m_bIdentdAttached = false; } diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp index f2a680cb9..74c39f713 100644 --- a/src/kvirc/kernel/KviIrcUrl.cpp +++ b/src/kvirc/kernel/KviIrcUrl.cpp @@ -285,15 +285,15 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsoleWindow* pConsol if(pConsole) { if(pConsole->connectionInProgress()) { - pConsole = g_pFrame->firstNotConnectedConsole(); + pConsole = g_pMainWindow->firstNotConnectedConsole(); if(!pConsole) { - pConsole = g_pFrame->createNewConsole(); + pConsole = g_pMainWindow->createNewConsole(); } } } else { - pConsole = g_pFrame->firstNotConnectedConsole(); + pConsole = g_pMainWindow->firstNotConnectedConsole(); if(!pConsole) { - pConsole = g_pFrame->createNewConsole(); + pConsole = g_pMainWindow->createNewConsole(); } } } @@ -321,7 +321,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsoleWindow* pConsol ( server->useSSL() != parts.bSsl ) || ( server->isIPv6() != parts.bIPv6) ) { // New server, try to reconnect - KviKvsScript::run(szCommand,(contextSpec & TryCurrentContext) ? g_pFrame->createNewConsole() : pConsole); + KviKvsScript::run(szCommand,(contextSpec & TryCurrentContext) ? g_pMainWindow->createNewConsole() : pConsole); return parts.iError; } else { // the same server, but probably new chanlist diff --git a/src/kvirc/kernel/KviLagMeter.cpp b/src/kvirc/kernel/KviLagMeter.cpp index 675cbb338..6e1ffd097 100644 --- a/src/kvirc/kernel/KviLagMeter.cpp +++ b/src/kvirc/kernel/KviLagMeter.cpp @@ -85,7 +85,7 @@ void KviLagMeter::timerEvent(QTimerEvent *) if((m_uLag / 10) != (m_uLastEmittedLag / 10)) { m_uLastEmittedLag = m_uLag; - g_pFrame->childConnectionLagChange(m_pConnection); + g_pMainWindow->childConnectionLagChange(m_pConnection); KviCString szLag(KviCString::Format,"%u",m_uLag); diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 52e2278cb..c1ec252d4 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -1335,10 +1335,10 @@ void KviApplication::optionResetUpdate(int flags) if(flags & KviOption_resetRestartIdentd) { if(g_iIdentDaemonRunningUsers) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_STOP); if(KVI_OPTION_BOOL(KviOption_boolUseIdentService) && !KVI_OPTION_BOOL(KviOption_boolUseIdentServiceOnlyOnConnect)) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_START); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_START); } if(flags & KviOption_resetUpdateGui) @@ -1348,7 +1348,7 @@ void KviApplication::optionResetUpdate(int flags) if(flags & KviOption_resetUpdateWindowList) { - g_pFrame->recreateWindowList(); + g_pMainWindow->recreateWindowList(); } if(flags & KviOption_resetRestartNotifyList) diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 426883885..2de80cf16 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -826,9 +826,9 @@ namespace KviKvsCoreFunctions Q_UNUSED(__pContext); Q_UNUSED(__pParams); - if (g_pFrame->mainStatusBar()) + if (g_pMainWindow->mainStatusBar()) { - QList<QWidget *> widgets = g_pFrame->mainStatusBar()->findChildren<QWidget *>(); + QList<QWidget *> widgets = g_pMainWindow->mainStatusBar()->findChildren<QWidget *>(); KVSCF_pRetBuffer->setInteger(widgets.count()); } else KVSCF_pRetBuffer->setInteger(0); diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp index 4a6aa613a..3dbf1ee8f 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp @@ -467,7 +467,7 @@ namespace KviKvsCoreFunctions Q_UNUSED(__pContext); Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(g_pFrame->isActiveWindow()); + KVSCF_pRetBuffer->setBoolean(g_pMainWindow->isActiveWindow()); return true; } @@ -492,7 +492,7 @@ namespace KviKvsCoreFunctions Q_UNUSED(__pContext); Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(g_pFrame->isMinimized()); + KVSCF_pRetBuffer->setBoolean(g_pMainWindow->isMinimized()); return true; } diff --git a/src/kvirc/module/KviMexToolBar.cpp b/src/kvirc/module/KviMexToolBar.cpp index 98b504930..c844650ad 100644 --- a/src/kvirc/module/KviMexToolBar.cpp +++ b/src/kvirc/module/KviMexToolBar.cpp @@ -29,10 +29,10 @@ KviMexToolBar::KviMexToolBar(KviModuleExtensionDescriptor * pDesc, const QString & szName) : KviToolBar(szName,Qt::TopToolBarArea), KviModuleExtension(pDesc) { - g_pFrame->registerModuleExtensionToolBar(this); + g_pMainWindow->registerModuleExtensionToolBar(this); } KviMexToolBar::~KviMexToolBar() { - g_pFrame->unregisterModuleExtensionToolBar(this); + g_pMainWindow->unregisterModuleExtensionToolBar(this); } diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp index d2b3b8c66..7efdbc792 100644 --- a/src/kvirc/module/KviModuleManager.cpp +++ b/src/kvirc/module/KviModuleManager.cpp @@ -261,7 +261,7 @@ bool KviModuleManager::loadModule(const QString &modName) // be verbose if needed....just make sure that we're not shutting down... if(_OUTPUT_VERBOSE && !g_pApp->kviClosingDown()) { - if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, + if(g_pMainWindow)g_pMainWindow->firstConsole()->output(KVI_OUT_VERBOSE, __tr2qs("Loaded module '%s' (%s)"),modName.toUtf8().data(),szName.toUtf8().data()); } return true; @@ -298,7 +298,7 @@ bool KviModuleManager::unloadModule(KviModule * module) if(_OUTPUT_VERBOSE && !g_pApp->kviClosingDown()) { - if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, + if(g_pMainWindow)g_pMainWindow->firstConsole()->output(KVI_OUT_VERBOSE, __tr2qs("Unloaded module '%s'"),szModName.toUtf8().data()); } return true; diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index 44e0a7160..47357fedd 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -205,7 +205,7 @@ void KviConsoleWindow::triggerCreationEvents() KVS_TRIGGER_EVENT_0(KviEvent_OnKVIrcStartup,this); if(KVI_OPTION_BOOL(KviOption_boolShowTipAtStartup)) - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TIP_OPEN); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TIP_OPEN); } if(m_iFlags & KVI_CONSOLE_FLAG_FIRSTINFRAME) @@ -476,7 +476,7 @@ void KviConsoleWindow::connectionDetached() void KviConsoleWindow::closeEvent(QCloseEvent *e) { - if(g_pFrame->consoleCount() > 1) + if(g_pMainWindow->consoleCount() > 1) { // there are other consoles beside this one if(context()->state() == KviIrcContext::Connected) diff --git a/src/kvirc/ui/KviDebugWindow.cpp b/src/kvirc/ui/KviDebugWindow.cpp index 965698891..ef48e4e9f 100644 --- a/src/kvirc/ui/KviDebugWindow.cpp +++ b/src/kvirc/ui/KviDebugWindow.cpp @@ -42,12 +42,12 @@ KviDebugWindow * KviDebugWindow::m_pInstance = 0; KviDebugWindow::KviDebugWindow() -: KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) +: KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pMainWindow,__tr2qs("Debug Messages"),0) { m_pInstance = this; m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); - m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); + m_pIrcView = new KviIrcView(m_pSplitter,g_pMainWindow,this); m_pInput = new KviInput(this,0); updateCaption(); } @@ -61,7 +61,7 @@ KviDebugWindow * KviDebugWindow::getInstance() { if(m_pInstance)return m_pInstance; m_pInstance = new KviDebugWindow(); - g_pFrame->addWindow(m_pInstance,!KVI_OPTION_BOOL(KviOption_boolShowMinimizedDebugWindow)); + g_pMainWindow->addWindow(m_pInstance,!KVI_OPTION_BOOL(KviOption_boolShowMinimizedDebugWindow)); if(KVI_OPTION_BOOL(KviOption_boolShowMinimizedDebugWindow)) m_pInstance->minimize(); return m_pInstance; diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index 764a00e37..aac89edb4 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -255,7 +255,7 @@ void KviInputEditor::paintEvent(QPaintEvent *) p.restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); + QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pMainWindow, contentsRect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); p.drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp index 72ffd7e1e..e67c26862 100644 --- a/src/kvirc/ui/KviIrcToolBar.cpp +++ b/src/kvirc/ui/KviIrcToolBar.cpp @@ -196,7 +196,7 @@ void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) pa.restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapTo(g_pFrame, rect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()); + QPoint pnt = mapTo(g_pMainWindow, rect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()); pa.drawTiledPixmap(rect(),*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 35e7f4378..83e46d33f 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -1050,7 +1050,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) pa.restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, r.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, r.topLeft()); + QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pMainWindow, r.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, r.topLeft()); pa.drawTiledPixmap(r,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index a832b9a63..5ed58e459 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -87,12 +87,12 @@ // Declared and managed by KviApplication (KviApplication.cpp) extern KviConfigurationFile * g_pWinPropertiesConfig; -KVIRC_API KviMainWindow * g_pFrame = 0; // the one and only frame object +KVIRC_API KviMainWindow * g_pMainWindow = 0; // the one and only frame object KviMainWindow::KviMainWindow() : KviTalMainWindow(0,"kvirc_frame") { - g_pFrame = this; + g_pMainWindow = this; setAutoFillBackground(false); setAttribute(Qt::WA_TranslucentBackground); //disable this flag that gets enabled by qt when using Qt::WA_TranslucentBackground @@ -129,7 +129,7 @@ KviMainWindow::KviMainWindow() setStatusBar(m_pStatusBar); // torque: moved out of status bar constructor // because module init functions exectued in load() - // couldn't access the status bar via g_pFrame->mainStatusBar() + // couldn't access the status bar via g_pMainWindow->mainStatusBar() // (assignment of m_pStatusBar happened after load() and // the init function) m_pStatusBar->load(); @@ -234,7 +234,7 @@ KviMainWindow::~KviMainWindow() delete m_pWinList; - g_pFrame = 0; + g_pMainWindow = 0; g_pApp->quit(); } diff --git a/src/kvirc/ui/KviMainWindow.h b/src/kvirc/ui/KviMainWindow.h index c04624f1a..013352307 100644 --- a/src/kvirc/ui/KviMainWindow.h +++ b/src/kvirc/ui/KviMainWindow.h @@ -238,7 +238,7 @@ private: }; #ifndef _KVI_FRAME_CPP_ - extern KVIRC_API KviMainWindow * g_pFrame; + extern KVIRC_API KviMainWindow * g_pMainWindow; #endif #endif //_KVI_FRAME_H_ diff --git a/src/kvirc/ui/KviMdiManager.cpp b/src/kvirc/ui/KviMdiManager.cpp index 7504f59c8..a9a995ee0 100644 --- a/src/kvirc/ui/KviMdiManager.cpp +++ b/src/kvirc/ui/KviMdiManager.cpp @@ -107,14 +107,14 @@ void KviMdiManager::paintEvent(QPaintEvent * e) return; } else if(g_pShadedParentGlobalDesktopBackground) { - QPoint pnt = viewport()->mapTo(g_pFrame, e->rect().topLeft() + scrollBarsOffset()); + QPoint pnt = viewport()->mapTo(g_pMainWindow, e->rect().topLeft() + scrollBarsOffset()); p.drawTiledPixmap(e->rect(),*(g_pShadedParentGlobalDesktopBackground), pnt); return; } #endif if(KVI_OPTION_PIXMAP(KviOption_pixmapMdiBackground).pixmap()) { - QPoint pnt = viewport()->mapTo(g_pFrame, e->rect().topLeft() + scrollBarsOffset()); + QPoint pnt = viewport()->mapTo(g_pMainWindow, e->rect().topLeft() + scrollBarsOffset()); p.drawTiledPixmap(e->rect(),*(KVI_OPTION_PIXMAP(KviOption_pixmapMdiBackground).pixmap()), pnt); } else { p.fillRect(e->rect(),KVI_OPTION_COLOR(KviOption_colorMdiBackground)); @@ -621,10 +621,10 @@ void KviMdiManager::slotSubWindowActivated(QMdiSubWindow * pMdiChild) { if(pMdiChild) { - if(((KviMdiChild*)pMdiChild)->client() && g_pFrame->isActiveWindow()) + if(((KviMdiChild*)pMdiChild)->client() && g_pMainWindow->isActiveWindow()) { //qDebug("subwindowactivated %p %s",pMdiChild, ((KviMdiChild*)pMdiChild)->plainCaption().toUtf8().data()); - g_pFrame->childWindowActivated((KviWindow *)((KviMdiChild*)pMdiChild)->client()); + g_pMainWindow->childWindowActivated((KviWindow *)((KviMdiChild*)pMdiChild)->client()); } else { //qDebug("(inactive) subwindowactivated %p %s",pMdiChild, ((KviMdiChild*)pMdiChild)->plainCaption().toUtf8().data()); } @@ -652,12 +652,12 @@ bool KviMdiManager::eventFilter(QObject *obj, QEvent *event) // While in sdi mode, avoid qt4's internal window switching if(keyEvent->key() == Qt::Key_Tab) { - if(event->type() == QEvent::KeyRelease) g_pFrame->switchToNextWindow(); + if(event->type() == QEvent::KeyRelease) g_pMainWindow->switchToNextWindow(); return true; } if(keyEvent->key() == Qt::Key_Backtab) { - if(event->type() == QEvent::KeyRelease) g_pFrame->switchToPrevWindow(); + if(event->type() == QEvent::KeyRelease) g_pMainWindow->switchToPrevWindow(); return true; } } diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index e0590e1e9..aa96819bf 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -234,7 +234,7 @@ void KviMenuBar::setupMainPopup() #ifndef COMPILE_ON_MAC main->insertSeparator(); - main->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pFrame,SLOT(close())); + main->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pMainWindow,SLOT(close())); #endif //COMPILE_ON_MAC } diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp index d91e251e2..fedb9c5c4 100644 --- a/src/kvirc/ui/KviThemedComboBox.cpp +++ b/src/kvirc/ui/KviThemedComboBox.cpp @@ -121,7 +121,7 @@ void KviThemedComboBox::paintEvent ( QPaintEvent * event ) p->fillRect(contentsRect(), col); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); + QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pMainWindow, contentsRect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt); } delete p; diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp index 2cb9d1260..5062c069c 100644 --- a/src/kvirc/ui/KviThemedLabel.cpp +++ b/src/kvirc/ui/KviThemedLabel.cpp @@ -85,7 +85,7 @@ void KviThemedLabel::paintEvent(QPaintEvent *e) p->fillRect(contentsRect(), col); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); + QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pMainWindow, contentsRect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt); } delete p; diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp index f45be7bea..90e68ce56 100644 --- a/src/kvirc/ui/KviThemedLineEdit.cpp +++ b/src/kvirc/ui/KviThemedLineEdit.cpp @@ -109,7 +109,7 @@ void KviThemedLineEdit::paintEvent ( QPaintEvent * event ) { QPoint pnt; if(m_pKviWindow) - pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); + pnt = m_pKviWindow->mdiParent() ? mapTo(g_pMainWindow, contentsRect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft()); else pnt = mapToGlobal(event->rect().topLeft()); p->drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt); diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp index 56cc30b18..391810aba 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.cpp +++ b/src/kvirc/ui/KviThemedTreeWidget.cpp @@ -81,7 +81,7 @@ void KviThemedTreeWidget::paintEvent(QPaintEvent *e) p->fillRect(viewport()->contentsRect(), col); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pKviWindow->mdiParent() ? viewport()->mapTo(g_pFrame, contentsRect().topLeft() + viewport()->contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(m_pKviWindow, contentsRect().topLeft() + viewport()->contentsRect().topLeft()); + QPoint pnt = m_pKviWindow->mdiParent() ? viewport()->mapTo(g_pMainWindow, contentsRect().topLeft() + viewport()->contentsRect().topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(m_pKviWindow, contentsRect().topLeft() + viewport()->contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt); } delete p; diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp index 86f6c61ee..1cb20a1c5 100644 --- a/src/kvirc/ui/KviToolBar.cpp +++ b/src/kvirc/ui/KviToolBar.cpp @@ -39,7 +39,7 @@ static KviTalPopupMenu * g_pToolBarPositionsPopup = 0; KviToolBar::KviToolBar(const QString & szLabel, Qt::ToolBarArea type, bool bNewLine, const char * pcName) -: KviTalToolBar(szLabel,g_pFrame,type,bNewLine,pcName) +: KviTalToolBar(szLabel,g_pMainWindow,type,bNewLine,pcName) { } @@ -82,7 +82,7 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) g_pToolBarPositionsPopup->clear(); g_pToolBarWindowsPopup->clear(); - g_pFrame->fillToolBarsPopup(g_pToolBarWindowsPopup); + g_pMainWindow->fillToolBarsPopup(g_pToolBarWindowsPopup); g_pToolBarContextPopup->insertItem(__tr2qs("Toolbars"),g_pToolBarWindowsPopup); g_pToolBarContextPopup->insertItem(__tr2qs("Icon Size"),g_pToolBarIconSizesPopup); @@ -95,12 +95,12 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) void KviToolBar::setBigIcons() { - g_pFrame->setUsesBigPixmaps(true); + g_pMainWindow->setUsesBigPixmaps(true); } void KviToolBar::setSmallIcons() { - g_pFrame->setUsesBigPixmaps(false); + g_pMainWindow->setUsesBigPixmaps(false); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp index 630f9227b..6290d3098 100644 --- a/src/kvirc/ui/KviTreeWindowList.cpp +++ b/src/kvirc/ui/KviTreeWindowList.cpp @@ -110,18 +110,18 @@ void KviTreeWindowListItem::unhighlight() m_iHighlightLevel = 0; setData(0, KVI_TTBID_HIGHLIGHT, m_iHighlightLevel); - if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension())g_pMainWindow->dockExtension()->refresh(); } void KviTreeWindowListItem::highlight(int iLevel) { if(iLevel <= m_iHighlightLevel)return; - if(treeWidget()->currentItem() == this && g_pFrame->isActiveWindow())return; + if(treeWidget()->currentItem() == this && g_pMainWindow->isActiveWindow())return; m_iHighlightLevel = iLevel; setData(0, KVI_TTBID_HIGHLIGHT, m_iHighlightLevel); - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); } void KviTreeWindowListItem::setProgress(int progress) @@ -246,7 +246,7 @@ void KviTreeWindowListTreeWidget::mousePressEvent(QMouseEvent *e) //left click activate/deactivate window if((g_pActiveWindow != wnd) || (wnd->isMinimized())) { - g_pFrame->setActiveWindow(wnd); + g_pMainWindow->setActiveWindow(wnd); } else wnd->minimize(); } @@ -311,7 +311,7 @@ void KviTreeWindowListTreeWidget::paintEvent(QPaintEvent * event) p->restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapTo(g_pFrame, rect.topLeft()); + QPoint pnt = mapTo(g_pMainWindow, rect.topLeft()); p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif @@ -440,7 +440,7 @@ void KviTreeWindowList::setActiveItem(KviWindowListItem * it) } ((KviTreeWindowListItem *)it)->setActive(true); - if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension())g_pMainWindow->dockExtension()->refresh(); } } diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index 3a44cc3c0..00af6c027 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -761,7 +761,7 @@ void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry { m_iSelectedCount++; if(m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pKviWindow,true); } } @@ -1150,7 +1150,7 @@ void KviUserListView::select(const QString & szNick) m_iSelectedCount = 0; } - g_pFrame->childWindowSelectionStateChange(m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pKviWindow,true); m_pViewArea->update(); } @@ -1252,7 +1252,7 @@ bool KviUserListView::partInternal(const QString & szNick, bool bRemoveDefinitiv { m_iSelectedCount--; if(m_iSelectedCount == 0) - g_pFrame->childWindowSelectionStateChange(m_pKviWindow,false); + g_pMainWindow->childWindowSelectionStateChange(m_pKviWindow,false); } if(pUserEntry->m_pPrev) pUserEntry->m_pPrev->m_pNext = pUserEntry->m_pNext; @@ -1400,7 +1400,7 @@ void KviUserListView::removeAllEntries() if(m_iSelectedCount != 0) { m_iSelectedCount = 0; - g_pFrame->childWindowSelectionStateChange(m_pKviWindow,false); + g_pMainWindow->childWindowSelectionStateChange(m_pKviWindow,false); } m_pViewArea->m_iTopItemOffset = 0; @@ -1727,7 +1727,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) p.restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = m_pListView->window()->mdiParent() ? mapTo(g_pFrame, r.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pListView->window(), r.topLeft()); + QPoint pnt = m_pListView->window()->mdiParent() ? mapTo(g_pMainWindow, r.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : mapTo(m_pListView->window(), r.topLeft()); p.drawTiledPixmap(r,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif @@ -2035,7 +2035,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent * e) pEntry->m_bSelected = true; if(m_pListView->m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else if(e->modifiers() & Qt::ControlModifier) { @@ -2046,9 +2046,9 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent * e) pEntry->m_bSelected = !pEntry->m_bSelected; if(m_pListView->m_iSelectedCount == 0) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,false); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,false); else if(m_pListView->m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else { // Single select mode @@ -2067,7 +2067,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent * e) m_pListView->m_iSelectedCount = 1; if(!bThereWasSelection) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } } @@ -2090,7 +2090,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent * e) } } if(m_pListView->m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } m_pListView->emitRightClick(); @@ -2149,7 +2149,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) m_pListView->ensureVisible(pNick->nick()); } } - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else if(e->key() == Qt::Key_Down) { @@ -2197,7 +2197,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) m_pListView->ensureVisible(pNick->nick()); } } - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else if(e->key() == Qt::Key_PageUp) { @@ -2257,7 +2257,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) if(pNick) m_pListView->ensureVisible(pNick->nick()); } - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else if(e->key() == Qt::Key_PageDown) { @@ -2317,7 +2317,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) if(pNick) m_pListView->ensureVisible(pNick->nick()); } - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else if(e->matches(QKeySequence::SelectAll)) { KviUserListEntry * pAux = m_pListView->m_pHeadItem; @@ -2327,7 +2327,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e) pAux = pAux->m_pNext; } - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); } else { QString szKey = e->text(); @@ -2434,9 +2434,9 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent * e) else m_pListView->m_iSelectedCount++; pEntry->m_bSelected = ! pEntry->m_bSelected; if(m_pListView->m_iSelectedCount == 0) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,false); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,false); else if(m_pListView->m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); m_pLastEntryUnderMouse=pEntry; } else { @@ -2452,7 +2452,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent * e) m_pListView->m_iSelectedCount++; pCurEntry->m_bSelected = true; if(m_pListView->m_iSelectedCount == 1) - g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); + g_pMainWindow->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); } } } diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index 1088bfaef..82b77a2a1 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -380,14 +380,14 @@ void KviWindow::createWindowListItem() { if(m_pWindowListItem) return; - m_pWindowListItem = g_pFrame->m_pWindowList->addItem(this); + m_pWindowListItem = g_pMainWindow->m_pWindowList->addItem(this); } void KviWindow::destroyWindowListItem() { if(m_pWindowListItem) { - g_pFrame->m_pWindowList->removeItem(m_pWindowListItem); + g_pMainWindow->m_pWindowList->removeItem(m_pWindowListItem); m_pWindowListItem = 0; } } @@ -822,10 +822,10 @@ void KviWindow::savePropertiesAsDefault() if(!KviQString::equalCI(group,typeString())) { // save also the settings for THIS specialized window - g_pFrame->saveWindowProperties(this,group); + g_pMainWindow->saveWindowProperties(this,group); } - g_pFrame->saveWindowProperties(this,typeString()); + g_pMainWindow->saveWindowProperties(this,typeString()); } void KviWindow::contextPopup() @@ -835,13 +835,13 @@ void KviWindow::contextPopup() void KviWindow::undock() { - g_pFrame->undockWindow(this); + g_pMainWindow->undockWindow(this); } void KviWindow::dock() { - g_pFrame->dockWindow(this); - g_pFrame->setActiveWindow(this); + g_pMainWindow->dockWindow(this); + g_pMainWindow->setActiveWindow(this); } void KviWindow::delayedAutoRaise() @@ -870,13 +870,13 @@ void KviWindow::delayedClose() void KviWindow::closeEvent(QCloseEvent *e) { e->ignore(); - if(g_pFrame) + if(g_pMainWindow) { - g_pFrame->childWindowCloseRequest(this); + g_pMainWindow->childWindowCloseRequest(this); } else { - /* In kvi_app destructor, g_pFrame gets deleted before modules gets unloaded. + /* In kvi_app destructor, g_pMainWindow gets deleted before modules gets unloaded. * So if a module tries to destroy a kviwindow while it gets unloaded, we end up here, - * having to delete this window without the help of g_pFrame. + * having to delete this window without the help of g_pMainWindow. * So we have 3 choices: * 1) delete this => will just print a qt warning "don't delete things on their event handler" * 2) deleteLater() => will tipically create an infinite recursion in the module unload routine @@ -920,7 +920,7 @@ void KviWindow::activateSelf() if(mdiParent()) mdiParent()->activate(); - g_pFrame->childWindowActivated(this); + g_pMainWindow->childWindowActivated(this); } void KviWindow::setFocus() diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index e4588d01c..e44299956 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -63,7 +63,7 @@ extern QPixmap * g_pActivityMeterPixmap; // KviWindowListBase::KviWindowListBase() -: QDockWidget(__tr2qs("Window List"),g_pFrame) +: QDockWidget(__tr2qs("Window List"),g_pMainWindow) { // FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseWindowListActivityMeter) setObjectName(__tr2qs("windowlist")); @@ -147,7 +147,7 @@ void KviWindowListBase::switchWindow(bool bNext,bool bInContextOnly,bool bHighli continue; if(bInContextOnly && it->kviWindow()->console() != cons) continue; - g_pFrame->setActiveWindow(it->kviWindow()); + g_pMainWindow->setActiveWindow(it->kviWindow()); return; } } @@ -236,7 +236,7 @@ void KviWindowListButton::mousePressEvent(QMouseEvent *e) { m_pWindow->delayedClose(); } else { - if((g_pActiveWindow != m_pWindow) || (m_pWindow->isMinimized()))g_pFrame->setActiveWindow(m_pWindow); + if((g_pActiveWindow != m_pWindow) || (m_pWindow->isMinimized()))g_pMainWindow->setActiveWindow(m_pWindow); else m_pWindow->minimize(); } } else m_pWindow->contextPopup(); @@ -446,8 +446,8 @@ void KviWindowListButton::unhighlight() if(m_iHighlightLevel < 1) return; m_iHighlightLevel = 0; - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); update(); } @@ -455,11 +455,11 @@ void KviWindowListButton::highlight(int iLevel) { if(iLevel <= m_iHighlightLevel) return; - if(m_bActive && g_pFrame->isActiveWindow()) + if(m_bActive && g_pMainWindow->isActiveWindow()) return; m_iHighlightLevel = iLevel; - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); update(); if(m_bActive) return; @@ -583,8 +583,8 @@ KviWindowListItem * KviClassicWindowList::addItem(KviWindow * wnd) insertButton(b); b->show(); doLayout(); - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); /* if(b->width() < m_pBase->width()) m_pBase->setMinimumWidth(b->width()); if(b->height() < m_pBase->height()) m_pBase->setMinimumWidth(b->height());*/ return b; @@ -596,8 +596,8 @@ bool KviClassicWindowList::removeItem(KviWindowListItem * it) { m_pButtonList->removeRef((KviWindowListButton *)it); doLayout(); - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); } return true; } @@ -610,8 +610,8 @@ void KviClassicWindowList::setActiveItem(KviWindowListItem * it) { b->setActive(((KviWindowListButton *)it) == b); } - if(g_pFrame->dockExtension()) - g_pFrame->dockExtension()->refresh(); + if(g_pMainWindow->dockExtension()) + g_pMainWindow->dockExtension()->refresh(); } } @@ -640,7 +640,7 @@ void KviClassicWindowList::doLayout() totCount -= btnsInRow; } - if(isFloating() || ((g_pFrame->dockWidgetArea(this) != Qt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != Qt::TopDockWidgetArea))) + if(isFloating() || ((g_pMainWindow->dockWidgetArea(this) != Qt::BottomDockWidgetArea) && (g_pMainWindow->dockWidgetArea(this) != Qt::TopDockWidgetArea))) { QDockWidget::DockWidgetFeatures f = features(); if(f & QDockWidget::DockWidgetVerticalTitleBar) diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp index aab1f7835..b4c058318 100644 --- a/src/modules/actioneditor/libkviactioneditor.cpp +++ b/src/modules/actioneditor/libkviactioneditor.cpp @@ -71,8 +71,8 @@ static bool actioneditor_module_can_unload(KviModule *) static bool actioneditor_module_cleanup(KviModule *) { - if(g_pActionEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pActionEditorWindow); + if(g_pActionEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pActionEditorWindow); g_pActionEditorWindow = 0; return true; } diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index aa7adfb3c..460463cff 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -350,9 +350,9 @@ void AddonManagementDialog::display(bool bTopLevel) m_pInstance->setParent(0); } } else { - if(m_pInstance->parent() != g_pFrame->splitter()) + if(m_pInstance->parent() != g_pMainWindow->splitter()) { - m_pInstance->setParent(g_pFrame->splitter()); + m_pInstance->setParent(g_pMainWindow->splitter()); } } } else { @@ -360,7 +360,7 @@ void AddonManagementDialog::display(bool bTopLevel) { m_pInstance = new AddonManagementDialog(0); } else { - m_pInstance = new AddonManagementDialog(g_pFrame->splitter()); + m_pInstance = new AddonManagementDialog(g_pMainWindow->splitter()); } } m_pInstance->show(); diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp index ffa63d704..2819371df 100644 --- a/src/modules/aliaseditor/libkvialiaseditor.cpp +++ b/src/modules/aliaseditor/libkvialiaseditor.cpp @@ -75,8 +75,8 @@ static bool aliaseditor_module_can_unload(KviModule * ) static bool aliaseditor_module_cleanup(KviModule *) { - if(g_pAliasEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pAliasEditorWindow); + if(g_pAliasEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pAliasEditorWindow); g_pAliasEditorWindow = 0; return true; } diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index ddcad53bc..f6a2bc75c 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -202,7 +202,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c) if(szAvatar.isEmpty()) { - KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString(),c->window()->connection()); + KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pMainWindow,QString(),c->window()->connection()); d->show(); return true; } diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp index a45256029..9090f67b8 100644 --- a/src/modules/classeditor/libkviclasseditor.cpp +++ b/src/modules/classeditor/libkviclasseditor.cpp @@ -74,8 +74,8 @@ static bool classeditor_module_can_unload(KviModule *) static bool classeditor_module_cleanup(KviModule *) { - if(g_pClassEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pClassEditorWindow); + if(g_pClassEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pClassEditorWindow); g_pClassEditorWindow = 0; return true; } diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index 75f4fee08..3b68b7660 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -472,7 +472,7 @@ static bool context_kvs_fnc_list(KviKvsModuleFunctionCall * c) { KviKvsArray * pArray = new KviKvsArray(); - KviPointerList<KviWindow> * pWinList = g_pFrame->windowList(); + KviPointerList<KviWindow> * pWinList = g_pMainWindow->windowList(); int idx = 0; for(KviWindow * pWnd = pWinList->first();pWnd;pWnd = pWinList->next()) { diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index 8e9e1b0a3..920756e21 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -1228,7 +1228,7 @@ void DccFileTransfer::fillContextPopup(KviTalPopupMenu * m) void DccFileTransfer::configureBandwidth() { if(m_pBandwidthDialog)return; - m_pBandwidthDialog = new DccFileTransferBandwidthDialog(g_pFrame,this); + m_pBandwidthDialog = new DccFileTransferBandwidthDialog(g_pMainWindow,this); connect(m_pBandwidthDialog,SIGNAL(destroyed()),this,SLOT(bandwidthDialogDestroyed())); m_pBandwidthDialog->setModal(true); m_pBandwidthDialog->show(); diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index 6ed7b541a..ff2366ef9 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -46,7 +46,7 @@ static bool editor_module_cleanup(KviModule *) { /* * This causes 2 crashes: one in KviApplication destructor (closing windows needs - * g_pFrame, that is deleted before this unloading routine) and the second in + * g_pMainWindow, that is deleted before this unloading routine) and the second in * the codetester window (it deletes us in its denstructor, and we tries to back-delete it) * So it's commented out by now.. */ diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp index 5f69b618f..cbde52a4c 100644 --- a/src/modules/eventeditor/libkvieventeditor.cpp +++ b/src/modules/eventeditor/libkvieventeditor.cpp @@ -73,8 +73,8 @@ static bool eventeditor_module_can_unload(KviModule *) static bool eventeditor_module_cleanup(KviModule *) { - if(g_pEventEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pEventEditorWindow); + if(g_pEventEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pEventEditorWindow); g_pEventEditorWindow = 0; return true; } diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index b73fef112..18575bd21 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -193,7 +193,7 @@ void FileTransferWidget::paintEvent(QPaintEvent * event) p->restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = g_pFileTransferWindow->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(g_pFileTransferWindow, rect.topLeft()); + QPoint pnt = g_pFileTransferWindow->mdiParent() ? viewport()->mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(g_pFileTransferWindow, rect.topLeft()); p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif @@ -561,7 +561,7 @@ void FileTransferWindow::openFilePopupActivated(int id) KUrl url; url.setPath(tmp); lst.append(url); - KRun::run(*((*itOffers).data()),lst,g_pFrame); + KRun::run(*((*itOffers).data()),lst,g_pMainWindow); break; } idx++; @@ -599,7 +599,7 @@ void FileTransferWindow::openLocalFileTerminal() tmp.prepend("konsole --workdir=\""); tmp.append("\""); - KRun::runCommand(tmp,g_pFrame); + KRun::runCommand(tmp,g_pMainWindow); #endif //COMPILE_KDE_SUPPORT #endif } @@ -656,7 +656,7 @@ void FileTransferWindow::openLocalFile() url.setPath(tmp); lst.append(url); - KRun::run(*offer, lst, g_pFrame); + KRun::run(*offer, lst, g_pMainWindow); #endif //COMPILE_KDE_SUPPORT #endif } @@ -684,7 +684,7 @@ void FileTransferWindow::openLocalFileWith() KUrl url; url.setPath(tmp); lst.append(url); - KRun::displayOpenWithDialog(lst,g_pFrame); + KRun::displayOpenWithDialog(lst,g_pMainWindow); #endif //COMPILE_KDE_SUPPORT #endif } @@ -730,7 +730,7 @@ void FileTransferWindow::openLocalFileFolder() KUrl url; url.setPath(tmp); lst.append(url); - KRun::run(*offer,lst,g_pFrame); + KRun::run(*offer,lst,g_pMainWindow); #endif //COMPILE_KDE_SUPPORT #endif } diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index 680960929..fde213de0 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -55,8 +55,8 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio } } - g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pFrame); - g_pFrame->addWindow(g_pFileTransferWindow,!bCreateMinimized); + g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pMainWindow); + g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized); if(bCreateMinimized)g_pFileTransferWindow->minimize(); return g_pFileTransferWindow; } @@ -133,8 +133,8 @@ static bool filetransferwindow_module_init(KviModule * m) static bool filetransferwindow_module_cleanup(KviModule *) { - if(g_pFileTransferWindow && g_pFrame) - g_pFrame->closeWindow(g_pFileTransferWindow); + if(g_pFileTransferWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pFileTransferWindow); g_pFileTransferWindow = 0; return true; } diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 85d485128..af49c3e62 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -108,7 +108,7 @@ void KviIOGraphWindow::paintEvent(QPaintEvent * e) p.restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mdiParent() ? mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : rect.topLeft(); + QPoint pnt = mdiParent() ? mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : rect.topLeft(); p.drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif @@ -300,8 +300,8 @@ static KviModuleExtension * iograph_extension_alloc(KviModuleExtensionAllocStruc } } - g_pIOGraphWindow = new KviIOGraphWindow(s->pDescriptor,g_pFrame,"IOGraph Window"); - g_pFrame->addWindow(g_pIOGraphWindow,!bCreateMinimized); + g_pIOGraphWindow = new KviIOGraphWindow(s->pDescriptor,g_pMainWindow,"IOGraph Window"); + g_pMainWindow->addWindow(g_pIOGraphWindow,!bCreateMinimized); if(bCreateMinimized)g_pIOGraphWindow->minimize(); return g_pIOGraphWindow; @@ -342,8 +342,8 @@ static bool iograph_module_init(KviModule *m) static bool iograph_module_cleanup(KviModule *) { - if(g_pIOGraphWindow && g_pFrame) - g_pFrame->closeWindow(g_pIOGraphWindow); + if(g_pIOGraphWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pIOGraphWindow); g_pIOGraphWindow = 0; return true; } diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 720abb57c..62b25f3a1 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -159,7 +159,7 @@ LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lp w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); layout->addWidget(w,11,1); - m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); + m_pIrcView = new KviIrcView(m_pSplitter,g_pMainWindow,this); m_pIrcView->setMaxBufferSize(INT_MAX); m_pIrcView->setFocusPolicy(Qt::ClickFocus); diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp index 7d0af7c04..66e63cefa 100644 --- a/src/modules/logview/libkvilogview.cpp +++ b/src/modules/logview/libkvilogview.cpp @@ -100,8 +100,8 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc } } - g_pLogViewWindow = new LogViewWindow(s->pDescriptor,g_pFrame); - g_pFrame->addWindow(g_pLogViewWindow,!bCreateMinimized); + g_pLogViewWindow = new LogViewWindow(s->pDescriptor,g_pMainWindow); + g_pMainWindow->addWindow(g_pLogViewWindow,!bCreateMinimized); if(bCreateMinimized)g_pLogViewWindow->minimize(); return g_pLogViewWindow; } @@ -142,8 +142,8 @@ static bool logview_module_init(KviModule * m) static bool logview_module_cleanup(KviModule *) { - if(g_pLogViewWindow && g_pFrame) - g_pFrame->closeWindow(g_pLogViewWindow); + if(g_pLogViewWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pLogViewWindow); g_pLogViewWindow = 0; return true; } diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp index 85835cac0..f3feb53ff 100644 --- a/src/modules/objects/KvsObject_dialog.cpp +++ b/src/modules/objects/KvsObject_dialog.cpp @@ -70,7 +70,7 @@ KVSO_END_CONSTRUCTOR(KvsObject_dialog) bool KvsObject_dialog::init(KviKvsRunTimeContext *,KviKvsVariantList *) { QWidget * w = g_pApp->activeModalWidget(); - if(!w)w = g_pFrame; + if(!w)w = g_pMainWindow; QDialog * d = new QDialog(parentScriptWidget() ? parentScriptWidget() : w); d->setObjectName(getName()); //d->setModal(true); diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp index 8a9eb15a7..38a3246e0 100644 --- a/src/modules/objects/KvsObject_dockWindow.cpp +++ b/src/modules/objects/KvsObject_dockWindow.cpp @@ -77,7 +77,7 @@ KVSO_END_DESTRUCTOR(KvsObject_dockWindow) bool KvsObject_dockWindow::init(KviKvsRunTimeContext *,KviKvsVariantList *) { - QDockWidget * pWidget = new QDockWidget(g_pFrame); + QDockWidget * pWidget = new QDockWidget(g_pMainWindow); pWidget->setObjectName(getName()); setObject(pWidget); return true; @@ -163,12 +163,12 @@ KVSO_CLASS_FUNCTION(dockWindow,dock) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("dock",KVS_PT_STRING,0,szDock) KVSO_PARAMETERS_END(c) - g_pFrame->removeDockWidget(_pDockWindow); + g_pMainWindow->removeDockWidget(_pDockWindow); if(szDock.indexOf('m',Qt::CaseInsensitive) == -1)_pDockWindow->setFloating(false); - if(szDock.indexOf('t',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow); - else if(szDock.indexOf('l',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow); - else if(szDock.indexOf('r',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow); - else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow); + if(szDock.indexOf('t',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow); + else if(szDock.indexOf('l',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow); + else if(szDock.indexOf('r',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow); + else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow); else if(szDock.indexOf('f',Qt::CaseInsensitive) != -1)_pDockWindow->setFloating(true); else if(szDock.indexOf('m',Qt::CaseInsensitive) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4"); else c->warning(__tr2qs_ctx("Invalid dock area specified","objects")); diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index c0598b7ae..83eeef790 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -1995,15 +1995,15 @@ KVSO_CLASS_FUNCTION(widget,insertIntoStatusBar) { CHECK_INTERNAL_POINTER(widget()) qDebug("instertinto"); - if (g_pFrame->mainStatusBar()) - g_pFrame->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0); + if (g_pMainWindow->mainStatusBar()) + g_pMainWindow->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0); return true; } KVSO_CLASS_FUNCTION(widget,removeFromStatusBar) { CHECK_INTERNAL_POINTER(widget()) - g_pFrame->statusBar()->removeWidget(widget()); + g_pMainWindow->statusBar()->removeWidget(widget()); return true; } @@ -2020,7 +2020,7 @@ KVSO_CLASS_FUNCTION(widget,setWebView) m_pWebview = new QWebView(widget()); m_pWebview->load(QUrl(szUrl)); m_pWebview->show(); - //if (widget()) g_pFrame->statusBar()->removeWidget(widget()); + //if (widget()) g_pMainWindow->statusBar()->removeWidget(widget()); return true; } #endif //COMPILE_WEBKIT_SUPPORT diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp index 49d54f1c6..28435f1ce 100644 --- a/src/modules/options/OptionsWidget_tray.cpp +++ b/src/modules/options/OptionsWidget_tray.cpp @@ -79,7 +79,7 @@ void OptionsWidget_tray::setEnabled(bool) else m_pLevelsGroup->setEnabled(false); - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); } else { m_pCloseInTray->setEnabled(false); m_pEnableFlashing->setEnabled(false); @@ -91,7 +91,7 @@ void OptionsWidget_tray::setEnabled(bool) m_pLevelBasedNotify->setChecked(false); m_pLevelsGroup->setChecked(false); - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE); + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE); } } diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp index 6db24dc08..e405e44e3 100644 --- a/src/modules/popupeditor/libkvipopupeditor.cpp +++ b/src/modules/popupeditor/libkvipopupeditor.cpp @@ -72,8 +72,8 @@ static bool popupeditor_module_can_unload(KviModule *) static bool popupeditor_module_cleanup(KviModule *) { - if(g_pPopupEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pPopupEditorWindow); + if(g_pPopupEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pPopupEditorWindow); g_pPopupEditorWindow = 0; return true; } diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp index 2ebf9ebf1..350c3fbbe 100644 --- a/src/modules/raweditor/libkviraweditor.cpp +++ b/src/modules/raweditor/libkviraweditor.cpp @@ -71,8 +71,8 @@ static bool raweditor_module_can_unload(KviModule *) static bool raweditor_module_cleanup(KviModule *) { - if(g_pRawEditorWindow && g_pFrame) - g_pFrame->closeWindow(g_pRawEditorWindow); + if(g_pRawEditorWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pRawEditorWindow); g_pRawEditorWindow = 0; return true; } diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index 7235d5878..4045db69b 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -57,8 +57,8 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension } } - g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pFrame); - g_pFrame->addWindow(g_pSharedFilesWindow,!bCreateMinimized); + g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pMainWindow); + g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized); if(bCreateMinimized)g_pSharedFilesWindow->minimize(); return g_pSharedFilesWindow; } @@ -131,8 +131,8 @@ static bool sharedfileswindow_module_init(KviModule * m) static bool sharedfileswindow_module_cleanup(KviModule *) { - if(g_pSharedFilesWindow && g_pFrame) - g_pFrame->closeWindow(g_pSharedFilesWindow); + if(g_pSharedFilesWindow && g_pMainWindow) + g_pMainWindow->closeWindow(g_pSharedFilesWindow); g_pSharedFilesWindow = 0; return true; } diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index 681ac076c..89844cc7d 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -380,14 +380,14 @@ namespace ThemeFunctions { if(bMaximizeFrame) { - if(g_pFrame->isMaximized()) + if(g_pMainWindow->isMaximized()) bMaximizeFrame = false; } if(bMaximizeFrame) - g_pFrame->showMaximized(); + g_pMainWindow->showMaximized(); - QPixmap pix = QPixmap::grabWidget(g_pFrame); + QPixmap pix = QPixmap::grabWidget(g_pMainWindow); bool bResult = true; if(pix.isNull()) @@ -398,7 +398,7 @@ namespace ThemeFunctions } if(bMaximizeFrame) - g_pFrame->showNormal(); + g_pMainWindow->showNormal(); return bResult; } } diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index a94b1ff04..3366ea871 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -235,9 +235,9 @@ void ThemeManagementDialog::display(bool bTopLevel) m_pInstance->setParent(0); } } else { - if(m_pInstance->parent() != g_pFrame->splitter()) + if(m_pInstance->parent() != g_pMainWindow->splitter()) { - m_pInstance->setParent(g_pFrame->splitter()); + m_pInstance->setParent(g_pMainWindow->splitter()); } } } else { @@ -245,7 +245,7 @@ void ThemeManagementDialog::display(bool bTopLevel) { m_pInstance = new ThemeManagementDialog(0); } else { - m_pInstance = new ThemeManagementDialog(g_pFrame->splitter()); + m_pInstance = new ThemeManagementDialog(g_pMainWindow->splitter()); } } m_pInstance->show(); @@ -349,8 +349,8 @@ void ThemeManagementDialog::installFromFile() void ThemeManagementDialog::getMoreThemes() { - if(!g_pFrame)return; - g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES); + if(!g_pMainWindow)return; + g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES); } void ThemeManagementDialog::saveCurrentTheme() diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp index e79fc482a..f5e7aed1e 100644 --- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp +++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp @@ -537,9 +537,9 @@ void CustomizeToolBarsDialog::display(bool bTopLevel) m_pInstance->setParent(0); } } else { - if(m_pInstance->parent() != g_pFrame->splitter()) + if(m_pInstance->parent() != g_pMainWindow->splitter()) { - m_pInstance->setParent(g_pFrame->splitter()); + m_pInstance->setParent(g_pMainWindow->splitter()); } } } else { @@ -547,7 +547,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel) { m_pInstance = new CustomizeToolBarsDialog(0); } else { - m_pInstance = new CustomizeToolBarsDialog(g_pFrame->splitter()); + m_pInstance = new CustomizeToolBarsDialog(g_pMainWindow->splitter()); } } m_pInstance->show(); diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp index 60e71993d..6dfa6c708 100644 --- a/src/modules/torrent/libkvitorrent.cpp +++ b/src/modules/torrent/libkvitorrent.cpp @@ -878,8 +878,8 @@ static bool torrent_module_init(KviModule *m) TorrentInterface::select(0); - if (g_pFrame->mainStatusBar()) - StatusBarApplet::selfRegister(g_pFrame->mainStatusBar()); + if (g_pMainWindow->mainStatusBar()) + StatusBarApplet::selfRegister(g_pMainWindow->mainStatusBar()); if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto") diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index acec41bd7..facd669bf 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -110,7 +110,7 @@ TrayIcon::TrayIcon(KviMainWindow * frm) id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::TrayIcon)),__tr2qs("Un&dock"),this,SLOT(executeInternalCommand(bool))); id->setData(KVI_INTERNALCOMMAND_TRAYICON_HIDE); - id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pFrame,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q)); + id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pMainWindow,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q)); connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup())); diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index d9bb68f6c..7266b237a 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -123,7 +123,7 @@ void UrlDialogTreeWidget::paintEvent(QPaintEvent * event) p->restore(); } else if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = ((KviWindow*)parent())->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo((KviWindow*)parent(), rect.topLeft()); + QPoint pnt = ((KviWindow*)parent())->mdiParent() ? viewport()->mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : viewport()->mapTo((KviWindow*)parent(), rect.topLeft()); p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt); } else { #endif @@ -160,7 +160,7 @@ KviUrlAction::~KviUrlAction() // ---------------------------- CLASS URLDIALOG ------------------------begin // UrlDialog::UrlDialog(KviPointerList<KviUrl> *) - :KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List") + :KviWindow(KVI_WINDOW_TYPE_TOOL,g_pMainWindow,"URL List") { setAutoFillBackground(false); @@ -323,7 +323,7 @@ void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point) p.insertSeparator(); m_pListPopup = new KviTalPopupMenu(0,"list"); - for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next()) + for(KviWindow *w=g_pMainWindow->windowList()->first();w;w=g_pMainWindow->windowList()->next()) { if ((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || @@ -355,7 +355,7 @@ void UrlDialog::sayToWin(QAction * act) KviQString::escapeKvs(&szWindow); QString say=QString("PRIVMSG %1 %2").arg(szWindow, szUrl); KviKvsScript::run(say,wnd); - g_pFrame->setActiveWindow(wnd); + g_pMainWindow->setActiveWindow(wnd); } else { QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),__tr2qs("Window not found."),QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton); } @@ -743,7 +743,7 @@ bool urllist() if (tmpitem->dlg) return false; tmpitem->dlg = new UrlDialog(g_pList); - g_pFrame->addWindow(tmpitem->dlg); + g_pMainWindow->addWindow(tmpitem->dlg); for(KviUrl *tmp=g_pList->first();tmp;tmp=g_pList->next()) { |