diff options
Diffstat (limited to 'src/modules')
21 files changed, 5 insertions, 284 deletions
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index d8d8a04f2..af74506fd 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -107,22 +107,6 @@ void KviCodeTesterWindow::resizeEvent(QResizeEvent *) void KviCodeTesterWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Script Tester","editor"); - - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); - - m_szHtmlActiveCaption = p1; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += p2; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += p3; - - m_szHtmlInactiveCaption = p1; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += p2; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += p3; } void KviCodeTesterWindow::getConfigGroupName(QString &szName) diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a5ff51837..621d4ab34 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -279,11 +279,6 @@ void KviDccChat::fillCaptionBuffers() m_pDescriptor->szNick).arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort); m_szPlainTextCaption = tmp; - - m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.toUtf8().data()); - m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.toUtf8().data()); } QPixmap * KviDccChat::myIconPtr() diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 4bec06344..ac4bd6fa5 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -799,11 +799,6 @@ void KviDccVoice::fillCaptionBuffers() m_pDescriptor->szLocalFileName.toUtf8().data()); m_szPlainTextCaption = tmp; - - m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.ptr()); - m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.ptr()); } QPixmap * KviDccVoice::myIconPtr() diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index ab0819a05..5380019d3 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -559,22 +559,6 @@ void KviEventEditorWindow::resizeEvent(QResizeEvent *) void KviEventEditorWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Event Editor","editor"); - - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); - - m_szHtmlActiveCaption = p1; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += p2; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += p3; - - m_szHtmlInactiveCaption = p1; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += p2; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += p3; } void KviEventEditorWindow::getConfigGroupName(QString &szName) diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index d8d5e3591..9a98af481 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -807,18 +807,6 @@ QSize KviFileTransferWindow::sizeHint() const void KviFileTransferWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("File Transfers","filetransferwindow"); - - m_szHtmlActiveCaption = "<nobr><font color=\""; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += "\"><b>"; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += "</b></font></nobr>"; - - m_szHtmlInactiveCaption = "<nobr><font color=\""; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += "\"><b>"; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += "</b></font></nobr>"; } void KviFileTransferWindow::die() diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 71de0855d..8074c625e 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -279,18 +279,6 @@ void KviHelpWindow::resizeEvent(QResizeEvent *) void KviHelpWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs("Help Browser"); - - m_szHtmlActiveCaption = "<nobr><font color=\""; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += "\"><b>"; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += "</b></font></nobr>"; - - m_szHtmlInactiveCaption = "<nobr><font color=\""; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += "\"><b>"; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += "</b></font></nobr>"; } diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 3587d6046..badc4e89a 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -69,18 +69,6 @@ void KviIOGraphWindow::resizeEvent(QResizeEvent *) void KviIOGraphWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs("I/O Traffic Graph"); - - m_szHtmlActiveCaption = "<nobr><font color=\""; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += "\"><b>"; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += "</b></font></nobr>"; - - m_szHtmlInactiveCaption = "<nobr><font color=\""; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += "\"><b>"; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += "</b></font></nobr>"; } void KviIOGraphWindow::die() diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 35613e370..923a46b2f 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -158,22 +158,6 @@ QSize KviLinksWindow::sizeHint() const void KviLinksWindow::fillCaptionBuffers() { KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Links for %Q [IRC Context %u]"),&m_szRootServer,m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlActiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data(), - &m_szRootServer, - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toUtf8().data(), - m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlInactiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data(), - &m_szRootServer, - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toUtf8().data(), - m_pConsole->context()->id()); } void KviLinksWindow::die() diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 9352b3436..9ce19644e 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -305,20 +305,6 @@ QSize KviListWindow::sizeHint() const void KviListWindow::fillCaptionBuffers() { KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Channel List [IRC Context %u]"),m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlActiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Channel List</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data(), - m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlInactiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Channel list</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data(), - m_pConsole->context()->id()); } void KviListWindow::die() diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index fff5c1cb3..eb94e28b6 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -205,14 +205,6 @@ void KviLogViewMDIWindow::resizeEvent(QResizeEvent *) void KviLogViewMDIWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview"); - - m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data()); - m_szHtmlActiveCaption.append(m_szPlainTextCaption); - m_szHtmlActiveCaption.append("</b></font></nobr>"); - - m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data()); - m_szHtmlInactiveCaption.append(m_szPlainTextCaption); - m_szHtmlInactiveCaption.append("</b></font></nobr>"); } void KviLogViewMDIWindow::die() diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index ecdec5347..114769457 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -256,11 +256,6 @@ KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(QWi return new KviThemeTransparencyOptionsWidget(parent); } -KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(QWidget * parent) -{ - return new KviThemeMdiCaptionsOptionsWidget(parent); -} - KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(QWidget * parent) { return new KviThemeMdiAreaOptionsWidget(parent); @@ -570,8 +565,6 @@ static const char * g_szName_KviThemeGeneralOptionsWidget = KVI_OPTIONS_WIDGET_N static const char * g_szClassName_KviThemeGeneralOptionsWidget = "KviThemeGeneralOptionsWidget"; static const char * g_szName_KviThemeTransparencyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget; static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "KviThemeTransparencyOptionsWidget"; -static const char * g_szName_KviThemeMdiCaptionsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget; -static const char * g_szClassName_KviThemeMdiCaptionsOptionsWidget = "KviThemeMdiCaptionsOptionsWidget"; static const char * g_szName_KviThemeMdiAreaOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget; static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "KviThemeMdiAreaOptionsWidget"; static const char * g_szName_KviThemeToolBarAppletsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget; @@ -1853,40 +1846,6 @@ KviOptionsInstanceManager::KviOptionsInstanceManager() e0->pChildList = 0; e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeMdiCaptionsOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeMdiCaptionsOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeMdiCaptionsOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeMdiCaptionsOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; e0->createProc = &classKviThemeMdiAreaOptionsWidget_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_KviThemeMdiAreaOptionsWidget; diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index c861c552e..63539a00d 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -152,28 +152,6 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(QWidget * parent) -: KviOptionsWidget(parent) -{ - createLayout(); - - addColorSelector(0,0,0,0,__tr2qs_ctx("Active Background","options"),KviOption_colorMdiCaptionActive); - addColorSelector(0,1,0,1,__tr2qs_ctx("Inactive Background","options"),KviOption_colorMdiCaptionInactive); - addColorSelector(0,2,0,2,__tr2qs_ctx("Active Text (Primary)","options"),KviOption_colorCaptionTextActive); - addColorSelector(0,3,0,3,__tr2qs_ctx("Active Text (Secondary)","options"),KviOption_colorCaptionTextActive2); - addColorSelector(0,4,0,4,__tr2qs_ctx("Inactive Text (Primary)","options"),KviOption_colorCaptionTextInactive); - addColorSelector(0,5,0,5,__tr2qs_ctx("Inactive Text (Secondary)","options"),KviOption_colorCaptionTextInactive2); - - addRowSpacer(0,6,0,6); -} - -KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget() -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) { diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h index f21d6509e..da19fc819 100644 --- a/src/modules/options/optw_interfacelookglobal.h +++ b/src/modules/options/optw_interfacelookglobal.h @@ -70,20 +70,6 @@ protected slots: void enableGlobalBackgroundPixmapSelector(bool); }; - -#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget KVI_SMALLICON_CAPTION -#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("Window Captions") -#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("theme,mdi") -#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget "theme" - -class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget -{ - Q_OBJECT -public: - KviThemeMdiCaptionsOptionsWidget(QWidget * parent); - ~KviThemeMdiCaptionsOptionsWidget(); -}; - #define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiAreaOptionsWidget KVI_SMALLICON_APPLET #define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("Workspace") #define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi") diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 894083c42..69586d24a 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -1356,22 +1356,6 @@ void KviPopupEditorWindow::resizeEvent(QResizeEvent *) void KviPopupEditorWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Popup Editor","editor"); - - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); - - m_szHtmlActiveCaption = p1; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += p2; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += p3; - - m_szHtmlInactiveCaption = p1; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += p2; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += p3; } diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index 78724a477..5efe02d1e 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -532,23 +532,6 @@ void KviRawEditorWindow::resizeEvent(QResizeEvent *) void KviRawEditorWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Raw Editor","editor"); - - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); - - m_szHtmlActiveCaption = p1; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += p2; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += p3; - - m_szHtmlInactiveCaption = p1; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += p2; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += p3; - } void KviRawEditorWindow::getConfigGroupName(QString &szName) diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 67d9f4054..c1c3507bb 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -701,19 +701,6 @@ QSize KviSharedFilesWindow::sizeHint() const void KviSharedFilesWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Shared Files","sharedfileswindow"); - - m_szHtmlActiveCaption = "<nobr><font color=\""; - m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); - m_szHtmlActiveCaption += "\"><b>"; - m_szHtmlActiveCaption += m_szPlainTextCaption; - m_szHtmlActiveCaption += "</b></font></nobr>"; - - m_szHtmlInactiveCaption = "<nobr><font color=\""; - m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name(); - m_szHtmlInactiveCaption += "\"><b>"; - m_szHtmlInactiveCaption += m_szPlainTextCaption; - m_szHtmlInactiveCaption += "</b></font></nobr>"; - } void KviSharedFilesWindow::die() diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 4d88b309c..4a2db776b 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -81,20 +81,6 @@ void KviSocketSpyWindow::getBaseLogFileName(QString &buffer) void KviSocketSpyWindow::fillCaptionBuffers() { KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlActiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data(), - m_pConsole->context()->id()); - - KviQString::sprintf(m_szHtmlInactiveCaption, - __tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \ - "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data(), - m_pConsole->context()->id()); } bool KviSocketSpyWindow::incomingMessage(const char * message) diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp index e0284ba27..d86004f36 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -70,15 +70,6 @@ void KviTermWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr("Terminal"); - - m_szHtmlActiveCaption.sprintf( - __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data()); - m_szHtmlInactiveCaption.sprintf( - __tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data()); } diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 86f3e6339..224c1c622 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1159,7 +1159,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) @short: Sets the caption of an user window @syntax: - window.setWindowTitle [-q] <window_id> <plain_text_caption> [html_inactive_caption] [html_active_caption] + window.setWindowTitle [-q] <window_id> <plain_text_caption> @switches: !sw: -q | --quiet Be quiet @@ -1168,16 +1168,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) If <window_id> is an empty string then the current window is assumed.[br] The window must be of type userwnd and must have been created by [fnc]$window.open[/fnc]: it is not possible to change the caption of other window types.[br] - If the window is not of the expected type then a warning is printed unless the -q switch is used.[br] - If [html_inactive_caption] and/or [html_active_caption] are given then - the html versions of the captions displayed in the window caption bars - are set too. If one of these parameters is missing then <plain_text_caption> is - used for the html versions too. The html captions can contain limited html code. In particular - you're allowed to use the <nobr>,<font>,<b> and <i> html tags. - It is better to avoid using colored fonts since you can't know which color scheme the - user will have set.[br] - If the windows get undocked, it will just use <plain_text_caption>, not the styled html captions. - If the specified window does not exist a warning is printed unless the -q switch is used. + If the window does not exists or is not of the expected type then a warning is printed unless the -q switch is used.[br] @seealso: */ @@ -1185,14 +1176,10 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c) { QString szWnd; QString szPlain; - QString szInactive; - QString szActive; KviWindow * pWnd; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window_id",KVS_PT_STRING,0,szWnd) KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0,szPlain) - KVSM_PARAMETER("html_inactive_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szInactive) - KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive) KVSM_PARAMETERS_END(c) pWnd = g_pApp->findWindow(szWnd.toUtf8().data()); @@ -1205,7 +1192,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c) if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW) { - ((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain,szInactive,szActive); + ((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain); } else { if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("The specified window is not of type \"userwnd\"")); } diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp index 7a87f3e41..156c4104f 100644 --- a/src/modules/window/userwindow.cpp +++ b/src/modules/window/userwindow.cpp @@ -94,12 +94,8 @@ void KviUserWindow::fillCaptionBuffers() // nothing here } -void KviUserWindow::setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive) +void KviUserWindow::setWindowTitleStrings(const QString &szPlainText) { m_szPlainTextCaption = szPlainText; - m_szHtmlActiveCaption = szHtmlActive; - m_szHtmlInactiveCaption = szHtmlInactive; - if(m_szHtmlActiveCaption.isEmpty())m_szHtmlActiveCaption = szPlainText; - if(m_szHtmlInactiveCaption.isEmpty())m_szHtmlInactiveCaption = szPlainText; updateCaption(); } diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h index a658a91a1..21902aa3b 100644 --- a/src/modules/window/userwindow.h +++ b/src/modules/window/userwindow.h @@ -42,7 +42,7 @@ protected: virtual QPixmap * myIconPtr(); virtual void fillCaptionBuffers(); public: - void setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive); + void setWindowTitleStrings(const QString &szPlainText); }; #endif //!_USERWINDOW_H_ |