diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/ident/libkviident.cpp | 2 | ||||
| -rw-r--r-- | src/modules/list/listwindow.cpp | 164 | ||||
| -rw-r--r-- | src/modules/list/listwindow.h | 51 | ||||
| -rw-r--r-- | src/modules/logview/logview_QT4_vc05.vcproj | 2 | ||||
| -rw-r--r-- | src/modules/popupeditor/popupeditor.cpp | 38 | ||||
| -rw-r--r-- | src/modules/reguser/reguser_QT4_vc05.vcproj | 2 |
6 files changed, 145 insertions, 114 deletions
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 6734e292a..7fff2cb42 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -450,7 +450,7 @@ ipv6_failure: // Ok...parse the request KviStr szReq = r->m_szData.left(idx); r->m_szData.cutLeft(idx + 1); - szReq.stripWhiteSpace(); + szReq.trimmed(); if(szReq.hasData()) { diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 4bf68f1c9..ea6db1bb5 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -46,6 +46,7 @@ #include "kvi_msgbox.h" #include "kvi_fileextensions.h" #include "kvi_tal_hbox.h" +#include "kvi_tal_tooltip.h" #include <QTimer> #include <QPainter> @@ -60,7 +61,7 @@ extern KviPointerList<KviListWindow> * g_pListWindowList; //extern KVIRC_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2); -KviChannelListViewItemData::KviChannelListViewItemData(const QString &szChan,const QString &szUsers,const QString &szTopic) +KviChannelTreeWidgetItemData::KviChannelTreeWidgetItemData(const QString &szChan,const QString &szUsers,const QString &szTopic) { m_szChan = szChan; m_szUsers = szUsers; @@ -70,24 +71,24 @@ KviChannelListViewItemData::KviChannelListViewItemData(const QString &szChan,con while(m_szUsersKey.length() < 6)m_szUsersKey.prepend("0"); } -KviChannelListViewItemData::~KviChannelListViewItemData() +KviChannelTreeWidgetItemData::~KviChannelTreeWidgetItemData() { } -KviChannelListViewItem::KviChannelListViewItem(KviTalListView * v,KviChannelListViewItemData * pData) -: KviTalListViewItem(v) +KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData) +: KviTalTreeWidgetItem(v) { m_pData = pData; } -KviChannelListViewItem::~KviChannelListViewItem() +KviChannelTreeWidgetItem::~KviChannelTreeWidgetItem() { delete m_pData; } -int KviChannelListViewItem::width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const +int KviChannelTreeWidgetItem::width ( const QFontMetrics & fm, const KviTalTreeWidget * lv, int column ) const { debug("width request"); QString szText; @@ -105,43 +106,48 @@ int KviChannelListViewItem::width ( const QFontMetrics & fm, const KviTalListVie #define KVI_LABEL_DEF_BACK 100 #define KVI_LABEL_DEF_FORE 101 -void KviChannelListViewItem::paintCell(QPainter * p,const QColorGroup &cg,int column,int width,int align) +void KviChannelTreeWidgetItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
{ QString szText; - - switch(column) + QPalette cg; + KviChannelTreeWidgetItem *item=static_cast<KviChannelTreeWidgetItem *>(index.internalPointer()); + switch(index.column()) { - case 0: szText = m_pData->m_szChan; break; - case 1: szText = m_pData->m_szUsers; break; - default: szText = m_pData->m_szTopic; break; + case 0: szText = item->channelData()->m_szChan; break; + case 1: szText = item->channelData()->m_szUsers; break; + default: szText = item->channelData()->m_szTopic; break; } - KviTalListView* lv = (KviTalListView *)listView(); - int marg = lv->itemMargin(); + KviTalTreeWidget* lv = (KviTalTreeWidget *)item->treeWidget(); + // FIXME + int marg = 5;//lv->itemMargin(); int r = marg; - p->fillRect( 0, 0, width, height(), cg.brush(lv->viewport()->backgroundRole()) ); + p->fillRect( option.rect.x(), option.rect.y(), option.rect.width(), option.rect.height(), cg.brush(lv->viewport()->backgroundRole()) ); + int width=option.rect.width(); - if ( isSelected() && - (column == 0 || lv->allColumnsShowFocus()) ) { - p->fillRect( r - marg, 0, width - r + marg, height(), - cg.brush( QColorGroup::Highlight ) ); + if ((option.state & QStyle::State_Selected) && (index.column() == 0 || lv->allColumnsShowFocus()) ) { + p->fillRect( r - marg, 0, width - r + marg, option.rect.height(), + cg.brush( QPalette::Highlight ) ); - if ( isEnabled() || !lv ) - p->setPen( cg.highlightedText() ); - else if ( !isEnabled() && lv) - p->setPen( lv->palette().disabled().highlightedText() ); + if ( (option.state & QStyle::State_Enabled) || !lv ) + p->setPen( cg.highlightedText().color() ); + else if ( !(option.state & QStyle::State_Enabled) && lv) + // FIXME + // p->setPen( lv->palette().currentColorGroup().inactive().highlightedText() ); + p->setPen( lv->palette().highlightedText().color() ); } else { - if ( isEnabled() || !lv ) - p->setPen( cg.text() ); - else if ( !isEnabled() && lv) - p->setPen( lv->palette().disabled().text() ); + if ( (option.state & QStyle::State_Enabled) || !lv ) + p->setPen( cg.text().color() ); + else if ( !(option.state & QStyle::State_Enabled) && lv) + //p->setPen( lv->palette().disabled().text() ); + p->setPen(lv->palette().text().color()); } - KviTopicWidget::paintColoredText(p,szText,cg,height(),width); + KviTopicWidget::paintColoredText(p,szText,cg,option.rect); } -QString KviChannelListViewItem::key(int col,bool) const +QString KviChannelTreeWidgetItem::key(int col,bool) const { switch(col) { @@ -167,53 +173,62 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pFlushTimer = 0; - m_pItemList = new KviPointerList<KviChannelListViewItemData>; + m_pItemList = new KviPointerList<KviChannelTreeWidgetItemData>; m_pItemList->setAutoDelete(false); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); - m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter"); - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter->setObjectName("splitter"); + m_pTopSplitter = new QSplitter(Qt::Horizontal,this); + m_pTopSplitter->setObjectName("top_splitter"); + m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter->setObjectName("vsplitter"); KviTalHBox * box = new KviTalHBox(m_pTopSplitter); + box->setSpacing(1); + box->setMargin(0); m_pOpenButton = new KviStyledToolButton(box); - m_pOpenButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); + m_pOpenButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)))); connect(m_pOpenButton,SIGNAL(clicked()),this,SLOT(importList())); m_pSaveButton = new KviStyledToolButton(box); - m_pSaveButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))); + m_pSaveButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)))); connect(m_pSaveButton,SIGNAL(clicked()),this,SLOT(exportList())); m_pRequestButton = new KviStyledToolButton(box,"request_button"); - m_pRequestButton->setUsesBigPixmap(false); - m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST))); + m_pRequestButton->setIconSize(QSize(16,16)); + m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST)))); connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList())); - QToolTip::add(m_pRequestButton,__tr2qs("Request List")); + KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List")); m_pStopListDownloadButton = new KviStyledToolButton(box,"stoplistdownload_button"); - m_pStopListDownloadButton->setUsesBigPixmap(false); - m_pStopListDownloadButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM))); + m_pStopListDownloadButton->setIconSize(QSize(16,16)); + m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM)))); connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload())); - QToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download")); + KviTalToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download")); m_pParamsEdit = new QLineEdit(box); box->setStretchFactor(m_pParamsEdit,1); - QToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \ + KviTalToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \ "allow you to filter the returned entries.<br>" \ "Commonly, masked channel names (*kvirc*) are accepted as parameters, as well as strings " \ "like <b>c<n</b> or <b>c>n</b> where <b>n</b> is the minimum or maximum of users on the channel.</center>")); m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label"); - m_pListView = new KviTalListView(m_pVertSplitter); - m_pListView->addColumn(__tr2qs("Channel")); - m_pListView->addColumn(__tr2qs("Users")); - m_pListView->addColumn(__tr2qs("Topic")); - m_pListView->setAllColumnsShowFocus(TRUE); - m_pListView->setColumnWidthMode(2,KviTalListView::Maximum); - m_pListView->setColumnWidthMode(3,KviTalListView::Maximum); - m_pListView->setSorting(100); - - connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *))); + m_pTreeWidget = new KviTalTreeWidget(m_pVertSplitter); + m_pTreeWidget->setItemDelegate(new KviChannelTreeWidgetItemDelegate(m_pTreeWidget)); + QStringList columnLabels; + columnLabels.append(__tr2qs("Channel")); + columnLabels.append(__tr2qs("Users")); + columnLabels.append(__tr2qs("Topic")); + m_pTreeWidget->setColumnCount(3); + m_pTreeWidget->setHeaderLabels(columnLabels); + m_pTreeWidget->setAllColumnsShowFocus(TRUE); + //m_pTreeWidget->setColumnWidthMode(2,KviTalTreeWidget::Maximum); + //m_pTreeWidget->setColumnWidthMode(3,KviTalTreeWidget::Maximum); + //m_pTreeWidget->setSorting(100); + m_pTreeWidget->sortItems(0,Qt::AscendingOrder); + connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem *)),this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem *))); m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); @@ -306,15 +321,15 @@ void KviListWindow::fillCaptionBuffers() 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().ascii(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii(), m_pConsole->ircContextId()); 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().ascii(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii(), m_pConsole->ircContextId()); } @@ -325,7 +340,7 @@ void KviListWindow::die() void KviListWindow::exportList() { - if(!m_pListView->firstChild()) + if(!m_pTreeWidget->topLevelItemCount()) { KviMessageBox::warning(__tr2qs("You cannot export an empty list")); return; @@ -344,21 +359,24 @@ void KviListWindow::exportList() __tr2qs("Configuration files (*.kvc)"),false, false,true,this)) { - if(QFileInfo(szFile).extension()!="kvc") + if(QFileInfo(szFile).completeSuffix()!="kvc") szFile.append(".kvc"); KviConfig cfg(szFile,KviConfig::Write); cfg.clear(); - KviTalListViewItemIterator it(m_pListView); - - while(it.current()) + //KviTalTreeWidgetItemIterator it(m_pTreeWidget); + + //while(it.current()) + KviChannelTreeWidgetItem *it; + for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - KviChannelListViewItemData* pData= ((KviChannelListViewItem*) ( it.current() ))->m_pData; + it=(KviChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + KviChannelTreeWidgetItemData* pData= it->m_pData; cfg.setGroup(pData->m_szChan); // Write properties cfg.writeEntry("topic",pData->m_szTopic); cfg.writeEntry("users",pData->m_szUsers); // cfg.writeEntry("usersKey",pData->m_szUsersKey); - ++it; + // ++it; } } } @@ -384,7 +402,7 @@ void KviListWindow::importList() { cfg.setGroup(it.currentKey()); m_pItemList->append( - new KviChannelListViewItemData( + new KviChannelTreeWidgetItemData( it.currentKey(), cfg.readQStringEntry("users","0"), cfg.readQStringEntry("topic","") @@ -429,7 +447,7 @@ void KviListWindow::startOfList() m_pItemList->clear(); m_pItemList->setAutoDelete(false); - m_pListView->clear(); + m_pTreeWidget->clear(); m_pRequestButton->setEnabled(false); } @@ -447,7 +465,7 @@ void KviListWindow::processData(KviIrcMessage *msg) QString sz2 = msg->connection()->decodeText(msg->safeParam(2)); m_pItemList->append( - new KviChannelListViewItemData( + new KviChannelTreeWidgetItemData( msg->connection()->decodeText(msg->safeParam(1)), msg->connection()->decodeText(msg->safeParam(2)), msg->connection()->decodeText(msg->safeTrailing())) @@ -462,19 +480,19 @@ void KviListWindow::processData(KviIrcMessage *msg) void KviListWindow::flush() { - m_pListView->setUpdatesEnabled(true); /* for v_scroolbar */ - while(KviChannelListViewItemData * d = m_pItemList->first()) + m_pTreeWidget->setUpdatesEnabled(true); /* for v_scroolbar */ + while(KviChannelTreeWidgetItemData * d = m_pItemList->first()) { - (void)new KviChannelListViewItem(m_pListView,d); + (void)new KviChannelTreeWidgetItem(m_pTreeWidget,d); m_pItemList->removeFirst(); } - m_pListView->setUpdatesEnabled(true); - m_pListView->viewport()->update(); + m_pTreeWidget->setUpdatesEnabled(true); + m_pTreeWidget->viewport()->update(); } -void KviListWindow::itemDoubleClicked(KviTalListViewItem *it) +void KviListWindow::itemDoubleClicked(KviTalTreeWidgetItem *it) { - QString sz = ((KviChannelListViewItem *)it)->channel(); + QString sz = ((KviChannelTreeWidgetItem *)it)->channel(); if(sz.isEmpty())return; if(!connection())return; KviQCString dat = connection()->encodeText(sz); diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h index bb4266cf0..92092702b 100644 --- a/src/modules/list/listwindow.h +++ b/src/modules/list/listwindow.h @@ -31,21 +31,33 @@ #include "kvi_sparser.h" #include "kvi_console.h" #include "kvi_irccontext.h" -#include "kvi_tal_listview.h" +#include "kvi_tal_treewidget.h" #include "kvi_tal_popupmenu.h" -#include <QToolButton> +#include "kvi_styled_controls.h" #include <QLineEdit> +#include <QItemDelegate> class KviThemedLabel; -class KviChannelListViewItemData + +class KviChannelTreeWidgetItemDelegate : public QItemDelegate +{ +public: + KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget=0) + : QItemDelegate(pWidget) {}; + ~KviChannelTreeWidgetItemDelegate(){}; + void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; + +}; +class KviChannelTreeWidgetItemData { - friend class KviChannelListViewItem; + friend class KviChannelTreeWidgetItem; friend class KviListWindow; + friend class KviChannelTreeWidgetItemDelegate; public: - KviChannelListViewItemData(const QString &szChan,const QString &szUsers,const QString &szTopic); - ~KviChannelListViewItemData(); + KviChannelTreeWidgetItemData(const QString &szChan,const QString &szUsers,const QString &szTopic); + ~KviChannelTreeWidgetItemData(); protected: QString m_szChan; QString m_szUsers; @@ -53,19 +65,20 @@ protected: QString m_szUsersKey; }; -class KviChannelListViewItem : public KviTalListViewItem +class KviChannelTreeWidgetItem : public KviTalTreeWidgetItem { friend class KviListWindow; public: - KviChannelListViewItem(KviTalListView * v,KviChannelListViewItemData * pData); - ~KviChannelListViewItem(); + KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData); + ~KviChannelTreeWidgetItem(); protected: - KviChannelListViewItemData * m_pData; + KviChannelTreeWidgetItemData * m_pData; public: const QString & channel(){ return m_pData->m_szChan; }; - int width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const; + const KviChannelTreeWidgetItemData * channelData(){ return m_pData;} + int width ( const QFontMetrics & fm, const KviTalTreeWidget * lv, int column ) const; protected: - virtual void paintCell(QPainter * p,const QColorGroup &cg,int col,int wdth,int align); +// virtual void paintCell(QPainter * p,const QColorGroup &cg,int col,int wdth,int align); virtual QString key(int col,bool) const; }; @@ -79,15 +92,15 @@ public: protected: QSplitter * m_pVertSplitter; QSplitter * m_pTopSplitter; - KviTalListView * m_pListView; + KviTalTreeWidget * m_pTreeWidget; QLineEdit * m_pParamsEdit; - QToolButton * m_pRequestButton; - QToolButton * m_pStopListDownloadButton; - QToolButton * m_pOpenButton; - QToolButton * m_pSaveButton; + KviStyledToolButton * m_pRequestButton; + KviStyledToolButton * m_pStopListDownloadButton; + KviStyledToolButton * m_pOpenButton; + KviStyledToolButton * m_pSaveButton; KviThemedLabel * m_pInfoLabel; QTimer * m_pFlushTimer; - KviPointerList<KviChannelListViewItemData> * m_pItemList; + KviPointerList<KviChannelTreeWidgetItemData> * m_pItemList; public: // Methods virtual void control(int msg); virtual void processData(KviIrcMessage * msg); @@ -100,7 +113,7 @@ protected: virtual void getBaseLogFileName(KviStr &buffer); protected slots: void flush(); - void itemDoubleClicked(KviTalListViewItem *it); + void itemDoubleClicked(KviTalTreeWidgetItem *it); void requestList(); void stoplistdownload(); void connectionStateChange(); diff --git a/src/modules/logview/logview_QT4_vc05.vcproj b/src/modules/logview/logview_QT4_vc05.vcproj index fe583a8aa..e4d8b8e73 100644 --- a/src/modules/logview/logview_QT4_vc05.vcproj +++ b/src/modules/logview/logview_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ZLIBINCDIR)";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGVIEW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGVIEW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index de3666264..90867ff79 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -717,46 +717,46 @@ void KviSinglePopupEditor::saveLastSelectedItem() void KviSinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,KviPopupListViewItem *it) { - it->m_szId.stripWhiteSpace(); + it->m_szId.trimmed(); switch(it->m_type) { case KviPopupListViewItem::Prologue: - it->m_szCode.stripWhiteSpace(); + it->m_szCode.trimmed(); p->addPrologue(it->m_szId,it->m_szCode); break; case KviPopupListViewItem::Epilogue: - it->m_szCode.stripWhiteSpace(); + it->m_szCode.trimmed(); p->addEpilogue(it->m_szId,it->m_szCode); break; case KviPopupListViewItem::Separator: - it->m_szCondition.stripWhiteSpace(); + it->m_szCondition.trimmed(); p->addSeparator(it->m_szId,it->m_szCondition); break; case KviPopupListViewItem::Label: - it->m_szText.stripWhiteSpace(); - it->m_szCondition.stripWhiteSpace(); - it->m_szIcon.stripWhiteSpace(); + it->m_szText.trimmed(); + it->m_szCondition.trimmed(); + it->m_szIcon.trimmed(); p->addLabel(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition); break; case KviPopupListViewItem::Item: - it->m_szText.stripWhiteSpace(); - it->m_szIcon.stripWhiteSpace(); - it->m_szCondition.stripWhiteSpace(); - it->m_szCode.stripWhiteSpace(); + it->m_szText.trimmed(); + it->m_szIcon.trimmed(); + it->m_szCondition.trimmed(); + it->m_szCode.trimmed(); p->addItem(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition); break; case KviPopupListViewItem::ExtMenu: - it->m_szText.stripWhiteSpace(); - it->m_szIcon.stripWhiteSpace(); - it->m_szCondition.stripWhiteSpace(); - it->m_szCode.stripWhiteSpace();// <-- this is the ext name in fact + it->m_szText.trimmed(); + it->m_szIcon.trimmed(); + it->m_szCondition.trimmed(); + it->m_szCode.trimmed();// <-- this is the ext name in fact p->addExtPopup(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition); break; case KviPopupListViewItem::Menu: { - it->m_szText.stripWhiteSpace(); - it->m_szIcon.stripWhiteSpace(); - it->m_szCondition.stripWhiteSpace(); + it->m_szText.trimmed(); + it->m_szIcon.trimmed(); + it->m_szCondition.trimmed(); KviKvsPopupMenu * menu = p->addPopup(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition); for(KviPopupListViewItem * item = (KviPopupListViewItem *)it->firstChild();item;item = (KviPopupListViewItem *)item->nextSibling()) { @@ -774,7 +774,7 @@ KviKvsPopupMenu * KviSinglePopupEditor::getMenu() saveLastSelectedItem(); QString tmp = m_pNameEditor->text(); - tmp.stripWhiteSpace(); + tmp.trimmed(); KviKvsPopupMenu * p = new KviKvsPopupMenu(tmp); for(KviPopupListViewItem * it = (KviPopupListViewItem *)m_pListView->firstChild();it;it = (KviPopupListViewItem *)it->nextSibling()) diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj index f202d1a73..931398534 100644 --- a/src/modules/reguser/reguser_QT4_vc05.vcproj +++ b/src/modules/reguser/reguser_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
|