From eb9ed8bbff0d342a5bdd89ba66d455b4ae69b351 Mon Sep 17 00:00:00 2001 From: Noldor Date: Mon, 2 Jun 2008 19:50:26 +0000 Subject: more QT4 port git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1892 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/addon/managementdialog.cpp | 31 ++++++++++++++++--------------- src/modules/addon/managementdialog.h | 10 +++++----- src/modules/dcc/broker.cpp | 4 ++-- src/modules/dcc/canvaswidget.cpp | 4 ++-- src/modules/dcc/libkvidcc.cpp | 4 ++-- src/modules/dcc/utils.cpp | 4 ++-- src/modules/editor/scripteditor.cpp | 2 +- src/modules/options/dialog.cpp | 4 ++-- 8 files changed, 32 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index ba43a2002..a57f1fe01 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -39,6 +39,7 @@ #include "kvi_sourcesdate.h" #include "kvi_draganddrop.h" #include "kvi_tal_listwidget.h" +#include "kvi_tal_tooltip.h" #include #include @@ -46,10 +47,10 @@ #include #include #include -#include +#include "kvi_styled_controls.h" #include #include -#include + #include #include #include @@ -102,51 +103,51 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p) hb->setSpacing(1); g->addWidget(hb,0,0); - QToolButton * tb; + KviStyledToolButton * tb; QFrame * sep; - m_pConfigureButton = new QToolButton(hb); + m_pConfigureButton = new KviStyledToolButton(hb); m_pConfigureButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_ADDONS))); m_pConfigureButton->setIconSize(QSize(32,32)); - QToolTip::add(m_pConfigureButton,__tr2qs_ctx("Configure Addon...","addon")); + KviTalToolTip::add(m_pConfigureButton,__tr2qs_ctx("Configure Addon...","addon")); connect(m_pConfigureButton,SIGNAL(clicked()),this,SLOT(configureScript())); - m_pHelpButton = new QToolButton(hb); + m_pHelpButton = new KviStyledToolButton(hb); m_pHelpButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_HELP))); m_pHelpButton->setIconSize(QSize(32,32)); - QToolTip::add(m_pHelpButton,__tr2qs_ctx("Show Help","addon")); + KviTalToolTip::add(m_pHelpButton,__tr2qs_ctx("Show Help","addon")); connect(m_pHelpButton,SIGNAL(clicked()),this,SLOT(showScriptHelp())); - m_pUninstallButton = new QToolButton(hb); + m_pUninstallButton = new KviStyledToolButton(hb); m_pUninstallButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE))); m_pUninstallButton->setIconSize(QSize(32,32)); - QToolTip::add(m_pUninstallButton,__tr2qs_ctx("Delete Selected Addons","addon")); + KviTalToolTip::add(m_pUninstallButton,__tr2qs_ctx("Delete Selected Addons","addon")); connect(m_pUninstallButton,SIGNAL(clicked()),this,SLOT(uninstallScript())); sep = new QFrame(hb); sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); sep->setMinimumWidth(12); - m_pPackButton = new QToolButton(hb); + m_pPackButton = new KviStyledToolButton(hb); m_pPackButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK))); m_pPackButton->setIconSize(QSize(32,32)); - QToolTip::add(m_pPackButton,__tr2qs_ctx("Create an Addon as a Distributable Package","addon")); + KviTalToolTip::add(m_pPackButton,__tr2qs_ctx("Create an Addon as a Distributable Package","addon")); connect(m_pPackButton,SIGNAL(clicked()),this,SLOT(packScript())); sep = new QFrame(hb); sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); sep->setMinimumWidth(12); - tb = new QToolButton(hb); + tb = new KviStyledToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); tb->setIconSize(QSize(32,32)); - QToolTip::add(tb,__tr2qs_ctx("Install Addon Package From Disk","addon")); + KviTalToolTip::add(tb,__tr2qs_ctx("Install Addon Package From Disk","addon")); connect(tb,SIGNAL(clicked()),this,SLOT(installScript())); - tb = new QToolButton(hb); + tb = new KviStyledToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW))); tb->setIconSize(QSize(32,32)); - QToolTip::add(tb,__tr2qs_ctx("Get More Addons...","addon")); + KviTalToolTip::add(tb,__tr2qs_ctx("Get More Addons...","addon")); connect(tb,SIGNAL(clicked()),this,SLOT(getMoreScripts())); QWidget *w= new QWidget(hb); diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h index f558ad38d..53511abb8 100644 --- a/src/modules/addon/managementdialog.h +++ b/src/modules/addon/managementdialog.h @@ -35,7 +35,7 @@ #include #include -class QToolButton; +class KviStyledToolButton; class QPixmap; class KviKvsScriptAddon; @@ -68,10 +68,10 @@ public: protected: KviTalListWidget * m_pListWidget; static KviScriptManagementDialog * m_pInstance; - QToolButton * m_pConfigureButton; - QToolButton * m_pHelpButton; - QToolButton * m_pPackButton; - QToolButton * m_pUninstallButton; + KviStyledToolButton * m_pConfigureButton; + KviStyledToolButton * m_pHelpButton; + KviStyledToolButton * m_pPackButton; + KviStyledToolButton * m_pUninstallButton; public: static KviScriptManagementDialog * instance(){ return m_pInstance; }; static void display(); diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index db45e0bf6..c1322fee7 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -166,7 +166,7 @@ void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc) { d = new KviDccDescriptor(*dcc); d->szLocalFileName = *(it); - d->szLocalFileName.stripWhiteSpace(); + d->szLocalFileName.trimmed(); ++it; if(d->szLocalFileName.isEmpty()) cancelDcc(d); @@ -786,7 +786,7 @@ void KviDccBroker::sendFileManage(KviDccDescriptor * dcc) { d = new KviDccDescriptor(*dcc); d->szLocalFileName = *(it); - d->szLocalFileName.stripWhiteSpace(); + d->szLocalFileName.trimmed(); ++it; if(d->szLocalFileName.isEmpty()) cancelDcc(d); diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 223a7989a..e0b4c53f0 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1303,10 +1303,10 @@ { KviStr fam = txt; fam.cutFromFirst(',',true); - fam.stripWhiteSpace(); + fam.trimmed(); KviStr psz = txt; psz.cutToFirst(',',true); - psz.stripWhiteSpace(); + psz.trimmed(); bool bOk; unsigned int uSize = psz.toUInt(&bOk); if(!bOk)uSize = 12; diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index 7909a53cd..70f3358a4 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -106,7 +106,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo } else { // -c or -n , grab a local nick from somewhere d->szLocalNick = KVI_OPTION_STRING(KviOption_stringNickname1); - d->szLocalNick.stripWhiteSpace(); + d->szLocalNick.trimmed(); if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1; d->szLocalUser = __tr2qs_ctx("unknown","dcc"); // we can live without it d->szLocalHost = d->szLocalUser; // we can live without it @@ -1228,7 +1228,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c) else { // -c or -n , grab a local nick from somewhere d->szLocalNick = KVI_OPTION_STRING(KviOption_stringNickname1); - d->szLocalNick.stripWhiteSpace(); + d->szLocalNick.trimmed(); if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1; d->szLocalUser = __tr("unknown"); // we can live without it d->szLocalHost = d->szLocalUser; // we can live without it diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp index acec18073..9f8e10735 100644 --- a/src/modules/dcc/utils.cpp +++ b/src/modules/dcc/utils.cpp @@ -40,7 +40,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin if(KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault)) { - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace(); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed(); if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty()) { if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) @@ -108,7 +108,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons if(KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault)) { - KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace(); + KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed(); if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty()) { if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data())) diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 4a26b4dc6..5fa06a1f6 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -91,7 +91,7 @@ KviCompletionBox::KviCompletionBox(QTextEdit * parent = 0) void KviCompletionBox::updateContents(QString buffer) { - //buffer=buffer.stripWhiteSpace(); + //buffer=buffer.trimmed(); KviPointerList *list; clear(); diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index e3ac65673..8e4080091 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -291,7 +291,7 @@ KviOptionsDialog::~KviOptionsDialog() void KviOptionsDialog::searchLineEditTextChanged(const QString &) { - QString txt = m_pSearchLineEdit->text().stripWhiteSpace(); + QString txt = m_pSearchLineEdit->text().trimmed(); m_pSearchButton->setEnabled(txt.length() > 0); } @@ -447,7 +447,7 @@ void KviOptionsDialog::search(const QString &szKeywords) void KviOptionsDialog::searchClicked() { - QString szTxt = m_pSearchLineEdit->text().stripWhiteSpace(); + QString szTxt = m_pSearchLineEdit->text().trimmed(); if(!szTxt.isEmpty()) search(szTxt); } -- cgit v1.3.1-10-gc9f91